diff options
| author | Quentin Young <qlyoung@cumulusnetworks.com> | 2018-08-03 20:03:29 +0200 |
|---|---|---|
| committer | Quentin Young <qlyoung@cumulusnetworks.com> | 2018-08-14 22:02:05 +0200 |
| commit | af4c27286d8eb3f347ff431a17a47a8d07cd8976 (patch) | |
| tree | caf5eae55c21f72baec4945cdb2cbc333d99f916 /zebra/zebra_netns_id.c | |
| parent | lib: remove still reachable blocks in ferr.c (diff) | |
| download | frr-af4c27286d8eb3f347ff431a17a47a8d07cd8976.tar.xz frr-af4c27286d8eb3f347ff431a17a47a8d07cd8976.zip | |
*: rename zlog_fer -> flog_err
Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
Diffstat (limited to 'zebra/zebra_netns_id.c')
| -rw-r--r-- | zebra/zebra_netns_id.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/zebra/zebra_netns_id.c b/zebra/zebra_netns_id.c index 698ac2986..119bff0b7 100644 --- a/zebra/zebra_netns_id.c +++ b/zebra/zebra_netns_id.c @@ -88,7 +88,7 @@ static int send_receive(int sock, struct nlmsghdr *nlh, unsigned int seq, ret = sendto(sock, (const void *)nlh, (size_t)nlh->nlmsg_len, 0, (struct sockaddr *)&snl, (socklen_t)sizeof(snl)); if (ret < 0) { - zlog_ferr(LIB_ERR_SOCKET, "netlink( %u) sendmsg() error: %s", + flog_err(LIB_ERR_SOCKET, "netlink( %u) sendmsg() error: %s", sock, safe_strerror(errno)); return -1; } @@ -109,18 +109,18 @@ static int send_receive(int sock, struct nlmsghdr *nlh, unsigned int seq, }; ret = recvmsg(sock, &msg, 0); if (ret < 0) { - zlog_ferr(LIB_ERR_SOCKET, + flog_err(LIB_ERR_SOCKET, "netlink recvmsg: error %d (errno %u)", ret, errno); return -1; } if (msg.msg_flags & MSG_TRUNC) { - zlog_ferr(ZEBRA_ERR_NETLINK_LENGTH_ERROR, + flog_err(ZEBRA_ERR_NETLINK_LENGTH_ERROR, "netlink recvmsg : error message truncated"); return -1; } /* nlh already points to buf */ if (nlh->nlmsg_seq != seq) { - zlog_ferr( + flog_err( ZEBRA_ERR_NETLINK_BAD_SEQUENCE, "netlink recvmsg: bad sequence number %x (expected %x)", seq, nlh->nlmsg_seq); @@ -175,7 +175,7 @@ ns_id_t zebra_ns_id_get(const char *netnspath) /* netlink socket */ sock = socket(AF_NETLINK, SOCK_RAW, NETLINK_ROUTE); if (sock < 0) { - zlog_ferr(LIB_ERR_SOCKET, "netlink( %u) socket() error: %s", + flog_err(LIB_ERR_SOCKET, "netlink( %u) socket() error: %s", sock, safe_strerror(errno)); close(fd); return NS_UNKNOWN; @@ -186,7 +186,7 @@ ns_id_t zebra_ns_id_get(const char *netnspath) snl.nl_pid = 0; /* AUTO PID */ ret = bind(sock, (struct sockaddr *)&snl, sizeof(snl)); if (ret < 0) { - zlog_ferr(LIB_ERR_SOCKET, + flog_err(LIB_ERR_SOCKET, "netlink( %u) socket() bind error: %s", sock, safe_strerror(errno)); close(sock); @@ -261,7 +261,7 @@ ns_id_t zebra_ns_id_get(const char *netnspath) if (ret <= 0) { if (errno != EEXIST && ret != 0) { - zlog_ferr( + flog_err( LIB_ERR_SOCKET, "netlink( %u) recvfrom() error 2 when reading: %s", fd, safe_strerror(errno)); |