diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2018-06-18 10:58:43 -0400 |
|---|---|---|
| committer | Quentin Young <qlyoung@cumulusnetworks.com> | 2018-08-14 20:02:05 +0000 |
| commit | 6ae7ed45ff9a9a6c10b58c752ec8952e9e54c52e (patch) | |
| tree | 629e7b0f8bac04199dc3a79e78e394cf5261a05f /eigrpd/eigrp_network.c | |
| parent | ad9921dbd8017c7f6f9cce0838bfee9377b7b403 (diff) | |
eigrpd: Convert to use LIB_ERR_XXX for zlog_err
Convert, where appropriate, to using LIB_ERR_XXX for zlog_ferr
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
Diffstat (limited to 'eigrpd/eigrp_network.c')
| -rw-r--r-- | eigrpd/eigrp_network.c | 33 |
1 files changed, 19 insertions, 14 deletions
diff --git a/eigrpd/eigrp_network.c b/eigrpd/eigrp_network.c index 629beddec3..6b716c1c03 100644 --- a/eigrpd/eigrp_network.c +++ b/eigrpd/eigrp_network.c @@ -37,6 +37,7 @@ #include "privs.h" #include "table.h" #include "vty.h" +#include "lib_errors.h" #include "eigrpd/eigrp_structs.h" #include "eigrpd/eigrpd.h" @@ -61,8 +62,9 @@ int eigrp_sock_init(void) #endif if (eigrpd_privs.change(ZPRIVS_RAISE)) - zlog_err("eigrp_sock_init: could not raise privs, %s", - safe_strerror(errno)); + zlog_ferr(LIB_ERR_PRIVILEGES, + "eigrp_sock_init: could not raise privs, %s", + safe_strerror(errno)); eigrp_sock = socket(AF_INET, SOCK_RAW, IPPROTO_EIGRPIGP); if (eigrp_sock < 0) { @@ -70,8 +72,8 @@ int eigrp_sock_init(void) if (eigrpd_privs.change(ZPRIVS_LOWER)) zlog_err("eigrp_sock_init: could not lower privs, %s", safe_strerror(errno)); - zlog_err("eigrp_read_sock_init: socket: %s", - safe_strerror(save_errno)); + zlog_ferr(LIB_ERR_SOCKET, "eigrp_read_sock_init: socket: %s", + safe_strerror(save_errno)); exit(1); } @@ -82,8 +84,9 @@ int eigrp_sock_init(void) if (ret < 0) { int save_errno = errno; if (eigrpd_privs.change(ZPRIVS_LOWER)) - zlog_err("eigrp_sock_init: could not lower privs, %s", - safe_strerror(errno)); + zlog_ferr(LIB_ERR_PRIVILEGES, + "eigrp_sock_init: could not lower privs, %s", + safe_strerror(errno)); zlog_warn("Can't set IP_HDRINCL option for fd %d: %s", eigrp_sock, safe_strerror(save_errno)); } @@ -94,8 +97,9 @@ int eigrp_sock_init(void) if (ret < 0) { int save_errno = errno; if (eigrpd_privs.change(ZPRIVS_LOWER)) - zlog_err("eigrpd_sock_init: could not lower privs, %s", - safe_strerror(errno)); + zlog_ferr(LIB_ERR_PRIVILEGES, + "eigrpd_sock_init: could not lower privs, %s", + safe_strerror(errno)); zlog_warn("can't set sockopt IP_TOS %d to socket %d: %s", tos, eigrp_sock, safe_strerror(save_errno)); close(eigrp_sock); /* Prevent sd leak. */ @@ -112,8 +116,9 @@ int eigrp_sock_init(void) zlog_warn("Can't set pktinfo option for fd %d", eigrp_sock); if (eigrpd_privs.change(ZPRIVS_LOWER)) { - zlog_err("eigrp_sock_init: could not lower privs, %s", - safe_strerror(errno)); + zlog_ferr(LIB_ERR_PRIVILEGES, + "eigrp_sock_init: could not lower privs, %s", + safe_strerror(errno)); } return eigrp_sock; @@ -126,8 +131,8 @@ void eigrp_adjust_sndbuflen(struct eigrp *eigrp, unsigned int buflen) if (eigrp->maxsndbuflen >= buflen) return; if (eigrpd_privs.change(ZPRIVS_RAISE)) - zlog_err("%s: could not raise privs, %s", __func__, - safe_strerror(errno)); + zlog_ferr(LIB_ERR_PRIVILEGES, "%s: could not raise privs, %s", + __func__, safe_strerror(errno)); /* Now we try to set SO_SNDBUF to what our caller has requested * (the MTU of a newly added interface). However, if the OS has @@ -146,8 +151,8 @@ void eigrp_adjust_sndbuflen(struct eigrp *eigrp, unsigned int buflen) else zlog_warn("%s: failed to get SO_SNDBUF", __func__); if (eigrpd_privs.change(ZPRIVS_LOWER)) - zlog_err("%s: could not lower privs, %s", __func__, - safe_strerror(errno)); + zlog_ferr(LIB_ERR_PRIVILEGES, "%s: could not lower privs, %s", + __func__, safe_strerror(errno)); } int eigrp_if_ipmulticast(struct eigrp *top, struct prefix *p, |