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

core: Make nm_device_create_l3_config_data_from_connection behave as expected

Browse source 
Currently nm_device_create_l3_config_data_from_connection uses the
connection applied to the given device for some properties.  Altough
this currently works since all users of
nm_device_create_l3_config_data_from_connection provide the applied
connection as parameter, it behaves unexpectedly when another
connection is given.
This commit is contained in:
Robin Ebert 2025-09-03 20:30:26 +02:00 • committed by Beniamino Galvani
parent caf156b2ac
commit 441e77a44c
1 changed files with 14 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1411,14 +1411,12 @@ _prop_get_ipvx_routed_dns(NMDevice *self, int addr_family)
} }
static NMSettingConnectionMdns static NMSettingConnectionMdns
_prop_get_connection_mdns(NMDevice *self) _prop_get_connection_mdns(NMDevice *self, NMConnection *connection)
{ {
NMConnection *connection;
NMSettingConnectionMdns mdns = NM_SETTING_CONNECTION_MDNS_DEFAULT; NMSettingConnectionMdns mdns = NM_SETTING_CONNECTION_MDNS_DEFAULT;
g_return_val_if_fail(NM_IS_DEVICE(self), NM_SETTING_CONNECTION_MDNS_DEFAULT); g_return_val_if_fail(NM_IS_DEVICE(self), NM_SETTING_CONNECTION_MDNS_DEFAULT);
connection = nm_device_get_applied_connection(self);
if (connection) if (connection)
mdns = nm_setting_connection_get_mdns(nm_connection_get_setting_connection(connection)); mdns = nm_setting_connection_get_mdns(nm_connection_get_setting_connection(connection));
if (mdns != NM_SETTING_CONNECTION_MDNS_DEFAULT) if (mdns != NM_SETTING_CONNECTION_MDNS_DEFAULT)
@ -1453,14 +1451,12 @@ _prop_get_sriov_preserve_on_down(NMDevice *self, NMSettingSriov *s_sriov)
} }
static NMSettingConnectionLlmnr static NMSettingConnectionLlmnr
_prop_get_connection_llmnr(NMDevice *self) _prop_get_connection_llmnr(NMDevice *self, NMConnection *connection)
{ {
NMConnection *connection;
NMSettingConnectionLlmnr llmnr = NM_SETTING_CONNECTION_LLMNR_DEFAULT; NMSettingConnectionLlmnr llmnr = NM_SETTING_CONNECTION_LLMNR_DEFAULT;
g_return_val_if_fail(NM_IS_DEVICE(self), NM_SETTING_CONNECTION_LLMNR_DEFAULT); g_return_val_if_fail(NM_IS_DEVICE(self), NM_SETTING_CONNECTION_LLMNR_DEFAULT);
connection = nm_device_get_applied_connection(self);
if (connection) if (connection)
llmnr = nm_setting_connection_get_llmnr(nm_connection_get_setting_connection(connection)); llmnr = nm_setting_connection_get_llmnr(nm_connection_get_setting_connection(connection));
if (llmnr != NM_SETTING_CONNECTION_LLMNR_DEFAULT) if (llmnr != NM_SETTING_CONNECTION_LLMNR_DEFAULT)
@ -1475,14 +1471,12 @@ _prop_get_connection_llmnr(NMDevice *self)
} }
static NMSettingConnectionDnsOverTls static NMSettingConnectionDnsOverTls
_prop_get_connection_dns_over_tls(NMDevice *self) _prop_get_connection_dns_over_tls(NMDevice *self, NMConnection *connection)
{ {
NMConnection *connection;
NMSettingConnectionDnsOverTls dns_over_tls = NM_SETTING_CONNECTION_DNS_OVER_TLS_DEFAULT; NMSettingConnectionDnsOverTls dns_over_tls = NM_SETTING_CONNECTION_DNS_OVER_TLS_DEFAULT;
g_return_val_if_fail(NM_IS_DEVICE(self), NM_SETTING_CONNECTION_DNS_OVER_TLS_DEFAULT); g_return_val_if_fail(NM_IS_DEVICE(self), NM_SETTING_CONNECTION_DNS_OVER_TLS_DEFAULT);
connection = nm_device_get_applied_connection(self);
if (connection) if (connection)
dns_over_tls = nm_setting_connection_get_dns_over_tls( dns_over_tls = nm_setting_connection_get_dns_over_tls(
nm_connection_get_setting_connection(connection)); nm_connection_get_setting_connection(connection));
@ -1498,14 +1492,12 @@ _prop_get_connection_dns_over_tls(NMDevice *self)
} }
static NMSettingConnectionDnssec static NMSettingConnectionDnssec
_prop_get_connection_dnssec(NMDevice *self) _prop_get_connection_dnssec(NMDevice *self, NMConnection *connection)
{ {
NMConnection *connection;
NMSettingConnectionDnssec dnssec = NM_SETTING_CONNECTION_DNSSEC_DEFAULT; NMSettingConnectionDnssec dnssec = NM_SETTING_CONNECTION_DNSSEC_DEFAULT;
g_return_val_if_fail(NM_IS_DEVICE(self), NM_SETTING_CONNECTION_DNSSEC_DEFAULT); g_return_val_if_fail(NM_IS_DEVICE(self), NM_SETTING_CONNECTION_DNSSEC_DEFAULT);
connection = nm_device_get_applied_connection(self);
if (connection) if (connection)
dnssec = nm_setting_connection_get_dnssec(nm_connection_get_setting_connection(connection)); dnssec = nm_setting_connection_get_dnssec(nm_connection_get_setting_connection(connection));
if (dnssec != NM_SETTING_CONNECTION_DNSSEC_DEFAULT) if (dnssec != NM_SETTING_CONNECTION_DNSSEC_DEFAULT)
@ -1520,14 +1512,12 @@ _prop_get_connection_dnssec(NMDevice *self)
} }
static NMMptcpFlags static NMMptcpFlags
_prop_get_connection_mptcp_flags(NMDevice *self) _prop_get_connection_mptcp_flags(NMDevice *self, NMConnection *connection)
{ {
NMConnection *connection; NMMptcpFlags mptcp_flags = NM_MPTCP_FLAGS_NONE;
NMMptcpFlags mptcp_flags = NM_MPTCP_FLAGS_NONE;
g_return_val_if_fail(NM_IS_DEVICE(self), NM_MPTCP_FLAGS_DISABLED); g_return_val_if_fail(NM_IS_DEVICE(self), NM_MPTCP_FLAGS_DISABLED);
connection = nm_device_get_applied_connection(self);
if (connection) { if (connection) {
mptcp_flags = mptcp_flags =
nm_setting_connection_get_mptcp_flags(nm_connection_get_setting_connection(connection)); nm_setting_connection_get_mptcp_flags(nm_connection_get_setting_connection(connection));
@ -2493,16 +2483,14 @@ _prop_get_ipv4_dhcp_vendor_class_identifier(NMDevice *self, NMSettingIP4Config *
} }
static NMSettingIP6ConfigPrivacy static NMSettingIP6ConfigPrivacy
_prop_get_ipv6_ip6_privacy(NMDevice *self) _prop_get_ipv6_ip6_privacy(NMDevice *self, NMConnection *connection)
{ {
NMSettingIP6ConfigPrivacy ip6_privacy; NMSettingIP6ConfigPrivacy ip6_privacy;
NMConnection *connection;
g_return_val_if_fail(self, NM_SETTING_IP6_CONFIG_PRIVACY_UNKNOWN); g_return_val_if_fail(self, NM_SETTING_IP6_CONFIG_PRIVACY_UNKNOWN);
/* 1.) First look at the per-connection setting. If it is not -1 (unknown), /* 1.) First look at the per-connection setting. If it is not -1 (unknown),
* use it. */ * use it. */
connection = nm_device_get_applied_connection(self);
if (connection) { if (connection) {
NMSettingIPConfig *s_ip6 = nm_connection_get_setting_ip6_config(connection); NMSettingIPConfig *s_ip6 = nm_connection_get_setting_ip6_config(connection);
@ -3635,12 +3623,12 @@ nm_device_create_l3_config_data_from_connection(NMDevice *self, NMConnection *co
l3cd = l3cd =
nm_l3_config_data_new_from_connection(nm_device_get_multi_index(self), ifindex, connection); nm_l3_config_data_new_from_connection(nm_device_get_multi_index(self), ifindex, connection);
nm_l3_config_data_set_mdns(l3cd, _prop_get_connection_mdns(self)); nm_l3_config_data_set_mdns(l3cd, _prop_get_connection_mdns(self, connection));
nm_l3_config_data_set_llmnr(l3cd, _prop_get_connection_llmnr(self)); nm_l3_config_data_set_llmnr(l3cd, _prop_get_connection_llmnr(self, connection));
nm_l3_config_data_set_dns_over_tls(l3cd, _prop_get_connection_dns_over_tls(self)); nm_l3_config_data_set_dns_over_tls(l3cd, _prop_get_connection_dns_over_tls(self, connection));
nm_l3_config_data_set_dnssec(l3cd, _prop_get_connection_dnssec(self)); 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)); 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)); nm_l3_config_data_set_mptcp_flags(l3cd, _prop_get_connection_mptcp_flags(self, connection));
return l3cd; return l3cd;
} }
@ -12891,7 +12879,7 @@ _dev_ipac6_start(NMDevice *self)
.router_solicitations = router_solicitations, .router_solicitations = router_solicitations,
.router_solicitation_interval = router_solicitation_interval, .router_solicitation_interval = router_solicitation_interval,
.ra_timeout = ra_timeout, .ra_timeout = ra_timeout,
.ip6_privacy = _prop_get_ipv6_ip6_privacy(self), .ip6_privacy = _prop_get_ipv6_ip6_privacy(self, connection),
}; };
priv->ipac6_data.ndisc = nm_lndp_ndisc_new(&config); priv->ipac6_data.ndisc = nm_lndp_ndisc_new(&config);