diff options
| -rw-r--r-- | ripngd/ripng_interface.c | 14 | ||||
| -rw-r--r-- | ripngd/ripngd.c | 26 |
2 files changed, 26 insertions, 14 deletions
diff --git a/ripngd/ripng_interface.c b/ripngd/ripng_interface.c index c463630b12..804cb26594 100644 --- a/ripngd/ripng_interface.c +++ b/ripngd/ripng_interface.c @@ -35,6 +35,7 @@ #include "thread.h" #include "privs.h" #include "vrf.h" +#include "lib_errors.h" #include "ripngd/ripngd.h" #include "ripngd/ripng_debug.h" @@ -72,14 +73,18 @@ static int ripng_multicast_join(struct interface *ifp) * for this call as a workaround. */ if (ripngd_privs.change(ZPRIVS_RAISE)) - zlog_err("ripng_multicast_join: could not raise privs"); + zlog_ferr( + LIB_ERR_PRIVILEGES, + "ripng_multicast_join: could not raise privs"); ret = setsockopt(ripng->sock, IPPROTO_IPV6, IPV6_JOIN_GROUP, (char *)&mreq, sizeof(mreq)); save_errno = errno; if (ripngd_privs.change(ZPRIVS_LOWER)) - zlog_err("ripng_multicast_join: could not lower privs"); + zlog_ferr( + LIB_ERR_PRIVILEGES, + "ripng_multicast_join: could not lower privs"); if (ret < 0 && save_errno == EADDRINUSE) { /* @@ -642,8 +647,9 @@ static int ripng_interface_wakeup(struct thread *t) /* Join to multicast group. */ if (ripng_multicast_join(ifp) < 0) { - zlog_err("multicast join failed, interface %s not running", - ifp->name); + zlog_ferr(LIB_ERR_SOCKET, + "multicast join failed, interface %s not running", + ifp->name); return 0; } diff --git a/ripngd/ripngd.c b/ripngd/ripngd.c index 565e151c53..7472ec6965 100644 --- a/ripngd/ripngd.c +++ b/ripngd/ripngd.c @@ -35,6 +35,7 @@ #include "routemap.h" #include "if_rmap.h" #include "privs.h" +#include "lib_errors.h" #include "ripngd/ripngd.h" #include "ripngd/ripng_route.h" @@ -94,7 +95,7 @@ static int ripng_make_socket(void) sock = socket(AF_INET6, SOCK_DGRAM, 0); if (sock < 0) { - zlog_err("Can't make ripng socket"); + zlog_ferr(LIB_ERR_SOCKET, "Can't make ripng socket"); return sock; } @@ -125,17 +126,21 @@ static int ripng_make_socket(void) ripaddr.sin6_port = htons(RIPNG_PORT_DEFAULT); if (ripngd_privs.change(ZPRIVS_RAISE)) - zlog_err("ripng_make_socket: could not raise privs"); + zlog_ferr(LIB_ERR_PRIVILEGES, + "ripng_make_socket: could not raise privs"); ret = bind(sock, (struct sockaddr *)&ripaddr, sizeof(ripaddr)); if (ret < 0) { - zlog_err("Can't bind ripng socket: %s.", safe_strerror(errno)); + zlog_ferr(LIB_ERR_SOCKET, "Can't bind ripng socket: %s.", + safe_strerror(errno)); if (ripngd_privs.change(ZPRIVS_LOWER)) - zlog_err("ripng_make_socket: could not lower privs"); + zlog_ferr(LIB_ERR_PRIVILEGES, + "ripng_make_socket: could not lower privs"); goto error; } if (ripngd_privs.change(ZPRIVS_LOWER)) - zlog_err("ripng_make_socket: could not lower privs"); + zlog_ferr(LIB_ERR_PRIVILEGES, + "ripng_make_socket: could not lower privs"); return sock; error: @@ -202,12 +207,13 @@ int ripng_send_packet(caddr_t buf, int bufsize, struct sockaddr_in6 *to, if (ret < 0) { if (to) - zlog_err("RIPng send fail on %s to %s: %s", ifp->name, - inet6_ntoa(to->sin6_addr), - safe_strerror(errno)); + zlog_ferr(LIB_ERR_SOCKET, + "RIPng send fail on %s to %s: %s", ifp->name, + inet6_ntoa(to->sin6_addr), + safe_strerror(errno)); else - zlog_err("RIPng send fail on %s: %s", ifp->name, - safe_strerror(errno)); + zlog_ferr(LIB_ERR_SOCKET, "RIPng send fail on %s: %s", + ifp->name, safe_strerror(errno)); } return ret; |