From ac976c6f714795ff42160cf012742e22088116fe Mon Sep 17 00:00:00 2001 From: Denis Kenzior Date: Thu, 29 Sep 2022 12:59:16 -0500 Subject: [PATCH] ap: Remove support for deprecated APRanges setting In preparation for 2.0 release, remove settings that were marked deprecated during 1.x cycle. --- src/ap.c | 32 +++++++------------------------- 1 file changed, 7 insertions(+), 25 deletions(-) diff --git a/src/ap.c b/src/ap.c index 7140e823..a0aa3d8b 100644 --- a/src/ap.c +++ b/src/ap.c @@ -4143,32 +4143,14 @@ static int ap_init(void) * [General].EnableNetworkConfiguration is true. */ if (netconfig_enabled()) { - if (l_settings_get_value(settings, "IPv4", "APAddressPool")) { - global_addr4_strs = l_settings_get_string_list(settings, - "IPv4", - "APAddressPool", - ','); - if (!global_addr4_strs || !*global_addr4_strs) { - l_error("Can't parse the [IPv4].APAddressPool " + global_addr4_strs = + l_settings_get_string_list(settings, "IPv4", + "APAddressPool", ','); + if (!global_addr4_strs || !global_addr4_strs[0]) { + l_error("Can't parse the [IPv4].APAddressPool " "setting as a string list"); - l_strv_free(global_addr4_strs); - global_addr4_strs = NULL; - } - } else if (l_settings_get_value(settings, - "General", "APRanges")) { - l_warn("The [General].APRanges setting is deprecated, " - "use [IPv4].APAddressPool instead"); - - global_addr4_strs = l_settings_get_string_list(settings, - "General", - "APRanges", - ','); - if (!global_addr4_strs || !*global_addr4_strs) { - l_error("Can't parse the [General].APRanges " - "setting as a string list"); - l_strv_free(global_addr4_strs); - global_addr4_strs = NULL; - } + l_strv_free(global_addr4_strs); + global_addr4_strs = NULL; } /* Fall back to 192.168.0.0/16 */