Skip to contentSkip to conversation

netconfig: Don't start ACD with FILS IP Assignment

PATCH New Andrew Zaborowski 1 participant 1 message Oct 22, 2021

lore
Share & tools
lore

Andrew Zaborowski

author
#0 lore raw

PATCH 1/1 netconfig: Don't start ACD with FILS IP Assignment

Restore the older behaviour where ACD was started only with static addressing. There are various arguments for saving setup time by not doing ACD when a wifi network has IP addresses managed centrally (and some arguments against), for now just restore the behaviour from before FILS IP Assignment was added.
---
This applies on top of the netconfig agent patchset.

 src/netconfig.c | 34 ++++++++++++++++++++--------------
 1 file changed, 20 insertions(+), 14 deletions(-)
src/netconfig.c +20 -14
index a17e06bb..73a621c5 100644
@@ -1653,22 +1653,28 @@ static bool netconfig_ipv4_select_and_install(struct netconfig *netconfig)
 							ip)))
 			return false;
 
-		netconfig->acd = l_acd_new(netconfig->ifindex);
-		l_acd_set_event_handler(netconfig->acd,
-					netconfig_ipv4_acd_event, netconfig,
-					NULL);
-		if (getenv("IWD_ACD_DEBUG"))
-			l_acd_set_debug(netconfig->acd, do_debug,
-					"[ACD] ", NULL);
-
-		if (!l_acd_start(netconfig->acd, ip)) {
-			l_error("failed to start ACD, continuing anyways");
-			l_acd_destroy(netconfig->acd);
-			netconfig->acd = NULL;
+		if (netconfig->rtm_protocol == RTPROT_STATIC) {
+			netconfig->acd = l_acd_new(netconfig->ifindex);
+			l_acd_set_event_handler(netconfig->acd,
+						netconfig_ipv4_acd_event,
+						netconfig, NULL);
 
-			netconfig_set(netconfig, AF_INET, changed);
-		} else
+			if (getenv("IWD_ACD_DEBUG"))
+				l_acd_set_debug(netconfig->acd, do_debug,
+						"[ACD] ", NULL);
+
+			if (!l_acd_start(netconfig->acd, ip)) {
+				l_error("failed to start ACD, continuing "
+					"anyways");
+				l_acd_destroy(netconfig->acd);
+				netconfig->acd = NULL;
+			}
+		}
+
+		if (netconfig->acd)
 			netconfig->pending_v4_set |= changed;
+		else
+			netconfig_set(netconfig, AF_INET, changed);
 
 		return true;
 	}
Signature · 1 line
2.32.0