colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

platform: refresh link cache when IPv6 tokenized identifier changes

Browse Source
This commit is contained in:
Lubomir Rintel
2014-09-29 17:58:44 +02:00
parent b47d55b500
commit 954a4b69b8
1 changed files with 33 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/platform/nm-linux-platform.c
View File

@@ -44,9 +44,9 @@
#include <netlink/route/route.h> #include <netlink/route/route.h>
#include <gudev/gudev.h> #include <gudev/gudev.h>
#if HAVE_LIBNL_INET6_ADDR_GEN_MODE #if HAVE_LIBNL_INET6_ADDR_GEN_MODE || HAVE_LIBNL_INET6_TOKEN
#include <netlink/route/link/inet6.h> #include <netlink/route/link/inet6.h>
#if HAVE_KERNEL_INET6_ADDR_GEN_MODE #if HAVE_LIBNL_INET6_ADDR_GEN_MODE && HAVE_KERNEL_INET6_ADDR_GEN_MODE
#include <linux/if_link.h> #include <linux/if_link.h>
#else #else
#define IN6_ADDR_GEN_MODE_EUI64 0 #define IN6_ADDR_GEN_MODE_EUI64 0
@@ -1900,6 +1900,37 @@ nm_nl_object_diff (ObjectType type, struct nl_object *_a, struct nl_object *_b)
return TRUE; return TRUE;
} }
#if HAVE_LIBNL_INET6_TOKEN
/* libnl ignores PROTINFO changes in object without AF assigned */
if (type == OBJECT_TYPE_LINK) {
struct rtnl_addr *a = (struct rtnl_addr *) _a;
struct rtnl_addr *b = (struct rtnl_addr *) _b;
auto_nl_addr struct nl_addr *token_a = NULL;
auto_nl_addr struct nl_addr *token_b = NULL;
if (rtnl_link_inet6_get_token ((struct rtnl_link *) a, &token_a) != 0)
token_a = NULL;
if (rtnl_link_inet6_get_token ((struct rtnl_link *) b, &token_b) != 0)
token_b = NULL;
if (token_a && token_b) {
if (nl_addr_get_family (token_a) == AF_INET6 &&
nl_addr_get_family (token_b) == AF_INET6 &&
nl_addr_get_len (token_a) == sizeof (struct in6_addr) &&
nl_addr_get_len (token_b) == sizeof (struct in6_addr) &&
memcmp (nl_addr_get_binary_addr (token_a),
nl_addr_get_binary_addr (token_b),
sizeof (struct in6_addr))) {
/* Token changed */
return TRUE;
}
} else if (token_a != token_b) {
/* Token added or removed (?). */
return TRUE;
}
}
#endif
if (type == OBJECT_TYPE_IP4_ADDRESS || type == OBJECT_TYPE_IP6_ADDRESS) { if (type == OBJECT_TYPE_IP4_ADDRESS || type == OBJECT_TYPE_IP6_ADDRESS) {
struct rtnl_addr *a = (struct rtnl_addr *) _a; struct rtnl_addr *a = (struct rtnl_addr *) _a;
struct rtnl_addr *b = (struct rtnl_addr *) _b; struct rtnl_addr *b = (struct rtnl_addr *) _b;