changeset 2442:8809d75691b7 draft

Fix compile on OpenBSD.
author Roy Marples <roy@marples.name>
date Fri, 25 Apr 2014 11:11:05 +0000
parents 1cc6480fcc9a
children d4c651006a97
files arp.c dhcp.c if-bsd.c ipv6.c
diffstat 4 files changed, 8 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/arp.c	Fri Apr 25 10:42:37 2014 +0000
+++ b/arp.c	Fri Apr 25 11:11:05 2014 +0000
@@ -25,6 +25,10 @@
  * SUCH DAMAGE.
  */
 
+#include <sys/socket.h>
+
+#include <net/if.h>
+#include <netinet/in.h>
 #include <netinet/if_ether.h>
 
 #include <errno.h>
--- a/dhcp.c	Fri Apr 25 10:42:37 2014 +0000
+++ b/dhcp.c	Fri Apr 25 11:11:05 2014 +0000
@@ -35,8 +35,8 @@
 #endif
 
 #include <arpa/inet.h>
+#include <net/if.h>
 #include <net/route.h>
-
 #include <netinet/if_ether.h>
 #include <netinet/in_systm.h>
 #include <netinet/in.h>
--- a/if-bsd.c	Fri Apr 25 10:42:37 2014 +0000
+++ b/if-bsd.c	Fri Apr 25 11:11:05 2014 +0000
@@ -42,9 +42,9 @@
 #ifdef __FreeBSD__ /* Needed so that including netinet6/in6_var.h works */
 #  include <net/if_var.h>
 #endif
-#include <net/if_ether.h>
 #include <net/if_media.h>
 #include <net/route.h>
+#include <netinet/if_ether.h>
 #include <netinet/in.h>
 #include <netinet6/in6_var.h>
 #include <netinet6/nd6.h>
--- a/ipv6.c	Fri Apr 25 10:42:37 2014 +0000
+++ b/ipv6.c	Fri Apr 25 11:11:05 2014 +0000
@@ -381,9 +381,9 @@
 	int ifa_flags;
 
 	ap = arg;
-	ifa_flags = in6_addr_flags(ap->iface->name, &ap->addr);
+	ifa_flags = if_addrflags6(ap->iface->name, &ap->addr);
 	if (ifa_flags == -1)
-		syslog(LOG_ERR, "%s: in6_addr_flags: %m", ap->iface->name);
+		syslog(LOG_ERR, "%s: if_addrflags6: %m", ap->iface->name);
 	else if (!(ifa_flags & IN6_IFF_TENTATIVE)) {
 		ipv6_handleifa(ap->iface->ctx, RTM_NEWADDR,
 		    ap->iface->ctx->ifaces, ap->iface->name,