diff options
| author | Mark Stapp <mjs@voltanet.io> | 2020-09-01 08:43:13 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-01 08:43:13 -0400 |
| commit | 5529b39211a88d0fd226db5a00c2d1d521fd3a7a (patch) | |
| tree | 071fb42a38027d855f2b71b14253fb5d85baaa5c /zebra/kernel_netlink.c | |
| parent | ddffdcf728280246e4ba8ba645d3c1b98763c4e5 (diff) | |
| parent | 97f85144603f596a74f008484e9d2e80f1571861 (diff) | |
Merge pull request #7028 from xThaid/netlink_buff
zebra: increase netlink receive buffer size
Diffstat (limited to 'zebra/kernel_netlink.c')
| -rw-r--r-- | zebra/kernel_netlink.c | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/zebra/kernel_netlink.c b/zebra/kernel_netlink.c index 16c94b7482..ad0d4bf56b 100644 --- a/zebra/kernel_netlink.c +++ b/zebra/kernel_netlink.c @@ -1453,6 +1453,15 @@ void kernel_init(struct zebra_ns *zns) if (ret < 0) zlog_notice("Registration for extended dp ACK failed : %d %s", errno, safe_strerror(errno)); + + /* + * Trim off the payload of the original netlink message in the + * acknowledgment. This option is available since Linux 4.2, so if + * setsockopt fails, ignore the error. + */ + one = 1; + ret = setsockopt(zns->netlink_dplane.sock, SOL_NETLINK, NETLINK_CAP_ACK, + &one, sizeof(one)); #endif /* Register kernel socket. */ @@ -1469,8 +1478,11 @@ void kernel_init(struct zebra_ns *zns) zns->netlink_dplane.name, safe_strerror(errno), errno); /* Set receive buffer size if it's set from command line */ - if (nl_rcvbufsize) + if (nl_rcvbufsize) { netlink_recvbuf(&zns->netlink, nl_rcvbufsize); + netlink_recvbuf(&zns->netlink_cmd, nl_rcvbufsize); + netlink_recvbuf(&zns->netlink_dplane, nl_rcvbufsize); + } netlink_install_filter(zns->netlink.sock, zns->netlink_cmd.snl.nl_pid, |