proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-09 22:03:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

zebra: cosmetic changes in the netlink code

Browse Source 
Signed-off-by: Jakub Urbańczyk <xthaid@gmail.com>
This commit is contained in:
Jakub Urbańczyk 2020-07-13 12:43:15 +02:00
parent ae6138bfd8
commit f865339348
1 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
zebra/kernel_netlink.c
View File

@ -702,20 +702,18 @@ static void netlink_parse_extended_ack(struct nlmsghdr *h)
* *
* Returns -1 on error. Otherwise, it returns the number of bytes sent. * Returns -1 on error. Otherwise, it returns the number of bytes sent.
*/ */
static int netlink_send_msg(const struct nlsock *nl, void *buf, size_t buflen) static ssize_t netlink_send_msg(const struct nlsock *nl, void *buf,
size_t buflen)
{ {
struct sockaddr_nl snl; struct sockaddr_nl snl = {};
struct iovec iov; struct iovec iov = {};
struct msghdr msg; struct msghdr msg = {};
int status, save_errno = 0; ssize_t status;
int save_errno = 0;
memset(&snl, 0, sizeof(snl));
memset(&iov, 0, sizeof(iov));
memset(&msg, 0, sizeof(msg));
iov.iov_base = buf; iov.iov_base = buf;
iov.iov_len = buflen; iov.iov_len = buflen;
msg.msg_name = (void *)&snl; msg.msg_name = &snl;
msg.msg_namelen = sizeof(snl); msg.msg_namelen = sizeof(snl);
msg.msg_iov = &iov; msg.msg_iov = &iov;
msg.msg_iovlen = 1; msg.msg_iovlen = 1;
@ -733,7 +731,7 @@ static int netlink_send_msg(const struct nlsock *nl, void *buf, size_t buflen)
zlog_hexdump(buf, buflen); zlog_hexdump(buf, buflen);
} }
if (status < 0) { if (status == -1) {
flog_err_sys(EC_LIB_SOCKET, "%s error: %s", __func__, flog_err_sys(EC_LIB_SOCKET, "%s error: %s", __func__,
safe_strerror(save_errno)); safe_strerror(save_errno));
return -1; return -1;
@ -771,9 +769,9 @@ static int netlink_recv_msg(const struct nlsock *nl, struct msghdr msg,
#else #else
status = recvmsg(nl->sock, &msg, 0); status = recvmsg(nl->sock, &msg, 0);
#endif /* HANDLE_NETLINK_FUZZING */ #endif /* HANDLE_NETLINK_FUZZING */
} while (status < 0 && errno == EINTR); } while (status == -1 && errno == EINTR);
if (status < 0) { if (status == -1) {
if (errno == EWOULDBLOCK || errno == EAGAIN) if (errno == EWOULDBLOCK || errno == EAGAIN)
return 0; return 0;
flog_err(EC_ZEBRA_RECVMSG_OVERRUN, "%s recvmsg overrun: %s", flog_err(EC_ZEBRA_RECVMSG_OVERRUN, "%s recvmsg overrun: %s",
@ -1027,7 +1025,7 @@ int netlink_talk_info(int (*filter)(struct nlmsghdr *, ns_id_t, int startup),
n->nlmsg_type, n->nlmsg_len, n->nlmsg_seq, n->nlmsg_type, n->nlmsg_len, n->nlmsg_seq,
n->nlmsg_flags); n->nlmsg_flags);
if (netlink_send_msg(nl, n, n->nlmsg_len) < 0) if (netlink_send_msg(nl, n, n->nlmsg_len) == -1)
return -1; return -1;
/* /*
@ -1076,7 +1074,7 @@ int netlink_request(struct nlsock *nl, void *req)
n->nlmsg_pid = nl->snl.nl_pid; n->nlmsg_pid = nl->snl.nl_pid;
n->nlmsg_seq = ++nl->seq; n->nlmsg_seq = ++nl->seq;
if (netlink_send_msg(nl, req, n->nlmsg_len) < 0) if (netlink_send_msg(nl, req, n->nlmsg_len) == -1)
return -1; return -1;
return 0; return 0;