Kernel/iwd
3
0
Fork 0
mirror of https://git.kernel.org/pub/scm/network/wireless/iwd.git synced 2024-11-23 07:29:28 +01:00
Code Releases Activity

ap: Print error messages in dhcp_load_settings

Browse Source
This commit is contained in:
Andrew Zaborowski 2021-02-26 17:17:24 +01:00 committed by Denis Kenzior
parent cdb2c2b3e3
commit b689100c1c
1 changed files with 28 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/ap.c
View File

@ -2413,24 +2413,38 @@ static bool dhcp_load_settings(struct ap_state *ap, struct l_settings *settings)
if (!l_settings_get_uint(settings, "IPv4", "LeaseTime", &lease_time)) if (!l_settings_get_uint(settings, "IPv4", "LeaseTime", &lease_time))
lease_time = 0; lease_time = 0;
if (ip_range && l_strv_length(ip_range) != 2) if (gateway && !l_dhcp_server_set_gateway(server, gateway)) {
goto parse_error; l_error("[IPv4].Gateway value error");
goto error;
}
if (netmask && !l_dhcp_server_set_netmask(server, netmask)) if (dns && !l_dhcp_server_set_dns(server, dns)) {
goto parse_error; l_error("[IPv4].DNSList value error");
goto error;
}
if (gateway && !l_dhcp_server_set_gateway(server, gateway)) if (netmask && !l_dhcp_server_set_netmask(server, netmask)) {
goto parse_error; l_error("[IPv4].Netmask value error");
goto error;
}
if (dns && !l_dhcp_server_set_dns(server, dns)) if (ip_range) {
goto parse_error; if (l_strv_length(ip_range) != 2) {
l_error("Two addresses expected in [IPv4].IPRange");
goto error;
}
if (ip_range && !l_dhcp_server_set_ip_range(server, ip_range[0], if (!l_dhcp_server_set_ip_range(server, ip_range[0],
ip_range[1])) ip_range[1])) {
goto parse_error; l_error("Error setting IP range from [IPv4].IPRange");
goto error;
}
}
if (lease_time && !l_dhcp_server_set_lease_time(server, lease_time)) if (lease_time && !l_dhcp_server_set_lease_time(server, lease_time)) {
goto parse_error; l_error("[IPv4].LeaseTime value error");
goto error;
}
if (netmask && inet_pton(AF_INET, netmask, &ia) > 0) if (netmask && inet_pton(AF_INET, netmask, &ia) > 0)
ap->ip_prefix = __builtin_popcountl(ia.s_addr); ap->ip_prefix = __builtin_popcountl(ia.s_addr);
@ -2439,7 +2453,7 @@ static bool dhcp_load_settings(struct ap_state *ap, struct l_settings *settings)
ret = true; ret = true;
parse_error: error:
l_strv_free(dns); l_strv_free(dns);
l_strv_free(ip_range); l_strv_free(ip_range);
return ret; return ret;