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

WIP: all: use get_controller() accessor everywhere

Browse source 
git grep -l nm_setting_connection_get_master |grep -v nm-setting-connection  |xargs sed 's/nm_setting_connection_get_master/nm_setting_connection_get_controller/g' -i
This commit is contained in:
Lubomir Rintel 2023-01-17 18:35:32 +01:00
parent f3ce911d29
commit 06777031b2
24 changed files with 50 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -8633,7 +8633,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(
@ -8649,7 +8649,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,
@ -10662,7 +10662,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

@ -445,7 +445,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_controller(nm_setting_connection_get_connection_type(s_con)))

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

@ -4406,7 +4406,7 @@ find_master(NMManager *self,
s_con = nm_connection_get_setting_connection(connection);
g_assert(s_con);
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

@ -1832,7 +1832,7 @@ activate_slave_connections(NMPolicy *self, NMDevice *device)
s_slave_con =
nm_connection_get_setting_connection(nm_settings_connection_get_connection(sett_conn));
slave_master = nm_setting_connection_get_master(s_slave_con);
slave_master = nm_setting_connection_get_controller(s_slave_con);
if (!slave_master)
continue;
if (!NM_IN_STRSET(slave_master, master_device, master_uuid_applied, master_uuid_settings))

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

@ -2185,7 +2185,7 @@ write_connection_setting(NMSettingConnection *s_con, shvarFile *ifcfg)
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_slave_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_slave_type(s_con), ==, NULL);
nmtst_assert_connection_verifies_after_normalization(connection, 0, 0);
@ -7663,7 +7663,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_slave_type(s_con),
==,
NM_SETTING_BRIDGE_SETTING_NAME);
@ -8257,7 +8257,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_slave_type(s_con), ==, NM_SETTING_BOND_SETTING_NAME);
}
@ -8314,7 +8314,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_slave_type(s_con), ==, NM_SETTING_BOND_SETTING_NAME);
s_port = nmtst_connection_assert_setting(connection, NM_TYPE_SETTING_BOND_PORT);
@ -8514,7 +8514,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_slave_type(s_con), ==, NM_SETTING_BOND_SETTING_NAME);
}
@ -9054,7 +9054,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);
@ -9182,7 +9182,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(nm_setting_connection_is_slave_type(s_con, NM_SETTING_BRIDGE_SETTING_NAME));
s_wired = nm_connection_get_setting_wired(connection);

2
src/libnm-client-impl/libnm.ver
View file

@ -480,7 +480,7 @@ global:
nm_setting_connection_get_gateway_ping_timeout;
nm_setting_connection_get_id;
nm_setting_connection_get_interface_name;
nm_setting_connection_get_master;
nm_setting_connection_get_controller;
nm_setting_connection_get_num_permissions;
nm_setting_connection_get_num_secondaries;
nm_setting_connection_get_permission;

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

@ -1085,7 +1085,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_slave_type(s_con);
@ -1167,7 +1167,7 @@ _supports_addr_family(NMConnection *self, int family)
&& (nm_streq0(nm_setting_connection_get_slave_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

@ -94,7 +94,7 @@ verify(NMSetting *setting, NMConnection *connection, GError **error)
slave_type = nm_setting_connection_get_slave_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-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_slave_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

@ -308,7 +308,7 @@ verify(NMSetting *setting, NMConnection *connection, GError **error)
slave_type = nm_setting_connection_get_slave_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

@ -618,7 +618,7 @@ verify(NMSetting *setting, NMConnection *connection, GError **error)
slave_type = nm_setting_connection_get_slave_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

@ -236,7 +236,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

@ -964,7 +964,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_slave_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);
@ -980,7 +980,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_slave_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);
@ -1061,7 +1061,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_slave_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);
@ -1077,7 +1077,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_slave_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);
@ -1140,7 +1140,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_slave_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);
@ -1218,7 +1218,7 @@ test_bridge(void)
g_assert_cmpstr(nm_setting_connection_get_slave_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);
@ -1236,7 +1236,7 @@ test_bridge(void)
g_assert_cmpstr(nm_setting_connection_get_slave_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);
@ -1299,7 +1299,7 @@ test_bridge_default(void)
g_assert_cmpstr(nm_setting_connection_get_slave_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);
@ -1367,7 +1367,7 @@ test_bridge_ip(void)
g_assert_cmpstr(nm_setting_connection_get_slave_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_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_slave_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);
@ -1446,7 +1446,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_slave_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_master_changed_cb(GObject *object, GParamSpec *pspec, gpointer user_d
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-slave-list.c
View file

@ -107,7 +107,7 @@ nmt_slave_list_connection_filter(NmtEditConnectionList *list,
if (g_strcmp0(slave_type, priv->master_type) != 0)
return FALSE;
master = nm_setting_connection_get_master(s_con);
master = nm_setting_connection_get_controller(s_con);
if (!master)
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);
master = nm_setting_connection_get_master(s_con);
master = nm_setting_connection_get_controller(s_con);
if (!master)
return TRUE;
slave_type = nm_setting_connection_get_slave_type(s_con);
@ -525,7 +525,7 @@ nmt_remove_connection(NMRemoteConnection *connection)
for (i = 0; i < all_conns->len; i++) {
slave = all_conns->pdata[i];
s_con = nm_connection_get_setting_connection(NM_CONNECTION(slave));
master = nm_setting_connection_get_master(s_con);
master = nm_setting_connection_get_controller(s_con);
if (master) {
if (!g_strcmp0(master, uuid) || !g_strcmp0(master, iface))
slaves = g_slist_prepend(slaves, g_object_ref(slave));