From: Donald Sharp Date: Fri, 29 Jun 2018 13:49:08 +0000 (-0400) Subject: zebra: Remove need for ACK for netlink messages X-Git-Tag: frr-6.1-dev~171^2 X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=8c85e8ea92808ecbf8d301b00e991784830024a7;p=mirror%2Ffrr.git zebra: Remove need for ACK for netlink messages Kernel requests via netlink are synchronous. Therefore we do not need to specify a need for a ACK and we can make the netlink_cmd NONBLOCKING 1) If the netlink message is going to cause an error we will still get one. Since results from the kernel are synchronous we will get the error message on the netlink_cmd socket and handle it 2) If the netlink message is going to send more than one packet we will still get them all. Since the results from the kernel are synchronous we will receive all data. Signed-off-by: Donald Sharp --- diff --git a/zebra/kernel_netlink.c b/zebra/kernel_netlink.c index 73f64de7f3..8703b01319 100644 --- a/zebra/kernel_netlink.c +++ b/zebra/kernel_netlink.c @@ -829,9 +829,6 @@ int netlink_talk(int (*filter)(struct nlmsghdr *, ns_id_t, int startup), n->nlmsg_seq = ++nl->seq; 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) zlog_debug( "netlink_talk: %s type %s(%u), len=%d seq=%u flags 0x%x", @@ -978,8 +975,12 @@ void kernel_init(struct zebra_ns *zns) /* Register kernel socket. */ if (fcntl(zns->netlink.sock, F_SETFL, O_NONBLOCK) < 0) - zlog_err("Can't set %s socket flags: %s", - zns->netlink.name, safe_strerror(errno)); + zlog_err("Can't set %s socket error: %s(%d)", + zns->netlink.name, safe_strerror(errno), errno); + + if (fcntl(zns->netlink_cmd.sock, F_SETFL, O_NONBLOCK) < 0) + zlog_err("Can't set %s socket error: %s(%d)", + zns->netlink_cmd.name, safe_strerror(errno), errno); /* Set receive buffer size if it's set from command line */ if (nl_rcvbufsize)