Remove the pseudo interface created for prefix delegation and mix different

IA options in one DHCP state as recommended by RFC 7550.

Hopefully this will simplify support a great deal.

diff --git a/defs.h b/defs.h
index d92b9100249939a7afe8312d08b02f1edb58a710..1b150102118c647789486cfcc0e308004c97b4ad 100644 (file)
--- a/defs.h
+++ b/defs.h
@@ -46,7 +46,7 @@
 # define SECRET                        SYSCONFDIR "/" PACKAGE ".secret"
 #endif
 #ifndef LEASEFILE
-# define LEASEFILE             DBDIR "/" PACKAGE "-%s%s%s.lease"
+# define LEASEFILE             DBDIR "/" PACKAGE "-%s%s.lease"
 #endif
 #ifndef LEASEFILE6
 # define LEASEFILE6            LEASEFILE "6"

diff --git a/dhcp-common.c b/dhcp-common.c
index 0d67472e070726573f0da6632908c6a80889b6f6..5684441492caccee93d9676e3b1b0c96fd32317a 100644 (file)
--- a/dhcp-common.c
+++ b/dhcp-common.c
@@ -755,7 +755,7 @@ print_option(char *s, size_t len, const struct dhcp_opt *opt,
 
 int
 dhcp_set_leasefile(char *leasefile, size_t len, int family,
-    const struct interface *ifp, const char *extra)
+    const struct interface *ifp)
 {
        char ssid[len];
 
@@ -782,7 +782,7 @@ dhcp_set_leasefile(char *leasefile, size_t len, int family,
                ssid[0] = '\0';
        return snprintf(leasefile, len,
            family == AF_INET ? LEASEFILE : LEASEFILE6,
-           ifp->name, ssid, extra);
+           ifp->name, ssid);
 }
 
 static size_t

diff --git a/dhcp-common.h b/dhcp-common.h
index 5f7b15404d580e9403f44b13fd5c8dfd4005de64..ba04db4739f16c7c23c1f92ca1c1822f2449e262 100644 (file)
--- a/dhcp-common.h
+++ b/dhcp-common.h
@@ -106,8 +106,7 @@ int make_option_mask(const struct dhcp_opt *, size_t,
 size_t encode_rfc1035(const char *src, uint8_t *dst);
 ssize_t decode_rfc3397(char *, size_t, const uint8_t *, size_t);
 ssize_t print_string(char *, size_t, int, const uint8_t *, size_t);
-int dhcp_set_leasefile(char *, size_t, int,
-    const struct interface *, const char *);
+int dhcp_set_leasefile(char *, size_t, int, const struct interface *);
 
 size_t dhcp_envoption(struct dhcpcd_ctx *,
     char **, const char *, const char *, struct dhcp_opt *,

diff --git a/dhcp.c b/dhcp.c
index 89eb6a5d575d669cdcddd1cbdc7633d2b000d9a5..8276e65913444ec30ae6b2d4e9575ab43236e7e1 100644 (file)
--- a/dhcp.c
+++ b/dhcp.c
@@ -3025,7 +3025,7 @@ dhcp_dump(struct interface *ifp)
        state->raw_fd = state->arp_fd = -1;
        TAILQ_INIT(&state->arp_states);
        dhcp_set_leasefile(state->leasefile, sizeof(state->leasefile),
-           AF_INET, ifp, "");
+           AF_INET, ifp);
        state->new = read_lease(ifp);
        if (state->new == NULL) {
                logger(ifp->ctx, LOG_ERR, "%s: %s: %m",
@@ -3107,7 +3107,7 @@ dhcp_init(struct interface *ifp)
        state->reason = "PREINIT";
        state->nakoff = 0;
        dhcp_set_leasefile(state->leasefile, sizeof(state->leasefile),
-           AF_INET, ifp, "");
+           AF_INET, ifp);
 
        ifo = ifp->options;
        /* We need to drop the leasefile so that dhcp_start

diff --git a/dhcp6.c b/dhcp6.c
index 88b6a939fd3de1f547dbb71956e6bc41bb6e71f5..363b29ba710eaaed889de8821dab5b2198305670 100644 (file)
--- a/dhcp6.c
+++ b/dhcp6.c
@@ -32,6 +32,7 @@
 
 #include <netinet/in.h>
 
+#include <assert.h>
 #include <ctype.h>
 #include <errno.h>
 #include <fcntl.h>
@@ -642,31 +643,20 @@ dhcp6_makemessage(struct interface *ifp)
                            !(ap->flags & IPV6_AF_REQUEST))
                                continue;
                        if (ap->ia_type == D6_OPTION_IA_PD) {
-                               if (!(ifo->options & DHCPCD_NOPFXDLG)) {
-                                       len += sizeof(*o) + sizeof(u8) +
-                                           sizeof(u32) + sizeof(u32) +
-                                           sizeof(ap->prefix);
-                                       if (ap->prefix_exclude_len)
-                                               len += sizeof(*o) + 1 +
-                                                   (uint8_t)((ap->prefix_exclude_len -
-                                                   ap->prefix_len - 1) / NBBY)
-                                                   + 1;
-
-                               }
-                       } else if (!(ifo->options & DHCPCD_PFXDLGONLY))
+                               len += sizeof(*o) + sizeof(u8) +
+                                   sizeof(u32) + sizeof(u32) +
+                                   sizeof(ap->prefix);
+                               if (ap->prefix_exclude_len)
+                                       len += sizeof(*o) + 1 +
+                                           (uint8_t)((ap->prefix_exclude_len -
+                                           ap->prefix_len - 1) / NBBY) + 1;
+                       } else
                                len += sizeof(*o) + sizeof(ap->addr) +
                                    sizeof(u32) + sizeof(u32);
                }
                /* FALLTHROUGH */
        case DH6S_INIT:
-               for (l = 0; l < ifo->ia_len; l++) {
-                       if (ifo->ia[l].ia_type == D6_OPTION_IA_PD) {
-                               if (ifo->options & DHCPCD_NOPFXDLG)
-                                       continue;
-                       } else if (ifo->options & DHCPCD_PFXDLGONLY)
-                               continue;
-                       len += sizeof(*o) + (sizeof(u32) * 3);
-               }
+               len += ifo->ia_len * (sizeof(*o) + (sizeof(u32) * 3));
                IA = 1;
                break;
        default:
@@ -778,11 +768,6 @@ dhcp6_makemessage(struct interface *ifp)
        }
 
        for (l = 0; IA && l < ifo->ia_len; l++) {
-               if (ifo->ia[l].ia_type == D6_OPTION_IA_PD) {
-                       if (ifo->options & DHCPCD_NOPFXDLG)
-                               continue;
-               } else if (ifo->options & DHCPCD_PFXDLGONLY)
-                       continue;
                o = D6_NEXT_OPTION(o);
                o->code = htons(ifo->ia[l].ia_type);
                o->len = htons(sizeof(u32) + sizeof(u32) + sizeof(u32));
@@ -1124,8 +1109,12 @@ logsend:
                            state->send->xid[2],
                            timespec_to_double(&state->RT));
 
+               /* This sometimes happens when we delegate to this interface
+                * AND run DHCPv6 on it normally. */
+               assert(timespec_to_double(&state->RT) != 0);
+
                /* Wait the initial delay */
-               if (state->IMD) {
+               if (state->IMD != 0) {
                        state->IMD = 0;
                        eloop_timeout_add_tv(ifp->ctx->eloop,
                            &state->RT, callback, ifp);
@@ -1462,9 +1451,6 @@ dhcp6_hasprefixdelegation(struct interface *ifp)
        size_t i;
        uint16_t t;
 
-       if (ifp->options->options & DHCPCD_NOPFXDLG)
-               return 0;
-
        t = 0;
        for (i = 0; i < ifp->options->ia_len; i++) {
                if (t && t != ifp->options->ia[i].ia_type) {
@@ -2043,15 +2029,13 @@ dhcp6_findia(struct interface *ifp, const struct dhcp6_message *m, size_t l,
                        continue;
                }
                if (code == D6_OPTION_IA_PD) {
-                       if (!(ifo->options & DHCPCD_NOPFXDLG) &&
-                           dhcp6_findpd(ifp, iaid, p, ol, acquired) == 0)
-                       {
+                       if (dhcp6_findpd(ifp, iaid, p, ol, acquired) == 0) {
                                logger(ifp->ctx, LOG_WARNING,
                                    "%s: %s: DHCPv6 REPLY missing Prefix",
                                    ifp->name, sfrom);
                                continue;
                        }
-               } else if (!(ifo->options & DHCPCD_PFXDLGONLY)) {
+               } else {
                        if (dhcp6_findna(ifp, code, iaid, p, ol, acquired) == 0)
                        {
                                logger(ifp->ctx, LOG_WARNING,
@@ -2444,8 +2428,6 @@ dhcp6_delegate_prefix(struct interface *ifp)
        }
 
        TAILQ_FOREACH(ifd, ifp->ctx->ifaces, next) {
-               if (ifd->options->options & DHCPCD_NOPFXDLG)
-                       continue;
                k = 0;
                carrier_warned = abrt = 0;
                TAILQ_FOREACH(ap, &state->addrs, next) {
@@ -2578,24 +2560,6 @@ dhcp6_find_delegates(struct interface *ifp)
        return k;
 }
 
-static struct interface *
-dhcp6_findpfxdlgif(struct interface *ifp)
-{
-       struct interface *ifn;
-
-       if (ifp->options && ifp->options->options & DHCPCD_PFXDLGONLY)
-               return NULL;
-
-       if (ifp->ctx && ifp->ctx->ifaces) {
-               TAILQ_FOREACH(ifn, ifp->ctx->ifaces, next) {
-                       if (strcmp(ifn->name, ifp->name) == 0 &&
-                           ifn->options->options & DHCPCD_PFXDLGONLY)
-                               return ifn;
-               }
-       }
-       return NULL;
-}
-
 /* ARGSUSED */
 static void
 dhcp6_handledata(void *arg)
@@ -2606,7 +2570,7 @@ dhcp6_handledata(void *arg)
        ssize_t bytes;
        struct cmsghdr *cm;
        struct in6_pktinfo pkt;
-       struct interface *ifp, *ifpx;
+       struct interface *ifp;
        const char *op;
        struct dhcp6_message *r;
        struct dhcp6_state *state;
@@ -2659,9 +2623,7 @@ dhcp6_handledata(void *arg)
        }
 
        TAILQ_FOREACH(ifp, dctx->ifaces, next) {
-               /* Ensure we work on the master interface */
-               if (ifp->index == (unsigned int)pkt.ipi6_ifindex &&
-                   !(ifp->options->options & DHCPCD_PFXDLGONLY))
+               if (ifp->index == (unsigned int)pkt.ipi6_ifindex)
                        break;
        }
        if (ifp == NULL) {
@@ -2671,18 +2633,6 @@ dhcp6_handledata(void *arg)
                return;
        }
 
-       r = (struct dhcp6_message *)ctx->rcvhdr.msg_iov[0].iov_base;
-
-       /* Which interface state is the IAID for? */
-       ifpx = dhcp6_findpfxdlgif(ifp);
-       if (ifpx && D6_STATE(ifpx)) {
-               state = D6_STATE(ifpx);
-               if (r->xid[0] == state->send->xid[0] &&
-                   r->xid[1] == state->send->xid[1] &&
-                   r->xid[2] == state->send->xid[2])
-                       ifp = ifpx;
-       }
-
        state = D6_STATE(ifp);
        if (state == NULL || state->send == NULL) {
                logger(ifp->ctx, LOG_DEBUG,
@@ -2690,6 +2640,7 @@ dhcp6_handledata(void *arg)
                return;
        }
 
+       r = (struct dhcp6_message *)ctx->rcvhdr.msg_iov[0].iov_base;
        /* We're already bound and this message is for another machine */
        /* XXX DELEGATED? */
        if (r->type != DHCP6_RECONFIGURE &&
@@ -3185,43 +3136,6 @@ dhcp6_start1(void *arg)
        if (dhcp6_findselfsla(ifp, NULL))
                del_option_mask(ifo->requestmask6, D6_OPTION_RAPID_COMMIT);
 
-       /* Create a 2nd interface to handle the PD state */
-       if (!(ifo->options & (DHCPCD_PFXDLGONLY | DHCPCD_PFXDLGMIX)) &&
-           dhcp6_hasprefixdelegation(ifp) > 1)
-       {
-               const char * const argv[] = { ifp->name };
-               struct if_head *ifs;
-               struct interface *ifn;
-
-               ifn = dhcp6_findpfxdlgif(ifp);
-               if (ifn == NULL) {
-                       ifs = if_discover(ifp->ctx, -1, UNCONST(argv));
-                       if (ifs) {
-                               ifn = TAILQ_FIRST(ifs);
-                               if (ifn) {
-                                       logger(ifp->ctx, LOG_INFO,
-                                           "%s: creating pseudo interface"
-                                           " to handle Prefix Delegation",
-                                           ifp->name);
-                                       ifp->options->options |=
-                                           DHCPCD_NOPFXDLG;
-                                       TAILQ_REMOVE(ifs, ifn, next);
-                                       TAILQ_INSERT_AFTER(ifp->ctx->ifaces,
-                                           ifp, ifn, next);
-                                       dhcpcd_initstate(ifn,
-                                           DHCPCD_PFXDLGONLY);
-                                       eloop_timeout_add_sec(ifp->ctx->eloop,
-                                           0, dhcpcd_startinterface, ifn);
-                               }
-                               while ((ifn = TAILQ_FIRST(ifs))) {
-                                       TAILQ_REMOVE(ifs, ifn, next);
-                                       if_free(ifn);
-                               }
-                               free(ifs);
-                       }
-               }
-       }
-
        if (state->state == DH6S_INFORM) {
                add_option_mask(ifo->requestmask6, D6_OPTION_INFO_REFRESH_TIME);
                dhcp6_startinform(ifp);
@@ -3276,8 +3190,7 @@ dhcp6_start(struct interface *ifp, enum DH6S init_state)
 gogogo:
        state->state = init_state;
        dhcp_set_leasefile(state->leasefile, sizeof(state->leasefile),
-           AF_INET6, ifp,
-           ifp->options->options & DHCPCD_PFXDLGONLY ? ".pd" : "");
+           AF_INET6, ifp);
        if (ipv6_linklocal(ifp) == NULL) {
                logger(ifp->ctx, LOG_DEBUG,
                    "%s: delaying DHCPv6 soliciation for LL address",
@@ -3314,7 +3227,6 @@ dhcp6_reboot(struct interface *ifp)
 static void
 dhcp6_freedrop(struct interface *ifp, int drop, const char *reason)
 {
-       struct interface *ifpx;
        struct dhcp6_state *state;
        struct dhcpcd_ctx *ctx;
        unsigned long long options;
@@ -3345,15 +3257,6 @@ dhcp6_freedrop(struct interface *ifp, int drop, const char *reason)
            (DHCPCD_EXITING | DHCPCD_PERSISTENT)) !=
            (DHCPCD_EXITING | DHCPCD_PERSISTENT));
 
-       ifpx = dhcp6_findpfxdlgif(ifp);
-       if (ifpx) {
-               if (options & DHCPCD_EXITING)
-                       ifpx->options->options |= DHCPCD_EXITING;
-               dhcp6_freedrop(ifpx, dropdele ? 1 : drop, reason);
-               TAILQ_REMOVE(ifp->ctx->ifaces, ifpx, next);
-               if_free(ifpx);
-       }
-
        if (ifp->ctx->eloop)
                eloop_timeout_delete(ifp->ctx->eloop, NULL, ifp);
 
@@ -3598,8 +3501,7 @@ dhcp6_dump(struct interface *ifp)
        }
        TAILQ_INIT(&state->addrs);
        dhcp_set_leasefile(state->leasefile, sizeof(state->leasefile),
-           AF_INET6, ifp,
-           ifp->options->options & DHCPCD_PFXDLGONLY ? ".pd" : "");
+           AF_INET6, ifp);
        if (dhcp6_readlease(ifp, 0) == -1) {
                logger(ifp->ctx, LOG_ERR, "%s: %s: %m",
                    *ifp->name ? ifp->name : state->leasefile, __func__);

diff --git a/dhcpcd-run-hooks.in b/dhcpcd-run-hooks.in
index 870e8ce59a99458e3945c90e699a9f888f2473a8..4d4490dc1a244d43036703f770c107b840d4f879 100644 (file)
--- a/dhcpcd-run-hooks.in
+++ b/dhcpcd-run-hooks.in
@@ -10,7 +10,7 @@ case "$reason" in
        *)
                ifsuffix=".dhcp";;
 esac
-ifname="$interface$ifsuffix${ifclass+.}$ifclass"
+ifname="$interface$ifsuffix"
 
 from=from
 signature_base="# Generated by dhcpcd"

diff --git a/dhcpcd.8.in b/dhcpcd.8.in
index e4e38da05e9a6bfc347ff0d080b825427eaf9634..50d33c16142da367f50cb0f8e39824a8685536f9 100644 (file)
--- a/dhcpcd.8.in
+++ b/dhcpcd.8.in
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd May 9, 2015
+.Dd June 5, 2015
 .Dt DHCPCD 8
 .Os
 .Sh NAME
@@ -608,9 +608,6 @@ Use the
 or
 .Fl 6
 flags to specify an address family.
-Pass a 2nd
-.Fl U, Fl Fl dumplease option to dump a secondary lease, such as
-DHCPv6 Prefix Delegation when not being mixed with another IA type.
 .It Fl V, Fl Fl variables
 Display a list of option codes, the associated variable and encoding for use in
 .Xr dhcpcd-run-hooks 8 .
@@ -734,7 +731,7 @@ RFC\ 3004, RFC\ 3118, RFC\ 3203, RFC\ 3315, RFC\ 3361, RFC\ 3633, RFC\ 3396,
 RFC\ 3397, RFC\ 3442, RFC\ 3495, RFC\ 3925, RFC\ 3927, RFC\ 4039, RFC\ 4075,
 RFC\ 4242, RFC\ 4361, RFC\ 4390, RFC\ 4702, RFC\ 4074, RFC\ 4861, RFC\ 4833,
 RFC\ 4941, RFC\ 5227, RFC\ 5942, RFC\ 5969, RFC\ 6106, RFC\ 6334, RFC\ 6603,
-RFC\ 6704, RFC\ 7217.
+RFC\ 6704, RFC\ 7217, RFC\ 7550.
 .Sh AUTHORS
 .An Roy Marples Aq Mt roy@marples.name
 .Sh BUGS

diff --git a/dhcpcd.c b/dhcpcd.c
index 69254b201cd426e47749e317e8155a4b48f5dc73..8db01d90001a729f594d1e73c57b02cb3c046f1e 100644 (file)
--- a/dhcpcd.c
+++ b/dhcpcd.c
@@ -407,11 +407,6 @@ configure_interface1(struct interface *ifp)
        if (ifo->metric != -1)
                ifp->metric = (unsigned int)ifo->metric;
 
-       /* If we're a psuedo interface, ensure we disable as much as we can */
-       if (ifp->options->options & DHCPCD_PFXDLGONLY)
-               ifp->options->options &=
-                   ~(DHCPCD_IPV4 | DHCPCD_IPV6RS | DHCPCD_WAITIP | DHCPCD_WAITIP6);
-
        if (!(ifo->options & DHCPCD_IPV4))
                ifo->options &= ~(DHCPCD_DHCP | DHCPCD_IPV4LL | DHCPCD_WAITIP4);
 
@@ -730,8 +725,6 @@ warn_iaid_conflict(struct interface *ifp, uint8_t *iaid)
        TAILQ_FOREACH(ifn, ifp->ctx->ifaces, next) {
                if (ifn == ifp)
                        continue;
-               if (ifn->options->options & DHCPCD_PFXDLGONLY)
-                       continue;
                if (memcmp(ifn->options->iaid, iaid,
                    sizeof(ifn->options->iaid)) == 0)
                        break;
@@ -743,7 +736,7 @@ warn_iaid_conflict(struct interface *ifp, uint8_t *iaid)
        }
 
        /* This is only a problem if the interfaces are on the same network. */
-       if (ifn && strcmp(ifp->name, ifn->name))
+       if (ifn)
                logger(ifp->ctx, LOG_ERR,
                    "%s: IAID conflicts with one assigned to %s",
                    ifp->name, ifn->name);
@@ -801,17 +794,14 @@ dhcpcd_startinterface(void *arg)
                if (ifp->ctx->duid == NULL) {
                        if (duid_init(ifp) == 0)
                                return;
-                       if (!(ifo->options & DHCPCD_PFXDLGONLY))
-                               logger(ifp->ctx, LOG_INFO, "DUID %s",
-                                   hwaddr_ntoa(ifp->ctx->duid,
-                                   ifp->ctx->duid_len,
-                                   buf, sizeof(buf)));
+                       logger(ifp->ctx, LOG_INFO, "DUID %s",
+                           hwaddr_ntoa(ifp->ctx->duid,
+                           ifp->ctx->duid_len,
+                           buf, sizeof(buf)));
                }
        }
 
-       if (ifo->options & (DHCPCD_DUID | DHCPCD_IPV6) &&
-           !(ifo->options & DHCPCD_PFXDLGONLY))
-       {
+       if (ifo->options & (DHCPCD_DUID | DHCPCD_IPV6)) {
                /* Report IAIDs */
                logger(ifp->ctx, LOG_INFO, "%s: IAID %s", ifp->name,
                    hwaddr_ntoa(ifo->iaid, sizeof(ifo->iaid),
@@ -1128,16 +1118,8 @@ stop_all_interfaces(struct dhcpcd_ctx *ctx, int do_release)
 {
        struct interface *ifp;
 
-       /* drop_dhcp could change the order, so we do it like this. */
-       for (;;) {
-               /* Be sane and drop the last config first,
-                * skipping any pseudo interfaces */
-               TAILQ_FOREACH_REVERSE(ifp, ctx->ifaces, if_head, next) {
-                       if (!(ifp->options->options & DHCPCD_PFXDLGONLY))
-                               break;
-               }
-               if (ifp == NULL)
-                       break;
+       /* Drop the last interface first */
+       while ((ifp = TAILQ_LAST(ctx->ifaces, if_head)) != NULL) {
                if (do_release) {
                        ifp->options->options |= DHCPCD_RELEASE;
                        ifp->options->options &= ~DHCPCD_PERSISTENT;
@@ -1418,10 +1400,7 @@ main(int argc, char **argv)
                        i = 1;
                        break;
                case 'U':
-                       if (i == 3)
-                               i = 4;
-                       else if (i != 4)
-                               i = 3;
+                       i = 3;
                        break;
                case 'V':
                        i = 2;
@@ -1481,8 +1460,6 @@ main(int argc, char **argv)
                        ctx.options |= DHCPCD_TEST;
                else
                        ctx.options |= DHCPCD_DUMPLEASE;
-               if (i == 4)
-                       ctx.options |= DHCPCD_PFXDLGONLY;
                ctx.options |= DHCPCD_PERSISTENT;
                ctx.options &= ~DHCPCD_DAEMONISE;
        }
@@ -1577,8 +1554,6 @@ main(int argc, char **argv)
                        }
                }
                configure_interface(ifp, ctx.argc, ctx.argv, 0);
-               if (ctx.options & DHCPCD_PFXDLGONLY)
-                       ifp->options->options |= DHCPCD_PFXDLGONLY;
                if (family == 0 || family == AF_INET) {
                        if (dhcp_dump(ifp) == -1)
                                i = 1;

diff --git a/dhcpcd.conf.5.in b/dhcpcd.conf.5.in
index 7d9de3f87c2f9c46590889f29cb16a5d66a2800b..82c1ace2b242339864d1387567596aefdd4a0a53 100644 (file)
--- a/dhcpcd.conf.5.in
+++ b/dhcpcd.conf.5.in
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd June 3, 2015
+.Dd June 5, 2015
 .Dt DHCPCD.CONF 5
 .Os
 .Sh NAME
@@ -320,18 +320,6 @@ interface eth0
     ia_na 1        # request an IPv6 address
     ia_pd 2 eth1/0  # get a /64 and assign it to eth1
 .Ed
-.It Ic ia_pd_mix
-To be RFC compliant,
-.Nm dhcpcd
-cannot mix Prefix Delegation with other DHCPv6 address types in the same
-session.
-This has a number of issues: additional DHCP traffic and potential collisions
-between options.
-.Ic ia_pd_mix
-enables
-.Li draft-ietf-dhc-dhcpv6-stateful-issues-06
-support so that Prefix Delegation can be mixed with other address types in
-the same session.
 .It Ic ipv4only
 Only configure IPv4.
 .It Ic ipv6only

diff --git a/if-options.c b/if-options.c
index 04b64a3198af3989651b307b29db87aea078c380..5d31d9a5ca365960d05b8b5427a03a8d68fa7947 100644 (file)
--- a/if-options.c
+++ b/if-options.c
@@ -94,7 +94,7 @@
 #define O_CONTROLGRP           O_BASE + 34
 #define O_SLAAC                        O_BASE + 35
 #define O_GATEWAY              O_BASE + 36
-#define O_PFXDLGMIX            O_BASE + 37
+// unassigned                  O_BASE + 37
 #define O_IPV6RA_AUTOCONF      O_BASE + 38
 #define O_IPV6RA_NOAUTOCONF    O_BASE + 39
 #define O_REJECT               O_BASE + 40
@@ -193,7 +193,6 @@ const struct option cf_options[] = {
        {"controlgroup",    required_argument, NULL, O_CONTROLGRP},
        {"slaac",           required_argument, NULL, O_SLAAC},
        {"gateway",         no_argument,       NULL, O_GATEWAY},
-       {"ia_pd_mix",       no_argument,       NULL, O_PFXDLGMIX},
        {"reject",          required_argument, NULL, O_REJECT},
        {"bootp",           no_argument,       NULL, O_BOOTP},
        {"nodelay",         no_argument,       NULL, O_NODELAY},
@@ -2012,9 +2011,6 @@ err_sla:
                else
                        ifo->options &= ~DHCPCD_SLAACPRIVATE;
                break;
-       case O_PFXDLGMIX:
-               ifo->options |= DHCPCD_PFXDLGMIX;
-               break;
        case O_BOOTP:
                ifo->options |= DHCPCD_BOOTP;
                break;

diff --git a/if-options.h b/if-options.h
index c94242d8031e522742244eb58ffe56184d1044f4..d5ff7a2e3cd79c2a686d662a719809d37e0abb33 100644 (file)
--- a/if-options.h
+++ b/if-options.h
@@ -104,9 +104,9 @@
 #define DHCPCD_IAID                    (1ULL << 48)
 #define DHCPCD_DHCP                    (1ULL << 49)
 #define DHCPCD_DHCP6                   (1ULL << 50)
-#define DHCPCD_NOPFXDLG                        (1ULL << 51)
-#define DHCPCD_PFXDLGONLY              (1ULL << 52)
-#define DHCPCD_PFXDLGMIX               (1ULL << 53)
+// unassigned                          (1ULL << 51)
+// unassigned                          (1ULL << 52)
+// unassinged                          (1ULL << 53)
 #define DHCPCD_IPV6RA_AUTOCONF         (1ULL << 54)
 #define DHCPCD_ROUTER_HOST_ROUTE_WARNED        (1ULL << 55)
 #define DHCPCD_IPV6RA_ACCEPT_NOPUBLIC  (1ULL << 56)
@@ -117,7 +117,6 @@
 
 #define DHCPCD_WARNINGS (DHCPCD_CSR_WARNED | \
                DHCPCD_ROUTER_HOST_ROUTE_WARNED)
-#define DHCPCD_CONF (DHCPCD_NOPFXDLG | DHCPCD_PFXDLGONLY)
 
 extern const struct option cf_options[];
 

diff --git a/if.c b/if.c
index 2f1a7e5780a262b4e7ff58af6797ad08269b17e3..201cc48ccf0c5e0c0483f13b018d7a4a930f9d8b 100644 (file)
--- a/if.c
+++ b/if.c
@@ -548,13 +548,11 @@ if_findindexname(struct if_head *ifaces, unsigned int idx, const char *name)
                struct interface *ifp;
 
                TAILQ_FOREACH(ifp, ifaces, next) {
-                       if ((ifp->options == NULL ||
-                           !(ifp->options->options & DHCPCD_PFXDLGONLY)) &&
-                           ((name && strcmp(ifp->name, name) == 0) ||
+                       if ((name && strcmp(ifp->name, name) == 0) ||
 #ifdef __linux__
                            (name && strcmp(ifp->alias, name) == 0) ||
 #endif
-                           (!name && ifp->index == idx)))
+                           (!name && ifp->index == idx))
                                return ifp;
                }
        }
@@ -603,14 +601,6 @@ if_cmp(const struct interface *si, const struct interface *ti)
        int r;
 #endif
 
-       /* Always prefer master interfaces */
-       if (!(si->options->options & DHCPCD_PFXDLGONLY) &&
-           ti->options->options & DHCPCD_PFXDLGONLY)
-               return -1;
-       if (si->options->options & DHCPCD_PFXDLGONLY &&
-           !(ti->options->options & DHCPCD_PFXDLGONLY))
-               return 1;
-
        /* Check carrier status first */
        if (si->carrier > ti->carrier)
                return -1;

diff --git a/ipv4.c b/ipv4.c
index 82e36c3058e49923fbeb581763ecd6ddc450b056..d5855a6aa7ff053d3c64b0f04e07b6bcbeff63f7 100644 (file)
--- a/ipv4.c
+++ b/ipv4.c
@@ -889,7 +889,7 @@ ipv4_preferanother(struct interface *ifp)
                goto out;
 
        TAILQ_FOREACH(ifn, ifp->ctx->ifaces, next) {
-               if (ifn == ifp || strcmp(ifn->name, ifp->name) == 0)
+               if (ifn == ifp)
                        break; /* We are already the most preferred */
                nstate = D_STATE(ifn);
                if (nstate && !nstate->added &&
@@ -946,7 +946,7 @@ ipv4_applyaddr(void *arg)
        /* Ensure only one interface has the address */
        r = 0;
        TAILQ_FOREACH(ifn, ifp->ctx->ifaces, next) {
-               if (ifn == ifp || strcmp(ifn->name, ifp->name) == 0) {
+               if (ifn == ifp) {
                        r = 1; /* past ourselves */
                        continue;
                }
@@ -975,7 +975,7 @@ ipv4_applyaddr(void *arg)
        /* Does another interface already have the address from a prior boot? */
        if (ifn == NULL) {
                TAILQ_FOREACH(ifn, ifp->ctx->ifaces, next) {
-                       if (ifn == ifp || strcmp(ifn->name, ifp->name) == 0)
+                       if (ifn == ifp)
                                continue;
                        ap = ipv4_iffindaddr(ifn, &lease->addr, NULL);
                        if (ap)

diff --git a/ipv6.c b/ipv6.c
index 67f9a1746e0f223394f66866e3c290b6f403fae5..f9119d4812011215ee4e225580599ac98b628a9e 100644 (file)
--- a/ipv6.c
+++ b/ipv6.c
@@ -625,7 +625,7 @@ ipv6_addaddr(struct ipv6_addr *ap, const struct timespec *now)
 
        /* Ensure no other interface has this address */
        TAILQ_FOREACH(ifp, ap->iface->ctx->ifaces, next) {
-               if (ifp == ap->iface || strcmp(ifp->name, ap->iface->name) == 0)
+               if (ifp == ap->iface)
                        continue;
                state = IPV6_STATE(ifp);
                if (state == NULL)
@@ -798,9 +798,7 @@ ipv6_addaddrs(struct ipv6_addrhead *addrs)
                {
                        apf = ipv6_findaddr(ap->iface->ctx,
                            &ap->addr, IPV6_AF_ADDED);
-                       if (apf && apf->iface != ap->iface &&
-                           strcmp(apf->iface->name, ap->iface->name))
-                       {
+                       if (apf && apf->iface != ap->iface) {
                                if (apf->iface->metric <= ap->iface->metric) {
                                        logger(apf->iface->ctx, LOG_INFO,
                                            "%s: preferring %s on %s",
@@ -864,8 +862,7 @@ ipv6_freedrop_addrs(struct ipv6_addrhead *addrs, int drop,
                        /* Find the same address somewhere else */
                        apf = ipv6_findaddr(ap->iface->ctx, &ap->addr, 0);
                        if (apf == NULL ||
-                           (apf->iface != ap->iface &&
-                           strcmp(apf->iface->name, ap->iface->name)))
+                           (apf->iface != ap->iface))
                                ipv6_deleteaddr(ap);
                        if (!(ap->iface->options->options &
                            DHCPCD_EXITING) && apf)
@@ -931,108 +928,104 @@ ipv6_handleifa(struct dhcpcd_ctx *ctx,
                errno = ESRCH;
                return;
        }
-       TAILQ_FOREACH(ifp, ifs, next) {
-               /* Each psuedo interface also stores addresses */
-               if (strcmp(ifp->name, ifname))
-                       continue;
-               state = ipv6_getstate(ifp);
-               if (state == NULL)
-                       continue;
-
-               if (!IN6_IS_ADDR_LINKLOCAL(addr)) {
-                       ipv6nd_handleifa(ctx, cmd, ifname, addr, flags);
-                       dhcp6_handleifa(ctx, cmd, ifname, addr, flags);
-               }
+       if ((ifp = if_find(ifs, ifname)) == NULL)
+               return;
+       if ((state = ipv6_getstate(ifp)) == NULL)
+               return;
 
-               TAILQ_FOREACH(ap, &state->addrs, next) {
-                       if (IN6_ARE_ADDR_EQUAL(&ap->addr, addr))
-                               break;
-               }
+       if (!IN6_IS_ADDR_LINKLOCAL(addr)) {
+               ipv6nd_handleifa(ctx, cmd, ifname, addr, flags);
+               dhcp6_handleifa(ctx, cmd, ifname, addr, flags);
+       }
 
-               switch (cmd) {
-               case RTM_DELADDR:
-                       if (ap) {
-                               TAILQ_REMOVE(&state->addrs, ap, next);
-                               ipv6_freeaddr(ap);
-                       }
+       TAILQ_FOREACH(ap, &state->addrs, next) {
+               if (IN6_ARE_ADDR_EQUAL(&ap->addr, addr))
                        break;
-               case RTM_NEWADDR:
-                       if (ap == NULL) {
-                               char buf[INET6_ADDRSTRLEN];
-                               const char *cbp;
-
-                               ap = calloc(1, sizeof(*ap));
-                               ap->iface = ifp;
-                               ap->addr = *addr;
-                               ap->prefix_len = prefix_len;
-                               ipv6_makeprefix(&ap->prefix, &ap->addr,
-                                   ap->prefix_len);
-                               cbp = inet_ntop(AF_INET6, &addr->s6_addr,
-                                   buf, sizeof(buf));
-                               if (cbp)
-                                       snprintf(ap->saddr, sizeof(ap->saddr),
-                                           "%s/%d", cbp, prefix_len);
-                               if (if_getlifetime6(ap) == -1) {
-                                       /* No support or address vanished.
-                                        * Either way, just set a deprecated
-                                        * infinite time lifetime and continue.
-                                        * This is fine because we only want
-                                        * to know this when trying to extend
-                                        * temporary addresses.
-                                        * As we can't extend infinite, we'll
-                                        * create a new temporary address. */
-                                       ap->prefix_pltime = 0;
-                                       ap->prefix_vltime =
-                                           ND6_INFINITE_LIFETIME;
-                               }
-                               /* This is a minor regression against RFC 4941
-                                * because the kernel only knows when the
-                                * lifetimes were last updated, not when the
-                                * address was initially created.
-                                * Provided dhcpcd is not restarted, this
-                                * won't be a problem.
-                                * If we don't like it, we can always
-                                * pretend lifetimes are infinite and always
-                                * generate a new temporary address on
-                                * restart. */
-                               ap->acquired = ap->created;
-                               TAILQ_INSERT_TAIL(&state->addrs,
-                                   ap, next);
+       }
+
+       switch (cmd) {
+       case RTM_DELADDR:
+               if (ap) {
+                       TAILQ_REMOVE(&state->addrs, ap, next);
+                       ipv6_freeaddr(ap);
+               }
+               break;
+       case RTM_NEWADDR:
+               if (ap == NULL) {
+                       char buf[INET6_ADDRSTRLEN];
+                       const char *cbp;
+
+                       ap = calloc(1, sizeof(*ap));
+                       ap->iface = ifp;
+                       ap->addr = *addr;
+                       ap->prefix_len = prefix_len;
+                       ipv6_makeprefix(&ap->prefix, &ap->addr,
+                           ap->prefix_len);
+                       cbp = inet_ntop(AF_INET6, &addr->s6_addr,
+                           buf, sizeof(buf));
+                       if (cbp)
+                               snprintf(ap->saddr, sizeof(ap->saddr),
+                                   "%s/%d", cbp, prefix_len);
+                       if (if_getlifetime6(ap) == -1) {
+                               /* No support or address vanished.
+                                * Either way, just set a deprecated
+                                * infinite time lifetime and continue.
+                                * This is fine because we only want
+                                * to know this when trying to extend
+                                * temporary addresses.
+                                * As we can't extend infinite, we'll
+                                * create a new temporary address. */
+                               ap->prefix_pltime = 0;
+                               ap->prefix_vltime =
+                                   ND6_INFINITE_LIFETIME;
                        }
-                       ap->addr_flags = flags;
+                       /* This is a minor regression against RFC 4941
+                        * because the kernel only knows when the
+                        * lifetimes were last updated, not when the
+                        * address was initially created.
+                        * Provided dhcpcd is not restarted, this
+                        * won't be a problem.
+                        * If we don't like it, we can always
+                        * pretend lifetimes are infinite and always
+                        * generate a new temporary address on
+                        * restart. */
+                       ap->acquired = ap->created;
+                       TAILQ_INSERT_TAIL(&state->addrs,
+                           ap, next);
+               }
+               ap->addr_flags = flags;
 #ifdef IPV6_MANAGETEMPADDR
-                       if (ap->addr_flags & IN6_IFF_TEMPORARY)
-                               ap->flags |= IPV6_AF_TEMPORARY;
+               if (ap->addr_flags & IN6_IFF_TEMPORARY)
+                       ap->flags |= IPV6_AF_TEMPORARY;
 #endif
-                       if (IN6_IS_ADDR_LINKLOCAL(&ap->addr)) {
+               if (IN6_IS_ADDR_LINKLOCAL(&ap->addr)) {
 #ifdef IPV6_POLLADDRFLAG
-                               if (ap->addr_flags & IN6_IFF_TENTATIVE) {
-                                       struct timespec tv;
-
-                                       ms_to_ts(&tv, RETRANS_TIMER / 2);
-                                       eloop_timeout_add_tv(
-                                           ap->iface->ctx->eloop,
-                                           &tv, ipv6_checkaddrflags, ap);
-                                       break;
-                               }
+                       if (ap->addr_flags & IN6_IFF_TENTATIVE) {
+                               struct timespec tv;
+
+                               ms_to_ts(&tv, RETRANS_TIMER / 2);
+                               eloop_timeout_add_tv(
+                                   ap->iface->ctx->eloop,
+                                   &tv, ipv6_checkaddrflags, ap);
+                               break;
+                       }
 #endif
 
-                               if (!(ap->addr_flags & IN6_IFF_NOTUSEABLE)) {
-                                       /* Now run any callbacks.
-                                        * Typically IPv6RS or DHCPv6 */
-                                       while ((cb =
-                                           TAILQ_FIRST(&state->ll_callbacks)))
-                                       {
-                                               TAILQ_REMOVE(
-                                                   &state->ll_callbacks,
-                                                   cb, next);
-                                               cb->callback(cb->arg);
-                                               free(cb);
-                                       }
+                       if (!(ap->addr_flags & IN6_IFF_NOTUSEABLE)) {
+                               /* Now run any callbacks.
+                                * Typically IPv6RS or DHCPv6 */
+                               while ((cb =
+                                   TAILQ_FIRST(&state->ll_callbacks)))
+                               {
+                                       TAILQ_REMOVE(
+                                           &state->ll_callbacks,
+                                           cb, next);
+                                       cb->callback(cb->arg);
+                                       free(cb);
                                }
                        }
-                       break;
                }
+               break;
        }
 }
 

diff --git a/ipv6nd.c b/ipv6nd.c
index f2fd963eca9c1eef07add663af75bab0b088a5a8..74b11cacee4bdf95348aad0dc1f21057757202fb 100644 (file)
--- a/ipv6nd.c
+++ b/ipv6nd.c
@@ -1646,9 +1646,7 @@ ipv6nd_handledata(void *arg)
        }
 
        TAILQ_FOREACH(ifp, dctx->ifaces, next) {
-               if (ifp->index == (unsigned int)pkt.ipi6_ifindex &&
-                   !(ifp->options->options & DHCPCD_PFXDLGONLY))
-               {
+               if (ifp->index == (unsigned int)pkt.ipi6_ifindex) {
                        if (!(ifp->options->options & DHCPCD_IPV6))
                                return;
                        break;

diff --git a/script.c b/script.c
index 74338055b24f3689c2c5f845758876ebe630cc9e..90278bf1299e1e1aa6f8f6edf582df1ce5240c49 100644 (file)
--- a/script.c
+++ b/script.c
@@ -317,8 +317,7 @@ make_env(const struct interface *ifp, const char *reason, char ***argv)
        snprintf(env[7], e, "ifmtu=%d", if_getmtu(ifp->name));
        l = e = strlen("interface_order=");
        TAILQ_FOREACH(ifp2, ifp->ctx->ifaces, next) {
-               if (!(ifp2->options->options & DHCPCD_PFXDLGONLY))
-                       e += strlen(ifp2->name) + 1;
+               e += strlen(ifp2->name) + 1;
        }
        EMALLOC(8, e);
        p = env[8];
@@ -326,13 +325,11 @@ make_env(const struct interface *ifp, const char *reason, char ***argv)
        e -= l;
        p += l;
        TAILQ_FOREACH(ifp2, ifp->ctx->ifaces, next) {
-               if (!(ifp2->options->options & DHCPCD_PFXDLGONLY)) {
-                       l = strlcpy(p, ifp2->name, e);
-                       p += l;
-                       e -= l;
-                       *p++ = ' ';
-                       e--;
-               }
+               l = strlcpy(p, ifp2->name, e);
+               p += l;
+               e -= l;
+               *p++ = ' ';
+               e--;
        }
        *--p = '\0';
        if (strcmp(reason, "STOPPED") == 0) {
@@ -421,16 +418,6 @@ make_env(const struct interface *ifp, const char *reason, char ***argv)
        }
 #endif
 #ifdef INET6
-       if (dhcp6 && d6_state && ifo->options & DHCPCD_PFXDLGONLY) {
-               nenv = realloc(env, sizeof(char *) * (elen + 2));
-               if (nenv == NULL)
-                       goto eexit;
-               env = nenv;
-               env[elen] = strdup("ifclass=pd");
-               if (env[elen] == NULL)
-                       goto eexit;
-               elen++;
-       }
        if (dhcp6 && d6_state && d6_state->old) {
                n = dhcp6_env(NULL, NULL, ifp,
                    d6_state->old, d6_state->old_len);