[src/ROY]: src/external/bsd/dhcpcd/dist/src Import dhcpcd-7.0.5a.

[roy <roy%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/d8a859686098
branches:  ROY
changeset: 455211:d8a859686098
user:      roy <roy%NetBSD.org@localhost>
date:      Mon Jun 04 09:55:13 2018 +0000

description:
Import dhcpcd-7.0.5a.
Only change is to fix builds without INET6.

diffstat:

 external/bsd/dhcpcd/dist/src/dhcp.h   |   1 -
 external/bsd/dhcpcd/dist/src/dhcp6.h  |   1 -
 external/bsd/dhcpcd/dist/src/dhcpcd.c |  21 ++++++++++++++++++++-
 external/bsd/dhcpcd/dist/src/ipv4ll.h |   1 -
 external/bsd/dhcpcd/dist/src/ipv6.c   |   2 ++
 external/bsd/dhcpcd/dist/src/ipv6.h   |   1 -
 external/bsd/dhcpcd/dist/src/ipv6nd.h |   1 -
 7 files changed, 22 insertions(+), 6 deletions(-)

diffs (157 lines):

diff -r 314e3336b986 -r d8a859686098 external/bsd/dhcpcd/dist/src/dhcp.h
--- a/external/bsd/dhcpcd/dist/src/dhcp.h       Sat Jun 02 09:42:48 2018 +0000
+++ b/external/bsd/dhcpcd/dist/src/dhcp.h       Mon Jun 04 09:55:13 2018 +0000
@@ -267,7 +267,6 @@
 void dhcp_free(struct interface *);
 int dhcp_dump(struct interface *);
 #else
-#define dhcp_drop(a, b) {}
 #define dhcp_start(a) {}
 #define dhcp_abort(a) {}
 #define dhcp_renew(a) {}
diff -r 314e3336b986 -r d8a859686098 external/bsd/dhcpcd/dist/src/dhcp6.h
--- a/external/bsd/dhcpcd/dist/src/dhcp6.h      Sat Jun 02 09:42:48 2018 +0000
+++ b/external/bsd/dhcpcd/dist/src/dhcp6.h      Mon Jun 04 09:55:13 2018 +0000
@@ -245,7 +245,6 @@
 #define dhcp6_renew(a) {}
 #define dhcp6_env(a, b, c, d, e) (0)
 #define dhcp6_free(a) {}
-#define dhcp6_handleifa(a, b) {}
 #define dhcp6_dadcompleted(a) (0)
 #define dhcp6_drop(a, b) {}
 #define dhcp6_dropnondelegates(a) {}
diff -r 314e3336b986 -r d8a859686098 external/bsd/dhcpcd/dist/src/dhcpcd.c
--- a/external/bsd/dhcpcd/dist/src/dhcpcd.c     Sat Jun 02 09:42:48 2018 +0000
+++ b/external/bsd/dhcpcd/dist/src/dhcpcd.c     Mon Jun 04 09:55:13 2018 +0000
@@ -363,14 +363,25 @@
 dhcpcd_drop(struct interface *ifp, int stop)
 {
 
+#ifdef DHCP6
        dhcp6_drop(ifp, stop ? NULL : "EXPIRE6");
+#endif
+#ifdef INET6
        ipv6nd_drop(ifp);
        ipv6_drop(ifp);
+#endif
+#ifdef IPV4LL
        ipv4ll_drop(ifp);
+#endif
+#ifdef DHCP
        dhcp_drop(ifp, stop ? "STOP" : "EXPIRE");
+#endif
 #ifdef ARP
        arp_drop(ifp);
 #endif
+#if !defined(DHCP6) && !defined(DHCP)
+       UNUSED(stop);
+#endif
 }
 
 static void
@@ -773,8 +784,10 @@
 warn_iaid_conflict(struct interface *ifp, uint16_t ia_type, uint8_t *iaid)
 {
        struct interface *ifn;
+#ifdef INET6
        size_t i;
        struct if_ia *ia;
+#endif
 
        TAILQ_FOREACH(ifn, ifp->ctx->ifaces, next) {
                if (ifn == ifp || !ifn->active)
@@ -783,12 +796,14 @@
                    memcmp(ifn->options->iaid, iaid,
                    sizeof(ifn->options->iaid)) == 0)
                        break;
+#ifdef INET6
                for (i = 0; i < ifn->options->ia_len; i++) {
                        ia = &ifn->options->ia[i];
                        if (ia->ia_type == ia_type &&
                            memcmp(ia->iaid, iaid, sizeof(ia->iaid)) == 0)
                                break;
                }
+#endif
        }
 
        /* This is only a problem if the interfaces are on the same network. */
@@ -802,7 +817,6 @@
 {
        struct interface *ifp = arg;
        struct if_options *ifo = ifp->options;
-       size_t i;
        char buf[DUID_LEN * 3];
        int carrier;
        struct timespec tv;
@@ -842,13 +856,17 @@
        }
 
        if (ifo->options & (DHCPCD_DUID | DHCPCD_IPV6)) {
+#ifdef INET6
+               size_t i;
                struct if_ia *ia;
+#endif
 
                /* Report IAIDs */
                loginfox("%s: IAID %s", ifp->name,
                    hwaddr_ntoa(ifo->iaid, sizeof(ifo->iaid),
                    buf, sizeof(buf)));
                warn_iaid_conflict(ifp, 0, ifo->iaid);
+#ifdef INET6
                for (i = 0; i < ifo->ia_len; i++) {
                        ia = &ifo->ia[i];
                        if (memcmp(ifo->iaid, ia->iaid, sizeof(ifo->iaid))) {
@@ -859,6 +877,7 @@
                                warn_iaid_conflict(ifp, ia->ia_type, ia->iaid);
                        }
                }
+#endif
        }
 
        if (ifo->options & DHCPCD_IPV6 && ipv6_start(ifp) == -1) {
diff -r 314e3336b986 -r d8a859686098 external/bsd/dhcpcd/dist/src/ipv4ll.h
--- a/external/bsd/dhcpcd/dist/src/ipv4ll.h     Sat Jun 02 09:42:48 2018 +0000
+++ b/external/bsd/dhcpcd/dist/src/ipv4ll.h     Mon Jun 04 09:55:13 2018 +0000
@@ -75,7 +75,6 @@
 #define        ipv4ll_defaultroute(route, ifp) (0)
 #define        ipv4ll_handlert(a, b, c)        (0)
 #define        ipv4ll_free(a)                  {}
-#define        ipv4ll_drop(a)                  {}
 #endif
 
 #endif
diff -r 314e3336b986 -r d8a859686098 external/bsd/dhcpcd/dist/src/ipv6.c
--- a/external/bsd/dhcpcd/dist/src/ipv6.c       Sat Jun 02 09:42:48 2018 +0000
+++ b/external/bsd/dhcpcd/dist/src/ipv6.c       Mon Jun 04 09:55:13 2018 +0000
@@ -1183,7 +1183,9 @@
                return;
 
        ipv6nd_handleifa(cmd, ia, pid);
+#ifdef DHCP6
        dhcp6_handleifa(cmd, ia, pid);
+#endif
 
 out:
        /* Done with the ia now, so free it. */
diff -r 314e3336b986 -r d8a859686098 external/bsd/dhcpcd/dist/src/ipv6.h
--- a/external/bsd/dhcpcd/dist/src/ipv6.h       Sat Jun 02 09:42:48 2018 +0000
+++ b/external/bsd/dhcpcd/dist/src/ipv6.h       Mon Jun 04 09:55:13 2018 +0000
@@ -285,7 +285,6 @@
 #define ipv6_hasaddr(a) (0)
 #define ipv6_free_ll_callbacks(a) {}
 #define ipv6_free(a) {}
-#define ipv6_drop(a) {}
 #define ipv6_ctxfree(a) {}
 #define ipv6_gentempifid(a) {}
 #endif
diff -r 314e3336b986 -r d8a859686098 external/bsd/dhcpcd/dist/src/ipv6nd.h
--- a/external/bsd/dhcpcd/dist/src/ipv6nd.h     Sat Jun 02 09:42:48 2018 +0000
+++ b/external/bsd/dhcpcd/dist/src/ipv6nd.h     Mon Jun 04 09:55:13 2018 +0000
@@ -107,7 +107,6 @@
 #define ipv6nd_free(a) {}
 #define ipv6nd_hasra(a) (0)
 #define ipv6nd_dadcompleted(a) (0)
-#define ipv6nd_drop(a) {}
 #define ipv6nd_expire(a, b) {}
 #endif