diff options
| author | Thomas Haller <thaller@redhat.com> | 2015-04-21 11:14:27 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2015-04-21 11:38:00 +0200 |
| commit | c6c1ef1a1413c9771b74fe5b96877a46725f2031 (patch) | |
| tree | 92bb0096bf7a9bb6850d81a147fbbb26533ed5f2 | |
| parent | 982958612b5bcbca2abb0ae03bb6c131c2791561 (diff) | |
| download | NetworkManager-th/platform-self-argument.tar.gz | |
platform: pass @platform instance to build_rtnl_addr()th/platform-self-argument
| -rw-r--r-- | src/platform/nm-linux-platform.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/platform/nm-linux-platform.c b/src/platform/nm-linux-platform.c index 0fedb7275d..f3d25e2532 100644 --- a/src/platform/nm-linux-platform.c +++ b/src/platform/nm-linux-platform.c @@ -3599,7 +3599,8 @@ ip4_is_link_local (const struct in_addr *src) } static struct nl_object * -build_rtnl_addr (int family, +build_rtnl_addr (NMPlatform *platform, + int family, int ifindex, gconstpointer addr, gconstpointer peer_addr, @@ -3661,7 +3662,7 @@ build_rtnl_addr (int family, rtnl_addr_set_preferred_lifetime (rtnladdr, preferred); } if (flags) { - if ((flags & ~0xFF) && !check_support_kernel_extended_ifa_flags (nm_platform_get ())) { + if ((flags & ~0xFF) && !check_support_kernel_extended_ifa_flags (platform)) { /* Older kernels don't accept unknown netlink attributes. * * With commit libnl commit 5206c050504f8676a24854519b9c351470fb7cc6, libnl will only set @@ -3691,7 +3692,7 @@ ip4_address_add (NMPlatform *platform, guint32 preferred, const char *label) { - return add_object (platform, build_rtnl_addr (AF_INET, ifindex, &addr, + return add_object (platform, build_rtnl_addr (platform, AF_INET, ifindex, &addr, peer_addr ? &peer_addr : NULL, plen, lifetime, preferred, 0, label)); @@ -3707,7 +3708,7 @@ ip6_address_add (NMPlatform *platform, guint32 preferred, guint flags) { - return add_object (platform, build_rtnl_addr (AF_INET6, ifindex, &addr, + return add_object (platform, build_rtnl_addr (platform, AF_INET6, ifindex, &addr, IN6_IS_ADDR_UNSPECIFIED (&peer_addr) ? NULL : &peer_addr, plen, lifetime, preferred, flags, NULL)); @@ -3716,19 +3717,19 @@ ip6_address_add (NMPlatform *platform, static gboolean ip4_address_delete (NMPlatform *platform, int ifindex, in_addr_t addr, int plen, in_addr_t peer_address) { - return delete_object (platform, build_rtnl_addr (AF_INET, ifindex, &addr, peer_address ? &peer_address : NULL, plen, 0, 0, 0, NULL), TRUE); + return delete_object (platform, build_rtnl_addr (platform, AF_INET, ifindex, &addr, peer_address ? &peer_address : NULL, plen, 0, 0, 0, NULL), TRUE); } static gboolean ip6_address_delete (NMPlatform *platform, int ifindex, struct in6_addr addr, int plen) { - return delete_object (platform, build_rtnl_addr (AF_INET6, ifindex, &addr, NULL, plen, 0, 0, 0, NULL), TRUE); + return delete_object (platform, build_rtnl_addr (platform, AF_INET6, ifindex, &addr, NULL, plen, 0, 0, 0, NULL), TRUE); } static gboolean ip_address_exists (NMPlatform *platform, int family, int ifindex, gconstpointer addr, int plen) { - auto_nl_object struct nl_object *object = build_rtnl_addr (family, ifindex, addr, NULL, plen, 0, 0, 0, NULL); + auto_nl_object struct nl_object *object = build_rtnl_addr (platform, family, ifindex, addr, NULL, plen, 0, 0, 0, NULL); auto_nl_object struct nl_object *cached_object = nl_cache_search (choose_cache (platform, object), object); return !!cached_object; |