diff options
| author | Quentin Young <qlyoung@cumulusnetworks.com> | 2018-08-06 16:36:50 +0000 |
|---|---|---|
| committer | Quentin Young <qlyoung@cumulusnetworks.com> | 2018-08-14 20:02:05 +0000 |
| commit | 09c866e34dd6f1725ff5a2354017c13485c2c755 (patch) | |
| tree | 5dd5e6484250d6388453ace46240d210af30df36 /ripngd | |
| parent | 85cd2f9f9a43d0c536f445cc65b94a8d90bb4c97 (diff) | |
*: rename ferr_zlog -> flog_err_sys
Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
Diffstat (limited to 'ripngd')
| -rw-r--r-- | ripngd/ripng_interface.c | 6 | ||||
| -rw-r--r-- | ripngd/ripngd.c | 19 |
2 files changed, 13 insertions, 12 deletions
diff --git a/ripngd/ripng_interface.c b/ripngd/ripng_interface.c index 5a5123bc27..0063893022 100644 --- a/ripngd/ripng_interface.c +++ b/ripngd/ripng_interface.c @@ -647,9 +647,9 @@ static int ripng_interface_wakeup(struct thread *t) /* Join to multicast group. */ if (ripng_multicast_join(ifp) < 0) { - flog_err(LIB_ERR_SOCKET, - "multicast join failed, interface %s not running", - ifp->name); + flog_err_sys(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 e29d6ae5ca..80e0047ff3 100644 --- a/ripngd/ripngd.c +++ b/ripngd/ripngd.c @@ -95,7 +95,7 @@ static int ripng_make_socket(void) sock = socket(AF_INET6, SOCK_DGRAM, 0); if (sock < 0) { - flog_err(LIB_ERR_SOCKET, "Can't make ripng socket"); + flog_err_sys(LIB_ERR_SOCKET, "Can't make ripng socket"); return sock; } @@ -131,8 +131,8 @@ static int ripng_make_socket(void) ret = bind(sock, (struct sockaddr *)&ripaddr, sizeof(ripaddr)); if (ret < 0) { - flog_err(LIB_ERR_SOCKET, "Can't bind ripng socket: %s.", - safe_strerror(errno)); + flog_err_sys(LIB_ERR_SOCKET, "Can't bind ripng socket: %s.", + safe_strerror(errno)); if (ripngd_privs.change(ZPRIVS_LOWER)) flog_err(LIB_ERR_PRIVILEGES, "ripng_make_socket: could not lower privs"); @@ -207,13 +207,14 @@ int ripng_send_packet(caddr_t buf, int bufsize, struct sockaddr_in6 *to, if (ret < 0) { if (to) - flog_err(LIB_ERR_SOCKET, - "RIPng send fail on %s to %s: %s", ifp->name, - inet6_ntoa(to->sin6_addr), - safe_strerror(errno)); + flog_err_sys(LIB_ERR_SOCKET, + "RIPng send fail on %s to %s: %s", + ifp->name, inet6_ntoa(to->sin6_addr), + safe_strerror(errno)); else - flog_err(LIB_ERR_SOCKET, "RIPng send fail on %s: %s", - ifp->name, safe_strerror(errno)); + flog_err_sys(LIB_ERR_SOCKET, + "RIPng send fail on %s: %s", ifp->name, + safe_strerror(errno)); } return ret; |