diff options
| author | Michael Biebl <biebl@debian.org> | 2018-05-11 22:08:45 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2018-05-11 22:08:45 +0200 |
| commit | ee9c73a923909e23a649407be77e25235d769e25 (patch) | |
| tree | e21c923621fa278e737da693df9eb60ea31a6067 /src/ndisc/nm-ndisc.h | |
| parent | f60117b41d5433be1b4a96d82cd11d0c3dce9b63 (diff) | |
New upstream version 1.10.8 upstream/1.10.8
Diffstat (limited to 'src/ndisc/nm-ndisc.h')
| -rw-r--r-- | src/ndisc/nm-ndisc.h | 33 |
1 files changed, 1 insertions, 32 deletions
diff --git a/src/ndisc/nm-ndisc.h b/src/ndisc/nm-ndisc.h index 9a8a27d7..b66c2289 100644 --- a/src/ndisc/nm-ndisc.h +++ b/src/ndisc/nm-ndisc.h @@ -27,9 +27,6 @@ #include "nm-setting-ip6-config.h" #include "NetworkManagerUtils.h" -#include "platform/nm-platform.h" -#include "platform/nmp-object.h" - #define NM_TYPE_NDISC (nm_ndisc_get_type ()) #define NM_NDISC(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_NDISC, NMNDisc)) #define NM_NDISC_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_NDISC, NMNDiscClass)) @@ -177,7 +174,7 @@ NMNDiscNodeType nm_ndisc_get_node_type (NMNDisc *self); gboolean nm_ndisc_set_iid (NMNDisc *ndisc, const NMUtilsIPv6IfaceId iid); void nm_ndisc_start (NMNDisc *ndisc); -void nm_ndisc_dad_failed (NMNDisc *ndisc, const struct in6_addr *address); +void nm_ndisc_dad_failed (NMNDisc *ndisc, struct in6_addr *address); void nm_ndisc_set_config (NMNDisc *ndisc, const GArray *addresses, const GArray *dns_servers, @@ -187,32 +184,4 @@ NMPlatform *nm_ndisc_get_platform (NMNDisc *self); NMPNetns *nm_ndisc_netns_get (NMNDisc *self); gboolean nm_ndisc_netns_push (NMNDisc *self, NMPNetns **netns); -static inline gboolean -nm_ndisc_dad_addr_is_fail_candidate_event (NMPlatformSignalChangeType change_type, - const NMPlatformIP6Address *addr) -{ - return !NM_FLAGS_HAS (addr->n_ifa_flags, IFA_F_TEMPORARY) - && ( (change_type == NM_PLATFORM_SIGNAL_CHANGED && addr->n_ifa_flags & IFA_F_DADFAILED) - || (change_type == NM_PLATFORM_SIGNAL_REMOVED && addr->n_ifa_flags & IFA_F_TENTATIVE)); -} - -static inline gboolean -nm_ndisc_dad_addr_is_fail_candidate (NMPlatform *platform, - const NMPObject *obj) -{ - const NMPlatformIP6Address *addr; - - addr = NMP_OBJECT_CAST_IP6_ADDRESS (nm_platform_lookup_obj (platform, - NMP_CACHE_ID_TYPE_OBJECT_TYPE, - obj)); - if ( addr - && ( NM_FLAGS_HAS (addr->n_ifa_flags, IFA_F_TEMPORARY) - || !NM_FLAGS_HAS (addr->n_ifa_flags, IFA_F_DADFAILED))) { - /* the address still/again exists and is not in DADFAILED state. Skip it. */ - return FALSE; - } - - return TRUE; -} - #endif /* __NETWORKMANAGER_NDISC_H__ */ |