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

Merge pull request #2589 from donaldsharp/admiral_ACK_bar

Browse Source 
Netlink sockets are synchronous
This commit is contained in:
Renato Westphal 2018-07-14 11:48:40 -03:00 committed by GitHub
commit 972388dd5c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 25 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
zebra/kernel_netlink.c
View File

@ -829,9 +829,6 @@ int netlink_talk(int (*filter)(struct nlmsghdr *, ns_id_t, int startup),
n->nlmsg_seq = ++nl->seq; n->nlmsg_seq = ++nl->seq;
n->nlmsg_pid = nl->snl.nl_pid; n->nlmsg_pid = nl->snl.nl_pid;
/* Request an acknowledgement by setting NLM_F_ACK */
n->nlmsg_flags |= NLM_F_ACK;
if (IS_ZEBRA_DEBUG_KERNEL) if (IS_ZEBRA_DEBUG_KERNEL)
zlog_debug( zlog_debug(
"netlink_talk: %s type %s(%u), len=%d seq=%u flags 0x%x", "netlink_talk: %s type %s(%u), len=%d seq=%u flags 0x%x",
@ -942,12 +939,20 @@ void kernel_init(struct zebra_ns *zns)
snprintf(zns->netlink.name, sizeof(zns->netlink.name), snprintf(zns->netlink.name, sizeof(zns->netlink.name),
"netlink-listen (NS %u)", zns->ns_id); "netlink-listen (NS %u)", zns->ns_id);
zns->netlink.sock = -1; zns->netlink.sock = -1;
netlink_socket(&zns->netlink, groups, zns->ns_id); if (netlink_socket(&zns->netlink, groups, zns->ns_id) < 0) {
zlog_err("Failure to create %s socket",
zns->netlink.name);
exit(-1);
}
snprintf(zns->netlink_cmd.name, sizeof(zns->netlink_cmd.name), snprintf(zns->netlink_cmd.name, sizeof(zns->netlink_cmd.name),
"netlink-cmd (NS %u)", zns->ns_id); "netlink-cmd (NS %u)", zns->ns_id);
zns->netlink_cmd.sock = -1; zns->netlink_cmd.sock = -1;
netlink_socket(&zns->netlink_cmd, 0, zns->ns_id); if (netlink_socket(&zns->netlink_cmd, 0, zns->ns_id) < 0) {
zlog_err("Failure to create %s socket",
zns->netlink_cmd.name);
exit(-1);
}
/* /*
* SOL_NETLINK is not available on all platforms yet * SOL_NETLINK is not available on all platforms yet
@ -969,23 +974,24 @@ void kernel_init(struct zebra_ns *zns)
#endif #endif
/* Register kernel socket. */ /* Register kernel socket. */
if (zns->netlink.sock > 0) { if (fcntl(zns->netlink.sock, F_SETFL, O_NONBLOCK) < 0)
/* Only want non-blocking on the netlink event socket */ zlog_err("Can't set %s socket error: %s(%d)",
if (fcntl(zns->netlink.sock, F_SETFL, O_NONBLOCK) < 0) zns->netlink.name, safe_strerror(errno), errno);
zlog_err("Can't set %s socket flags: %s",
zns->netlink.name, safe_strerror(errno));
/* Set receive buffer size if it's set from command line */ if (fcntl(zns->netlink_cmd.sock, F_SETFL, O_NONBLOCK) < 0)
if (nl_rcvbufsize) zlog_err("Can't set %s socket error: %s(%d)",
netlink_recvbuf(&zns->netlink, nl_rcvbufsize); zns->netlink_cmd.name, safe_strerror(errno), errno);
netlink_install_filter(zns->netlink.sock, /* Set receive buffer size if it's set from command line */
zns->netlink_cmd.snl.nl_pid); if (nl_rcvbufsize)
zns->t_netlink = NULL; netlink_recvbuf(&zns->netlink, nl_rcvbufsize);
thread_add_read(zebrad.master, kernel_read, zns, netlink_install_filter(zns->netlink.sock,
zns->netlink.sock, &zns->t_netlink); zns->netlink_cmd.snl.nl_pid);
} zns->t_netlink = NULL;
thread_add_read(zebrad.master, kernel_read, zns,
zns->netlink.sock, &zns->t_netlink);
rt_netlink_init(); rt_netlink_init();
} }