proxmox-mirrors/mirror_lxc
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_lxc synced 2025-08-08 20:35:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #2681 from brauner/2018-10-08/adapt_netns_ifaddrs_to_new_kernel

Browse Source 
netns_ifaddrs: support NETLINK_DUMP_STRICT_CHK
This commit is contained in:
Stéphane Graber 2018-10-08 17:06:58 -04:00 committed by GitHub
commit e2103b180a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/include/netns_ifaddrs.c
View File

@ -477,6 +477,14 @@ static int __rtnl_enumerate(int link_af, int addr_af, __s32 netns_id,
if (fd < 0) if (fd < 0)
return -1; return -1;
r = setsockopt(fd, SOL_NETLINK, NETLINK_DUMP_STRICT_CHK, &(int){1},
sizeof(int));
if (r < 0 && netns_id >= 0) {
close(fd);
*netnsid_aware = false;
return -1;
}
r = __ifaddrs_netlink_recv(fd, 1, RTM_GETLINK, link_af, netns_id, r = __ifaddrs_netlink_recv(fd, 1, RTM_GETLINK, link_af, netns_id,
&getlink_netnsid_aware, cb, ctx); &getlink_netnsid_aware, cb, ctx);
if (!r) if (!r)

8
src/lxc/macro.h
View File

@ -239,6 +239,14 @@ extern int __build_bug_on_failed;
#define prctl_arg(x) ((unsigned long)x) #define prctl_arg(x) ((unsigned long)x)
/* networking */ /* networking */
#ifndef NETLINK_DUMP_STRICT_CHK
#define NETLINK_DUMP_STRICT_CHK 12
#endif
#ifndef SOL_NETLINK
#define SOL_NETLINK 270
#endif
#ifndef IFLA_LINKMODE #ifndef IFLA_LINKMODE
#define IFLA_LINKMODE 17 #define IFLA_LINKMODE 17
#endif #endif