mir/lxc
2
0
Fork 0
mirror of git://github.com/lxc/lxc synced 2025-09-01 15:10:25 +00:00
Code Issues Releases Wiki Activity

Merge pull request #2945 from brauner/2019-04-19/netns_getifaddrs_adapt_to_kernel_changes

Browse Source 
netns_getifaddrs: adapt to kernel changes
This commit is contained in:
Stéphane Graber
2019-04-19 13:58:23 -04:00
committed by GitHub
parent e12b27e5fb c8ca5a435c
commit 60c20c6e0e
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/include/netns_ifaddrs.c
View File

@@ -468,7 +468,7 @@ 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}, r = setsockopt(fd, SOL_NETLINK, NETLINK_GET_STRICT_CHK, &(int){1},
sizeof(int)); sizeof(int));
if (r < 0 && netns_id >= 0) { if (r < 0 && netns_id >= 0) {
close(fd); close(fd);

4
src/lxc/macro.h
View File

@@ -240,8 +240,8 @@ 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 #ifndef NETLINK_GET_STRICT_CHK
#define NETLINK_DUMP_STRICT_CHK 12 #define NETLINK_GET_STRICT_CHK 12
#endif #endif
#ifndef SOL_NETLINK #ifndef SOL_NETLINK