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

libnm: use nm_setting_connection_get_controller() where possible

Browse source 
To enforce conscious language support, use
`nm_setting_connection_get_controller()` where possible and replace
`nm_setting_connection_get_master()`.

https://issues.redhat.com/browse/RHEL-28623

https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/1882
This commit is contained in:
Wen Liang 2024-03-08 10:28:43 -05:00 • committed by Fernando Fernandez Mancera
parent 3cb9065305
commit db5b92fa03
25 changed files with 52 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/core/NetworkManagerUtils.c
View file

@ -702,8 +702,8 @@ check_connection_controller(NMConnection *orig, NMConnection *candidate, GHashTa
s_con_orig = nm_connection_get_setting_connection(orig);
s_con_cand = nm_connection_get_setting_connection(candidate);
orig_controller = nm_setting_connection_get_master(s_con_orig);
cand_controller = nm_setting_connection_get_master(s_con_cand);
orig_controller = nm_setting_connection_get_controller(s_con_orig);
cand_controller = nm_setting_connection_get_controller(s_con_cand);
/* A generated connection uses the UUID to specify the controller. Accept
* candidates that specify as controller an interface name matching that

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

@ -9207,7 +9207,7 @@ nm_device_generate_connection(NMDevice *self,
&& NM_IN_STRSET(ip6_method,
NM_SETTING_IP6_CONFIG_METHOD_IGNORE,
NM_SETTING_IP6_CONFIG_METHOD_DISABLED)
&& !nm_setting_connection_get_master(NM_SETTING_CONNECTION(s_con))
&& !nm_setting_connection_get_controller(NM_SETTING_CONNECTION(s_con))
&& c_list_is_empty(&priv->slaves)) {
NM_SET_OUT(out_maybe_later, TRUE);
g_set_error_literal(
@ -9223,7 +9223,7 @@ nm_device_generate_connection(NMDevice *self,
*/
if (nm_streq0(ip4_method, NM_SETTING_IP4_CONFIG_METHOD_DISABLED)
&& nm_streq0(ip6_method, NM_SETTING_IP6_CONFIG_METHOD_LINK_LOCAL)
&& !nm_setting_connection_get_master(NM_SETTING_CONNECTION(s_con))
&& !nm_setting_connection_get_controller(NM_SETTING_CONNECTION(s_con))
&& c_list_is_empty(&priv->slaves)
&& !nm_config_data_get_assume_ipv6ll_only(NM_CONFIG_GET_DATA, self)) {
_LOGD(LOGD_DEVICE,
@ -11333,7 +11333,7 @@ connection_requires_carrier(NMConnection *connection)
/* We can progress to IP_CONFIG now, so that we're enslaved.
* That may actually cause carrier to go up and thus continue activation. */
s_con = nm_connection_get_setting_connection(connection);
if (nm_setting_connection_get_master(s_con))
if (nm_setting_connection_get_controller(s_con))
return FALSE;
ip4_carrier_wanted = connection_ip_method_requires_carrier(connection, AF_INET, &ip4_used);

2
src/core/nm-active-connection.c
View file

@ -446,7 +446,7 @@ _set_applied_connection_take(NMActiveConnection *self, NMConnection *applied_con
/* we determine whether the connection is a master/slave, based solely
* on the connection properties itself. */
s_con = nm_connection_get_setting_connection(priv->applied_connection);
if (nm_setting_connection_get_master(s_con))
if (nm_setting_connection_get_controller(s_con))
flags_val |= NM_ACTIVATION_STATE_FLAG_IS_SLAVE;
if (_nm_connection_type_is_master(nm_setting_connection_get_connection_type(s_con)))

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

@ -4921,7 +4921,7 @@ find_master(NMManager *self,
nm_assert(!out_master_ac || !*out_master_ac);
s_con = nm_connection_get_setting_connection(connection);
master = nm_setting_connection_get_master(s_con);
master = nm_setting_connection_get_controller(s_con);
if (master == NULL)
return TRUE; /* success, but no master */

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

@ -1805,7 +1805,7 @@ unblock_autoconnect_for_ports(NMPolicy *self,
s_slave_con =
nm_settings_connection_get_setting(sett_conn, NM_META_SETTING_TYPE_CONNECTION);
slave_master = nm_setting_connection_get_master(s_slave_con);
slave_master = nm_setting_connection_get_controller(s_slave_con);
if (!slave_master)
continue;

10
src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c
View file

@ -297,7 +297,7 @@ check_if_bond_slave(shvarFile *ifcfg, NMSettingConnection *s_con)
v = svGetValueStr(ifcfg, "MASTER", &value);
if (v) {
master = nm_setting_connection_get_master(s_con);
master = nm_setting_connection_get_controller(s_con);
if (master) {
PARSE_WARNING("Already configured as slave of %s. Ignoring MASTER{_UUID}=\"%s\"",
master,
@ -331,7 +331,7 @@ check_if_team_slave(shvarFile *ifcfg, NMSettingConnection *s_con)
if (!v)
return;
master = nm_setting_connection_get_master(s_con);
master = nm_setting_connection_get_controller(s_con);
if (master) {
PARSE_WARNING("Already configured as slave of %s. Ignoring TEAM_MASTER{_UUID}=\"%s\"",
master,
@ -507,7 +507,7 @@ make_connection_setting(const char *file,
if (v) {
const char *old_value;
if ((old_value = nm_setting_connection_get_master(s_con))) {
if ((old_value = nm_setting_connection_get_controller(s_con))) {
PARSE_WARNING("Already configured as slave of %s. Ignoring BRIDGE=\"%s\"",
old_value,
v);
@ -530,7 +530,7 @@ make_connection_setting(const char *file,
if (v) {
const char *old_value;
if ((old_value = nm_setting_connection_get_master(s_con))) {
if ((old_value = nm_setting_connection_get_controller(s_con))) {
PARSE_WARNING("Already configured as slave of %s. Ignoring OVS_PORT=\"%s\"",
old_value,
v);
@ -550,7 +550,7 @@ make_connection_setting(const char *file,
if (v) {
const char *old_value;
if ((old_value = nm_setting_connection_get_master(s_con))) {
if ((old_value = nm_setting_connection_get_controller(s_con))) {
PARSE_WARNING("Already configured as slave of %s. Ignoring VRF{_UUID}=\"%s\"",
old_value,
v);

2
src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c
View file

@ -2247,7 +2247,7 @@ write_connection_setting(NMSettingConnection *s_con, shvarFile *ifcfg, const cha
mud_url = nm_setting_connection_get_mud_url(s_con);
svSetValue(ifcfg, "MUD_URL", mud_url);
master = nm_setting_connection_get_master(s_con);
master = nm_setting_connection_get_controller(s_con);
if (master) {
/* The reader prefers the *_UUID variants, however we still try to resolve
* it into an interface name, so that legacy tooling is not confused. */

16
src/core/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c
View file

@ -2230,7 +2230,7 @@ test_clear_master(void)
s_con = nmtst_connection_assert_setting(connection, NM_TYPE_SETTING_CONNECTION);
g_assert_cmpstr(nm_setting_connection_get_master(s_con), ==, "br0");
g_assert_cmpstr(nm_setting_connection_get_controller(s_con), ==, "br0");
g_assert_cmpstr(nm_setting_connection_get_port_type(s_con), ==, "bridge");
/* 2. write the connection to a new file */
@ -2247,7 +2247,7 @@ test_clear_master(void)
NULL,
NULL);
g_assert_cmpstr(nm_setting_connection_get_master(s_con), ==, NULL);
g_assert_cmpstr(nm_setting_connection_get_controller(s_con), ==, NULL);
g_assert_cmpstr(nm_setting_connection_get_port_type(s_con), ==, NULL);
nmtst_assert_connection_verifies_after_normalization(connection, 0, 0);
@ -7668,7 +7668,7 @@ test_read_bridge_component(void)
NULL);
s_con = nmtst_connection_assert_setting(connection, NM_TYPE_SETTING_CONNECTION);
g_assert_cmpstr(nm_setting_connection_get_master(s_con), ==, "br0");
g_assert_cmpstr(nm_setting_connection_get_controller(s_con), ==, "br0");
g_assert_cmpstr(nm_setting_connection_get_port_type(s_con), ==, NM_SETTING_BRIDGE_SETTING_NAME);
s_port = nmtst_connection_assert_setting(connection, NM_TYPE_SETTING_BRIDGE_PORT);
@ -8260,7 +8260,7 @@ test_read_bond_slave(void)
s_con = nmtst_connection_assert_setting(connection, NM_TYPE_SETTING_CONNECTION);
g_assert_cmpstr(nm_setting_connection_get_master(s_con), ==, "bond0");
g_assert_cmpstr(nm_setting_connection_get_controller(s_con), ==, "bond0");
g_assert_cmpstr(nm_setting_connection_get_port_type(s_con), ==, NM_SETTING_BOND_SETTING_NAME);
}
@ -8317,7 +8317,7 @@ test_read_bond_port(void)
_connection_from_file(TEST_IFCFG_DIR "/ifcfg-test-bond-port", NULL, TYPE_ETHERNET, NULL);
s_con = nmtst_connection_assert_setting(connection, NM_TYPE_SETTING_CONNECTION);
g_assert_cmpstr(nm_setting_connection_get_master(s_con), ==, "bond99");
g_assert_cmpstr(nm_setting_connection_get_controller(s_con), ==, "bond99");
g_assert_cmpstr(nm_setting_connection_get_port_type(s_con), ==, NM_SETTING_BOND_SETTING_NAME);
s_port = nmtst_connection_assert_setting(connection, NM_TYPE_SETTING_BOND_PORT);
@ -8556,7 +8556,7 @@ test_read_bond_slave_ib(void)
s_con = nmtst_connection_assert_setting(connection, NM_TYPE_SETTING_CONNECTION);
g_assert_cmpstr(nm_setting_connection_get_master(s_con), ==, "bond0");
g_assert_cmpstr(nm_setting_connection_get_controller(s_con), ==, "bond0");
g_assert_cmpstr(nm_setting_connection_get_port_type(s_con), ==, NM_SETTING_BOND_SETTING_NAME);
}
@ -9096,7 +9096,7 @@ test_read_team_port(gconstpointer user_data)
g_assert_cmpstr(nm_setting_connection_get_connection_type(s_con),
==,
NM_SETTING_WIRED_SETTING_NAME);
g_assert_cmpstr(nm_setting_connection_get_master(s_con), ==, "team0");
g_assert_cmpstr(nm_setting_connection_get_controller(s_con), ==, "team0");
s_team_port = nmtst_connection_assert_setting(connection, NM_TYPE_SETTING_TEAM_PORT);
g_assert_cmpstr(nm_setting_team_port_get_config(s_team_port), ==, expected_config);
@ -9224,7 +9224,7 @@ test_read_team_port_empty_config(void)
g_assert_cmpstr(nm_setting_connection_get_connection_type(s_con),
==,
NM_SETTING_WIRED_SETTING_NAME);
g_assert_cmpstr(nm_setting_connection_get_master(s_con), ==, "team0");
g_assert_cmpstr(nm_setting_connection_get_controller(s_con), ==, "team0");
/* Normalization adds a team-port setting */
s_team_port = nmtst_connection_assert_setting(connection, NM_TYPE_SETTING_TEAM_PORT);

4
src/core/settings/plugins/keyfile/tests/test-keyfile-settings.c
View file

@ -91,7 +91,7 @@ assert_reread(NMConnection *connection, gboolean normalize_connection, const cha
reread = keyfile_read_connection_from_file(testfile);
if (!normalize_connection && (s_con = nm_connection_get_setting_connection(connection))
&& !nm_setting_connection_get_master(s_con)
&& !nm_setting_connection_get_controller(s_con)
&& !nm_connection_get_setting_proxy(connection)) {
connection_clone = nmtst_clone_connection(connection);
connection = connection_clone;
@ -2003,7 +2003,7 @@ test_read_bridge_component(void)
g_assert(s_con);
g_assert_cmpstr(nm_setting_connection_get_id(s_con), ==, expected_id);
g_assert_cmpstr(nm_setting_connection_get_uuid(s_con), ==, expected_uuid);
g_assert_cmpstr(nm_setting_connection_get_master(s_con), ==, "br0");
g_assert_cmpstr(nm_setting_connection_get_controller(s_con), ==, "br0");
g_assert_cmpstr(nm_setting_connection_get_port_type(s_con), ==, NM_SETTING_BRIDGE_SETTING_NAME);
s_wired = nm_connection_get_setting_wired(connection);

4
src/libnm-core-impl/nm-connection.c
View file

@ -1093,7 +1093,7 @@ _normalize_connection_slave_type(NMConnection *self)
if (!s_con)
return FALSE;
if (!nm_setting_connection_get_master(s_con))
if (!nm_setting_connection_get_controller(s_con))
return FALSE;
slave_type = nm_setting_connection_get_port_type(s_con);
@ -1175,7 +1175,7 @@ _supports_addr_family(NMConnection *self, int family)
&& (nm_streq0(nm_setting_connection_get_port_type(s_con), NM_SETTING_VRF_SETTING_NAME)))
return TRUE;
return !nm_setting_connection_get_master(nm_connection_get_setting_connection(self));
return !nm_setting_connection_get_controller(nm_connection_get_setting_connection(self));
}
static gboolean

2
src/libnm-core-impl/nm-setting-6lowpan.c
View file

@ -95,7 +95,7 @@ verify(NMSetting *setting, NMConnection *connection, GError **error)
slave_type = nm_setting_connection_get_port_type(s_con);
if (!g_strcmp0(slave_type, NM_SETTING_6LOWPAN_SETTING_NAME))
master = nm_setting_connection_get_master(s_con);
master = nm_setting_connection_get_controller(s_con);
if (master && g_strcmp0(priv->parent, master) != 0) {
g_set_error(error,

2
src/libnm-core-impl/nm-setting-connection.c
View file

@ -715,7 +715,7 @@ nm_setting_connection_get_zone(NMSettingConnection *setting)
* Returns: interface name of the master device or UUID of the master
* connection.
*
* Deprecated: 1.46. Use nm_setting_connection_get_controller() instead which
* Deprecated: 1.46. Use nm_setting_connection_get_master() instead which
* is just an alias.
*/
const char *

2
src/libnm-core-impl/nm-setting-loopback.c
View file

@ -126,7 +126,7 @@ verify(NMSetting *setting, NMConnection *connection, GError **error)
if ((s_con = nm_connection_get_setting_connection(connection))) {
if (nm_setting_connection_get_port_type(s_con)
|| nm_setting_connection_get_master(s_con)) {
|| nm_setting_connection_get_controller(s_con)) {
g_set_error(error,
NM_CONNECTION_ERROR,
NM_CONNECTION_ERROR_INVALID_PROPERTY,

2
src/libnm-core-impl/nm-setting-macsec.c
View file

@ -324,7 +324,7 @@ verify(NMSetting *setting, NMConnection *connection, GError **error)
slave_type = nm_setting_connection_get_port_type(s_con);
if (!g_strcmp0(slave_type, NM_SETTING_MACSEC_SETTING_NAME))
master = nm_setting_connection_get_master(s_con);
master = nm_setting_connection_get_controller(s_con);
if (master && g_strcmp0(priv->parent, master) != 0) {
g_set_error(error,

2
src/libnm-core-impl/nm-setting-ovs-bridge.c
View file

@ -153,7 +153,7 @@ verify(NMSetting *setting, NMConnection *connection, GError **error)
return FALSE;
}
if (nm_setting_connection_get_master(s_con)) {
if (nm_setting_connection_get_controller(s_con)) {
g_set_error(error,
NM_CONNECTION_ERROR,
NM_CONNECTION_ERROR_INVALID_PROPERTY,

2
src/libnm-core-impl/nm-setting-ovs-interface.c
View file

@ -308,7 +308,7 @@ verify(NMSetting *setting, NMConnection *connection, GError **error)
return FALSE;
}
if (!nm_setting_connection_get_master(s_con)) {
if (!nm_setting_connection_get_controller(s_con)) {
g_set_error(error,
NM_CONNECTION_ERROR,
NM_CONNECTION_ERROR_INVALID_PROPERTY,

2
src/libnm-core-impl/nm-setting-ovs-port.c
View file

@ -413,7 +413,7 @@ verify(NMSetting *setting, NMConnection *connection, GError **error)
return FALSE;
}
if (!nm_setting_connection_get_master(s_con)) {
if (!nm_setting_connection_get_controller(s_con)) {
g_set_error(error,
NM_CONNECTION_ERROR,
NM_CONNECTION_ERROR_INVALID_PROPERTY,

2
src/libnm-core-impl/nm-setting-vlan.c
View file

@ -616,7 +616,7 @@ verify(NMSetting *setting, NMConnection *connection, GError **error)
slave_type = nm_setting_connection_get_port_type(s_con);
if (!g_strcmp0(slave_type, NM_SETTING_VLAN_SETTING_NAME))
master = nm_setting_connection_get_master(s_con);
master = nm_setting_connection_get_controller(s_con);
if (master && g_strcmp0(priv->parent, master) != 0) {
g_set_error(error,

2
src/libnm-core-impl/tests/test-keyfile.c
View file

@ -200,7 +200,7 @@ _nm_keyfile_read(GKeyFile *keyfile,
* keyfile reader does not add that (unless a [proxy] section
* is present. */
s_con = nm_connection_get_setting_connection(con);
if (s_con && !nm_setting_connection_get_master(s_con)
if (s_con && !nm_setting_connection_get_controller(s_con)
&& !nm_connection_get_setting_proxy(con))
nm_connection_add_setting(con, nm_setting_proxy_new());
}

2
src/nm-initrd-generator/nmi-cmdline-reader.c
View file

@ -240,7 +240,7 @@ reader_get_connection(Reader *reader,
candidate = g_hash_table_lookup(reader->hash, reader->array->pdata[i]);
s_con = nm_connection_get_setting_connection(candidate);
if (type_name == NULL && nm_setting_connection_get_master(s_con) == NULL) {
if (type_name == NULL && nm_setting_connection_get_controller(s_con) == NULL) {
connection = candidate;
break;
}

22
src/nm-initrd-generator/tests/test-cmdline-reader.c
View file

@ -1032,7 +1032,7 @@ test_bond(void)
NM_SETTING_WIRED_SETTING_NAME);
g_assert_cmpstr(nm_setting_connection_get_id(s_con), ==, "eth0");
g_assert_cmpstr(nm_setting_connection_get_port_type(s_con), ==, NM_SETTING_BOND_SETTING_NAME);
g_assert_cmpstr(nm_setting_connection_get_master(s_con), ==, master_uuid);
g_assert_cmpstr(nm_setting_connection_get_controller(s_con), ==, master_uuid);
g_assert_cmpint(nm_setting_connection_get_multi_connect(s_con),
==,
NM_CONNECTION_MULTI_CONNECT_SINGLE);
@ -1048,7 +1048,7 @@ test_bond(void)
NM_SETTING_WIRED_SETTING_NAME);
g_assert_cmpstr(nm_setting_connection_get_id(s_con), ==, "eth1");
g_assert_cmpstr(nm_setting_connection_get_port_type(s_con), ==, NM_SETTING_BOND_SETTING_NAME);
g_assert_cmpstr(nm_setting_connection_get_master(s_con), ==, master_uuid);
g_assert_cmpstr(nm_setting_connection_get_controller(s_con), ==, master_uuid);
g_assert_cmpint(nm_setting_connection_get_multi_connect(s_con),
==,
NM_CONNECTION_MULTI_CONNECT_SINGLE);
@ -1130,7 +1130,7 @@ test_bond_ip(void)
NM_SETTING_WIRED_SETTING_NAME);
g_assert_cmpstr(nm_setting_connection_get_id(s_con), ==, "eth0");
g_assert_cmpstr(nm_setting_connection_get_port_type(s_con), ==, NM_SETTING_BOND_SETTING_NAME);
g_assert_cmpstr(nm_setting_connection_get_master(s_con), ==, master_uuid);
g_assert_cmpstr(nm_setting_connection_get_controller(s_con), ==, master_uuid);
g_assert_cmpint(nm_setting_connection_get_multi_connect(s_con),
==,
NM_CONNECTION_MULTI_CONNECT_SINGLE);
@ -1146,7 +1146,7 @@ test_bond_ip(void)
NM_SETTING_WIRED_SETTING_NAME);
g_assert_cmpstr(nm_setting_connection_get_id(s_con), ==, "eth1");
g_assert_cmpstr(nm_setting_connection_get_port_type(s_con), ==, NM_SETTING_BOND_SETTING_NAME);
g_assert_cmpstr(nm_setting_connection_get_master(s_con), ==, master_uuid);
g_assert_cmpstr(nm_setting_connection_get_controller(s_con), ==, master_uuid);
g_assert_cmpint(nm_setting_connection_get_multi_connect(s_con),
==,
NM_CONNECTION_MULTI_CONNECT_SINGLE);
@ -1209,7 +1209,7 @@ test_bond_default(void)
NM_SETTING_WIRED_SETTING_NAME);
g_assert_cmpstr(nm_setting_connection_get_id(s_con), ==, "eth0");
g_assert_cmpstr(nm_setting_connection_get_port_type(s_con), ==, NM_SETTING_BOND_SETTING_NAME);
g_assert_cmpstr(nm_setting_connection_get_master(s_con), ==, master_uuid);
g_assert_cmpstr(nm_setting_connection_get_controller(s_con), ==, master_uuid);
g_assert_cmpint(nm_setting_connection_get_multi_connect(s_con),
==,
NM_CONNECTION_MULTI_CONNECT_SINGLE);
@ -1285,7 +1285,7 @@ test_bridge(void)
NM_SETTING_WIRED_SETTING_NAME);
g_assert_cmpstr(nm_setting_connection_get_id(s_con), ==, "eth0");
g_assert_cmpstr(nm_setting_connection_get_port_type(s_con), ==, NM_SETTING_BRIDGE_SETTING_NAME);
g_assert_cmpstr(nm_setting_connection_get_master(s_con), ==, master_uuid);
g_assert_cmpstr(nm_setting_connection_get_controller(s_con), ==, master_uuid);
g_assert_cmpint(nm_setting_connection_get_multi_connect(s_con),
==,
NM_CONNECTION_MULTI_CONNECT_SINGLE);
@ -1301,7 +1301,7 @@ test_bridge(void)
NM_SETTING_WIRED_SETTING_NAME);
g_assert_cmpstr(nm_setting_connection_get_id(s_con), ==, "eth1");
g_assert_cmpstr(nm_setting_connection_get_port_type(s_con), ==, NM_SETTING_BRIDGE_SETTING_NAME);
g_assert_cmpstr(nm_setting_connection_get_master(s_con), ==, master_uuid);
g_assert_cmpstr(nm_setting_connection_get_controller(s_con), ==, master_uuid);
g_assert_cmpint(nm_setting_connection_get_multi_connect(s_con),
==,
NM_CONNECTION_MULTI_CONNECT_SINGLE);
@ -1362,7 +1362,7 @@ test_bridge_default(void)
NM_SETTING_WIRED_SETTING_NAME);
g_assert_cmpstr(nm_setting_connection_get_id(s_con), ==, "eth0");
g_assert_cmpstr(nm_setting_connection_get_port_type(s_con), ==, NM_SETTING_BRIDGE_SETTING_NAME);
g_assert_cmpstr(nm_setting_connection_get_master(s_con), ==, master_uuid);
g_assert_cmpstr(nm_setting_connection_get_controller(s_con), ==, master_uuid);
g_assert_cmpint(nm_setting_connection_get_multi_connect(s_con),
==,
NM_CONNECTION_MULTI_CONNECT_SINGLE);
@ -1430,7 +1430,7 @@ test_bridge_ip(void)
g_assert_cmpstr(nm_setting_connection_get_port_type(s_con),
==,
NM_SETTING_BRIDGE_SETTING_NAME);
g_assert_cmpstr(nm_setting_connection_get_master(s_con), ==, master_uuid);
g_assert_cmpstr(nm_setting_connection_get_controller(s_con), ==, master_uuid);
g_assert_cmpint(nm_setting_connection_get_multi_connect(s_con),
==,
NM_CONNECTION_MULTI_CONNECT_SINGLE);
@ -1494,7 +1494,7 @@ test_team(void)
NM_SETTING_WIRED_SETTING_NAME);
g_assert_cmpstr(nm_setting_connection_get_id(s_con), ==, "eth0");
g_assert_cmpstr(nm_setting_connection_get_port_type(s_con), ==, NM_SETTING_TEAM_SETTING_NAME);
g_assert_cmpstr(nm_setting_connection_get_master(s_con), ==, master_uuid);
g_assert_cmpstr(nm_setting_connection_get_controller(s_con), ==, master_uuid);
g_assert_cmpint(nm_setting_connection_get_multi_connect(s_con),
==,
NM_CONNECTION_MULTI_CONNECT_SINGLE);
@ -1510,7 +1510,7 @@ test_team(void)
NM_SETTING_WIRED_SETTING_NAME);
g_assert_cmpstr(nm_setting_connection_get_id(s_con), ==, "eth1");
g_assert_cmpstr(nm_setting_connection_get_port_type(s_con), ==, NM_SETTING_TEAM_SETTING_NAME);
g_assert_cmpstr(nm_setting_connection_get_master(s_con), ==, master_uuid);
g_assert_cmpstr(nm_setting_connection_get_controller(s_con), ==, master_uuid);
g_assert_cmpint(nm_setting_connection_get_multi_connect(s_con),
==,
NM_CONNECTION_MULTI_CONNECT_SINGLE);

2
src/nmcli/settings.c
View file

@ -261,7 +261,7 @@ connection_controller_changed_cb(GObject *object, GParamSpec *pspec, gpointer us
NMSetting *s_ipv4, *s_ipv6;
const char *value, *tmp_str;
value = nm_setting_connection_get_master(s_con);
value = nm_setting_connection_get_controller(s_con);
if (value) {
s_ipv4 = nm_connection_get_setting_by_name(connection, NM_SETTING_IP4_CONFIG_SETTING_NAME);
s_ipv6 = nm_connection_get_setting_by_name(connection, NM_SETTING_IP6_CONFIG_SETTING_NAME);

2
src/nmtui/nmt-connect-connection-list.c
View file

@ -184,7 +184,7 @@ add_connections_for_device(NmtConnectDevice *nmtdev, const GPtrArray *connection
NMSettingConnection *s_con;
s_con = nm_connection_get_setting_connection(conn);
if (nm_setting_connection_get_master(s_con))
if (nm_setting_connection_get_controller(s_con))
continue;
if (nm_device_connection_valid(nmtdev->device, conn)) {

2
src/nmtui/nmt-port-list.c
View file

@ -107,7 +107,7 @@ nmt_port_list_connection_filter(NmtEditConnectionList *list,
if (g_strcmp0(port_type, priv->controller_type) != 0)
return FALSE;
controller = nm_setting_connection_get_master(s_con);
controller = nm_setting_connection_get_controller(s_con);
if (!controller)
return FALSE;

4
src/nmtui/nmtui-edit.c
View file

@ -58,7 +58,7 @@ edit_connection_list_filter(NmtEditConnectionList *list,
s_con = nm_connection_get_setting_connection(connection);
g_return_val_if_fail(s_con != NULL, FALSE);
controller = nm_setting_connection_get_master(s_con);
controller = nm_setting_connection_get_controller(s_con);
if (!controller)
return TRUE;
port_type = nm_setting_connection_get_port_type(s_con);
@ -525,7 +525,7 @@ nmt_remove_connection(NMRemoteConnection *connection)
for (i = 0; i < all_conns->len; i++) {
port = all_conns->pdata[i];
s_con = nm_connection_get_setting_connection(NM_CONNECTION(port));
controller = nm_setting_connection_get_master(s_con);
controller = nm_setting_connection_get_controller(s_con);
if (controller) {
if (!g_strcmp0(controller, uuid) || !g_strcmp0(controller, iface))
ports = g_slist_prepend(ports, g_object_ref(port));