diff options
Diffstat (limited to 'zebra/kernel_netlink.c')
| -rw-r--r-- | zebra/kernel_netlink.c | 65 |
1 files changed, 32 insertions, 33 deletions
diff --git a/zebra/kernel_netlink.c b/zebra/kernel_netlink.c index 323a6c33f5..d35230d7bd 100644 --- a/zebra/kernel_netlink.c +++ b/zebra/kernel_netlink.c @@ -163,7 +163,7 @@ 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_sys(LIB_ERR_SOCKET, + flog_err_sys(EC_LIB_SOCKET, "Can't get %s receive buffer size: %s", nl->name, safe_strerror(errno)); return -1; @@ -179,7 +179,7 @@ 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_sys(LIB_ERR_SOCKET, + flog_err_sys(EC_LIB_SOCKET, "Can't set %s receive buffer size: %s", nl->name, safe_strerror(errno)); return -1; @@ -187,7 +187,7 @@ static int netlink_recvbuf(struct nlsock *nl, uint32_t newsize) ret = getsockopt(nl->sock, SOL_SOCKET, SO_RCVBUF, &newsize, &newlen); if (ret < 0) { - flog_err_sys(LIB_ERR_SOCKET, + flog_err_sys(EC_LIB_SOCKET, "Can't get %s receive buffer size: %s", nl->name, safe_strerror(errno)); return -1; @@ -234,7 +234,7 @@ 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_sys(LIB_ERR_SOCKET, "Can't get %s socket name: %s", + flog_err_sys(EC_LIB_SOCKET, "Can't get %s socket name: %s", nl->name, safe_strerror(errno)); close(sock); return -1; @@ -286,10 +286,10 @@ static int netlink_information_fetch(struct nlmsghdr *h, ns_id_t ns_id, * this message type or not ask for * it to be sent up to us */ - flog_err(ZEBRA_ERR_UNKNOWN_NLMSG, - "Unknown netlink nlmsg_type %s(%d) vrf %u\n", - nl_msg_type_to_str(h->nlmsg_type), h->nlmsg_type, - ns_id); + flog_err(EC_ZEBRA_UNKNOWN_NLMSG, + "Unknown netlink nlmsg_type %s(%d) vrf %u\n", + nl_msg_type_to_str(h->nlmsg_type), h->nlmsg_type, + ns_id); break; } return 0; @@ -453,8 +453,7 @@ static void netlink_install_filter(int sock, __u32 pid) if (setsockopt(sock, SOL_SOCKET, SO_ATTACH_FILTER, &prog, sizeof(prog)) < 0) - flog_err_sys(LIB_ERR_SOCKET, - "Can't install socket filter: %s\n", + flog_err_sys(EC_LIB_SOCKET, "Can't install socket filter: %s\n", safe_strerror(errno)); } @@ -642,8 +641,9 @@ static void netlink_parse_extended_ack(struct nlmsghdr *h) * but noticing it for later. */ err_nlh = &err->msg; - zlog_debug("%s: Received %d extended Ack", - __PRETTY_FUNCTION__, err_nlh->nlmsg_type); + zlog_debug("%s: Received %s extended Ack", + __PRETTY_FUNCTION__, + nl_msg_type_to_str(err_nlh->nlmsg_type)); } } @@ -653,7 +653,7 @@ static void netlink_parse_extended_ack(struct nlmsghdr *h) if (is_err) zlog_err("Extended Error: %s", msg); else - flog_warn(ZEBRA_ERR_NETLINK_EXTENDED_WARNING, + flog_warn(EC_ZEBRA_NETLINK_EXTENDED_WARNING, "Extended Warning: %s", msg); } } @@ -710,9 +710,9 @@ int netlink_parse_info(int (*filter)(struct nlmsghdr *, ns_id_t, int), continue; if (errno == EWOULDBLOCK || errno == EAGAIN) break; - flog_err(ZEBRA_ERR_RECVMSG_OVERRUN, - "%s recvmsg overrun: %s", nl->name, - safe_strerror(errno)); + flog_err(EC_ZEBRA_RECVMSG_OVERRUN, + "%s recvmsg overrun: %s", nl->name, + safe_strerror(errno)); /* * In this case we are screwed. * There is no good way to @@ -723,14 +723,14 @@ int netlink_parse_info(int (*filter)(struct nlmsghdr *, ns_id_t, int), } if (status == 0) { - flog_err_sys(LIB_ERR_SOCKET, "%s EOF", nl->name); + flog_err_sys(EC_LIB_SOCKET, "%s EOF", nl->name); return -1; } if (msg.msg_namelen != sizeof snl) { - flog_err(ZEBRA_ERR_NETLINK_LENGTH_ERROR, - "%s sender address length error: length %d", - nl->name, msg.msg_namelen); + flog_err(EC_ZEBRA_NETLINK_LENGTH_ERROR, + "%s sender address length error: length %d", + nl->name, msg.msg_namelen); return -1; } @@ -803,10 +803,9 @@ int netlink_parse_info(int (*filter)(struct nlmsghdr *, ns_id_t, int), if (h->nlmsg_len < NLMSG_LENGTH(sizeof(struct nlmsgerr))) { - flog_err( - ZEBRA_ERR_NETLINK_LENGTH_ERROR, - "%s error: message truncated", - nl->name); + flog_err(EC_ZEBRA_NETLINK_LENGTH_ERROR, + "%s error: message truncated", + nl->name); return -1; } @@ -859,7 +858,7 @@ int netlink_parse_info(int (*filter)(struct nlmsghdr *, ns_id_t, int), err->msg.nlmsg_pid); } else flog_err( - ZEBRA_ERR_UNEXPECTED_MESSAGE, + EC_ZEBRA_UNEXPECTED_MESSAGE, "%s error: %s, type=%s(%u), seq=%u, pid=%u", nl->name, safe_strerror(-errnum), @@ -900,14 +899,14 @@ int netlink_parse_info(int (*filter)(struct nlmsghdr *, ns_id_t, int), /* After error care. */ if (msg.msg_flags & MSG_TRUNC) { - flog_err(ZEBRA_ERR_NETLINK_LENGTH_ERROR, - "%s error: message truncated", nl->name); + flog_err(EC_ZEBRA_NETLINK_LENGTH_ERROR, + "%s error: message truncated", nl->name); continue; } if (status) { - flog_err(ZEBRA_ERR_NETLINK_LENGTH_ERROR, - "%s error: data remnant size %d", nl->name, - status); + flog_err(EC_ZEBRA_NETLINK_LENGTH_ERROR, + "%s error: data remnant size %d", nl->name, + status); return -1; } } @@ -972,7 +971,7 @@ int netlink_talk(int (*filter)(struct nlmsghdr *, ns_id_t, int startup), } if (status < 0) { - flog_err_sys(LIB_ERR_SOCKET, "netlink_talk sendmsg() error: %s", + flog_err_sys(EC_LIB_SOCKET, "netlink_talk sendmsg() error: %s", safe_strerror(save_errno)); return -1; } @@ -995,7 +994,7 @@ int netlink_request(struct nlsock *nl, struct nlmsghdr *n) /* Check netlink socket. */ if (nl->sock < 0) { - flog_err_sys(LIB_ERR_SOCKET, "%s socket isn't active.", + flog_err_sys(EC_LIB_SOCKET, "%s socket isn't active.", nl->name); return -1; } @@ -1090,7 +1089,7 @@ void kernel_init(struct zebra_ns *zns) /* Register kernel socket. */ if (fcntl(zns->netlink.sock, F_SETFL, O_NONBLOCK) < 0) - flog_err_sys(LIB_ERR_SOCKET, "Can't set %s socket flags: %s", + flog_err_sys(EC_LIB_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) |