From db5b92fa03e65da83a744fe5d32af5f5657656c9 Mon Sep 17 00:00:00 2001 From: Wen Liang Date: Fri, 8 Mar 2024 10:28:43 -0500 Subject: [PATCH] libnm: use `nm_setting_connection_get_controller()` where possible 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 --- src/core/NetworkManagerUtils.c | 4 ++-- src/core/devices/nm-device.c | 6 ++--- src/core/nm-active-connection.c | 2 +- src/core/nm-manager.c | 2 +- src/core/nm-policy.c | 2 +- .../plugins/ifcfg-rh/nms-ifcfg-rh-reader.c | 10 ++++----- .../plugins/ifcfg-rh/nms-ifcfg-rh-writer.c | 2 +- .../plugins/ifcfg-rh/tests/test-ifcfg-rh.c | 16 +++++++------- .../keyfile/tests/test-keyfile-settings.c | 4 ++-- src/libnm-core-impl/nm-connection.c | 4 ++-- src/libnm-core-impl/nm-setting-6lowpan.c | 2 +- src/libnm-core-impl/nm-setting-connection.c | 2 +- src/libnm-core-impl/nm-setting-loopback.c | 2 +- src/libnm-core-impl/nm-setting-macsec.c | 2 +- src/libnm-core-impl/nm-setting-ovs-bridge.c | 2 +- .../nm-setting-ovs-interface.c | 2 +- src/libnm-core-impl/nm-setting-ovs-port.c | 2 +- src/libnm-core-impl/nm-setting-vlan.c | 2 +- src/libnm-core-impl/tests/test-keyfile.c | 2 +- src/nm-initrd-generator/nmi-cmdline-reader.c | 2 +- .../tests/test-cmdline-reader.c | 22 +++++++++---------- src/nmcli/settings.c | 2 +- src/nmtui/nmt-connect-connection-list.c | 2 +- src/nmtui/nmt-port-list.c | 2 +- src/nmtui/nmtui-edit.c | 4 ++-- 25 files changed, 52 insertions(+), 52 deletions(-) diff --git a/src/core/NetworkManagerUtils.c b/src/core/NetworkManagerUtils.c index cced171778..2f44714619 100644 --- a/src/core/NetworkManagerUtils.c +++ b/src/core/NetworkManagerUtils.c @@ -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 diff --git a/src/core/devices/nm-device.c b/src/core/devices/nm-device.c index 802c04fa79..e59a9f4b88 100644 --- a/src/core/devices/nm-device.c +++ b/src/core/devices/nm-device.c @@ -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); diff --git a/src/core/nm-active-connection.c b/src/core/nm-active-connection.c index eb7b1ccae5..19c62e6ac5 100644 --- a/src/core/nm-active-connection.c +++ b/src/core/nm-active-connection.c @@ -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))) diff --git a/src/core/nm-manager.c b/src/core/nm-manager.c index b069d8b7be..26ac039428 100644 --- a/src/core/nm-manager.c +++ b/src/core/nm-manager.c @@ -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 */ diff --git a/src/core/nm-policy.c b/src/core/nm-policy.c index feea97b114..60d11c7597 100644 --- a/src/core/nm-policy.c +++ b/src/core/nm-policy.c @@ -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; diff --git a/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c b/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c index 3bcbb71b94..8f42b7f1f6 100644 --- a/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c +++ b/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c @@ -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); diff --git a/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c b/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c index 617c5ef60b..43f6467547 100644 --- a/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c +++ b/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c @@ -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. */ diff --git a/src/core/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c b/src/core/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c index 1e6b6c25e9..2639f73cbc 100644 --- a/src/core/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c +++ b/src/core/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c @@ -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); diff --git a/src/core/settings/plugins/keyfile/tests/test-keyfile-settings.c b/src/core/settings/plugins/keyfile/tests/test-keyfile-settings.c index b26bad696b..e3e5f84ff9 100644 --- a/src/core/settings/plugins/keyfile/tests/test-keyfile-settings.c +++ b/src/core/settings/plugins/keyfile/tests/test-keyfile-settings.c @@ -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); diff --git a/src/libnm-core-impl/nm-connection.c b/src/libnm-core-impl/nm-connection.c index 33360d04a1..15b489d6c4 100644 --- a/src/libnm-core-impl/nm-connection.c +++ b/src/libnm-core-impl/nm-connection.c @@ -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 diff --git a/src/libnm-core-impl/nm-setting-6lowpan.c b/src/libnm-core-impl/nm-setting-6lowpan.c index 7066c3e6bb..d318ab007b 100644 --- a/src/libnm-core-impl/nm-setting-6lowpan.c +++ b/src/libnm-core-impl/nm-setting-6lowpan.c @@ -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, diff --git a/src/libnm-core-impl/nm-setting-connection.c b/src/libnm-core-impl/nm-setting-connection.c index 6818645ff3..46045c46f1 100644 --- a/src/libnm-core-impl/nm-setting-connection.c +++ b/src/libnm-core-impl/nm-setting-connection.c @@ -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 * diff --git a/src/libnm-core-impl/nm-setting-loopback.c b/src/libnm-core-impl/nm-setting-loopback.c index b329c74a36..2dc26cccef 100644 --- a/src/libnm-core-impl/nm-setting-loopback.c +++ b/src/libnm-core-impl/nm-setting-loopback.c @@ -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, diff --git a/src/libnm-core-impl/nm-setting-macsec.c b/src/libnm-core-impl/nm-setting-macsec.c index 763d306b76..5732fa0788 100644 --- a/src/libnm-core-impl/nm-setting-macsec.c +++ b/src/libnm-core-impl/nm-setting-macsec.c @@ -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, diff --git a/src/libnm-core-impl/nm-setting-ovs-bridge.c b/src/libnm-core-impl/nm-setting-ovs-bridge.c index bc5dd04a68..410d877101 100644 --- a/src/libnm-core-impl/nm-setting-ovs-bridge.c +++ b/src/libnm-core-impl/nm-setting-ovs-bridge.c @@ -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, diff --git a/src/libnm-core-impl/nm-setting-ovs-interface.c b/src/libnm-core-impl/nm-setting-ovs-interface.c index 8837908755..47c736659c 100644 --- a/src/libnm-core-impl/nm-setting-ovs-interface.c +++ b/src/libnm-core-impl/nm-setting-ovs-interface.c @@ -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, diff --git a/src/libnm-core-impl/nm-setting-ovs-port.c b/src/libnm-core-impl/nm-setting-ovs-port.c index f2071d4354..107d76cd04 100644 --- a/src/libnm-core-impl/nm-setting-ovs-port.c +++ b/src/libnm-core-impl/nm-setting-ovs-port.c @@ -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, diff --git a/src/libnm-core-impl/nm-setting-vlan.c b/src/libnm-core-impl/nm-setting-vlan.c index 534ed71372..16e3cf2acb 100644 --- a/src/libnm-core-impl/nm-setting-vlan.c +++ b/src/libnm-core-impl/nm-setting-vlan.c @@ -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, diff --git a/src/libnm-core-impl/tests/test-keyfile.c b/src/libnm-core-impl/tests/test-keyfile.c index 2b21e58328..9f54697140 100644 --- a/src/libnm-core-impl/tests/test-keyfile.c +++ b/src/libnm-core-impl/tests/test-keyfile.c @@ -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()); } diff --git a/src/nm-initrd-generator/nmi-cmdline-reader.c b/src/nm-initrd-generator/nmi-cmdline-reader.c index 1c35a9059c..8fcfc6d0e0 100644 --- a/src/nm-initrd-generator/nmi-cmdline-reader.c +++ b/src/nm-initrd-generator/nmi-cmdline-reader.c @@ -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; } diff --git a/src/nm-initrd-generator/tests/test-cmdline-reader.c b/src/nm-initrd-generator/tests/test-cmdline-reader.c index fd663b6d99..1f2141e61c 100644 --- a/src/nm-initrd-generator/tests/test-cmdline-reader.c +++ b/src/nm-initrd-generator/tests/test-cmdline-reader.c @@ -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); diff --git a/src/nmcli/settings.c b/src/nmcli/settings.c index d669112535..636df466e4 100644 --- a/src/nmcli/settings.c +++ b/src/nmcli/settings.c @@ -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); diff --git a/src/nmtui/nmt-connect-connection-list.c b/src/nmtui/nmt-connect-connection-list.c index 329494cc1b..70264d3ec2 100644 --- a/src/nmtui/nmt-connect-connection-list.c +++ b/src/nmtui/nmt-connect-connection-list.c @@ -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)) { diff --git a/src/nmtui/nmt-port-list.c b/src/nmtui/nmt-port-list.c index 9e4dd8a6ea..aa3217b166 100644 --- a/src/nmtui/nmt-port-list.c +++ b/src/nmtui/nmt-port-list.c @@ -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; diff --git a/src/nmtui/nmtui-edit.c b/src/nmtui/nmtui-edit.c index 723cfea9a3..0ba3bd0da7 100644 --- a/src/nmtui/nmtui-edit.c +++ b/src/nmtui/nmtui-edit.c @@ -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));