From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Thu, 7 Sep 2023 20:34:32 +0000 (+0900)
Subject: network: call network_adjust_dhcp_server() from network_drop_invalid_addresses()
X-Git-Tag: v255-rc1~523^2~4
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=26f8847102323d5d66c17f21685f3e6473354458;p=thirdparty%2Fsystemd.git

network: call network_adjust_dhcp_server() from network_drop_invalid_addresses()

We need to find a suitable static address for the DHCP server.
So, all static addresses must be verified before network_adjust_dhcp_server()
is called. For safety, let's call it from network_drop_invalid_addresses().

No functional change, just refactoring and preparation for later
commits.
---

diff --git a/src/network/networkd-address.c b/src/network/networkd-address.c
index 048f288df88..990d24e9b1c 100644
--- a/src/network/networkd-address.c
+++ b/src/network/networkd-address.c
@@ -2444,6 +2444,8 @@ int network_drop_invalid_addresses(Network *network) {
                 assert(r > 0);
         }
 
+        network_adjust_dhcp_server(network);
+
         return 0;
 }
 
diff --git a/src/network/networkd-dhcp-server.c b/src/network/networkd-dhcp-server.c
index c1d9fbc17cf..3663a506f6a 100644
--- a/src/network/networkd-dhcp-server.c
+++ b/src/network/networkd-dhcp-server.c
@@ -57,8 +57,7 @@ void network_adjust_dhcp_server(Network *network) {
                 bool have = false;
 
                 ORDERED_HASHMAP_FOREACH(address, network->addresses_by_section) {
-                        if (section_is_invalid(address->section))
-                                continue;
+                        assert(!section_is_invalid(address->section));
 
                         if (address->family != AF_INET)
                                 continue;
diff --git a/src/network/networkd-network.c b/src/network/networkd-network.c
index 7feb178c80c..e0a8be6b544 100644
--- a/src/network/networkd-network.c
+++ b/src/network/networkd-network.c
@@ -20,7 +20,6 @@
 #include "networkd-bridge-mdb.h"
 #include "networkd-dhcp-common.h"
 #include "networkd-dhcp-server-static-lease.h"
-#include "networkd-dhcp-server.h"
 #include "networkd-ipv6-proxy-ndp.h"
 #include "networkd-manager.h"
 #include "networkd-ndisc.h"
@@ -326,8 +325,6 @@ int network_verify(Network *network) {
                 return r; /* sr_iov_drop_invalid_sections() logs internally. */
         network_drop_invalid_static_leases(network);
 
-        network_adjust_dhcp_server(network);
-
         return 0;
 }