Improve startup with regards to carrier checking and adding a link-local

IPv6 address.

diff --git a/dhcpcd.c b/dhcpcd.c
index 11b07b8c222b99f567fd0617a8a9a7b3ffa3671f..b0c66f5ccb0affb3becf4f99bc4ed0d06f1107df 100644 (file)
--- a/dhcpcd.c
+++ b/dhcpcd.c
@@ -339,7 +339,7 @@ configure_interface1(struct interface *ifp)
                ifo->options &= ~(DHCPCD_ARP | DHCPCD_IPV4LL);
        if (!(ifp->flags & (IFF_POINTOPOINT | IFF_LOOPBACK | IFF_MULTICAST)))
                ifo->options &= ~DHCPCD_IPV6RS;
-       if (ifo->options & DHCPCD_LINK && if_carrier(ifp) == LINK_UNKNOWN)
+       if (ifo->options & DHCPCD_LINK && ifp->carrier == LINK_UNKNOWN)
                ifo->options &= ~DHCPCD_LINK;
 
        if (ifo->metric != -1)
@@ -561,32 +561,35 @@ warn_iaid_conflict(struct interface *ifp, uint8_t *iaid)
                    ifp->name, ifn->name);
 }
 
-void
-dhcpcd_startinterface(void *arg)
+static void
+pre_start(struct interface *ifp)
 {
-       struct interface *ifp = arg;
-       struct if_options *ifo = ifp->options;
-       size_t i;
-       char buf[DUID_LEN * 3];
 
        /* Add our link-local address before upping the interface
         * so our RFC7217 address beats the hwaddr based one.
         * This is also a safety check incase it was ripped out
         * from under us. */
-       if (ifo->options & DHCPCD_IPV6 && ipv6_start(ifp) == -1) {
+       if (ifp->options->options & DHCPCD_IPV6 && ipv6_start(ifp) == -1) {
                syslog(LOG_ERR, "%s: ipv6_start: %m", ifp->name);
-               ifo->options &= DHCPCD_IPV6;
+               ifp->options->options &= DHCPCD_IPV6;
        }
 
-       if (!(ifp->flags & IFF_UP) && if_carrier(ifp) != LINK_UNKNOWN) {
-               if (if_up(ifp) == -1)
-                       syslog(LOG_ERR, "%s: if_up: %m",
-                           ifp->name);
-       }
+       if (!(ifp->flags & IFF_UP) && if_up(ifp) == -1)
+               syslog(LOG_ERR, "%s: if_up: %m", ifp->name);
+}
+
+
+void
+dhcpcd_startinterface(void *arg)
+{
+       struct interface *ifp = arg;
+       struct if_options *ifo = ifp->options;
+       size_t i;
+       char buf[DUID_LEN * 3];
+
+       pre_start(ifp);
 
-       if (ifp->carrier == LINK_UNKNOWN)
-               dhcpcd_handlecarrier(ifp->ctx, LINK_UNKNOWN, 0, ifp->name);
-       if (ifp->carrier == LINK_DOWN) {
+       if (ifp->carrier == LINK_DOWN && ifo->options & DHCPCD_LINK) {
                syslog(LOG_INFO, "%s: waiting for carrier", ifp->name);
                return;
        }
@@ -700,31 +703,17 @@ init_state(struct interface *ifp, int argc, char **argv)
 static void
 run_preinit(struct interface *ifp)
 {
-       const char *reason;
 
-       reason = NULL; /* appease gcc */
-       if (ifp->options->options & DHCPCD_LINK) {
-               switch (if_carrier(ifp)) {
-               case LINK_DOWN:
-                       ifp->carrier = LINK_DOWN;
-                       reason = "NOCARRIER";
-                       break;
-               case LINK_UP:
-                       ifp->carrier = LINK_UP;
-                       reason = "CARRIER";
-                       break;
-               default:
-                       ifp->carrier = LINK_UNKNOWN;
-                       return;
-               }
-       } else
-               ifp->carrier = LINK_UNKNOWN;
+       pre_start(ifp);
+       if (ifp->ctx->options & DHCPCD_TEST)
+               return;
 
-       if (!(ifp->ctx->options & DHCPCD_TEST))
-               script_runreason(ifp, "PREINIT");
+       script_runreason(ifp, "PREINIT");
 
-       if (ifp->carrier != LINK_UNKNOWN && !(ifp->ctx->options & DHCPCD_TEST))
-               script_runreason(ifp, reason);
+       if (ifp->carrier != LINK_UNKNOWN &&
+           ifp->options->options & DHCPCD_LINK)
+               script_runreason(ifp,
+                   ifp->carrier == LINK_UP ? "CARRIER" : "NOCARRIER");
 }
 
 int

diff --git a/if.c b/if.c
index 7d5f3896d957367f44e307ec830469b9bd737c62..1155c215113859eb7c96fe5179cbf2cc455f50a3 100644 (file)
--- a/if.c
+++ b/if.c
@@ -295,6 +295,7 @@ if_discover(struct dhcpcd_ctx *ctx, int argc, char * const *argv)
                ifp->ctx = ctx;
                strlcpy(ifp->name, p, sizeof(ifp->name));
                ifp->flags = ifa->ifa_flags;
+               ifp->carrier = if_carrier(ifp);
 
                sdl_type = 0;
                /* Don't allow loopback unless explicit */