network: dhcp6: do not reconfigure/restart DHCPv6 clients when a new downstream appears

Previously, when a downstream appears which requests delegated prefix to
be assigned, then possibly restart all DHCPv6 clients for another
interfaces.

This makes networkd always honor the UseDelegatedPrefix= setting, and
not restart DHCPv6 clients.

diff --git a/src/network/networkd-dhcp6.c b/src/network/networkd-dhcp6.c
index 1deaed13477dccd6e7d459348f3980f27ade5480..a7106050c9717563e0a89e702485dbdcecfa164c 100644 (file)
--- a/src/network/networkd-dhcp6.c
+++ b/src/network/networkd-dhcp6.c
@@ -1320,73 +1320,64 @@ int dhcp6_start(Link *link) {
         return 1;
 }
 
-int dhcp6_request_prefix_delegation(Link *link) {
-        Link *l;
-
+static bool dhcp6_pd_uplink_is_ready(Link *link) {
         assert(link);
-        assert(link->manager);
-
-        if (!link_dhcp6_pd_is_enabled(link))
-                return 0;
 
-        log_link_debug(link, "Requesting DHCPv6 prefixes to be delegated for new link");
+        if (!link->network)
+                return false;
 
-        HASHMAP_FOREACH(l, link->manager->links_by_index) {
-                int r, enabled;
+        if (!link->network->dhcp6_use_pd_prefix)
+                return false;
 
-                if (l == link)
-                        continue;
+        if (!IN_SET(link->state, LINK_STATE_CONFIGURING, LINK_STATE_CONFIGURED))
+                return false;
 
-                if (!l->dhcp6_client)
-                        continue;
+        if (!link->dhcp6_client)
+                return false;
 
-                r = sd_dhcp6_client_get_prefix_delegation(l->dhcp6_client, &enabled);
-                if (r < 0) {
-                        log_link_warning_errno(l, r, "Cannot get prefix delegation when adding new link: %m");
-                        link_enter_failed(l);
-                        continue;
-                }
+        if (sd_dhcp6_client_is_running(link->dhcp6_client) <= 0)
+                return false;
 
-                if (enabled == 0) {
-                        r = sd_dhcp6_client_set_prefix_delegation(l->dhcp6_client, 1);
-                        if (r < 0) {
-                                log_link_warning_errno(l, r, "Cannot enable prefix delegation when adding new link: %m");
-                                link_enter_failed(l);
-                                continue;
-                        }
-                }
+        if (!link->dhcp6_lease)
+                return false;
 
-                r = sd_dhcp6_client_is_running(l->dhcp6_client);
-                if (r <= 0)
-                        continue;
+        return dhcp6_lease_has_pd_prefix(link->dhcp6_lease);
+}
 
-                if (enabled != 0) {
-                        if (dhcp6_lease_has_pd_prefix(l->dhcp6_lease)) {
-                                log_link_debug(l, "Requesting re-assignment of delegated prefixes after adding new link");
-                                r = dhcp6_pd_prefix_acquired(l);
-                                if (r < 0)
-                                        link_enter_failed(l);
-                        }
-                        continue;
-                }
+static int dhcp6_pd_find_uplink(Link *link, Link **ret) {
+        Link *l;
 
-                r = sd_dhcp6_client_stop(l->dhcp6_client);
-                if (r < 0) {
-                        log_link_warning_errno(l, r, "Cannot stop DHCPv6 prefix delegation client after adding new link: %m");
-                        link_enter_failed(l);
-                        continue;
-                }
+        assert(link);
+        assert(link->manager);
+        assert(ret);
 
-                r = sd_dhcp6_client_start(l->dhcp6_client);
-                if (r < 0) {
-                        log_link_warning_errno(l, r, "Cannot restart DHCPv6 prefix delegation client after adding new link: %m");
-                        link_enter_failed(l);
+        HASHMAP_FOREACH(l, link->manager->links_by_index) {
+                if (!dhcp6_pd_uplink_is_ready(l))
                         continue;
-                }
 
-                log_link_debug(l, "Restarted DHCPv6 client to acquire prefix delegations after adding new link");
+                /* Assume that there exists at most one link which acquired delegated prefixes. */
+                *ret = l;
+                return 0;
         }
 
+        return -ENODEV;
+}
+
+int dhcp6_request_prefix_delegation(Link *link) {
+        Link *uplink;
+
+        assert(link);
+
+        if (!link_dhcp6_pd_is_enabled(link))
+                return 0;
+
+        if (dhcp6_pd_find_uplink(link, &uplink) < 0)
+                return 0;
+
+        log_link_debug(uplink, "Requesting re-assignment of delegated prefixes after adding new link %s", link->ifname);
+        if (dhcp6_pd_prefix_acquired(uplink) < 0)
+                link_enter_failed(uplink);
+
         /* dhcp6_pd_prefix_acquired() may make the link in failed state. */
         if (link->state == LINK_STATE_FAILED)
                 return -ENOANO;