fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-01-01 23:30:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

dhcp: for systemd DHCPv6 client always explicitly set prefix-delegation

Browse source 
Beginning with [1], prefix delegation will be always enabled by default. Thus,
always explicitly set it.

[1] 01b4e90f32
This commit is contained in:
Thomas Haller 2022-01-25 19:48:50 +01:00
parent 2cf198d978
commit 6f3fd32bbb
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
1 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/core/dhcp/nm-dhcp-systemd.c
View file

@ -934,6 +934,7 @@ ip6_start(NMDhcpClient *client, const struct in6_addr *ll_addr, GError **error)
const guint8 *duid_arr;
gsize duid_len;
GBytes *duid;
gboolean prefix_delegation;
g_return_val_if_fail(!priv->client4, FALSE);
g_return_val_if_fail(!priv->client6, FALSE);
@ -1007,16 +1008,19 @@ ip6_start(NMDhcpClient *client, const struct in6_addr *ll_addr, GError **error)
}
}
prefix_delegation = FALSE;
if (client_config->v6.needed_prefixes > 0) {
if (client_config->v6.needed_prefixes > 1)
if (client_config->v6.needed_prefixes > 1) {
/* FIXME: systemd-networkd API only allows to request a
* single prefix */
_LOGW("dhcp-client6: only one prefix request is supported");
/* FIXME: systemd-networkd API only allows to request a
* single prefix */
r = sd_dhcp6_client_set_prefix_delegation(sd_client, TRUE);
if (r < 0) {
nm_utils_error_set_errno(error, r, "failed to enable prefix delegation: %s");
return FALSE;
}
prefix_delegation = TRUE;
}
r = sd_dhcp6_client_set_prefix_delegation(sd_client, prefix_delegation);
if (r < 0) {
nm_utils_error_set_errno(error, r, "failed to enable prefix delegation: %s");
return FALSE;
}
r = sd_dhcp6_client_set_local_address(sd_client, ll_addr);