diff options
Diffstat (limited to 'zebra/kernel_netlink.c')
| -rw-r--r-- | zebra/kernel_netlink.c | 49 |
1 files changed, 25 insertions, 24 deletions
diff --git a/zebra/kernel_netlink.c b/zebra/kernel_netlink.c index e9f440832a..57a7f5273e 100644 --- a/zebra/kernel_netlink.c +++ b/zebra/kernel_netlink.c @@ -163,9 +163,9 @@ static int netlink_recvbuf(struct nlsock *nl, uint32_t newsize) ret = getsockopt(nl->sock, SOL_SOCKET, SO_RCVBUF, &oldsize, &oldlen); if (ret < 0) { - flog_err(LIB_ERR_SOCKET, - "Can't get %s receive buffer size: %s", nl->name, - safe_strerror(errno)); + flog_err_sys(LIB_ERR_SOCKET, + "Can't get %s receive buffer size: %s", nl->name, + safe_strerror(errno)); return -1; } @@ -182,17 +182,17 @@ static int netlink_recvbuf(struct nlsock *nl, uint32_t newsize) ret = setsockopt(nl->sock, SOL_SOCKET, SO_RCVBUF, &nl_rcvbufsize, sizeof(nl_rcvbufsize)); if (ret < 0) { - flog_err(LIB_ERR_SOCKET, - "Can't set %s receive buffer size: %s", nl->name, - safe_strerror(errno)); + flog_err_sys(LIB_ERR_SOCKET, + "Can't set %s receive buffer size: %s", nl->name, + safe_strerror(errno)); return -1; } ret = getsockopt(nl->sock, SOL_SOCKET, SO_RCVBUF, &newsize, &newlen); if (ret < 0) { - flog_err(LIB_ERR_SOCKET, - "Can't get %s receive buffer size: %s", nl->name, - safe_strerror(errno)); + flog_err_sys(LIB_ERR_SOCKET, + "Can't get %s receive buffer size: %s", nl->name, + safe_strerror(errno)); return -1; } @@ -218,8 +218,8 @@ static int netlink_socket(struct nlsock *nl, unsigned long groups, sock = ns_socket(AF_NETLINK, SOCK_RAW, NETLINK_ROUTE, ns_id); if (sock < 0) { - flog_err(LIB_ERR_SOCKET, "Can't open %s socket: %s", nl->name, - safe_strerror(errno)); + flog_err_sys(LIB_ERR_SOCKET, "Can't open %s socket: %s", + nl->name, safe_strerror(errno)); return -1; } @@ -234,9 +234,9 @@ static int netlink_socket(struct nlsock *nl, unsigned long groups, flog_err(LIB_ERR_PRIVILEGES, "Can't lower privileges"); if (ret < 0) { - flog_err(LIB_ERR_SOCKET, - "Can't bind %s socket to group 0x%x: %s", nl->name, - snl.nl_groups, safe_strerror(save_errno)); + flog_err_sys(LIB_ERR_SOCKET, + "Can't bind %s socket to group 0x%x: %s", nl->name, + snl.nl_groups, safe_strerror(save_errno)); close(sock); return -1; } @@ -245,8 +245,8 @@ static int netlink_socket(struct nlsock *nl, unsigned long groups, namelen = sizeof snl; ret = getsockname(sock, (struct sockaddr *)&snl, (socklen_t *)&namelen); if (ret < 0 || namelen != sizeof snl) { - flog_err(LIB_ERR_SOCKET, "Can't get %s socket name: %s", - nl->name, safe_strerror(errno)); + flog_err_sys(LIB_ERR_SOCKET, "Can't get %s socket name: %s", + nl->name, safe_strerror(errno)); close(sock); return -1; } @@ -720,7 +720,7 @@ int netlink_parse_info(int (*filter)(struct nlmsghdr *, ns_id_t, int), } if (status == 0) { - flog_err(LIB_ERR_SOCKET, "%s EOF", nl->name); + flog_err_sys(LIB_ERR_SOCKET, "%s EOF", nl->name); return -1; } @@ -970,8 +970,8 @@ int netlink_talk(int (*filter)(struct nlmsghdr *, ns_id_t, int startup), } if (status < 0) { - flog_err(LIB_ERR_SOCKET, "netlink_talk sendmsg() error: %s", - safe_strerror(save_errno)); + flog_err_sys(LIB_ERR_SOCKET, "netlink_talk sendmsg() error: %s", + safe_strerror(save_errno)); return -1; } @@ -994,7 +994,8 @@ int netlink_request(struct nlsock *nl, struct nlmsghdr *n) /* Check netlink socket. */ if (nl->sock < 0) { - flog_err(LIB_ERR_SOCKET, "%s socket isn't active.", nl->name); + flog_err_sys(LIB_ERR_SOCKET, "%s socket isn't active.", + nl->name); return -1; } @@ -1020,8 +1021,8 @@ int netlink_request(struct nlsock *nl, struct nlmsghdr *n) flog_err(LIB_ERR_PRIVILEGES, "Can't lower privileges"); if (ret < 0) { - flog_err(LIB_ERR_SOCKET, "%s sendto failed: %s", nl->name, - safe_strerror(save_errno)); + flog_err_sys(LIB_ERR_SOCKET, "%s sendto failed: %s", nl->name, + safe_strerror(save_errno)); return -1; } @@ -1095,8 +1096,8 @@ void kernel_init(struct zebra_ns *zns) /* Register kernel socket. */ if (fcntl(zns->netlink.sock, F_SETFL, O_NONBLOCK) < 0) - flog_err(LIB_ERR_SOCKET, "Can't set %s socket flags: %s", - zns->netlink.name, safe_strerror(errno)); + flog_err_sys(LIB_ERR_SOCKET, "Can't set %s socket flags: %s", + zns->netlink.name, safe_strerror(errno)); if (fcntl(zns->netlink_cmd.sock, F_SETFL, O_NONBLOCK) < 0) zlog_err("Can't set %s socket error: %s(%d)", |