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

core: honor the ipv6.clat property

Browse source
This commit is contained in:
Beniamino Galvani 2025-09-11 06:08:57 +02:00
parent e097b33e22
commit 32d17d4ce6
5 changed files with 61 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
man/NetworkManager.conf.xml
View file

@ -1026,6 +1026,10 @@ ipv6.ip6-privacy=0
global default is used. If the default is unspecified, the fallback value is either "stable-privacy"
or "eui64", depending on whether the per-profile setting is "default" or "default-or-eui64, respectively.</para></listitem>
</varlistentry>
<varlistentry>
<term><varname>ipv6.clat</varname></term>
<listitem><para>If left unspecified, CLAT is disabled.</para></listitem>
</varlistentry>
<varlistentry>
<term><varname>ipv6.ra-timeout</varname></term>
<listitem><para>If left unspecified, the default value depends on the sysctl solicitation settings.</para></listitem>

25
src/core/devices/nm-device.c
View file

@ -1524,6 +1524,29 @@ _prop_get_connection_dnssec(NMDevice *self, NMConnection *connection)
NM_SETTING_CONNECTION_DNSSEC_DEFAULT);
}
static NMSettingIp6ConfigClat
_prop_get_ipv6_clat(NMDevice *self, NMConnection *connection)
{
NMSettingIP6Config *s_ip6 = NULL;
NMSettingIp6ConfigClat clat;
if (connection)
s_ip6 = (NMSettingIP6Config *) nm_connection_get_setting_ip6_config(connection);
if (!s_ip6)
return NM_SETTING_IP6_CONFIG_CLAT_NO;
clat = nm_setting_ip6_config_get_clat(s_ip6);
if (clat != NM_SETTING_IP6_CONFIG_CLAT_DEFAULT)
return clat;
return nm_config_data_get_connection_default_int64(NM_CONFIG_GET_DATA,
NM_CON_DEFAULT("ipv6.clat"),
self,
NM_SETTING_IP6_CONFIG_CLAT_NO,
NM_SETTING_IP6_CONFIG_CLAT_YES,
NM_SETTING_IP6_CONFIG_CLAT_NO);
}
static NMMptcpFlags
_prop_get_connection_mptcp_flags(NMDevice *self, NMConnection *connection)
{
@ -3642,6 +3665,8 @@ nm_device_create_l3_config_data_from_connection(NMDevice *self, NMConnection *co
nm_l3_config_data_set_dnssec(l3cd, _prop_get_connection_dnssec(self, connection));
nm_l3_config_data_set_ip6_privacy(l3cd, _prop_get_ipv6_ip6_privacy(self, connection));
nm_l3_config_data_set_mptcp_flags(l3cd, _prop_get_connection_mptcp_flags(self, connection));
nm_l3_config_data_set_clat(l3cd, _prop_get_ipv6_clat(self, connection));
return l3cd;
}

27
src/core/nm-l3-config-data.c
View file

@ -172,6 +172,7 @@ struct _NML3ConfigData {
bool routed_dns_4 : 1;
bool routed_dns_6 : 1;
bool clat : 1;
bool pref64_valid : 1;
};
@ -525,6 +526,10 @@ nm_l3_config_data_log(const NML3ConfigData *self,
_L("nis-domain: %s", self->nis_domain->str);
}
if (!IS_IPv4 && self->clat) {
_L("clat: yes");
}
if (!IS_IPv4 && self->pref64_valid) {
_L("pref64_prefix: %s/%d",
nm_utils_inet6_ntop(&self->pref64_prefix, sbuf_addr),
@ -1991,6 +1996,23 @@ nm_l3_config_data_set_network_id(NML3ConfigData *self, const char *value)
return nm_ref_string_reset_str(&self->network_id, value);
}
gboolean
nm_l3_config_data_set_clat(NML3ConfigData *self, gboolean val)
{
if (self->clat == val)
return FALSE;
self->clat = val;
return TRUE;
}
gboolean
nm_l3_config_data_get_clat(const NML3ConfigData *self)
{
nm_assert(_NM_IS_L3_CONFIG_DATA(self, TRUE));
return self->clat;
}
gboolean
nm_l3_config_data_set_pref64_valid(NML3ConfigData *self, gboolean val)
{
@ -2591,6 +2613,8 @@ nm_l3_config_data_cmp_full(const NML3ConfigData *a,
NM_CMP_DIRECT_UNSAFE(a->routed_dns_4, b->routed_dns_4);
NM_CMP_DIRECT_UNSAFE(a->routed_dns_6, b->routed_dns_6);
NM_CMP_DIRECT_UNSAFE(a->clat, b->clat);
NM_CMP_DIRECT(!!a->pref64_valid, !!b->pref64_valid);
if (a->pref64_valid) {
NM_CMP_DIRECT(a->pref64_plen, b->pref64_plen);
@ -3662,6 +3686,9 @@ nm_l3_config_data_merge(NML3ConfigData *self,
if (src->routed_dns_6)
self->routed_dns_6 = TRUE;
if (src->clat)
self->clat = TRUE;
if (src->pref64_valid) {
self->pref64_prefix = src->pref64_prefix;
self->pref64_plen = src->pref64_plen;

4
src/core/nm-l3-config-data.h
View file

@ -498,6 +498,10 @@ gboolean nm_l3_config_data_set_network_id(NML3ConfigData *self, const char *netw
const char *nm_l3_config_data_get_network_id(const NML3ConfigData *self);
gboolean nm_l3_config_data_set_clat(NML3ConfigData *self, gboolean val);
gboolean nm_l3_config_data_get_clat(const NML3ConfigData *self);
gboolean nm_l3_config_data_set_pref64_valid(NML3ConfigData *self, gboolean val);
gboolean nm_l3_config_data_get_pref64_valid(const NML3ConfigData *self);

2
src/core/nm-l3cfg.c
View file

@ -4260,7 +4260,7 @@ _l3cfg_update_combined_config(NML3Cfg *self,
}
#if HAVE_CLAT
if (nm_l3_config_data_get_pref64_valid(l3cd)) {
if (nm_l3_config_data_get_clat(l3cd) && nm_l3_config_data_get_pref64_valid(l3cd)) {
NMPlatformIPXRoute rx;
NMIPAddrTyped best_v6_gateway;
NMDedupMultiIter iter;