netconfig: limit DHCPv4 attempts to avoid extended netconfig times
PATCH v2 1/2 netconfig: limit DHCPv4 attempts to avoid extended netconfig times
ELL now has a setting to limit the number of DHCP attempts. This will now be set in IWD and if reached will result in a failure event, and in turn a disconnect.
IWD will set a maximum of 4 retries which should keep the maximum DHCP time to ~60 seconds roughly.
--- src/netconfig.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
src/netconfig.c +7 -2
@@ -50,6 +50,8 @@#include "src/netconfig.h" #include "src/sysfs.h" +#define DHCP_ATTEMPTS 4 +/* * Routing priority offset, configurable in main.conf. The route with lower * priority offset is preferred.
@@ -696,6 +698,7 @@ struct netconfig *netconfig_new(uint32_t ifindex)int dhcp_priority =L_LOG_INFO ;struct l_dhcp6_client *dhcp6;struct l_icmp6_client *icmp6; +struct l_dhcp_client *dhcp;l_debug ("Creating netconfig for interface: %d" , ifindex);
@@ -723,8 +726,8 @@ struct netconfig *netconfig_new(uint32_t ifindex)l_netconfig_set_event_handler (netconfig->nc, netconfig_event_handler, netconfig,NULL ); -l_dhcp_client_set_debug (l_netconfig_get_dhcp_client (netconfig->nc), - do_debug,"[DHCPv4] " ,NULL , dhcp_priority); + dhcp =l_netconfig_get_dhcp_client (netconfig->nc); +l_dhcp_client_set_max_attempts (dhcp,DHCP_ATTEMPTS ); dhcp6 =l_netconfig_get_dhcp6_client (netconfig->nc);l_dhcp6_client_set_lla_randomized (dhcp6, true);
@@ -735,6 +738,8 @@ struct netconfig *netconfig_new(uint32_t ifindex)if (debug_level) {l_dhcp6_client_set_debug (dhcp6, do_debug,"[DHCPv6] " ,NULL );l_icmp6_client_set_debug (icmp6, do_debug,"[ICMPv6] " ,NULL ); +l_dhcp_client_set_debug (dhcp, do_debug,"[DHCPv4] " ,NULL , + dhcp_priority); }return netconfig;
Signature · 1 line
2.34.1
PATCH v2 2/2 auto-t: add netconfig timeout test
Tests that netconfig eventually times out and that IWD disconnects
--- autotests/testNetconfig/autoconnect.psk | 2 + autotests/testNetconfig/timeout_test.py | 65 +++++++++++++++++++++++++ 2 files changed, 67 insertions(+) create mode 100644 autotests/testNetconfig/autoconnect.psk create mode 100644 autotests/testNetconfig/timeout_test.py
autotests/testNetconfig/autoconnect.psk new file +2 -0
@@ -0,0 +1,2 @@ +[IPv4] +SendHostname=true
autotests/testNetconfig/timeout_test.py new file +65 -0
65 lines not on this page · raw message
Signature · 1 line
2.34.1
Hi James,
Quoted 10 lines · James Prestwood
ELL now has a setting to limit the number of DHCP attempts. This will now be set in IWD and if reached will result in a failure event, and in turn a disconnect.
IWD will set a maximum of 4 retries which should keep the maximum DHCP time to ~60 seconds roughly.
--- src/netconfig.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
All applied, thanks.
Regards,
-Denis