inet6: Move BSD get/set scope function to ipv6 for general use

It seems that FreeBSD doesn't allow binding to scoped addresses,
so let's use our functions everwhere rather than directly
setting scope.

diff --git a/src/dhcp6.c b/src/dhcp6.c
index 2c0fed5215c830cb089cc6c4d5e29e8e8af4db5a..2019cdb98f50db77955d57a507de879a0aa9859f 100644 (file)
--- a/src/dhcp6.c
+++ b/src/dhcp6.c
@@ -3223,12 +3223,14 @@ dhcp6_bind(struct interface *ifp, const char *op, const char *sfrom)
                        state->state = DH6S_BOUND;
                state->failed = false;
 
-               if (state->renew && state->renew != ND6_INFINITE_LIFETIME)
+               if ((state->renew != 0 || state->rebind != 0) &&
+                   state->renew != ND6_INFINITE_LIFETIME)
                        eloop_timeout_add_sec(ifp->ctx->eloop,
                            state->renew,
                            state->state == DH6S_INFORMED ?
                            dhcp6_startinform : dhcp6_startrenew, ifp);
-               if (state->rebind && state->rebind != ND6_INFINITE_LIFETIME)
+               if ((state->rebind != 0 || state->expire != 0) &&
+                   state->rebind != ND6_INFINITE_LIFETIME)
                        eloop_timeout_add_sec(ifp->ctx->eloop,
                            state->rebind, dhcp6_startrebind, ifp);
                if (state->expire != ND6_INFINITE_LIFETIME)
@@ -3792,7 +3794,7 @@ dhcp6_openudp(unsigned int ifindex, struct in6_addr *ia)
 
        if (ia != NULL) {
                memcpy(&sa.sin6_addr, ia, sizeof(sa.sin6_addr));
-               sa.sin6_scope_id = ifindex;
+               ipv6_setscope(&sa, ifindex);
        }
 
        if (bind(s, (struct sockaddr *)&sa, sizeof(sa)) == -1)

diff --git a/src/if-bsd.c b/src/if-bsd.c
index 9a491b3123923fc7631f3aa78e97971648f8df69..15d20168db22d7fca4528edf86760de15979746e 100644 (file)
--- a/src/if-bsd.c
+++ b/src/if-bsd.c
@@ -109,11 +109,6 @@ static const char * const ifnames_ignore[] = {
        NULL
 };
 
-#ifdef INET6
-static void ifa_setscope(struct sockaddr_in6 *, unsigned int);
-static unsigned int ifa_getscope(const struct sockaddr_in6 *);
-#endif
-
 struct priv {
        int pf_inet6_fd;
 };
@@ -580,7 +575,7 @@ if_findsa(struct dhcpcd_ctx *ctx, const struct sockaddr *sa)
                struct ipv6_addr *ia;
 
                sin = (const void *)sa;
-               scope = ifa_getscope(sin);
+               scope = ipv6_getscope(sin);
                if (scope != 0)
                        return if_findindex(ctx->ifaces, scope);
                if ((ia = ipv6_findmaskaddr(ctx, &sin->sin6_addr)))
@@ -737,7 +732,7 @@ if_route(unsigned char cmd, const struct rt *rt)
                        if_copysa(&gateway.sa, &rt->rt_gateway);
 #ifdef INET6
                        if (gateway.sa.sa_family == AF_INET6)
-                               ifa_setscope(&gateway.sin6, rt->rt_ifp->index);
+                               ipv6_setscope(&gateway.sin6, rt->rt_ifp->index);
 #endif
                        ADDSA(&gateway.sa);
                }
@@ -960,44 +955,6 @@ if_addrflags(const struct interface *ifp, const struct in_addr *addr,
 #endif /* INET */
 
 #ifdef INET6
-static void
-ifa_setscope(struct sockaddr_in6 *sin, unsigned int ifindex)
-{
-
-#ifdef __KAME__
-       /* KAME based systems want to store the scope inside the sin6_addr
-        * for link local addresses */
-       if (IN6_IS_ADDR_LINKLOCAL(&sin->sin6_addr)) {
-               uint16_t scope = htons((uint16_t)ifindex);
-               memcpy(&sin->sin6_addr.s6_addr[2], &scope,
-                   sizeof(scope));
-       }
-       sin->sin6_scope_id = 0;
-#else
-       if (IN6_IS_ADDR_LINKLOCAL(&sin->sin6_addr))
-               sin->sin6_scope_id = ifindex;
-       else
-               sin->sin6_scope_id = 0;
-#endif
-}
-
-static unsigned int
-ifa_getscope(const struct sockaddr_in6 *sin)
-{
-#ifdef __KAME__
-       uint16_t scope;
-#endif
-
-       if (!IN6_IS_ADDR_LINKLOCAL(&sin->sin6_addr))
-               return 0;
-#ifdef __KAME__
-       memcpy(&scope, &sin->sin6_addr.s6_addr[2], sizeof(scope));
-       return (unsigned int)ntohs(scope);
-#else
-       return (unsigned int)sin->sin6_scope_id;
-#endif
-}
-
 static int
 if_ioctl6(struct dhcpcd_ctx *ctx, unsigned long req, void *data, size_t len)
 {
@@ -1042,7 +999,7 @@ if_address6(unsigned char cmd, const struct ipv6_addr *ia)
        }
 
        ADDADDR(&ifa.ifra_addr, &ia->addr);
-       ifa_setscope(&ifa.ifra_addr, ia->iface->index);
+       ipv6_setscope(&ifa.ifra_addr, ia->iface->index);
        ipv6_mask(&mask, ia->prefix_len);
        ADDADDR(&ifa.ifra_prefixmask, &mask);
 
@@ -1120,7 +1077,7 @@ if_addrflags6(const struct interface *ifp, const struct in6_addr *addr,
        strlcpy(ifr6.ifr_name, ifp->name, sizeof(ifr6.ifr_name));
        ifr6.ifr_addr.sin6_family = AF_INET6;
        ifr6.ifr_addr.sin6_addr = *addr;
-       ifa_setscope(&ifr6.ifr_addr, ifp->index);
+       ipv6_setscope(&ifr6.ifr_addr, ifp->index);
        priv = (struct priv *)ifp->ctx->priv;
        if (ioctl(priv->pf_inet6_fd, SIOCGIFAFLAG_IN6, &ifr6) != -1)
                flags = ifr6.ifr_ifru.ifru_flags6;
@@ -1141,7 +1098,7 @@ if_getlifetime6(struct ipv6_addr *ia)
        strlcpy(ifr6.ifr_name, ia->iface->name, sizeof(ifr6.ifr_name));
        ifr6.ifr_addr.sin6_family = AF_INET6;
        ifr6.ifr_addr.sin6_addr = ia->addr;
-       ifa_setscope(&ifr6.ifr_addr, ia->iface->index);
+       ipv6_setscope(&ifr6.ifr_addr, ia->iface->index);
        priv = (struct priv *)ia->iface->ctx->priv;
        if (ioctl(priv->pf_inet6_fd, SIOCGIFALIFETIME_IN6, &ifr6) == -1)
                return -1;
@@ -1517,7 +1474,7 @@ if_missfilter0(struct dhcpcd_ctx *ctx, struct interface *ifp,
 
 #ifdef INET6
        if (sa->sa_family == AF_INET6)
-               ifa_setscope(satosin6(sa), ifp->index);
+               ipv6_setscope(satosin6(sa), ifp->index);
 #else
        UNUSED(ifp);
 #endif
@@ -1530,7 +1487,7 @@ if_missfilter0(struct dhcpcd_ctx *ctx, struct interface *ifp,
 
 #ifdef INET6
        if (sa->sa_family == AF_INET6)
-               ifa_setscope(satosin6(sa), 0);
+               ipv6_setscope(satosin6(sa), 0);
 #endif
 
        return 0;

diff --git a/src/ipv6.c b/src/ipv6.c
index 8ecdf62235647b18cf109934824c2a92485affbf..4ea6101957ba0b5d7dfe957bc50c41e3ec493354 100644 (file)
--- a/src/ipv6.c
+++ b/src/ipv6.c
@@ -1532,6 +1532,44 @@ ipv6_tryaddlinklocal(struct interface *ifp)
        return ipv6_addlinklocal(ifp);
 }
 
+void
+ipv6_setscope(struct sockaddr_in6 *sin, unsigned int ifindex)
+{
+
+#ifdef __KAME__
+       /* KAME based systems want to store the scope inside the sin6_addr
+        * for link local addresses */
+       if (IN6_IS_ADDR_LINKLOCAL(&sin->sin6_addr)) {
+               uint16_t scope = htons((uint16_t)ifindex);
+               memcpy(&sin->sin6_addr.s6_addr[2], &scope,
+                   sizeof(scope));
+       }
+       sin->sin6_scope_id = 0;
+#else
+       if (IN6_IS_ADDR_LINKLOCAL(&sin->sin6_addr))
+               sin->sin6_scope_id = ifindex;
+       else
+               sin->sin6_scope_id = 0;
+#endif
+}
+
+unsigned int
+ipv6_getscope(const struct sockaddr_in6 *sin)
+{
+#ifdef __KAME__
+       uint16_t scope;
+#endif
+
+       if (!IN6_IS_ADDR_LINKLOCAL(&sin->sin6_addr))
+               return 0;
+#ifdef __KAME__
+       memcpy(&scope, &sin->sin6_addr.s6_addr[2], sizeof(scope));
+       return (unsigned int)ntohs(scope);
+#else
+       return (unsigned int)sin->sin6_scope_id;
+#endif
+}
+
 struct ipv6_addr *
 ipv6_newaddr(struct interface *ifp, const struct in6_addr *addr,
     uint8_t prefix_len, unsigned int flags)

diff --git a/src/ipv6.h b/src/ipv6.h
index b159827b5c791abc0846d839246287790099ffd8..5625d8510d160440e784823ea7c24b17793c604d 100644 (file)
--- a/src/ipv6.h
+++ b/src/ipv6.h
@@ -287,8 +287,10 @@ struct ipv6_addr *ipv6_findmaskaddr(struct dhcpcd_ctx *,
     const struct in6_addr *);
 #define ipv6_linklocal(ifp) ipv6_iffindaddr((ifp), NULL, IN6_IFF_NOTUSEABLE)
 int ipv6_addlinklocalcallback(struct interface *, void (*)(void *), void *);
-struct ipv6_addr *ipv6_newaddr(struct interface *, const struct in6_addr *, uint8_t,
-    unsigned int);
+void ipv6_setscope(struct sockaddr_in6 *, unsigned int);
+unsigned int ipv6_getscope(const struct sockaddr_in6 *);
+struct ipv6_addr *ipv6_newaddr(struct interface *, const struct in6_addr *,
+    uint8_t, unsigned int);
 void ipv6_freeaddr(struct ipv6_addr *);
 void ipv6_freedrop(struct interface *, int);
 #define ipv6_free(ifp) ipv6_freedrop((ifp), 0)