dhcpv6: don't initialize IA-handing when turning down interface

[project/odhcpd.git] / src / ndp.c

diff --git a/src/ndp.c b/src/ndp.c
index 9fc539b..5e8b5ac 100644 (file)
--- a/src/ndp.c
+++ b/src/ndp.c
@@ -73,16 +73,6 @@ int init_ndp(void)
        setsockopt(rtnl_event.uloop.fd, SOL_NETLINK,
                        NETLINK_ADD_MEMBERSHIP, &group, sizeof(group));
 
-       // Synthesize initial address events
-       struct {
-               struct nlmsghdr nh;
-               struct ifaddrmsg ifa;
-       } req2 = {
-               {sizeof(req2), RTM_GETADDR, NLM_F_REQUEST | NLM_F_DUMP,
-                               ++rtnl_seqid, 0},
-               {.ifa_family = AF_INET6}
-       };
-       send(rtnl_event.uloop.fd, &req2, sizeof(req2), MSG_DONTWAIT);
        odhcpd_register(&rtnl_event);
 
        // Open ICMPv6 socket
@@ -125,6 +115,7 @@ static void dump_neigh_table(bool proxy)
                {.ndm_family = AF_INET6, .ndm_flags = (proxy) ? NTF_PROXY : 0}
        };
        send(rtnl_event.uloop.fd, &req, sizeof(req), MSG_DONTWAIT);
+       odhcpd_process(&rtnl_event);
 }
 
 
@@ -135,17 +126,34 @@ int setup_ndp_interface(struct interface *iface, bool enable)
        int procfd = open(procbuf, O_WRONLY);
        bool dump_neigh = false;
 
-       if (iface->ndp_event.uloop.fd >= 0) {
+       if (iface->ndp_event.uloop.fd > 0) {
                uloop_fd_delete(&iface->ndp_event.uloop);
                close(iface->ndp_event.uloop.fd);
                iface->ndp_event.uloop.fd = -1;
 
-               write(procfd, "0\n", 2);
+               if (!enable || iface->ndp != RELAYD_RELAY)
+                       if (write(procfd, "0\n", 2) < 0) {}
+
                dump_neigh = true;
        }
 
+       if (enable && (iface->ra == RELAYD_SERVER ||
+                       iface->dhcpv6 == RELAYD_SERVER || iface->ndp == RELAYD_RELAY)) {
+               // Synthesize initial address events
+               struct {
+                       struct nlmsghdr nh;
+                       struct ifaddrmsg ifa;
+               } req2 = {
+                       {sizeof(req2), RTM_GETADDR, NLM_F_REQUEST | NLM_F_DUMP,
+                                       ++rtnl_seqid, 0},
+                       {.ifa_family = AF_INET6, .ifa_index = iface->ifindex}
+               };
+               send(rtnl_event.uloop.fd, &req2, sizeof(req2), MSG_DONTWAIT);
+       }
+
        if (enable && iface->ndp == RELAYD_RELAY) {
-               write(procfd, "1\n", 2);
+               if (write(procfd, "1\n", 2) < 0) {}
+               close(procfd);
 
                int sock = socket(AF_PACKET, SOCK_DGRAM | SOCK_CLOEXEC, htons(ETH_P_IPV6));
                if (sock < 0) {
@@ -188,8 +196,9 @@ int setup_ndp_interface(struct interface *iface, bool enable)
                        dump_neigh_table(false);
                else
                        dump_neigh = false;
+       } else {
+               close(procfd);
        }
-       close(procfd);
 
        if (dump_neigh)
                dump_neigh_table(true);
@@ -250,7 +259,7 @@ static void handle_solicit(void *addr, void *data, size_t len,
        struct interface *c;
        list_for_each_entry(c, &interfaces, head)
                if (iface->ndp == RELAYD_RELAY && iface != c &&
-                               (!ns_is_dad || !c->external == false))
+                               (ns_is_dad || !c->external))
                        ping6(&req->nd_ns_target, c);
 }
 
@@ -288,7 +297,7 @@ void odhcpd_setup_route(const struct in6_addr *addr, int prefixlen,
        if (add) {
                req.nh.nlmsg_type = RTM_NEWROUTE;
                req.nh.nlmsg_flags |= (NLM_F_CREATE | NLM_F_REPLACE);
-               req.rtm.rtm_protocol = RTPROT_BOOT;
+               req.rtm.rtm_protocol = RTPROT_STATIC;
                req.rtm.rtm_scope = (gw) ? RT_SCOPE_UNIVERSE : RT_SCOPE_LINK;
                req.rtm.rtm_type = RTN_UNICAST;
        } else {
@@ -296,23 +305,20 @@ void odhcpd_setup_route(const struct in6_addr *addr, int prefixlen,
                req.rtm.rtm_scope = RT_SCOPE_NOWHERE;
        }
 
-       size_t reqlen = (gw) ? sizeof(req) : offsetof(struct req, rta_gw);
-       send(rtnl_event.uloop.fd, &req, reqlen, MSG_DONTWAIT);
+       req.nh.nlmsg_len = (gw) ? sizeof(req) : offsetof(struct req, rta_gw);
+       send(rtnl_event.uloop.fd, &req, req.nh.nlmsg_len, MSG_DONTWAIT);
 }
 
 // Use rtnetlink to modify kernel routes
-static void setup_route(struct in6_addr *addr, struct interface *iface,
-               bool add)
+static void setup_route(struct in6_addr *addr, struct interface *iface, bool add)
 {
        char namebuf[INET6_ADDRSTRLEN];
        inet_ntop(AF_INET6, addr, namebuf, sizeof(namebuf));
-       syslog(LOG_NOTICE, "%s about %s on %s", (add) ? "Learned" : "Forgot",
-                       namebuf, (iface) ? iface->ifname : "<pending>");
+       syslog(LOG_NOTICE, "%s about %s on %s",
+                       (add) ? "Learned" : "Forgot", namebuf, iface->ifname);
 
-       if (!iface || !iface->learn_routes)
-               return;
-
-       odhcpd_setup_route(addr, 128, iface, NULL, add);
+       if (iface->learn_routes)
+               odhcpd_setup_route(addr, 128, iface, NULL, add);
 }
 
 
@@ -398,6 +404,7 @@ static void handle_rtnetlink(_unused void *addr, void *data, size_t len,
                                if (nh->nlmsg_type == RTM_NEWNEIGH) {
                                        req.ndm.ndm_ifindex = iface->ifindex;
                                        send(rtnl_event.uloop.fd, &req, sizeof(req), MSG_DONTWAIT);
+                                       setup_route(addr, iface, false);
                                        dump_neigh = true;
                                }
                        } else if (add) {