]> git.ipfire.org Git - thirdparty/dhcpcd.git/commitdiff
Fix compile on OpenBSD.
authorRoy Marples <roy@marples.name>
Mon, 19 Mar 2018 20:56:42 +0000 (20:56 +0000)
committerRoy Marples <roy@marples.name>
Mon, 19 Mar 2018 20:56:42 +0000 (20:56 +0000)
src/ipv6.c
src/ipv6nd.c

index 282d40e5b45b38d744c41c0b43c100c1a06b1078..b88757afbf0e49f185ee2074cbb74b75b09cddb2 100644 (file)
@@ -1973,40 +1973,6 @@ again:
        return ia;
 }
 
-void
-ipv6_markaddrsstale(struct interface *ifp, unsigned int flags)
-{
-       struct ipv6_state *state;
-       struct ipv6_addr *ia;
-
-       state = IPV6_STATE(ifp);
-       if (state == NULL)
-               return;
-
-       TAILQ_FOREACH(ia, &state->addrs, next) {
-               if (flags == 0 || ia->flags & flags)
-                       ia->flags |= IPV6_AF_STALE;
-       }
-}
-
-void
-ipv6_deletestaleaddrs(struct interface *ifp)
-{
-       struct ipv6_state *state;
-       struct ipv6_addr *ia, *ia1;
-
-       state = IPV6_STATE(ifp);
-       if (state == NULL)
-               return;
-
-       TAILQ_FOREACH_SAFE(ia, &state->addrs, next, ia1) {
-               if (ia->flags & IPV6_AF_STALE)
-                       ipv6_handleifa(ifp->ctx, RTM_DELADDR,
-                           ifp->ctx->ifaces, ifp->name,
-                           &ia->addr, ia->prefix_len, 0, 0);
-       }
-}
-
 struct ipv6_addr *
 ipv6_settemptime(struct ipv6_addr *ia, int flags)
 {
@@ -2128,6 +2094,40 @@ ipv6_regentempifid(void *arg)
 }
 #endif /* IPV6_MANAGETEMPADDR */
 
+void
+ipv6_markaddrsstale(struct interface *ifp, unsigned int flags)
+{
+       struct ipv6_state *state;
+       struct ipv6_addr *ia;
+
+       state = IPV6_STATE(ifp);
+       if (state == NULL)
+               return;
+
+       TAILQ_FOREACH(ia, &state->addrs, next) {
+               if (flags == 0 || ia->flags & flags)
+                       ia->flags |= IPV6_AF_STALE;
+       }
+}
+
+void
+ipv6_deletestaleaddrs(struct interface *ifp)
+{
+       struct ipv6_state *state;
+       struct ipv6_addr *ia, *ia1;
+
+       state = IPV6_STATE(ifp);
+       if (state == NULL)
+               return;
+
+       TAILQ_FOREACH_SAFE(ia, &state->addrs, next, ia1) {
+               if (ia->flags & IPV6_AF_STALE)
+                       ipv6_handleifa(ifp->ctx, RTM_DELADDR,
+                           ifp->ctx->ifaces, ifp->name,
+                           &ia->addr, ia->prefix_len, 0, 0);
+       }
+}
+
 
 static struct rt *
 inet6_makeroute(struct interface *ifp, const struct ra *rap)
index d5b94943b113111927403cf4b7e73895124de8eb..c8c2e54d79f33b4ba752c97d4dee9c19985d6d21 100644 (file)
@@ -870,7 +870,9 @@ ipv6nd_handlera(struct dhcpcd_ctx *ctx, struct interface *ifp,
                rap->expired = 0;
        rap->hasdns = 0;
 
+#ifdef IPV6_AF_TEMPORARY
        ipv6_markaddrsstale(ifp, IPV6_AF_TEMPORARY);
+#endif
        TAILQ_FOREACH(ap, &rap->addrs, next) {
                ap->flags |= IPV6_AF_STALE;
        }