]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
network: introduce ipv4acd_set_ifname()
authorYu Watanabe <watanabe.yu+github@gmail.com>
Wed, 8 Sep 2021 05:08:13 +0000 (14:08 +0900)
committerYu Watanabe <watanabe.yu+github@gmail.com>
Fri, 10 Sep 2021 08:06:24 +0000 (17:06 +0900)
src/network/networkd-ipv4acd.c
src/network/networkd-ipv4acd.h
src/network/networkd-link.c

index 5c57032f2a851e4d7214504d45fb977e6e11195d..74a669ead43d594bca393171b080f90d0854bbfb 100644 (file)
@@ -288,3 +288,18 @@ int ipv4acd_stop(Link *link) {
 
         return r;
 }
+
+int ipv4acd_set_ifname(Link *link) {
+        Address *address;
+        int r;
+
+        assert(link);
+
+        SET_FOREACH(address, link->addresses_ipv4acd) {
+                r = sd_ipv4acd_set_ifname(address->acd, link->ifname);
+                if (r < 0)
+                        return r;
+        }
+
+        return 0;
+}
index d2b4ff775f5a2caadc30bca4b4708efa773434e1..c3d8b0ec3874a7e887b021bc6e2fffb6e3f36313 100644 (file)
@@ -8,3 +8,4 @@ int ipv4acd_address_is_ready_to_configure(Link *link, const Address *address);
 int ipv4acd_update_mac(Link *link);
 int ipv4acd_start(Link *link);
 int ipv4acd_stop(Link *link);
+int ipv4acd_set_ifname(Link *link);
index 4afd540d201512f97c196341543bef40abc18f18..96c0a3e048bc759d11e05fabe06c51a3568208ac 100644 (file)
@@ -2276,12 +2276,9 @@ static int link_update_name(Link *link, sd_netlink_message *message) {
                         return log_link_debug_errno(link, r, "Failed to update interface name in IPv4LL client: %m");
         }
 
-        Address *a;
-        SET_FOREACH(a, link->addresses_ipv4acd) {
-                r = sd_ipv4acd_set_ifname(a->acd, link->ifname);
-                if (r < 0)
-                        return log_link_debug_errno(link, r, "Failed to update interface name in IPv4ACD client: %m");
-        }
+        r = ipv4acd_set_ifname(link);
+        if (r < 0)
+                return log_link_debug_errno(link, r, "Failed to update interface name in IPv4ACD client: %m");
 
         return 0;
 }