]> git.ipfire.org Git - thirdparty/dhcpcd.git/commitdiff
Fix compile on OpenBSD.
authorRoy Marples <roy@marples.name>
Fri, 25 Apr 2014 11:11:05 +0000 (11:11 +0000)
committerRoy Marples <roy@marples.name>
Fri, 25 Apr 2014 11:11:05 +0000 (11:11 +0000)
arp.c
dhcp.c
if-bsd.c
ipv6.c

diff --git a/arp.c b/arp.c
index 83745f46d6d7c7d49d378c3a7c365ebc4c150b3f..93f266346d22fbc70f463d175e1b83ab3f82c19c 100644 (file)
--- a/arp.c
+++ b/arp.c
  * SUCH DAMAGE.
  */
 
+#include <sys/socket.h>
+
+#include <net/if.h>
+#include <netinet/in.h>
 #include <netinet/if_ether.h>
 
 #include <errno.h>
diff --git a/dhcp.c b/dhcp.c
index b55240003c179e47ba9f792f00812a1de271df46..3791aae299c2944ff0ef984dfd296a82525eaccd 100644 (file)
--- a/dhcp.c
+++ b/dhcp.c
@@ -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>
index 50001adc0f9d2594208dadb3912b30199bf029c0..64229b0b9689b898139a54c9fa26b71aaa11f60b 100644 (file)
--- a/if-bsd.c
+++ b/if-bsd.c
@@ -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>
diff --git a/ipv6.c b/ipv6.c
index 0c5f9b357877b904198c080dbb90f9840037ea40..b77e75906a3152924af1ad9c78fbc7e9584e68a0 100644 (file)
--- a/ipv6.c
+++ b/ipv6.c
@@ -381,9 +381,9 @@ ipv6_checkaddrflags(void *arg)
        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,