[src/trunk]: src/external/bsd/dhcpcd/dist/src Sync

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

details:   https://anonhg.NetBSD.org/src/rev/c49a6da9ac26
branches:  trunk
changeset: 319601:c49a6da9ac26
user:      roy <roy%NetBSD.org@localhost>
date:      Mon Jun 04 09:56:16 2018 +0000

description:
Sync

diffstat:

 external/bsd/dhcpcd/dist/src/dhcpcd.c |  21 ++++++++++++++++++++-
 1 files changed, 20 insertions(+), 1 deletions(-)

diffs (89 lines):

diff -r 0f112a5b9fc3 -r c49a6da9ac26 external/bsd/dhcpcd/dist/src/dhcpcd.c
--- a/external/bsd/dhcpcd/dist/src/dhcpcd.c     Mon Jun 04 09:55:13 2018 +0000
+++ b/external/bsd/dhcpcd/dist/src/dhcpcd.c     Mon Jun 04 09:56:16 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) {