fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2025-12-27 01:10:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

dhcp/internal: handle multiple Router options in internal DHCP clint

Browse source 
https://bugzilla.redhat.com/show_bug.cgi?id=1634657
This commit is contained in:
Thomas Haller 2018-12-21 11:31:47 +01:00
parent 334d5682ae
commit f3e1dea1fe
1 changed files with 34 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
src/dhcp/nm-dhcp-systemd.c
View file

@ -481,30 +481,49 @@ lease_to_ip4_config (NMDedupMultiIndex *multi_idx,
add_option (options, dhcp4_requests, SD_DHCP_OPTION_STATIC_ROUTE, str_static->str);
}
/* FIXME: internal client only supports returning the first router. */
num = sd_dhcp_lease_get_router (lease, &a_router);
if ( num > 0
&& a_router[0].s_addr) {
nm_utils_inet4_ntop (a_router[0].s_addr, addr_str);
LOG_LEASE (LOGD_DHCP4, "gateway %s", addr_str);
add_option (options, dhcp4_requests, SD_DHCP_OPTION_ROUTER, addr_str);
if (num > 0) {
guint32 default_route_metric = route_metric;
nm_gstring_prepare (&str);
for (i = 0; i < num; i++) {
guint32 m;
s = nm_utils_inet4_ntop (a_router[i].s_addr, addr_str);
g_string_append (nm_gstring_add_space_delimiter (str), s);
if (a_router[i].s_addr == 0) {
/* silently skip 0.0.0.0 */
continue;
}
if (has_router_from_classless) {
/* If the DHCP server returns both a Classless Static Routes option and a
* Router option, the DHCP client MUST ignore the Router option [RFC 3442].
*
* Be more lenient and ignore the Router option only if Classless Static
* Routes contain a default gateway (as other DHCP backends do).
*/
continue;
}
/* if there are multiple default routes, we add them with differing
* metrics. */
m = default_route_metric;
if (default_route_metric < G_MAXUINT32)
default_route_metric++;
/* If the DHCP server returns both a Classless Static Routes option and a
* Router option, the DHCP client MUST ignore the Router option [RFC 3442].
*
* Be more lenient and ignore the Router option only if Classless Static
* Routes contain a default gateway (as other DHCP backends do).
*/
if (!has_router_from_classless) {
nm_ip4_config_add_route (ip4_config,
&((const NMPlatformIP4Route) {
.rt_source = NM_IP_CONFIG_SOURCE_DHCP,
.gateway = a_router[0].s_addr,
.gateway = a_router[i].s_addr,
.table_coerced = nm_platform_route_table_coerce (route_table),
.metric = route_metric,
.metric = m,
}),
NULL);
}
LOG_LEASE (LOGD_DHCP4, "router %s", str->str);
add_option (options, dhcp4_requests, SD_DHCP_OPTION_ROUTER, str->str);
}
if ( sd_dhcp_lease_get_mtu (lease, &mtu) >= 0