From: Roy Marples <roy@marples.name>
Date: Sun, 2 Jun 2013 10:51:20 +0000 (+0000)
Subject: Fix compile on FreeBSD
X-Git-Tag: v5.99.7~8
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c2ae21d761de496384dd476e8fe085bcdc604b98;p=thirdparty%2Fdhcpcd.git

Fix compile on FreeBSD
---

diff --git a/duid.c b/duid.c
index f4fb980a..4f39512b 100644
--- 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 d4640ac3..b82a71db 100644
--- 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 7e9d4b01..11a9ce51 100644
--- 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