Fix compile on FreeBSD

diff --git a/duid.c b/duid.c
index f4fb980a284c401cda11a064ec9f1df19d919ce8..4f39512b04e73ab0c30fdc18b9e74d09e7c75fb0 100644 (file)
--- a/duid.c
+++ b/duid.c
@@ -29,6 +29,8 @@
 #define DUID_LLT       1
 #define DUID_LL                3
 
+#include <sys/socket.h>
+
 #include <net/if.h>
 #include <net/if_arp.h>
 

diff --git a/if-bsd.c b/if-bsd.c
index d4640ac36564ef1bf0c0be0974993b421f34aef3..b82a71db2868c476e3d5d93f6000e5f449848b10 100644 (file)
--- a/if-bsd.c
+++ b/if-bsd.c
@@ -499,7 +499,7 @@ in6_addr_flags(const char *ifname, const struct in6_addr *addr)
                ifr6.ifr_addr.sin6_family = AF_INET6;
                ifr6.ifr_addr.sin6_addr = *addr;
                if (ioctl(s, SIOCGIFAFLAG_IN6, &ifr6) != -1)
-                       flags = ifr6.ifr_flags;
+                       flags = ifr6.ifr_ifru.ifru_flags6;
                close(s);
        }
        return flags;

diff --git a/ipv6ns.c b/ipv6ns.c
index 7e9d4b01b9ef234aedb15c8fd0943f11675c476b..11a9ce516618e86ce3fb22559cb7f80f38c093f2 100644 (file)
--- a/ipv6ns.c
+++ b/ipv6ns.c
@@ -589,7 +589,7 @@ ipv6ns_handledata(__unused void *arg)
                            nd_na->nd_na_target.s6_addr,
                            sizeof(ap->addr.s6_addr)) == 0)
                        {
-                               ap->dad = 1;
+                               ap->flags |= IPV6_AF_DUPLICATED;
                                if (ap->dadcallback)
                                        ap->dadcallback(ap);
 #ifdef DEBUG_NS
@@ -608,7 +608,7 @@ ipv6ns_handledata(__unused void *arg)
                                    nd_na->nd_na_target.s6_addr,
                                    sizeof(ap->addr.s6_addr)) == 0)
                                {
-                                       ap->dad = 1;
+                                       ap->flags |= IPV6_AF_DUPLICATED;
                                        if (ap->dadcallback)
                                                ap->dadcallback(ap);
 #ifdef DEBUG_NS