diff --git a/Makefile.am b/Makefile.am index 8113000040..dbfeffd921 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3440,10 +3440,10 @@ EXTRA_DIST += \ src/core/settings/plugins/keyfile/tests/keyfiles/Test_New_Wireless_Group_Names \ src/core/settings/plugins/keyfile/tests/keyfiles/Test_minimal_1 \ src/core/settings/plugins/keyfile/tests/keyfiles/Test_minimal_2 \ - src/core/settings/plugins/keyfile/tests/keyfiles/Test_minimal_slave_1 \ - src/core/settings/plugins/keyfile/tests/keyfiles/Test_minimal_slave_2 \ - src/core/settings/plugins/keyfile/tests/keyfiles/Test_minimal_slave_3 \ - src/core/settings/plugins/keyfile/tests/keyfiles/Test_minimal_slave_4 \ + src/core/settings/plugins/keyfile/tests/keyfiles/Test_minimal_port_1 \ + src/core/settings/plugins/keyfile/tests/keyfiles/Test_minimal_port_2 \ + src/core/settings/plugins/keyfile/tests/keyfiles/Test_minimal_port_3 \ + src/core/settings/plugins/keyfile/tests/keyfiles/Test_minimal_port_4 \ src/core/settings/plugins/keyfile/tests/keyfiles/Test_Missing_Vlan_Setting \ src/core/settings/plugins/keyfile/tests/keyfiles/Test_Missing_Vlan_Flags \ src/core/settings/plugins/keyfile/tests/keyfiles/Test_Missing_ID_UUID \ @@ -3603,13 +3603,13 @@ EXTRA_DIST += \ src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-netmask-1.cexpected \ src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-random_wifi_connection.cexpected \ src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-random_wifi_connection_2.cexpected \ - src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-team-slave-enp31s0f1-142.cexpected \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-team-port-enp31s0f1-142.cexpected \ src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-eth-type \ src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-main \ src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-mode-numeric \ src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-port \ - src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-slave \ - src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-slave-ib \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-port \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-port-ib \ src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bridge-component \ src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bridge-main \ src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bridge-missing-stp \ diff --git a/man/NetworkManager.conf.xml b/man/NetworkManager.conf.xml index aec49569b1..474e795177 100644 --- a/man/NetworkManager.conf.xml +++ b/man/NetworkManager.conf.xml @@ -218,7 +218,7 @@ no-auto-default=* if specified (See ). Otherwise, it is a list of matches to specify for which device carrier should be ignored. See for the - syntax how to specify a device. Note that master types like + syntax how to specify a device. Note that controller types like bond, bridge, and team ignore carrier by default. You can however revert that default using the "except:" specifier (or better, use the per-device setting instead of the deprecated setting). @@ -856,8 +856,13 @@ ipv6.ip6-privacy=0 If left unspecified, the default value is 3 tries before failing the connection. + + connection.autoconnect-ports + connection.autoconnect-slaves + This is deprecated, please use "connection.autoconnect-ports" instead. + connection.down-on-poweroff @@ -1124,7 +1129,7 @@ ipv6.ip6-privacy=0 [connection] ipv6.ip6-privacy=0 -connection.autoconnect-slaves=1 +connection.autoconnect-ports=1 vpn.timeout=120 [connection-wifi-wlan0] diff --git a/man/nm-openvswitch.xml b/man/nm-openvswitch.xml index 67b5ea7ce6..ff85212908 100644 --- a/man/nm-openvswitch.xml +++ b/man/nm-openvswitch.xml @@ -57,8 +57,8 @@ The configuration is made up of Bridges, Ports and - Interfaces. Interfaces are always enslaved to Ports, and Ports are always - enslaved to Bridges. + Interfaces. Interfaces are always attached to Ports, and Ports are always + attached to Bridges. NetworkManager only creates Bridges, Ports and Interfaces @@ -66,7 +66,7 @@ local interface nor its port automatically. - You can't enslave Interface directly to a Bridge. You + You can't attach Interface directly to a Bridge. You always need a Port, even if it has just one interface. @@ -89,7 +89,7 @@ type. Due to the limitations of OVSDB, "empty" Bridges (with no Ports) can't exist. NetworkManager inserts the records for Bridges into OVSDB when a Port is - enslaved. + attached. @@ -101,18 +101,18 @@ Due to the limitations of OVSDB, "empty" Ports (with no Interfaces) can't exist. Ports can also be configured to do VLAN tagging or Bonding. NetworkManager inserts the records for Ports into OVSDB when an Interface is - enslaved. Ports must be enslaved to a Bridge. + attached. Ports must be attached to a Bridge. Interfaces - Interfaces are represented by a connections enslaved to a Port. The + Interfaces are represented by a connections attached to a Port. The system interfaces (that have a corresponding Linux link) have a respective connection.type of the link (e.g. "wired", "bond", "dummy", etc.). Other interfaces ("internal" or "patch" interfaces) are of ovs-interface type. The OVSDB entries are - inserted upon enslavement to a Port. + inserted upon attachment to a Port. @@ -123,10 +123,10 @@ Creating a Bridge with a single internal Interface $ nmcli conn add type ovs-bridge conn.interface bridge0 Connection 'ovs-bridge-bridge0' (d10fc64d-1d48-4394-a1b8-e1aea72f27d5) successfully added. -$ nmcli conn add type ovs-port conn.interface port0 master bridge0 +$ nmcli conn add type ovs-port conn.interface port0 controller bridge0 Connection 'ovs-port-port0' (5ae22bae-bba4-4815-9ade-7e635633e1f0) successfully added. -$ nmcli conn add type ovs-interface slave-type ovs-port conn.interface iface0 \ - master port0 ipv4.method manual ipv4.address 192.0.2.1/24 +$ nmcli conn add type ovs-interface port-type ovs-port conn.interface iface0 \ + controller port0 ipv4.method manual ipv4.address 192.0.2.1/24 Connection 'ovs-interface-iface0' (3640d2a1-a2fd-4718-92f1-cffadb5b6cdc) successfully added. As said above, you need to create a Port even for a single interface. @@ -136,29 +136,29 @@ Connection 'ovs-interface-iface0' (3640d2a1-a2fd-4718-92f1-cffadb5b6cdc) success Adding a Linux interface to a Bridge -$ nmcli conn add type ovs-port conn.interface port1 master bridge0 +$ nmcli conn add type ovs-port conn.interface port1 controller bridge0 Connection 'ovs-port-port1' (67d041eb-8e7b-4458-afee-a1d07c9c4552) successfully added. -$ nmcli conn add type ethernet conn.interface eth0 master port1 +$ nmcli conn add type ethernet conn.interface eth0 controller port1 Connection 'ovs-slave-eth0' (d459c45c-cf78-4c1c-b4b7-505e71379624) successfully added. Again, you need a port. Creating a VLAN -$ nmcli conn add type ovs-port conn.interface port2 master bridge0 ovs-port.tag 120 +$ nmcli conn add type ovs-port conn.interface port2 controller bridge0 ovs-port.tag 120 Connection 'ovs-port-port2' (3994c093-4ef7-4549-a4fd-627b831c3cb8) successfully added. -$ nmcli conn add type ethernet conn.interface eth1 master port2 +$ nmcli conn add type ethernet conn.interface eth1 controller port2 Connection 'ovs-slave-eth1' (099be06e-71ad-484d-8d5a-fcadc5f207f5) successfully added. It's just a port with a tag. Creating a Bond -$ nmcli conn add type ovs-port conn.interface bond0 master bridge0 +$ nmcli conn add type ovs-port conn.interface bond0 controller bridge0 Connection 'ovs-port-bond0' (d154ebf9-e999-4e1b-a084-a3de53d25d8a) successfully added. -$ nmcli conn add type ethernet conn.interface eth2 master bond0 +$ nmcli conn add type ethernet conn.interface eth2 controller bond0 Connection 'ovs-slave-eth2' (475ac1bf-30b2-4534-a877-27f33f58b082) successfully added. -$ nmcli conn add type ethernet conn.interface eth3 master bond0 +$ nmcli conn add type ethernet conn.interface eth3 controller bond0 Connection 'ovs-slave-eth3' (8dedeecb-ed12-482b-b77a-24a4fb835136) successfully added. It's just a Port with multiple interfaces. See nm-settings-nmcli manual for diff --git a/man/nm-settings-ifcfg-rh.xsl b/man/nm-settings-ifcfg-rh.xsl index 8ad3b10825..790cd79cd2 100644 --- a/man/nm-settings-ifcfg-rh.xsl +++ b/man/nm-settings-ifcfg-rh.xsl @@ -153,8 +153,8 @@ BOOTPROTO=dhcp Bonding configuration: -ifcfg-BOND: ifcfg-BOND-slave: -NAME=BOND NAME=BOND-slave +ifcfg-BOND: ifcfg-BOND-port: +NAME=BOND NAME=BOND-port UUID=b41888aa-924c-450c-b0f8-85a4f0a51b4a UUID=9bb048e4-286a-4cc3-b104-007dbd20decb DEVICE=bond100 DEVICE=eth0 BONDING_OPTS="mode=balance-rr miimon=100" ONBOOT=yes @@ -177,16 +177,16 @@ NAME=team0-profile UUID=1d3460a0-7b37-457f-a300-fe8d92da4807 ONBOOT=yes -ifcfg-my_team0_slave1: -NAME=team0-slave1 +ifcfg-my_team0_port1: +NAME=team0-port1 UUID=d5aed298-c567-4cc1-b808-6d38ecef9e64 DEVICE=eth1 ONBOOT=yes TEAM_MASTER=team0 DEVICETYPE=TeamPort -ifcfg-my_team0_slave2: -NAME=team0-slave2 +ifcfg-my_team0_port2: +NAME=team0-port2 UUID=94e75f4e-e5ad-401c-8962-31e0ae5d2215 DEVICE=eth2 ONBOOT=yes diff --git a/man/nm-settings-keyfile.xsl b/man/nm-settings-keyfile.xsl index d216ee15dd..90cb6268c7 100644 --- a/man/nm-settings-keyfile.xsl +++ b/man/nm-settings-keyfile.xsl @@ -173,8 +173,8 @@ id=MainBridge id=br-port-1 uuid=171ae855-a0ab-42b6-bd0c-60f5812eea9d uuid=d6e8ae98-71f8-4b3d-9d2d-2e26048fe794 interface-name=MainBridge interface-name=em1 type=bridge type=ethernet - master=MainBridge -[bridge] slave-type=bridge + controller=MainBridge +[bridge] port-type=bridge interface-name=MainBridge diff --git a/man/nmcli-examples.xml b/man/nmcli-examples.xml index 5249d6ba04..71ea5dc805 100644 --- a/man/nmcli-examples.xml +++ b/man/nmcli-examples.xml @@ -187,56 +187,56 @@ B,DISPATCH - Adding a bonding master and two slave connection profiles + Adding a bonding controller and two port connection profiles $ nmcli con add type bond ifname mybond0 mode active-backup -$ nmcli con add type ethernet ifname eth1 master mybond0 -$ nmcli con add type ethernet ifname eth2 master mybond0 +$ nmcli con add type ethernet ifname eth1 controller mybond0 +$ nmcli con add type ethernet ifname eth2 controller mybond0 - This example demonstrates adding a bond master connection and two slaves. The - first command adds a master bond connection, naming the bonding interface + This example demonstrates adding a bond controller connection and two ports. The + first command adds a controller bond connection, naming the bonding interface mybond0 and using active-backup mode. - The next two commands add slaves connections, both enslaved to mybond0. - The first slave will be bound to eth1 interface, the second to + The next two commands add port connections, both attached as port to mybond0. + The first port will be bound to eth1 interface, the second to eth2. - Adding a team master and two slave connection profiles -$ nmcli con add type team con-name Team1 ifname Team1 config team1-master-json.conf -$ nmcli con add type ethernet con-name Team1-slave1 ifname em1 master Team1 -$ nmcli con add type ethernet con-name Team1-slave2 ifname em2 master Team1 + Adding a team controller and two port connection profiles +$ nmcli con add type team con-name Team1 ifname Team1 config team1-controller-json.conf +$ nmcli con add type ethernet con-name Team1-port1 ifname em1 controller Team1 +$ nmcli con add type ethernet con-name Team1-port2 ifname em2 controller Team1 - This example demonstrates adding a team master connection profile and two slaves. It is - very similar to the bonding example. The first command adds a master team profile, naming + This example demonstrates adding a team controller connection profile and two ports. It is + very similar to the bonding example. The first command adds a controller team profile, naming the team interface and the profile Team1. The team configuration - for the master is read from team1-master-json.conf file. Later, you can + for the controller is read from team1-controller-json.conf file. Later, you can change the configuration with modify command - (nmcli con modify Team1 team.config team1-master-another-json.conf). - The last two commands add slaves profiles, both enslaved to Team1. - The first slave will be bound to the em1 interface, the second to - em2. The slaves don't specify config and thus + (nmcli con modify Team1 team.config team1-controller-another-json.conf). + The last two commands add port profiles, both attached as port to Team1. + The first port will be bound to the em1 interface, the second to + em2. The ports don't specify config and thus teamd will use its default configuration. You will activate the whole setup - by activating both slaves: - $ nmcli con up Team1-slave1 - $ nmcli con up Team1-slave2 + by activating both ports: + $ nmcli con up Team1-port1 + $ nmcli con up Team1-port2 By default, the created profiles are marked for auto-activation. But if another connection has been activated on the device, the new profile won't activate automatically and you need to activate it manually. - Adding a bridge and two slave profiles + Adding a bridge and two port profiles $ nmcli con add type bridge con-name TowerBridge ifname TowerBridge -$ nmcli con add type ethernet con-name br-slave-1 ifname ens3 master TowerBridge -$ nmcli con add type ethernet con-name br-slave-2 ifname ens4 master TowerBridge +$ nmcli con add type ethernet con-name br-port-1 ifname ens3 controller TowerBridge +$ nmcli con add type ethernet con-name br-port-2 ifname ens4 controller TowerBridge $ nmcli con modify TowerBridge bridge.stp no - This example demonstrates adding a bridge master connection and two slaves. The - first command adds a master bridge connection, naming the bridge interface and + This example demonstrates adding a bridge controller connection and two ports. The + first command adds a controller bridge connection, naming the bridge interface and the profile as TowerBridge. - The next two commands add slaves profiles, both will be enslaved to + The next two commands add ports profiles, both will be attached as port to TowerBridge. - The first slave will be tied to ens3 interface, the second to + The first port will be tied to ens3 interface, the second to ens4. The last command will disable 802.1D STP for the TowerBridge profile. @@ -375,8 +375,8 @@ connection.timestamp: 0 connection.read-only: no connection.permissions: connection.zone: -- -connection.master: -- -connection.slave-type: -- +connection.controller: -- +connection.port-type: -- connection.secondaries: connection.gateway-ping-timeout: 0 --------------------------------------------------------------------------- @@ -465,8 +465,8 @@ connection.timestamp: 0 connection.read-only: no connection.permissions: connection.zone: -- -connection.master: -- -connection.slave-type: -- +connection.controller: -- +connection.port-type: -- connection.secondaries: connection.gateway-ping-timeout: 0 --------------------------------------------------------------------------- @@ -525,8 +525,8 @@ connection.timestamp: 0 connection.read-only: no connection.permissions: connection.zone: -- -connection.master: -- -connection.slave-type: -- +connection.controller: -- +connection.port-type: -- connection.secondaries: connection.gateway-ping-timeout: 0 --------------------------------------------------------------------------- diff --git a/man/nmcli.xml b/man/nmcli.xml index 6299404703..f3b6706ece 100644 --- a/man/nmcli.xml +++ b/man/nmcli.xml @@ -1031,7 +1031,7 @@ sort | awk ' /^(bond|bridge|team)-slave$/ { - printf " %s (deprecated for ethernet with master)\n", $0; + printf " %s (deprecated for ethernet with controller)\n", $0; next; } /^(wifi|ethernet|olpc-mash)$/ { @@ -1059,9 +1059,9 @@ adsl bluetooth bond - bond-slave (deprecated for ethernet with master) + bond-slave (deprecated for ethernet with controller) bridge - bridge-slave (deprecated for ethernet with master) + bridge-slave (deprecated for ethernet with controller) cdma dummy generic @@ -1078,7 +1078,7 @@ ovs-port pppoe team - team-slave (deprecated for ethernet with master) + team-slave (deprecated for ethernet with controller) tun veth vlan diff --git a/src/core/devices/nm-device-bond.c b/src/core/devices/nm-device-bond.c index 98670c8d72..06a02d1a7a 100644 --- a/src/core/devices/nm-device-bond.c +++ b/src/core/devices/nm-device-bond.c @@ -121,7 +121,7 @@ _set_bond_attr(NMDevice *device, const char *attr, const char *value) /* kernel does not allow setting ad_actor_system to "00:00:00:00:00:00". We would thus * log an EINVAL error. Avoid that... at least, if the value is already "00:00:00:00:00:00". */ cur_val = - nm_platform_sysctl_master_get_option(nm_device_get_platform(device), ifindex, attr); + nm_platform_sysctl_controller_get_option(nm_device_get_platform(device), ifindex, attr); if (nm_streq0(cur_val, NM_BOND_AD_ACTOR_SYSTEM_DEFAULT)) return TRUE; @@ -129,8 +129,10 @@ _set_bond_attr(NMDevice *device, const char *attr, const char *value) * That will fail, and we will log a warning. There is nothing else to do. */ } - ret = - nm_platform_sysctl_master_set_option(nm_device_get_platform(device), ifindex, attr, value); + ret = nm_platform_sysctl_controller_set_option(nm_device_get_platform(device), + ifindex, + attr, + value); if (!ret) _LOGW(LOGD_PLATFORM, "failed to set bonding attribute '%s' to '%s'", attr, value); return ret; @@ -187,8 +189,9 @@ update_connection(NMDevice *device, NMConnection *connection) NM_SETTING_BOND_OPTION_BALANCE_SLB)) continue; - value = - nm_platform_sysctl_master_get_option(nm_device_get_platform(device), ifindex, option); + value = nm_platform_sysctl_controller_get_option(nm_device_get_platform(device), + ifindex, + option); if (value && _nm_setting_bond_get_option_type(s_bond, option) == NM_BOND_OPTION_TYPE_BOTH) { p = strchr(value, ' '); @@ -349,9 +352,10 @@ set_bond_arp_ip_targets(NMDevice *device, NMSettingBond *s_bond) gs_free char *cur_arp_ip_target = NULL; /* ARP targets: clear and initialize the list */ - cur_arp_ip_target = nm_platform_sysctl_master_get_option(nm_device_get_platform(device), - ifindex, - NM_SETTING_BOND_OPTION_ARP_IP_TARGET); + cur_arp_ip_target = + nm_platform_sysctl_controller_get_option(nm_device_get_platform(device), + ifindex, + NM_SETTING_BOND_OPTION_ARP_IP_TARGET); set_arp_targets( device, cur_arp_ip_target, @@ -659,7 +663,7 @@ commit_port_options(NMDevice *bond_device, NMDevice *port, NMSettingBondPort *s_ * one of those modes, don't try to set the priority explicitly to zero. */ prio_has = FALSE; } else if (nm_platform_kernel_support_get_full( - NM_PLATFORM_KERNEL_SUPPORT_TYPE_IFLA_BOND_SLAVE_PRIO, + NM_PLATFORM_KERNEL_SUPPORT_TYPE_IFLA_BOND_PORT_PRIO, FALSE) == NM_OPTION_BOOL_TRUE) { /* We can only detect support if we have it. We cannot detect lack of support if @@ -699,15 +703,15 @@ attach_port(NMDevice *device, NMDeviceBond *self = NM_DEVICE_BOND(device); NMSettingBondPort *s_port; - nm_device_master_check_slave_physical_port(device, port, LOGD_BOND); + nm_device_controller_check_port_physical_port(device, port, LOGD_BOND); if (configure) { gboolean success; nm_device_take_down(port, TRUE); - success = nm_platform_link_enslave(nm_device_get_platform(device), - nm_device_get_ip_ifindex(device), - nm_device_get_ip_ifindex(port)); + success = nm_platform_link_attach_port(nm_device_get_platform(device), + nm_device_get_ip_ifindex(device), + nm_device_get_ip_ifindex(port)); nm_device_bring_up(port); if (!success) { @@ -737,7 +741,7 @@ detach_port(NMDevice *device, NMDeviceBond *self = NM_DEVICE_BOND(device); gboolean success; gs_free char *address = NULL; - int ifindex_slave; + int ifindex_port; int ifindex; if (configure) { @@ -746,9 +750,9 @@ detach_port(NMDevice *device, configure = FALSE; } - ifindex_slave = nm_device_get_ip_ifindex(port); + ifindex_port = nm_device_get_ip_ifindex(port); - if (ifindex_slave <= 0) + if (ifindex_port <= 0) _LOGD(LOGD_BOND, "bond port %s is already detached", nm_device_get_ip_iface(port)); if (configure) { @@ -758,10 +762,10 @@ detach_port(NMDevice *device, address = g_strdup(nm_device_get_hw_address(device)); - if (ifindex_slave > 0) { - success = nm_platform_link_release(nm_device_get_platform(device), - nm_device_get_ip_ifindex(device), - ifindex_slave); + if (ifindex_port > 0) { + success = nm_platform_link_release_port(nm_device_get_platform(device), + nm_device_get_ip_ifindex(device), + ifindex_port); if (success) { _LOGI(LOGD_BOND, "detached bond port %s", nm_device_get_ip_iface(port)); @@ -773,7 +777,7 @@ detach_port(NMDevice *device, if ((applied = nm_device_get_applied_connection(device)) && ((s_wired = nm_connection_get_setting_wired(applied))) && ((cloned_mac = nm_setting_wired_get_cloned_mac_address(s_wired)))) { - /* When the last slave is released the bond MAC will be set to a random + /* When the last port is released the bond MAC will be set to a random * value by kernel; if we have set a cloned-mac-address, we need to * restore it to the previous value. */ nm_platform_process_events(nm_device_get_platform(device)); @@ -781,16 +785,16 @@ detach_port(NMDevice *device, nm_device_hw_addr_set(device, address, "restore", FALSE); } - /* Kernel bonding code "closes" the slave when releasing it, (which clears + /* Kernel bonding code "closes" the port when releasing it, (which clears * IFF_UP), so we must bring it back up here to ensure carrier changes and - * other state is noticed by the now-released slave. + * other state is noticed by the now-released port. */ - if (ifindex_slave > 0) { + if (ifindex_port > 0) { if (!nm_device_bring_up(port)) _LOGW(LOGD_BOND, "detached bond port could not be brought up."); } } else { - if (ifindex_slave > 0) { + if (ifindex_port > 0) { _LOGI(LOGD_BOND, "bond port %s was detached", nm_device_get_ip_iface(port)); } } @@ -962,8 +966,8 @@ nm_device_bond_class_init(NMDeviceBondClass *klass) device_class->get_generic_capabilities = get_generic_capabilities; device_class->complete_connection = complete_connection; - device_class->update_connection = update_connection; - device_class->master_update_slave_connection = controller_update_port_connection; + device_class->update_connection = update_connection; + device_class->controller_update_port_connection = controller_update_port_connection; device_class->create_and_realize = create_and_realize; device_class->act_stage1_prepare = act_stage1_prepare; diff --git a/src/core/devices/nm-device-bridge.c b/src/core/devices/nm-device-bridge.c index 82314f1364..b256056d43 100644 --- a/src/core/devices/nm-device-bridge.c +++ b/src/core/devices/nm-device-bridge.c @@ -311,7 +311,7 @@ typedef struct { #define OPTION_TYPE_TOFROM(to, fro) .to_sysfs = (to), .from_sysfs = (fro) -static const Option master_options[] = { +static const Option controller_options[] = { OPTION(NM_SETTING_BRIDGE_STP, /* this must stay as the first item */ "stp_state", OPTION_TYPE_BOOL(NM_BRIDGE_STP_DEF), ), @@ -487,12 +487,12 @@ update_connection(NMDevice *device, NMConnection *connection) gs_free char *stp = NULL; int stp_value; - option = master_options; + option = controller_options; nm_assert(nm_streq(option->sysname, "stp_state")); - stp = nm_platform_sysctl_master_get_option(nm_device_get_platform(device), - ifindex, - option->sysname); + stp = nm_platform_sysctl_controller_get_option(nm_device_get_platform(device), + ifindex, + option->sysname); stp_value = _nm_utils_ascii_str_to_int64(stp, 10, option->nm_min, option->nm_max, option->nm_default); g_object_set(s_bridge, option->name, stp_value, NULL); @@ -503,9 +503,9 @@ update_connection(NMDevice *device, NMConnection *connection) gs_free char *str = NULL; GParamSpec *pspec; - str = nm_platform_sysctl_master_get_option(nm_device_get_platform(device), - ifindex, - option->sysname); + str = nm_platform_sysctl_controller_get_option(nm_device_get_platform(device), + ifindex, + option->sysname); pspec = g_object_class_find_property(G_OBJECT_GET_CLASS(s_bridge), option->name); if (!stp_value && option->only_with_stp) @@ -575,22 +575,22 @@ out: } static gboolean -master_update_slave_connection(NMDevice *device, - NMDevice *slave, - NMConnection *connection, - GError **error) +controller_update_port_connection(NMDevice *device, + NMDevice *port, + NMConnection *connection, + GError **error) { NMSettingConnection *s_con; NMSettingBridgePort *s_port; - int ifindex_slave = nm_device_get_ifindex(slave); + int ifindex_port = nm_device_get_ifindex(port); NMConnection *applied_connection = nm_device_get_applied_connection(device); const NMPlatformLink *pllink; - g_return_val_if_fail(ifindex_slave > 0, FALSE); + g_return_val_if_fail(ifindex_port > 0, FALSE); s_con = nm_connection_get_setting_connection(connection); s_port = _nm_connection_ensure_setting(connection, NM_TYPE_SETTING_BRIDGE_PORT); - pllink = nm_platform_link_get(nm_device_get_platform(slave), ifindex_slave); + pllink = nm_platform_link_get(nm_device_get_platform(port), ifindex_port); if (pllink && pllink->port_kind == NM_PORT_KIND_BRIDGE) { g_object_set(s_port, @@ -917,19 +917,19 @@ attach_port(NMDevice *device, gpointer user_data) { NMDeviceBridge *self = NM_DEVICE_BRIDGE(device); - NMConnection *master_connection; + NMConnection *controller_connection; NMSettingBridge *s_bridge; NMSettingBridgePort *s_port; if (configure) { - if (!nm_platform_link_enslave(nm_device_get_platform(device), - nm_device_get_ip_ifindex(device), - nm_device_get_ip_ifindex(port))) + if (!nm_platform_link_attach_port(nm_device_get_platform(device), + nm_device_get_ip_ifindex(device), + nm_device_get_ip_ifindex(port))) return FALSE; - master_connection = nm_device_get_applied_connection(device); - nm_assert(master_connection); - s_bridge = nm_connection_get_setting_bridge(master_connection); + controller_connection = nm_device_get_applied_connection(device); + nm_assert(controller_connection); + s_bridge = nm_connection_get_setting_bridge(controller_connection); nm_assert(s_bridge); s_port = nm_connection_get_setting_bridge_port(connection); @@ -945,7 +945,7 @@ attach_port(NMDevice *device, plat_vlans = setting_vlans_to_platform(vlans); - /* Since the link was just enslaved, there are no existing VLANs + /* Since the link was just enportd, there are no existing VLANs * (except for the default one) and so there's no need to flush. */ if (plat_vlans @@ -976,7 +976,7 @@ detach_port(NMDevice *device, { NMDeviceBridge *self = NM_DEVICE_BRIDGE(device); gboolean success; - int ifindex_slave; + int ifindex_port; int ifindex; if (configure) { @@ -985,17 +985,17 @@ detach_port(NMDevice *device, configure = FALSE; } - ifindex_slave = nm_device_get_ip_ifindex(port); + ifindex_port = nm_device_get_ip_ifindex(port); - if (ifindex_slave <= 0) { + if (ifindex_port <= 0) { _LOGD(LOGD_TEAM, "bridge port %s is already detached", nm_device_get_ip_iface(port)); return TRUE; } if (configure) { - success = nm_platform_link_release(nm_device_get_platform(device), - nm_device_get_ip_ifindex(device), - ifindex_slave); + success = nm_platform_link_release_port(nm_device_get_platform(device), + nm_device_get_ip_ifindex(device), + ifindex_port); if (success) { _LOGI(LOGD_BRIDGE, "detached bridge port %s", nm_device_get_ip_iface(port)); @@ -1061,7 +1061,7 @@ create_and_realize(NMDevice *device, mtu = nm_setting_wired_get_mtu(s_wired); /* If mtu != 0, we set the MTU of the new bridge at creation time. However, kernel will still - * automatically adjust the MTU of the bridge based on the minimum of the slave's MTU. + * automatically adjust the MTU of the bridge based on the minimum of the port's MTU. * We don't want this automatism as the user asked for a fixed MTU. * * To workaround this behavior of kernel, we will later toggle the MTU twice. See @@ -1199,8 +1199,8 @@ nm_device_bridge_class_init(NMDeviceBridgeClass *klass) device_class->check_connection_available = check_connection_available; device_class->complete_connection = complete_connection; - device_class->update_connection = update_connection; - device_class->master_update_slave_connection = master_update_slave_connection; + device_class->update_connection = update_connection; + device_class->controller_update_port_connection = controller_update_port_connection; device_class->create_and_realize = create_and_realize; device_class->act_stage1_prepare_set_hwaddr_ethernet = TRUE; diff --git a/src/core/devices/nm-device-private.h b/src/core/devices/nm-device-private.h index 013bc7fd86..3bf5925cfe 100644 --- a/src/core/devices/nm-device-private.h +++ b/src/core/devices/nm-device-private.h @@ -58,10 +58,11 @@ void nm_device_activate_schedule_stage3_ip_config(NMDevice *device, gboolean do_ void nm_device_recheck_available_connections(NMDevice *device); -void -nm_device_master_check_slave_physical_port(NMDevice *self, NMDevice *slave, NMLogDomain log_domain); +void nm_device_controller_check_port_physical_port(NMDevice *self, + NMDevice *port, + NMLogDomain log_domain); -void nm_device_master_release_slaves_all(NMDevice *self); +void nm_device_controller_release_ports_all(NMDevice *self); void nm_device_set_carrier(NMDevice *self, gboolean carrier); diff --git a/src/core/devices/nm-device-vrf.c b/src/core/devices/nm-device-vrf.c index 6c7adc6c59..c3d3134700 100644 --- a/src/core/devices/nm-device-vrf.c +++ b/src/core/devices/nm-device-vrf.c @@ -222,13 +222,13 @@ attach_port(NMDevice *device, gboolean success = TRUE; const char *port_iface = nm_device_get_ip_iface(port); - nm_device_master_check_slave_physical_port(device, port, LOGD_DEVICE); + nm_device_controller_check_port_physical_port(device, port, LOGD_DEVICE); if (configure) { nm_device_take_down(port, TRUE); - success = nm_platform_link_enslave(nm_device_get_platform(device), - nm_device_get_ip_ifindex(device), - nm_device_get_ip_ifindex(port)); + success = nm_platform_link_attach_port(nm_device_get_platform(device), + nm_device_get_ip_ifindex(device), + nm_device_get_ip_ifindex(port)); nm_device_bring_up(port); if (!success) @@ -267,9 +267,9 @@ detach_port(NMDevice *device, if (configure) { if (ifindex_port > 0) { - success = nm_platform_link_release(nm_device_get_platform(device), - nm_device_get_ip_ifindex(device), - ifindex_port); + success = nm_platform_link_release_port(nm_device_get_platform(device), + nm_device_get_ip_ifindex(device), + ifindex_port); if (success) { _LOGI(LOGD_DEVICE, "detached VRF port %s", nm_device_get_ip_iface(port)); diff --git a/src/core/devices/nm-device.c b/src/core/devices/nm-device.c index f23bc05d47..2382f6588f 100644 --- a/src/core/devices/nm-device.c +++ b/src/core/devices/nm-device.c @@ -107,10 +107,10 @@ typedef void (*ActivationHandleFunc)(NMDevice *self); typedef enum { - RELEASE_SLAVE_TYPE_NO_CONFIG, - RELEASE_SLAVE_TYPE_CONFIG, - RELEASE_SLAVE_TYPE_CONFIG_FORCE, -} ReleaseSlaveType; + RELEASE_PORT_TYPE_NO_CONFIG, + RELEASE_PORT_TYPE_CONFIG, + RELEASE_PORT_TYPE_CONFIG_FORCE, +} ReleasePortType; typedef enum { CLEANUP_TYPE_KEEP, @@ -127,13 +127,13 @@ typedef enum _nm_packed { } AddrMethodState; typedef struct { - CList lst_slave; - NMDevice *slave; + CList lst_port; + NMDevice *port; GCancellable *cancellable; gulong watch_id; - bool slave_is_enslaved; + bool port_is_attached; bool configure; -} SlaveInfo; +} PortInfo; typedef struct { NMDevice *device; @@ -592,7 +592,7 @@ typedef struct _NMDevicePrivate { NMDeviceAutoconnectBlockedFlags autoconnect_blocked_flags : 5; - bool is_enslaved : 1; + bool is_attached : 1; bool device_link_changed_down : 1; @@ -710,13 +710,13 @@ typedef struct _NMDevicePrivate { NMPlatformLinkChangeFlags flags; } link_props_state; - /* controller interface for bridge/bond/team slave */ + /* controller interface for bridge/bond/team port */ NMDevice *controller; gulong controller_ready_id; int controller_ifindex; - /* slave management */ - CList slaves; /* list of SlaveInfo */ + /* port management */ + CList ports; /* list of PortInfo */ NMMetered metered; @@ -789,11 +789,11 @@ static void _dev_l3_cfg_commit(NMDevice *self, gboolean do_sync); static void _dev_l3_cfg_commit_type_reset(NMDevice *self); -static gboolean nm_device_master_add_slave(NMDevice *self, NMDevice *slave, gboolean configure); -static void nm_device_slave_notify_enslave(NMDevice *self, gboolean success); -static void nm_device_slave_notify_release(NMDevice *self, - NMDeviceStateReason reason, - ReleaseSlaveType release_type); +static gboolean nm_device_controller_add_port(NMDevice *self, NMDevice *port, gboolean configure); +static void nm_device_port_notify_attach_as_port(NMDevice *self, gboolean success); +static void nm_device_port_notify_release(NMDevice *self, + NMDeviceStateReason reason, + ReleasePortType release_type); static void _dev_ipll6_start(NMDevice *self); @@ -3834,9 +3834,9 @@ _dev_ip_state_check(NMDevice *self, int addr_family) if (priv->ip_data_x[IS_IPv4].state == NM_DEVICE_IP_STATE_PENDING && nm_active_connection_get_controller(NM_ACTIVE_CONNECTION(priv->act_request.obj)) - && !priv->is_enslaved) { + && !priv->is_attached) { /* Don't progress into IP_CHECK or SECONDARIES if we're waiting for the - * master to enslave us. */ + * controller to attach as port us. */ ip_state = NM_DEVICE_IP_STATE_PENDING; goto got_ip_state; } @@ -5683,9 +5683,9 @@ nm_device_get_route_metric(NMDevice *self, int addr_family) if (connection) { s_ip = nm_connection_get_setting_ip_config(connection, addr_family); - /* Slave interfaces don't have IP settings, but we may get here when + /* Port interfaces don't have IP settings, but we may get here when * external changes are made or when noticing IP changes when starting - * the slave connection. + * the port connection. */ if (s_ip) { route_metric = nm_setting_ip_config_get_route_metric(s_ip); @@ -6671,43 +6671,43 @@ nm_device_get_connectivity_state(NMDevice *self, int addr_family) /*****************************************************************************/ -static SlaveInfo * -find_slave_info(NMDevice *self, NMDevice *slave) +static PortInfo * +find_port_info(NMDevice *self, NMDevice *port) { NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE(self); - SlaveInfo *info; + PortInfo *info; - c_list_for_each_entry (info, &priv->slaves, lst_slave) { - if (info->slave == slave) + c_list_for_each_entry (info, &priv->ports, lst_port) { + if (info->port == port) return info; } return NULL; } static void -attach_port_done(NMDevice *self, NMDevice *slave, gboolean success) +attach_port_done(NMDevice *self, NMDevice *port, gboolean success) { - SlaveInfo *info; + PortInfo *info; - info = find_slave_info(self, slave); + info = find_port_info(self, port); if (!info) return; - info->slave_is_enslaved = success; + info->port_is_attached = success; - nm_device_slave_notify_enslave(info->slave, success); + nm_device_port_notify_attach_as_port(info->port, success); /* Ensure the device's hardware address is up-to-date; it often changes - * when slaves change. + * when ports change. */ nm_device_update_hw_address(self); - /* Since slave devices don't have their own IP configuration, + /* Since port devices don't have their own IP configuration, * set the MTU here. */ - _commit_mtu(slave); + _commit_mtu(port); - /* Restart IP configuration if we're waiting for slaves. Do this + /* Restart IP configuration if we're waiting for ports. Do this * after updating the hardware address as IP config may need the * new address. */ @@ -6718,181 +6718,181 @@ attach_port_done(NMDevice *self, NMDevice *slave, gboolean success) static void attach_port_cb(NMDevice *self, GError *error, gpointer user_data) { - NMDevice *slave = user_data; - SlaveInfo *info; + NMDevice *port = user_data; + PortInfo *info; if (nm_utils_error_is_cancelled(error)) return; - info = find_slave_info(self, slave); + info = find_port_info(self, port); if (!info) return; nm_clear_g_cancellable(&info->cancellable); - attach_port_done(self, slave, !error); + attach_port_done(self, port, !error); } /** - * nm_device_master_enslave_slave: - * @self: the master device - * @slave: the slave device to enslave - * @connection: (nullable): the slave device's connection + * nm_device_controller_attach_port: + * @self: the controller device + * @port: the port device to attach as port + * @connection: (nullable): the port device's connection * * If @self is capable of enslaving other devices (ie it's a bridge, bond, team, - * etc) then this function enslaves @slave. + * etc) then this function attach @port. */ static void -nm_device_master_enslave_slave(NMDevice *self, NMDevice *slave, NMConnection *connection) +nm_device_controller_attach_port(NMDevice *self, NMDevice *port, NMConnection *connection) { - SlaveInfo *info; - NMTernary success; - gboolean configure; + PortInfo *info; + NMTernary success; + gboolean configure; g_return_if_fail(self); - g_return_if_fail(slave); + g_return_if_fail(port); g_return_if_fail(NM_DEVICE_GET_CLASS(self)->attach_port); - info = find_slave_info(self, slave); + info = find_port_info(self, port); if (!info) return; - if (info->slave_is_enslaved) + if (info->port_is_attached) success = TRUE; else { configure = (info->configure && connection != NULL); if (configure) - g_return_if_fail(nm_device_get_state(slave) >= NM_DEVICE_STATE_DISCONNECTED); + g_return_if_fail(nm_device_get_state(port) >= NM_DEVICE_STATE_DISCONNECTED); nm_clear_g_cancellable(&info->cancellable); info->cancellable = g_cancellable_new(); success = NM_DEVICE_GET_CLASS(self)->attach_port(self, - slave, + port, connection, configure, info->cancellable, attach_port_cb, - slave); + port); if (success == NM_TERNARY_DEFAULT) return; } - attach_port_done(self, slave, success); + attach_port_done(self, port, success); } static void detach_port_cb(NMDevice *self, GError *error, gpointer user_data) { - nm_auto_unref_object NMDevice *slave = user_data; - NMDevicePrivate *port_priv = NM_DEVICE_GET_PRIVATE(slave); + nm_auto_unref_object NMDevice *port = user_data; + NMDevicePrivate *port_priv = NM_DEVICE_GET_PRIVATE(port); nm_assert(port_priv->port_detach_count > 0); if (--port_priv->port_detach_count == 0) { if (port_priv->state == NM_DEVICE_STATE_DEACTIVATING) { - deactivate_ready(slave, port_priv->port_detach_reason); + deactivate_ready(port, port_priv->port_detach_reason); } } } /** - * nm_device_master_release_slave: - * @self: the master device - * @slave: the slave device to release - * @configure: whether @self needs to actually release @slave - * @release_type: whether @self needs to actually release slave + * nm_device_controller_release_port: + * @self: the controller device + * @port: the port device to release + * @configure: whether @self needs to actually release @port + * @release_type: whether @self needs to actually release port * and whether that is forced. - * @reason: the state change reason for the @slave + * @reason: the state change reason for the @port * * If @self is capable of enslaving other devices (ie it's a bridge, bond, team, - * etc) then this function releases the previously enslaved @slave and/or - * updates the state of @self and @slave to reflect its release. + * etc) then this function releases the previously attached @port and/or + * updates the state of @self and @port to reflect its release. */ static void -nm_device_master_release_slave(NMDevice *self, - NMDevice *slave, - ReleaseSlaveType release_type, - NMDeviceStateReason reason) +nm_device_controller_release_port(NMDevice *self, + NMDevice *port, + ReleasePortType release_type, + NMDeviceStateReason reason) { NMDevicePrivate *priv; NMDevicePrivate *port_priv; - SlaveInfo *info; - gs_unref_object NMDevice *self_free = NULL; - gs_unref_object NMDevice *slave_free = NULL; + PortInfo *info; + gs_unref_object NMDevice *self_free = NULL; + gs_unref_object NMDevice *port_free = NULL; g_return_if_fail(NM_DEVICE(self)); - g_return_if_fail(NM_DEVICE(slave)); + g_return_if_fail(NM_DEVICE(port)); nm_assert(NM_IN_SET(release_type, - RELEASE_SLAVE_TYPE_NO_CONFIG, - RELEASE_SLAVE_TYPE_CONFIG, - RELEASE_SLAVE_TYPE_CONFIG_FORCE)); + RELEASE_PORT_TYPE_NO_CONFIG, + RELEASE_PORT_TYPE_CONFIG, + RELEASE_PORT_TYPE_CONFIG_FORCE)); g_return_if_fail(NM_DEVICE_GET_CLASS(self)->detach_port != NULL); - info = find_slave_info(self, slave); + info = find_port_info(self, port); _LOGT(LOGD_CORE, - "master: release one slave " NM_HASH_OBFUSCATE_PTR_FMT "/%s %s%s", - NM_HASH_OBFUSCATE_PTR(slave), - nm_device_get_iface(slave), - !info ? "(not registered)" : (info->slave_is_enslaved ? "(enslaved)" : "(not enslaved)"), - release_type == RELEASE_SLAVE_TYPE_CONFIG_FORCE + "controller: release one port " NM_HASH_OBFUSCATE_PTR_FMT "/%s %s%s", + NM_HASH_OBFUSCATE_PTR(port), + nm_device_get_iface(port), + !info ? "(not registered)" : (info->port_is_attached ? "(attached)" : "(not attached)"), + release_type == RELEASE_PORT_TYPE_CONFIG_FORCE ? " (force-configure)" - : (release_type == RELEASE_SLAVE_TYPE_CONFIG ? " (configure)" : "(no-config)")); + : (release_type == RELEASE_PORT_TYPE_CONFIG ? " (configure)" : "(no-config)")); if (!info) g_return_if_reached(); priv = NM_DEVICE_GET_PRIVATE(self); - port_priv = NM_DEVICE_GET_PRIVATE(slave); + port_priv = NM_DEVICE_GET_PRIVATE(port); g_return_if_fail(self == port_priv->controller); - nm_assert(slave == info->slave); + nm_assert(port == info->port); nm_clear_g_cancellable(&info->cancellable); /* first, let subclasses handle the release ... */ - if (info->slave_is_enslaved || nm_device_sys_iface_state_is_external(slave) - || release_type >= RELEASE_SLAVE_TYPE_CONFIG_FORCE) { + if (info->port_is_attached || nm_device_sys_iface_state_is_external(port) + || release_type >= RELEASE_PORT_TYPE_CONFIG_FORCE) { NMTernary ret; ret = NM_DEVICE_GET_CLASS(self)->detach_port(self, - slave, - release_type >= RELEASE_SLAVE_TYPE_CONFIG, + port, + release_type >= RELEASE_PORT_TYPE_CONFIG, NULL, detach_port_cb, - g_object_ref(slave)); + g_object_ref(port)); if (ret == NM_TERNARY_DEFAULT) { port_priv->port_detach_count++; port_priv->port_detach_reason = reason; } } - /* raise notifications about the release, including clearing is_enslaved. */ - nm_device_slave_notify_release(slave, reason, release_type); + /* raise notifications about the release, including clearing is_attached. */ + nm_device_port_notify_release(port, reason, release_type); /* keep both alive until the end of the function. * Transfers ownership from port_priv->controller. */ nm_assert(self == port_priv->controller); self_free = g_steal_pointer(&port_priv->controller); - nm_assert(slave == info->slave); - slave_free = g_steal_pointer(&info->slave); + nm_assert(port == info->port); + port_free = g_steal_pointer(&info->port); - c_list_unlink(&info->lst_slave); - g_signal_handler_disconnect(slave, info->watch_id); + c_list_unlink(&info->lst_port); + g_signal_handler_disconnect(port, info->watch_id); nm_g_slice_free(info); - if (c_list_is_empty(&priv->slaves)) { + if (c_list_is_empty(&priv->ports)) { _active_connection_set_state_flags_full(self, 0, - NM_ACTIVATION_STATE_FLAG_MASTER_HAS_SLAVES); + NM_ACTIVATION_STATE_FLAG_CONTROLLER_HAS_PORTS); } /* Ensure the device's hardware address is up-to-date; it often changes - * when slaves change. + * when ports change. */ nm_device_update_hw_address(self); - nm_device_set_unmanaged_by_flags(slave, - NM_UNMANAGED_IS_SLAVE, + nm_device_set_unmanaged_by_flags(port, + NM_UNMANAGED_IS_PORT, NM_UNMAN_FLAG_OP_FORGET, NM_DEVICE_STATE_REASON_REMOVED); } @@ -6922,7 +6922,7 @@ _dev_unmanaged_is_external_down(NMDevice *self, gboolean consider_can) /* Manage externally-created software interfaces only when they are IFF_UP */ if (priv->ifindex <= 0 || !priv->up - || !(!c_list_is_empty(&priv->slaves) + || !(!c_list_is_empty(&priv->ports) || nm_platform_link_can_assume(nm_device_get_platform(self), priv->ifindex))) return NM_UNMAN_FLAG_OP_SET_UNMANAGED; @@ -7017,8 +7017,8 @@ carrier_changed(NMDevice *self, gboolean carrier) return; } /* fall-through and change state of device */ - } else if (priv->is_enslaved && !carrier) { - /* Slaves don't deactivate when they lose carrier; for + } else if (priv->is_attached && !carrier) { + /* Ports don't deactivate when they lose carrier; for * bonds/teams in particular that would be actively * counterproductive. */ @@ -7162,65 +7162,65 @@ nm_device_set_carrier_from_platform(NMDevice *self) /*****************************************************************************/ static void -device_recheck_slave_status(NMDevice *self, const NMPlatformLink *plink) +device_recheck_port_status(NMDevice *self, const NMPlatformLink *plink) { NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE(self); - NMDevice *master; - nm_auto_nmpobj const NMPObject *plink_master_keep_alive = NULL; - const NMPlatformLink *plink_master; + NMDevice *controller; + nm_auto_nmpobj const NMPObject *plink_controller_keep_alive = NULL; + const NMPlatformLink *plink_controller; g_return_if_fail(plink); - if (plink->master > 0) { - master = nm_manager_get_device_by_ifindex(NM_MANAGER_GET, plink->master); - plink_master = nm_platform_link_get(nm_device_get_platform(self), plink->master); - plink_master_keep_alive = nmp_object_ref(NMP_OBJECT_UP_CAST(plink_master)); + if (plink->controller > 0) { + controller = nm_manager_get_device_by_ifindex(NM_MANAGER_GET, plink->controller); + plink_controller = nm_platform_link_get(nm_device_get_platform(self), plink->controller); + plink_controller_keep_alive = nmp_object_ref(NMP_OBJECT_UP_CAST(plink_controller)); } else { if (priv->controller_ifindex == 0) goto out; - master = NULL; - plink_master = NULL; + controller = NULL; + plink_controller = NULL; } - if (master == NULL && plink_master - && NM_IN_STRSET(plink_master->name, "ovs-system", "ovs-netdev") - && plink_master->type == NM_LINK_TYPE_OPENVSWITCH) { + if (controller == NULL && plink_controller + && NM_IN_STRSET(plink_controller->name, "ovs-system", "ovs-netdev") + && plink_controller->type == NM_LINK_TYPE_OPENVSWITCH) { _LOGD(LOGD_DEVICE, "the device claimed by openvswitch"); goto out; } - priv->controller_ifindex = plink->master; + priv->controller_ifindex = plink->controller; if (priv->controller) { - if (plink->master > 0 && plink->master == nm_device_get_ifindex(priv->controller)) { - /* call add-slave again. We expect @self already to be added to - * the master, but this also triggers a recheck-assume. */ - nm_device_master_add_slave(priv->controller, self, FALSE); + if (plink->controller > 0 && plink->controller == nm_device_get_ifindex(priv->controller)) { + /* call add-port again. We expect @self already to be added to + * the controller, but this also triggers a recheck-assume. */ + nm_device_controller_add_port(priv->controller, self, FALSE); goto out; } - nm_device_master_release_slave(priv->controller, - self, - RELEASE_SLAVE_TYPE_NO_CONFIG, - NM_DEVICE_STATE_REASON_CONNECTION_ASSUMED); + nm_device_controller_release_port(priv->controller, + self, + RELEASE_PORT_TYPE_NO_CONFIG, + NM_DEVICE_STATE_REASON_CONNECTION_ASSUMED); } - if (master) { - if (NM_DEVICE_GET_CLASS(master)->attach_port) { - nm_device_master_add_slave(master, self, FALSE); + if (controller) { + if (NM_DEVICE_GET_CLASS(controller)->attach_port) { + nm_device_controller_add_port(controller, self, FALSE); } else { _LOGD(LOGD_DEVICE, - "enslaved to non-master-type device %s; ignoring", - nm_device_get_iface(master)); + "attached to non-controller-type device %s; ignoring", + nm_device_get_iface(controller)); } goto out; } - if (plink->master) { + if (plink->controller) { _LOGD(LOGD_DEVICE, - "enslaved to unknown device %d (%s%s%s)", - plink->master, - NM_PRINT_FMT_QUOTED(plink_master, "\"", plink_master->name, "\"", "??")); + "attached to unknown device %d (%s%s%s)", + plink->controller, + NM_PRINT_FMT_QUOTED(plink_controller, "\"", plink_controller->name, "\"", "??")); if (!priv->ifindex_changed_id) { priv->ifindex_changed_id = g_signal_connect(nm_device_get_manager(self), NM_MANAGER_DEVICE_IFINDEX_CHANGED, @@ -7246,7 +7246,7 @@ device_ifindex_changed_cb(NMManager *manager, NMDevice *device_changed, NMDevice return; _LOGD(LOGD_DEVICE, - "master %s with ifindex %d appeared", + "controller %s with ifindex %d appeared", nm_device_get_iface(device_changed), nm_device_get_ifindex(device_changed)); if (!priv->device_link_changed_id) @@ -7436,7 +7436,7 @@ device_link_changed(gpointer user_data) _dev_unmanaged_check_external_down(self, FALSE, FALSE); - device_recheck_slave_status(self, pllink); + device_recheck_port_status(self, pllink); if (priv->up && (!was_up || seen_down)) { /* the link was down and just came up. That happens for example, while changing MTU. @@ -7988,7 +7988,7 @@ realize_start_notify(NMDevice *self, const NMPlatformLink *pllink) * Update the device from backing resource properties (like hardware * addresses, carrier states, driver/firmware info, etc). This function * should only change properties for this device, and should not perform - * any tasks that affect other interfaces (like master/slave or parent/child + * any tasks that affect other interfaces (like controller/port or parent/child * stuff). */ static void @@ -8140,7 +8140,7 @@ realize_start_setup(NMDevice *self, * @self: the #NMDevice * @plink: the #NMPlatformLink if backed by a kernel netdevice * - * Update the device's master/slave or parent/child relationships from + * Update the device's controller/port or parent/child relationships from * backing resource properties. After this function finishes, the device * is ready for network connectivity. */ @@ -8157,7 +8157,7 @@ nm_device_realize_finish(NMDevice *self, const NMPlatformLink *plink) g_return_if_fail(!priv->real); if (plink) - device_recheck_slave_status(self, plink); + device_recheck_port_status(self, plink); priv->real = TRUE; _notify(self, PROP_REAL); @@ -8317,7 +8317,7 @@ nm_device_unrealize(NMDevice *self, gboolean remove_resources, GError **error) nm_device_set_unmanaged_flags(self, NM_UNMANAGED_USER_UDEV | NM_UNMANAGED_USER_EXPLICIT - | NM_UNMANAGED_EXTERNAL_DOWN | NM_UNMANAGED_IS_SLAVE, + | NM_UNMANAGED_EXTERNAL_DOWN | NM_UNMANAGED_IS_PORT, NM_UNMAN_FLAG_OP_FORGET); nm_device_state_changed(self, @@ -8436,117 +8436,117 @@ nm_device_new_default_connection(NMDevice *self) } static void -slave_state_changed(NMDevice *slave, - NMDeviceState slave_new_state, - NMDeviceState slave_old_state, - NMDeviceStateReason reason, - NMDevice *self) +port_state_changed(NMDevice *port, + NMDeviceState port_new_state, + NMDeviceState port_old_state, + NMDeviceStateReason reason, + NMDevice *self) { NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE(self); gboolean release = FALSE; gboolean configure; _LOGD(LOGD_DEVICE, - "slave %s state change %d (%s) -> %d (%s)", - nm_device_get_iface(slave), - slave_old_state, - nm_device_state_to_string(slave_old_state), - slave_new_state, - nm_device_state_to_string(slave_new_state)); + "port %s state change %d (%s) -> %d (%s)", + nm_device_get_iface(port), + port_old_state, + nm_device_state_to_string(port_old_state), + port_new_state, + nm_device_state_to_string(port_new_state)); - /* Don't try to enslave slaves until the master is ready */ + /* Don't try to attach ports until the controller is ready */ if (priv->state < NM_DEVICE_STATE_CONFIG) return; - if (slave_new_state == NM_DEVICE_STATE_IP_CONFIG) - nm_device_master_enslave_slave(self, slave, nm_device_get_applied_connection(slave)); - else if (slave_new_state > NM_DEVICE_STATE_ACTIVATED) + if (port_new_state == NM_DEVICE_STATE_IP_CONFIG) + nm_device_controller_attach_port(self, port, nm_device_get_applied_connection(port)); + else if (port_new_state > NM_DEVICE_STATE_ACTIVATED) release = TRUE; - else if (slave_new_state <= NM_DEVICE_STATE_DISCONNECTED - && slave_old_state > NM_DEVICE_STATE_DISCONNECTED) { + else if (port_new_state <= NM_DEVICE_STATE_DISCONNECTED + && port_old_state > NM_DEVICE_STATE_DISCONNECTED) { /* Catch failures due to unavailable or unmanaged */ release = TRUE; } if (release) { configure = (priv->sys_iface_state == NM_DEVICE_SYS_IFACE_STATE_MANAGED - && nm_device_sys_iface_state_get(slave) != NM_DEVICE_SYS_IFACE_STATE_EXTERNAL) - || nm_device_sys_iface_state_get(slave) == NM_DEVICE_SYS_IFACE_STATE_MANAGED; + && nm_device_sys_iface_state_get(port) != NM_DEVICE_SYS_IFACE_STATE_EXTERNAL) + || nm_device_sys_iface_state_get(port) == NM_DEVICE_SYS_IFACE_STATE_MANAGED; - nm_device_master_release_slave(self, - slave, - configure ? RELEASE_SLAVE_TYPE_CONFIG - : RELEASE_SLAVE_TYPE_NO_CONFIG, - reason); + nm_device_controller_release_port(self, + port, + configure ? RELEASE_PORT_TYPE_CONFIG + : RELEASE_PORT_TYPE_NO_CONFIG, + reason); /* Bridge/bond/team interfaces are left up until manually deactivated */ - if (c_list_is_empty(&priv->slaves) && priv->state == NM_DEVICE_STATE_ACTIVATED) - _LOGD(LOGD_DEVICE, "last slave removed; remaining activated"); + if (c_list_is_empty(&priv->ports) && priv->state == NM_DEVICE_STATE_ACTIVATED) + _LOGD(LOGD_DEVICE, "last port removed; remaining activated"); } } /** - * nm_device_master_add_slave: - * @self: the master device - * @slave: the slave device to enslave - * @configure: pass %TRUE if the slave should be configured by the master, or + * nm_device_controller_add_port: + * @self: the controller device + * @port: the port device to attach as port + * @configure: pass %TRUE if the port should be configured by the controller, or * %FALSE if it is already configured outside NetworkManager * * If @self is capable of enslaving other devices (ie it's a bridge, bond, team, - * etc) then this function adds @slave to the slave list for later enslavement. + * etc) then this function adds @port to the port list for later attachment as port. * - * Returns: %TRUE if the slave was enslaved. %FALSE means, the slave was already - * enslaved and nothing was done. + * Returns: %TRUE if the port was attached. %FALSE means, the port was already + * attached and nothing was done. */ static gboolean -nm_device_master_add_slave(NMDevice *self, NMDevice *slave, gboolean configure) +nm_device_controller_add_port(NMDevice *self, NMDevice *port, gboolean configure) { NMDevicePrivate *priv; NMDevicePrivate *port_priv; - SlaveInfo *info; + PortInfo *info; gboolean changed = FALSE; g_return_val_if_fail(NM_IS_DEVICE(self), FALSE); - g_return_val_if_fail(NM_IS_DEVICE(slave), FALSE); + g_return_val_if_fail(NM_IS_DEVICE(port), FALSE); g_return_val_if_fail(NM_DEVICE_GET_CLASS(self)->attach_port, FALSE); priv = NM_DEVICE_GET_PRIVATE(self); - port_priv = NM_DEVICE_GET_PRIVATE(slave); + port_priv = NM_DEVICE_GET_PRIVATE(port); - info = find_slave_info(self, slave); + info = find_port_info(self, port); _LOGT(LOGD_CORE, - "master: add one slave " NM_HASH_OBFUSCATE_PTR_FMT "/%s%s", - NM_HASH_OBFUSCATE_PTR(slave), - nm_device_get_iface(slave), + "controller: add one port " NM_HASH_OBFUSCATE_PTR_FMT "/%s%s", + NM_HASH_OBFUSCATE_PTR(port), + nm_device_get_iface(port), info ? " (already registered)" : ""); if (configure) - g_return_val_if_fail(nm_device_get_state(slave) >= NM_DEVICE_STATE_DISCONNECTED, FALSE); + g_return_val_if_fail(nm_device_get_state(port) >= NM_DEVICE_STATE_DISCONNECTED, FALSE); if (!info) { g_return_val_if_fail(!port_priv->controller, FALSE); - g_return_val_if_fail(!port_priv->is_enslaved, FALSE); + g_return_val_if_fail(!port_priv->is_attached, FALSE); - info = g_slice_new0(SlaveInfo); - info->slave = g_object_ref(slave); + info = g_slice_new0(PortInfo); + info->port = g_object_ref(port); info->configure = configure; info->watch_id = - g_signal_connect(slave, NM_DEVICE_STATE_CHANGED, G_CALLBACK(slave_state_changed), self); - c_list_link_tail(&priv->slaves, &info->lst_slave); + g_signal_connect(port, NM_DEVICE_STATE_CHANGED, G_CALLBACK(port_state_changed), self); + c_list_link_tail(&priv->ports, &info->lst_port); port_priv->controller = g_object_ref(self); - _active_connection_set_state_flags(self, NM_ACTIVATION_STATE_FLAG_MASTER_HAS_SLAVES); + _active_connection_set_state_flags(self, NM_ACTIVATION_STATE_FLAG_CONTROLLER_HAS_PORTS); /* no need to emit * - * _notify (slave, PROP_CONTROLLER); + * _notify (port, PROP_CONTROLLER); * - * because port_priv->is_enslaved is not true, thus the value + * because port_priv->is_attached is not true, thus the value * didn't change yet. */ - g_warn_if_fail(!NM_FLAGS_HAS(port_priv->unmanaged_mask, NM_UNMANAGED_IS_SLAVE)); - nm_device_set_unmanaged_by_flags(slave, - NM_UNMANAGED_IS_SLAVE, + g_warn_if_fail(!NM_FLAGS_HAS(port_priv->unmanaged_mask, NM_UNMANAGED_IS_PORT)); + nm_device_set_unmanaged_by_flags(port, + NM_UNMANAGED_IS_PORT, NM_UNMAN_FLAG_OP_SET_MANAGED, NM_DEVICE_STATE_REASON_CONNECTION_ASSUMED); changed = TRUE; @@ -8554,42 +8554,44 @@ nm_device_master_add_slave(NMDevice *self, NMDevice *slave, gboolean configure) g_return_val_if_fail(port_priv->controller == self, FALSE); nm_device_queue_recheck_assume(self); - nm_device_queue_recheck_assume(slave); + nm_device_queue_recheck_assume(port); return changed; } /** - * nm_device_master_check_slave_physical_port: - * @self: the master device - * @slave: a slave device + * nm_device_controller_check_port_physical_port: + * @self: the controller device + * @port: a port device * @log_domain: domain to log a warning in * - * Checks if @self already has a slave with the same #NMDevice:physical-port-id - * as @slave, and logs a warning if so. + * Checks if @self already has a port with the same #NMDevice:physical-port-id + * as @port, and logs a warning if so. */ void -nm_device_master_check_slave_physical_port(NMDevice *self, NMDevice *slave, NMLogDomain log_domain) +nm_device_controller_check_port_physical_port(NMDevice *self, + NMDevice *port, + NMLogDomain log_domain) { NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE(self); - const char *slave_physical_port_id, *existing_physical_port_id; - SlaveInfo *info; + const char *port_physical_port_id, *existing_physical_port_id; + PortInfo *info; - slave_physical_port_id = nm_device_get_physical_port_id(slave); - if (!slave_physical_port_id) + port_physical_port_id = nm_device_get_physical_port_id(port); + if (!port_physical_port_id) return; - c_list_for_each_entry (info, &priv->slaves, lst_slave) { - if (info->slave == slave) + c_list_for_each_entry (info, &priv->ports, lst_port) { + if (info->port == port) continue; - existing_physical_port_id = nm_device_get_physical_port_id(info->slave); - if (nm_streq0(slave_physical_port_id, existing_physical_port_id)) { + existing_physical_port_id = nm_device_get_physical_port_id(info->port); + if (nm_streq0(port_physical_port_id, existing_physical_port_id)) { _LOGW(log_domain, - "slave %s shares a physical port with existing slave %s", - nm_device_get_ip_iface(slave), - nm_device_get_ip_iface(info->slave)); - /* Since this function will get called for every slave, we only have + "port %s shares a physical port with existing port %s", + nm_device_get_ip_iface(port), + nm_device_get_ip_iface(info->port)); + /* Since this function will get called for every port, we only have * to warn about the first match we find; if there are other matches * later in the list, we will have already warned about them matching * @existing earlier. @@ -8600,14 +8602,14 @@ nm_device_master_check_slave_physical_port(NMDevice *self, NMDevice *slave, NMLo } void -nm_device_master_release_slaves_all(NMDevice *self) +nm_device_controller_release_ports_all(NMDevice *self) { NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE(self); NMDeviceStateReason reason; - SlaveInfo *info; - SlaveInfo *safe; + PortInfo *info; + PortInfo *safe; - /* Don't release the slaves if this connection doesn't belong to NM. */ + /* Don't release the ports if this connection doesn't belong to NM. */ if (nm_device_sys_iface_state_is_external(self)) return; @@ -8615,15 +8617,15 @@ nm_device_master_release_slaves_all(NMDevice *self) if (priv->state == NM_DEVICE_STATE_FAILED) reason = NM_DEVICE_STATE_REASON_DEPENDENCY_FAILED; - c_list_for_each_entry_safe (info, safe, &priv->slaves, lst_slave) { + c_list_for_each_entry_safe (info, safe, &priv->ports, lst_port) { if (priv->activation_state_preserve_external_ports - && nm_device_sys_iface_state_is_external(info->slave)) { + && nm_device_sys_iface_state_is_external(info->port)) { _LOGT(LOGD_DEVICE, - "master: preserve external port %s", - nm_device_get_iface(info->slave)); + "controller: preserve external port %s", + nm_device_get_iface(info->port)); continue; } - nm_device_master_release_slave(self, info->slave, RELEASE_SLAVE_TYPE_CONFIG, reason); + nm_device_controller_release_port(self, info->port, RELEASE_PORT_TYPE_CONFIG, reason); } /* We only need this flag for a short time. It served its purpose. Clear @@ -8663,7 +8665,7 @@ nm_device_get_controller(NMDevice *self) { NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE(self); - if (priv->is_enslaved) { + if (priv->is_attached) { g_return_val_if_fail(priv->controller, NULL); return priv->controller; } @@ -8671,15 +8673,15 @@ nm_device_get_controller(NMDevice *self) } /** - * nm_device_slave_notify_enslave: - * @self: the slave device + * nm_device_port_notify_attach: + * @self: the port device * @success: whether the enslaving operation succeeded * - * Notifies a slave that either it has been enslaved, or else its master tried - * to enslave it and failed. + * Notifies a port that either it has been attached, or else its controller tried + * to attach it as port and failed. */ static void -nm_device_slave_notify_enslave(NMDevice *self, gboolean success) +nm_device_port_notify_attach_as_port(NMDevice *self, gboolean success) { NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE(self); NMConnection *connection = nm_device_get_applied_connection(self); @@ -8687,16 +8689,16 @@ nm_device_slave_notify_enslave(NMDevice *self, gboolean success) g_return_if_fail(priv->controller); - if (!priv->is_enslaved) { + if (!priv->is_attached) { if (success) { if (activating) { _LOGI(LOGD_DEVICE, - "Activation: connection '%s' enslaved, continuing activation", + "Activation: connection '%s' attached as port, continuing activation", nm_connection_get_id(connection)); } else - _LOGI(LOGD_DEVICE, "enslaved to %s", nm_device_get_iface(priv->controller)); + _LOGI(LOGD_DEVICE, "attached to %s", nm_device_get_iface(priv->controller)); - priv->is_enslaved = TRUE; + priv->is_attached = TRUE; _notify(priv->controller, PROP_CONTROLLER); @@ -8705,7 +8707,7 @@ nm_device_slave_notify_enslave(NMDevice *self, gboolean success) nm_gobject_notify_together(priv->controller, PROP_PORTS, PROP_SLAVES); } else if (activating) { _LOGW(LOGD_DEVICE, - "Activation: connection '%s' could not be enslaved", + "Activation: connection '%s' could not be attached as port", nm_connection_get_id(connection)); } } @@ -8724,56 +8726,58 @@ nm_device_slave_notify_enslave(NMDevice *self, gboolean success) } /** - * nm_device_slave_notify_release: - * @self: the slave device + * nm_device_port_notify_release: + * @self: the port device * @reason: the reason associated with the state change * - * Notifies a slave that it has been released, and why. + * Notifies a port that it has been released, and why. */ static void -nm_device_slave_notify_release(NMDevice *self, - NMDeviceStateReason reason, - ReleaseSlaveType release_type) +nm_device_port_notify_release(NMDevice *self, + NMDeviceStateReason reason, + ReleasePortType release_type) { NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE(self); NMConnection *connection = nm_device_get_applied_connection(self); - const char *master_status; + const char *controller_status; g_return_if_fail(priv->controller); - if (!priv->is_enslaved && release_type == RELEASE_SLAVE_TYPE_NO_CONFIG) + if (!priv->is_attached && release_type == RELEASE_PORT_TYPE_NO_CONFIG) return; if (priv->state > NM_DEVICE_STATE_DISCONNECTED && priv->state <= NM_DEVICE_STATE_ACTIVATED) { switch (nm_device_state_reason_check(reason)) { case NM_DEVICE_STATE_REASON_DEPENDENCY_FAILED: - master_status = "failed"; + controller_status = "failed"; break; case NM_DEVICE_STATE_REASON_USER_REQUESTED: - reason = NM_DEVICE_STATE_REASON_USER_REQUESTED; - master_status = "deactivated by user request"; + reason = NM_DEVICE_STATE_REASON_USER_REQUESTED; + controller_status = "deactivated by user request"; break; case NM_DEVICE_STATE_REASON_CONNECTION_REMOVED: - reason = NM_DEVICE_STATE_REASON_DEPENDENCY_FAILED; - master_status = "deactivated because master was removed"; + reason = NM_DEVICE_STATE_REASON_DEPENDENCY_FAILED; + controller_status = "deactivated because controller was removed"; break; default: - master_status = "deactivated"; + controller_status = "deactivated"; break; } _LOGD(LOGD_DEVICE, - "Activation: connection '%s' master %s", + "Activation: connection '%s' controller %s", nm_connection_get_id(connection), - master_status); + controller_status); /* Cancel any pending activation sources */ _cancel_activation(self); nm_device_queue_state(self, NM_DEVICE_STATE_DEACTIVATING, reason); } else - _LOGI(LOGD_DEVICE, "released from master device %s", nm_device_get_iface(priv->controller)); + _LOGI(LOGD_DEVICE, + "released from controller device %s", + nm_device_get_iface(priv->controller)); - priv->is_enslaved = FALSE; + priv->is_attached = FALSE; _notify(priv->controller, PROP_CONTROLLER); @@ -8788,7 +8792,7 @@ nm_device_slave_notify_release(NMDevice *self, * of the device (provided, it is still not cleared at this point). * * Called by the manager when the device was removed. Releases the device from - * the master in case it's enslaved. + * the controller in case it's attached as port. */ void nm_device_removed(NMDevice *self, gboolean unconfigure_ip_config) @@ -8803,12 +8807,12 @@ nm_device_removed(NMDevice *self, gboolean unconfigure_ip_config) priv = NM_DEVICE_GET_PRIVATE(self); if (priv->controller) { - /* this is called when something externally messes with the slave or during shut-down. - * Release the slave from master, but don't touch the device. */ - nm_device_master_release_slave(priv->controller, - self, - RELEASE_SLAVE_TYPE_NO_CONFIG, - NM_DEVICE_STATE_REASON_CONNECTION_ASSUMED); + /* this is called when something externally messes with the port or during shut-down. + * Release the port from controller, but don't touch the device. */ + nm_device_controller_release_port(priv->controller, + self, + RELEASE_PORT_TYPE_NO_CONFIG, + NM_DEVICE_STATE_REASON_CONNECTION_ASSUMED); } _dev_l3_register_l3cds(self, priv->l3cfg, FALSE, unconfigure_ip_config); @@ -8837,7 +8841,7 @@ is_available(NMDevice *self, NMDeviceCheckDevAvailableFlags flags) if (NM_FLAGS_HAS(flags, _NM_DEVICE_CHECK_DEV_AVAILABLE_IGNORE_CARRIER)) return TRUE; - /* master types are always available even without carrier. */ + /* controller types are always available even without carrier. */ if (nm_device_is_controller(self)) return TRUE; @@ -8877,7 +8881,7 @@ nm_device_is_available(NMDevice *self, NMDeviceCheckDevAvailableFlags flags) gboolean nm_device_ignore_carrier_by_default(NMDevice *self) { - /* master types ignore-carrier by default. */ + /* controller types ignore-carrier by default. */ return nm_device_is_controller(self); } @@ -9090,8 +9094,8 @@ device_has_config(NMDevice *self) if (!pllink) return FALSE; - if (pllink->master > 0) { - /* Master-slave relationship is also a configuration */ + if (pllink->controller > 0) { + /* Master-port relationship is also a configuration */ return TRUE; } @@ -9116,30 +9120,30 @@ device_has_config(NMDevice *self) } /** - * nm_device_master_update_slave_connection: - * @self: the master #NMDevice - * @slave: the slave #NMDevice - * @connection: the #NMConnection to update with the slave settings + * nm_device_controller_update_port_connection: + * @self: the controller #NMDevice + * @port: the port #NMDevice + * @connection: the #NMConnection to update with the port settings * @error: error description * - * Reads the slave configuration for @slave and updates @connection with those - * properties. This invokes a virtual function on the master device @self. + * Reads the port configuration for @port and updates @connection with those + * properties. This invokes a virtual function on the controller device @self. * * Returns: %TRUE if the configuration was read and @connection updated, * %FALSE on failure. */ gboolean -nm_device_master_update_slave_connection(NMDevice *self, - NMDevice *slave, - NMConnection *connection, - GError **error) +nm_device_controller_update_port_connection(NMDevice *self, + NMDevice *port, + NMConnection *connection, + GError **error) { NMDeviceClass *klass; gboolean success; g_return_val_if_fail(self, FALSE); g_return_val_if_fail(NM_IS_DEVICE(self), FALSE); - g_return_val_if_fail(slave, FALSE); + g_return_val_if_fail(port, FALSE); g_return_val_if_fail(connection, FALSE); g_return_val_if_fail(!error || !*error, FALSE); g_return_val_if_fail(nm_connection_get_setting_connection(connection), FALSE); @@ -9147,20 +9151,21 @@ nm_device_master_update_slave_connection(NMDevice *self, g_return_val_if_fail(nm_device_get_iface(self), FALSE); klass = NM_DEVICE_GET_CLASS(self); - if (klass->master_update_slave_connection) { - success = klass->master_update_slave_connection(self, slave, connection, error); + if (klass->controller_update_port_connection) { + success = klass->controller_update_port_connection(self, port, connection, error); g_return_val_if_fail(!error || (success && !*error) || *error, success); return success; } - g_set_error(error, - NM_DEVICE_ERROR, - NM_DEVICE_ERROR_FAILED, - "master device '%s' cannot update a slave connection for slave device '%s' (master " - "type not supported?)", - nm_device_get_iface(self), - nm_device_get_iface(slave)); + g_set_error( + error, + NM_DEVICE_ERROR, + NM_DEVICE_ERROR_FAILED, + "controller device '%s' cannot update a port connection for port device '%s' (controller " + "type not supported?)", + nm_device_get_iface(self), + nm_device_get_iface(port)); return FALSE; } @@ -9196,7 +9201,7 @@ _get_maybe_ipv6_disabled(NMDevice *self) */ NMConnection * nm_device_generate_connection(NMDevice *self, - NMDevice *master, + NMDevice *controller, gboolean *out_maybe_later, GError **error) { @@ -9254,21 +9259,21 @@ nm_device_generate_connection(NMDevice *self, nm_connection_add_setting(connection, s_con); - /* If the device is a slave, update various slave settings */ - if (master) { - if (!nm_device_master_update_slave_connection(master, self, connection, &local)) { + /* If the device is a port, update various port settings */ + if (controller) { + if (!nm_device_controller_update_port_connection(controller, self, connection, &local)) { g_set_error(error, NM_DEVICE_ERROR, NM_DEVICE_ERROR_FAILED, - "master device '%s' failed to update slave connection: %s", - nm_device_get_iface(master), + "controller device '%s' failed to update port connection: %s", + nm_device_get_iface(controller), local->message); g_error_free(local); NM_SET_OUT(out_maybe_later, TRUE); return NULL; } } else { - /* Only regular and master devices get IP configuration; slaves do not */ + /* Only regular and controller devices get IP configuration; ports do not */ s_ip4 = nm_utils_platform_capture_ip_setting(nm_device_get_platform(self), AF_INET, nm_device_get_ip_ifindex(self), @@ -9309,7 +9314,7 @@ nm_device_generate_connection(NMDevice *self, } /* Ignore the connection if it has no IP configuration, - * no slave configuration, and is not a master interface. + * no port configuration, and is not a controller interface. */ ip4_method = nm_utils_get_ip_config_method(connection, AF_INET); ip6_method = nm_utils_get_ip_config_method(connection, AF_INET6); @@ -9318,32 +9323,33 @@ nm_device_generate_connection(NMDevice *self, NM_SETTING_IP6_CONFIG_METHOD_IGNORE, NM_SETTING_IP6_CONFIG_METHOD_DISABLED) && !nm_setting_connection_get_controller(NM_SETTING_CONNECTION(s_con)) - && c_list_is_empty(&priv->slaves)) { + && c_list_is_empty(&priv->ports)) { NM_SET_OUT(out_maybe_later, TRUE); g_set_error_literal( error, NM_DEVICE_ERROR, NM_DEVICE_ERROR_FAILED, - "ignoring generated connection (no IP and not in master-slave relationship)"); + "ignoring generated connection (no IP and not in controller-port relationship)"); return NULL; } - /* Ignore any IPv6LL-only, not master connections without slaves, + /* Ignore any IPv6LL-only, not controller connections without ports, * unless they are in the assume-ipv6ll-only list. */ 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_controller(NM_SETTING_CONNECTION(s_con)) - && c_list_is_empty(&priv->slaves) + && c_list_is_empty(&priv->ports) && !nm_config_data_get_assume_ipv6ll_only(NM_CONFIG_GET_DATA, self)) { - _LOGD(LOGD_DEVICE, - "ignoring generated connection (IPv6LL-only and not in master-slave relationship)"); + _LOGD( + LOGD_DEVICE, + "ignoring generated connection (IPv6LL-only and not in controller-port relationship)"); NM_SET_OUT(out_maybe_later, TRUE); g_set_error_literal( error, NM_DEVICE_ERROR, NM_DEVICE_ERROR_FAILED, - "ignoring generated connection (IPv6LL-only and not in master-slave relationship)"); + "ignoring generated connection (IPv6LL-only and not in controller-port relationship)"); return NULL; } @@ -9594,28 +9600,28 @@ nm_device_check_connection_compatible(NMDevice *self, } gboolean -nm_device_check_slave_connection_compatible(NMDevice *self, NMConnection *slave) +nm_device_check_port_connection_compatible(NMDevice *self, NMConnection *port) { NMSettingConnection *s_con; - const char *connection_type, *slave_type; + const char *connection_type, *port_type; g_return_val_if_fail(NM_IS_DEVICE(self), FALSE); - g_return_val_if_fail(NM_IS_CONNECTION(slave), FALSE); + g_return_val_if_fail(NM_IS_CONNECTION(port), FALSE); if (!nm_device_is_controller(self)) return FALSE; - /* All masters should have connection type set */ + /* All controllers should have connection type set */ connection_type = NM_DEVICE_GET_CLASS(self)->connection_type_supported; g_return_val_if_fail(connection_type, FALSE); - s_con = nm_connection_get_setting_connection(slave); + s_con = nm_connection_get_setting_connection(port); g_assert(s_con); - slave_type = nm_setting_connection_get_port_type(s_con); - if (!slave_type) + port_type = nm_setting_connection_get_port_type(s_con); + if (!port_type) return FALSE; - return nm_streq(connection_type, slave_type); + return nm_streq(connection_type, port_type); } gboolean @@ -9905,35 +9911,37 @@ activation_source_invoke_or_schedule(NMDevice *self, ActivationHandleFunc func, /*****************************************************************************/ static void -master_ready(NMDevice *self, NMActiveConnection *active) +controller_ready(NMDevice *self, NMActiveConnection *active) { NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE(self); - NMActiveConnection *master_connection; - NMDevice *master; + NMActiveConnection *controller_connection; + NMDevice *controller; /* Notify a controller device that it has a new port */ nm_assert(nm_active_connection_get_controller_ready(active)); - master_connection = nm_active_connection_get_controller(active); + controller_connection = nm_active_connection_get_controller(active); - master = nm_active_connection_get_device(master_connection); + controller = nm_active_connection_get_device(controller_connection); - _LOGD(LOGD_DEVICE, "master connection ready; master device %s", nm_device_get_iface(master)); + _LOGD(LOGD_DEVICE, + "controller connection ready; controller device %s", + nm_device_get_iface(controller)); - if (priv->controller && priv->controller != master) - nm_device_master_release_slave(priv->controller, - self, - RELEASE_SLAVE_TYPE_NO_CONFIG, - NM_DEVICE_STATE_REASON_CONNECTION_ASSUMED); + if (priv->controller && priv->controller != controller) + nm_device_controller_release_port(priv->controller, + self, + RELEASE_PORT_TYPE_NO_CONFIG, + NM_DEVICE_STATE_REASON_CONNECTION_ASSUMED); - /* If the master didn't change, add-slave only rechecks whether to assume a connection. */ - nm_device_master_add_slave(master, - self, - !nm_device_sys_iface_state_is_external_or_assume(self)); + /* If the controller didn't change, add-port only rechecks whether to assume a connection. */ + nm_device_controller_add_port(controller, + self, + !nm_device_sys_iface_state_is_external_or_assume(self)); } static void -master_ready_cb(NMActiveConnection *active, GParamSpec *pspec, NMDevice *self) +controller_ready_cb(NMActiveConnection *active, GParamSpec *pspec, NMDevice *self) { NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE(self); @@ -10062,7 +10070,7 @@ activate_stage1_device_prepare(NMDevice *self) NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE(self); NMActStageReturn ret = NM_ACT_STAGE_RETURN_SUCCESS; NMActiveConnection *active; - NMActiveConnection *master; + NMActiveConnection *controller; NMDeviceClass *klass; nm_assert((priv->ip_data_4.state == NM_DEVICE_IP_STATE_NONE) @@ -10183,16 +10191,16 @@ activate_stage1_device_prepare(NMDevice *self) } } - active = NM_ACTIVE_CONNECTION(priv->act_request.obj); - master = nm_active_connection_get_controller(active); - if (master) { - if (nm_active_connection_get_state(master) >= NM_ACTIVE_CONNECTION_STATE_DEACTIVATING) { - NMDevice *master_device = nm_active_connection_get_device(master); - NMDeviceStateReason failure_reason = NM_DEVICE_STATE_REASON_DEPENDENCY_FAILED; + active = NM_ACTIVE_CONNECTION(priv->act_request.obj); + controller = nm_active_connection_get_controller(active); + if (controller) { + if (nm_active_connection_get_state(controller) >= NM_ACTIVE_CONNECTION_STATE_DEACTIVATING) { + NMDevice *controller_device = nm_active_connection_get_device(controller); + NMDeviceStateReason failure_reason = NM_DEVICE_STATE_REASON_DEPENDENCY_FAILED; - _LOGD(LOGD_DEVICE, "master connection is deactivating"); + _LOGD(LOGD_DEVICE, "controller connection is deactivating"); - if (master_device && NM_DEVICE_GET_PRIVATE(master_device)->queued_act_request) { + if (controller_device && NM_DEVICE_GET_PRIVATE(controller_device)->queued_act_request) { /* if the controller is going to activate again, don't block this device */ failure_reason = NM_DEVICE_STATE_REASON_NONE; } @@ -10206,20 +10214,20 @@ activate_stage1_device_prepare(NMDevice *self) priv->controller_ready_id = g_signal_connect(active, "notify::" NM_ACTIVE_CONNECTION_INT_CONTROLLER_READY, - G_CALLBACK(master_ready_cb), + G_CALLBACK(controller_ready_cb), self); } return; } } nm_clear_g_signal_handler(priv->act_request.obj, &priv->controller_ready_id); - if (master) - master_ready(self, active); + if (controller) + controller_ready(self, active); else if (priv->controller) { - nm_device_master_release_slave(priv->controller, - self, - RELEASE_SLAVE_TYPE_CONFIG_FORCE, - NM_DEVICE_STATE_REASON_CONNECTION_ASSUMED); + nm_device_controller_release_port(priv->controller, + self, + RELEASE_PORT_TYPE_CONFIG_FORCE, + NM_DEVICE_STATE_REASON_CONNECTION_ASSUMED); } nm_device_activate_schedule_stage2_device_config(self, TRUE); @@ -10447,7 +10455,7 @@ activate_stage2_device_config(NMDevice *self) NMActStageReturn ret; NMSettingWired *s_wired; gboolean no_firmware = FALSE; - SlaveInfo *info; + PortInfo *info; NMTernary accept_all_mac_addresses; nm_device_state_changed(self, NM_DEVICE_STATE_CONFIG, NM_DEVICE_STATE_REASON_NONE); @@ -10495,17 +10503,17 @@ activate_stage2_device_config(NMDevice *self) } } - /* If we have slaves that aren't yet enslaved, do that now */ - c_list_for_each_entry (info, &priv->slaves, lst_slave) { - NMDeviceState slave_state = nm_device_get_state(info->slave); + /* If we have ports that aren't yet attached, do that now */ + c_list_for_each_entry (info, &priv->ports, lst_port) { + NMDeviceState port_state = nm_device_get_state(info->port); - if (slave_state == NM_DEVICE_STATE_IP_CONFIG) - nm_device_master_enslave_slave(self, - info->slave, - nm_device_get_applied_connection(info->slave)); + if (port_state == NM_DEVICE_STATE_IP_CONFIG) + nm_device_controller_attach_port(self, + info->port, + nm_device_get_applied_connection(info->port)); else if (priv->act_request.obj && nm_device_sys_iface_state_is_external(self) - && slave_state <= NM_DEVICE_STATE_DISCONNECTED) - nm_device_queue_recheck_assume(info->slave); + && port_state <= NM_DEVICE_STATE_DISCONNECTED) + nm_device_queue_recheck_assume(info->port); } s_wired = nm_device_get_applied_setting(self, NM_TYPE_SETTING_WIRED); @@ -11451,7 +11459,7 @@ connection_requires_carrier(NMConnection *connection) gboolean ip4_used = FALSE; gboolean ip6_used = FALSE; - /* We can progress to IP_CONFIG now, so that we're enslaved. + /* We can progress to IP_CONFIG now, so that we're attached as port. * 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_controller(s_con)) @@ -11490,17 +11498,17 @@ connection_requires_carrier(NMConnection *connection) } static gboolean -have_any_ready_slaves(NMDevice *self) +have_any_ready_ports(NMDevice *self) { NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE(self); - SlaveInfo *info; + PortInfo *info; - /* Any enslaved slave is "ready" in the generic case as it's + /* Any attached port is "ready" in the generic case as it's * at least >= NM_DEVICE_STATE_IP_CONFIG and has had Layer 2 * properties set up. */ - c_list_for_each_entry (info, &priv->slaves, lst_slave) { - if (NM_DEVICE_GET_PRIVATE(info->slave)->is_enslaved) + c_list_for_each_entry (info, &priv->ports, lst_port) { + if (NM_DEVICE_GET_PRIVATE(info->port)->is_attached) return TRUE; } return FALSE; @@ -11924,10 +11932,10 @@ _set_mtu(NMDevice *self, guint32 mtu) _notify(self, PROP_MTU); if (priv->controller) { - /* changing the MTU of a slave, might require the master to reset - * its MTU. Note that the master usually cannot set a MTU larger - * then the slave's. Hence, when the slave increases the MTU, - * master might want to retry setting the MTU. */ + /* changing the MTU of a port, might require the controller to reset + * its MTU. Note that the controller usually cannot set a MTU larger + * then the port's. Hence, when the port increases the MTU, + * controller might want to retry setting the MTU. */ nm_device_commit_mtu(priv->controller); } } @@ -12042,8 +12050,8 @@ _commit_mtu(NMDevice *self) /* the interface has IPv6 enabled. The MTU with IPv6 cannot be smaller * then 1280. * - * For slave-devices (that don't have @s_ip6 we) don't do this fixup because - * it's anyway an unsolved problem when the slave configures a conflicting + * For port-devices (that don't have @s_ip6 we) don't do this fixup because + * it's anyway an unsolved problem when the port configures a conflicting * MTU. */ mtu_desired = 1280; } @@ -12145,8 +12153,8 @@ _commit_mtu(NMDevice *self) "mtu: failure to set MTU. %s", NM_IS_DEVICE_VLAN(self) ? "Is the parent's MTU size large enough?" - : (!c_list_is_empty(&priv->slaves) - ? "Are the MTU sizes of the slaves large enough?" + : (!c_list_is_empty(&priv->ports) + ? "Are the MTU sizes of the ports large enough?" : "Did you configure the MTU correctly?")); } priv->carrier_wait_until_msec = @@ -12662,7 +12670,7 @@ _dev_addrgenmode6_set(NMDevice *self, guint8 addr_gen_mode) /*****************************************************************************/ static gboolean -ip_requires_slaves(NMDevice *self, int addr_family) +ip_requires_ports(NMDevice *self, int addr_family) { const char *method; @@ -12671,7 +12679,7 @@ ip_requires_slaves(NMDevice *self, int addr_family) if (NM_IS_IPv4(addr_family)) return nm_streq(method, NM_SETTING_IP4_CONFIG_METHOD_AUTO); - /* SLAAC, DHCP, and Link-Local depend on connectivity (and thus slaves) + /* SLAAC, DHCP, and Link-Local depend on connectivity (and thus ports) * to complete addressing. SLAAC and DHCP need a peer to provide a prefix. */ return NM_IN_STRSET(method, @@ -12716,11 +12724,11 @@ activate_stage3_ip_config_for_addr_family(NMDevice *self, int addr_family, const priv->ip_data_x[IS_IPv4].wait_for_carrier = FALSE; } - if (nm_device_is_controller(self) && ip_requires_slaves(self, addr_family)) { - /* If the master has no ready slaves, and depends on slaves for + if (nm_device_is_controller(self) && ip_requires_ports(self, addr_family)) { + /* If the controller has no ready ports, and depends on ports for * a successful IP configuration attempt, then postpone IP addressing. */ - if (!have_any_ready_slaves(self)) { + if (!have_any_ready_ports(self)) { if (!priv->ip_data_x[IS_IPv4].wait_for_ports) { _LOGT_ip(addr_family, "waiting for ports"); priv->ip_data_x[IS_IPv4].wait_for_ports = TRUE; @@ -12766,10 +12774,10 @@ activate_stage3_ip_config_for_addr_family(NMDevice *self, int addr_family, const if (priv->controller) { /* If a device only has an IPv6 link-local address, * we don't generate an assumed connection. Therefore, - * when a new slave connection (without IP configuration) + * when a new port connection (without IP configuration) * is activated on the device, the link-local address * remains configured. The IP configuration of an activated - * slave should not depend on the previous state. Flush + * port should not depend on the previous state. Flush * addresses and routes on activation. */ if (ip_ifindex > 0) { @@ -14289,7 +14297,7 @@ _device_activate(NMDevice *self, NMActRequest *req) g_return_if_fail(NM_IS_ACT_REQUEST(req)); nm_assert(nm_device_is_real(self)); - /* Ensure the activation request is still valid; the master may have + /* Ensure the activation request is still valid; the controller may have * already failed in which case activation of this device should not proceed. */ if (nm_active_connection_get_state(NM_ACTIVE_CONNECTION(req)) @@ -15078,7 +15086,7 @@ NM_UTILS_FLAGS2STR_DEFINE(nm_unmanaged_flags2str, NM_UTILS_FLAGS2STR(NM_UNMANAGED_USER_CONF, "user-conf"), NM_UTILS_FLAGS2STR(NM_UNMANAGED_USER_UDEV, "user-udev"), NM_UTILS_FLAGS2STR(NM_UNMANAGED_EXTERNAL_DOWN, "external-down"), - NM_UTILS_FLAGS2STR(NM_UNMANAGED_IS_SLAVE, "is-slave"), ); + NM_UTILS_FLAGS2STR(NM_UNMANAGED_IS_PORT, "is-port"), ); static const char * _unmanaged_flags2str(NMUnmanagedFlags flags, NMUnmanagedFlags mask, char *buf, gsize len) @@ -15209,8 +15217,8 @@ _get_managed_by_flags(NMUnmanagedFlags flags, flags &= ~(NM_UNMANAGED_BY_DEFAULT | NM_UNMANAGED_USER_UDEV | NM_UNMANAGED_EXTERNAL_DOWN); } - if (NM_FLAGS_HAS(mask, NM_UNMANAGED_IS_SLAVE) && !NM_FLAGS_HAS(flags, NM_UNMANAGED_IS_SLAVE)) { - /* for an enslaved device, by-default doesn't matter */ + if (NM_FLAGS_HAS(mask, NM_UNMANAGED_IS_PORT) && !NM_FLAGS_HAS(flags, NM_UNMANAGED_IS_PORT)) { + /* for an attached device, by-default doesn't matter */ flags &= ~NM_UNMANAGED_BY_DEFAULT; } @@ -15991,8 +15999,8 @@ check_connection_available(NMDevice *self, } if (nm_device_is_controller(self)) { - /* master types are always available even without carrier. - * Making connection non-available would un-enslave slaves which + /* controller types are always available even without carrier. + * Making connection non-available would de-attach ports which * is not desired. */ return TRUE; } @@ -16446,8 +16454,8 @@ nm_device_cleanup(NMDevice *self, NMDeviceStateReason reason, CleanupType cleanu ifindex = nm_device_get_ip_ifindex(self); if (cleanup_type == CLEANUP_TYPE_DECONFIGURE) { - /* master: release slaves */ - nm_device_master_release_slaves_all(self); + /* controller: release ports */ + nm_device_controller_release_ports_all(self); /* Take out any entries in the routing table and any IP address the device had. */ if (ifindex > 0) { @@ -16469,13 +16477,13 @@ nm_device_cleanup(NMDevice *self, NMDeviceStateReason reason, CleanupType cleanu if (ifindex > 0) nm_platform_ip4_dev_route_blacklist_set(nm_device_get_platform(self), ifindex, NULL); - /* slave: mark no longer enslaved */ + /* port: mark no longer attached */ if (priv->controller && priv->ifindex > 0 - && nm_platform_link_get_master(nm_device_get_platform(self), priv->ifindex) <= 0) { - nm_device_master_release_slave(priv->controller, - self, - RELEASE_SLAVE_TYPE_NO_CONFIG, - NM_DEVICE_STATE_REASON_CONNECTION_ASSUMED); + && nm_platform_link_get_controller(nm_device_get_platform(self), priv->ifindex) <= 0) { + nm_device_controller_release_port(priv->controller, + self, + RELEASE_PORT_TYPE_NO_CONFIG, + NM_DEVICE_STATE_REASON_CONNECTION_ASSUMED); } lldp_setup(self, NM_TERNARY_FALSE); @@ -16768,7 +16776,7 @@ _set_state_full(NMDevice *self, NMDeviceState state, NMDeviceStateReason reason, if (state < NM_DEVICE_STATE_UNAVAILABLE || (state >= NM_DEVICE_STATE_IP_CONFIG && state < NM_DEVICE_STATE_ACTIVATED)) { - /* preserve-external-ports is used by NMCheckpoint to activate a master + /* preserve-external-ports is used by NMCheckpoint to activate a controller * device, and preserve already attached ports. This means, this state is only * relevant during the deactivation and the following activation of the * right profile. Once we are sufficiently far in the activation of the @@ -16985,7 +16993,7 @@ _set_state_full(NMDevice *self, NMDeviceState state, NMDeviceStateReason reason, case NM_DEVICE_STATE_FAILED: /* Usually upon failure the activation chain is interrupted in * one of the stages; but in some cases the device fails for - * external events (as a failure of master connection) while + * external events (as a failure of controller connection) while * the activation sequence is running and so we need to ensure * that the chain is terminated here. */ @@ -16996,8 +17004,8 @@ _set_state_full(NMDevice *self, NMDeviceState state, NMDeviceStateReason reason, "Activation: failed for connection '%s'", sett_conn ? nm_settings_connection_get_id(sett_conn) : ""); - /* Notify any slaves of the unexpected failure */ - nm_device_master_release_slaves_all(self); + /* Notify any ports of the unexpected failure */ + nm_device_controller_release_ports_all(self); /* If the connection doesn't yet have a timestamp, set it to zero so that * we can distinguish between connections we've tried to activate and have @@ -17221,7 +17229,7 @@ nm_device_get_state_reason(NMDevice *self) * @flag: whether to set or clear the the flag. * * This sets an internal flag to true, which does something specific. - * For non-master devices, it has no effect. For master devices, this + * For non-controller devices, it has no effect. For controller devices, this * will prevent to detach all external ports, until the next activation * completes. * @@ -18391,19 +18399,19 @@ static GVariant * _device_get_ports_variant(NMDevice *device) { NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE(device); - SlaveInfo *info; + PortInfo *info; GVariantBuilder builder; gboolean any = FALSE; if (priv->ports_variant) return priv->ports_variant; - c_list_for_each_entry (info, &priv->slaves, lst_slave) { + c_list_for_each_entry (info, &priv->ports, lst_port) { const char *path; - if (!NM_DEVICE_GET_PRIVATE(info->slave)->is_enslaved) + if (!NM_DEVICE_GET_PRIVATE(info->port)->is_attached) continue; - path = nm_dbus_object_get_path(NM_DBUS_OBJECT(info->slave)); + path = nm_dbus_object_get_path(NM_DBUS_OBJECT(info->port)); if (!path) continue; if (!any) { @@ -18690,7 +18698,7 @@ nm_device_init(NMDevice *self) c_list_init(&self->devices_lst); c_list_init(&self->devcon_dev_lst_head); c_list_init(&self->policy_auto_activate_lst); - c_list_init(&priv->slaves); + c_list_init(&priv->ports); priv->ipdhcp_data_6.v6.mode = NM_NDISC_DHCP_LEVEL_NONE; @@ -18844,7 +18852,7 @@ dispose(GObject *object) _cleanup_generic_pre(self, CLEANUP_TYPE_KEEP); - nm_assert(c_list_is_empty(&priv->slaves)); + nm_assert(c_list_is_empty(&priv->ports)); /* Let the kernel manage IPv6LL again */ _dev_addrgenmode6_set(self, NM_IN6_ADDR_GEN_MODE_EUI64); diff --git a/src/core/devices/nm-device.h b/src/core/devices/nm-device.h index ba45497ce2..37eda5c0c8 100644 --- a/src/core/devices/nm-device.h +++ b/src/core/devices/nm-device.h @@ -375,10 +375,10 @@ typedef struct _NMDeviceClass { /* Update the connection with currently configured L2 settings */ void (*update_connection)(NMDevice *device, NMConnection *connection); - gboolean (*master_update_slave_connection)(NMDevice *self, - NMDevice *slave, - NMConnection *connection, - GError **error); + gboolean (*controller_update_port_connection)(NMDevice *self, + NMDevice *port, + NMConnection *connection, + GError **error); /* Attachs a port asynchronously. Returns TRUE/FALSE on immediate * success/error; in such cases, the callback is not invoked. If the @@ -526,14 +526,14 @@ gboolean nm_device_is_available(NMDevice *dev, NMDeviceCheckDevAvailableFlags fl gboolean nm_device_has_carrier(NMDevice *dev); NMConnection *nm_device_generate_connection(NMDevice *self, - NMDevice *master, + NMDevice *controller, gboolean *out_maybe_later, GError **error); -gboolean nm_device_master_update_slave_connection(NMDevice *master, - NMDevice *slave, - NMConnection *connection, - GError **error); +gboolean nm_device_controller_update_port_connection(NMDevice *controller, + NMDevice *port, + NMConnection *connection, + GError **error); gboolean nm_device_can_auto_connect(NMDevice *self, NMSettingsConnection *sett_conn, char **specific_object); @@ -549,7 +549,7 @@ gboolean nm_device_check_connection_compatible(NMDevice *device, gboolean check_properties, GError **error); -gboolean nm_device_check_slave_connection_compatible(NMDevice *device, NMConnection *connection); +gboolean nm_device_check_port_connection_compatible(NMDevice *device, NMConnection *connection); gboolean nm_device_can_be_parent(NMDevice *device); gboolean nm_device_can_assume_connections(NMDevice *self); @@ -603,9 +603,9 @@ void nm_device_copy_ip6_dns_config(NMDevice *self, NMDevice *from_device); * them by default * @NM_UNMANAGED_USER_UDEV: %TRUE when unmanaged by user decision (via UDev rule) * @NM_UNMANAGED_EXTERNAL_DOWN: %TRUE when unmanaged because !IFF_UP and not created by NM - * @NM_UNMANAGED_IS_SLAVE: indicates that the device is enslaved. Note that - * setting the NM_UNMANAGED_IS_SLAVE to %TRUE makes no sense, this flag has only - * meaning to set a slave device as managed if the parent is managed too. + * @NM_UNMANAGED_IS_PORT: indicates that the device is attached as port. Note that + * setting the NM_UNMANAGED_IS_PORT to %TRUE makes no sense, this flag has only + * meaning to set a port device as managed if the parent is managed too. */ typedef enum { NM_UNMANAGED_NONE = 0, @@ -624,7 +624,7 @@ typedef enum { NM_UNMANAGED_USER_CONF = (1LL << 6), NM_UNMANAGED_USER_UDEV = (1LL << 7), NM_UNMANAGED_EXTERNAL_DOWN = (1LL << 8), - NM_UNMANAGED_IS_SLAVE = (1LL << 9), + NM_UNMANAGED_IS_PORT = (1LL << 9), NM_UNMANAGED_ALL = ((1LL << 10) - 1), } NMUnmanagedFlags; diff --git a/src/core/devices/ovs/nm-device-ovs-bridge.c b/src/core/devices/ovs/nm-device-ovs-bridge.c index 27d0400380..0977766939 100644 --- a/src/core/devices/ovs/nm-device-ovs-bridge.c +++ b/src/core/devices/ovs/nm-device-ovs-bridge.c @@ -49,7 +49,7 @@ create_and_realize(NMDevice *device, const NMPlatformLink **out_plink, GError **error) { - /* The actual backing resources will be created on enslavement by the port + /* The actual backing resources will be created on attachment by the port * when it can identify the port and the bridge. */ return TRUE; diff --git a/src/core/devices/ovs/nm-device-ovs-port.c b/src/core/devices/ovs/nm-device-ovs-port.c index e102028060..2acafba231 100644 --- a/src/core/devices/ovs/nm-device-ovs-port.c +++ b/src/core/devices/ovs/nm-device-ovs-port.c @@ -48,7 +48,7 @@ create_and_realize(NMDevice *device, const NMPlatformLink **out_plink, GError **error) { - /* The port will be added to ovsdb when an interface is enslaved, + /* The port will be added to ovsdb when an interface is attached as port, * because there's no such thing like an empty port. */ return TRUE; diff --git a/src/core/devices/team/nm-device-team.c b/src/core/devices/team/nm-device-team.c index 1f70537f60..0f420a7a27 100644 --- a/src/core/devices/team/nm-device-team.c +++ b/src/core/devices/team/nm-device-team.c @@ -238,10 +238,10 @@ update_connection(NMDevice *device, NMConnection *connection) /*****************************************************************************/ static gboolean -master_update_slave_connection(NMDevice *device, - NMDevice *slave, - NMConnection *connection, - GError **error) +controller_update_port_connection(NMDevice *device, + NMDevice *port, + NMConnection *connection, + GError **error) { NMDeviceTeam *self = NM_DEVICE_TEAM(device); NMSettingTeamPort *s_port; @@ -251,23 +251,24 @@ master_update_slave_connection(NMDevice *device, struct teamdctl *tdc; const char *team_port_config = NULL; const char *iface = nm_device_get_iface(device); - const char *iface_slave = nm_device_get_iface(slave); + const char *iface_port = nm_device_get_iface(port); NMConnection *applied_connection = nm_device_get_applied_connection(device); tdc = _tdc_connect_new(self, iface, &connect_error); if (!tdc) { - g_set_error(error, - NM_DEVICE_ERROR, - NM_DEVICE_ERROR_FAILED, - "update slave connection for slave '%s' failed to connect to teamd for master " - "%s (%s)", - iface_slave, - iface, - connect_error->message); + g_set_error( + error, + NM_DEVICE_ERROR, + NM_DEVICE_ERROR_FAILED, + "update port connection for port '%s' failed to connect to teamd for controller " + "%s (%s)", + iface_port, + iface, + connect_error->message); return FALSE; } - err = teamdctl_port_config_get_raw_direct(tdc, iface_slave, (char **) &team_port_config); + err = teamdctl_port_config_get_raw_direct(tdc, iface_port, (char **) &team_port_config); port_config = g_strdup(team_port_config); teamdctl_disconnect(tdc); teamdctl_free(tdc); @@ -275,9 +276,9 @@ master_update_slave_connection(NMDevice *device, g_set_error(error, NM_DEVICE_ERROR, NM_DEVICE_ERROR_FAILED, - "update slave connection for slave '%s' failed to get configuration from teamd " - "master %s (err=%d)", - iface_slave, + "update port connection for port '%s' failed to get configuration from teamd " + "controller %s (err=%d)", + iface_port, iface, err); g_free(port_config); @@ -858,7 +859,7 @@ attach_port(NMDevice *device, const char *port_iface = nm_device_get_ip_iface(port); NMSettingTeamPort *s_team_port; - nm_device_master_check_slave_physical_port(device, port, LOGD_TEAM); + nm_device_controller_check_port_physical_port(device, port, LOGD_TEAM); if (configure) { nm_device_take_down(port, TRUE); @@ -881,9 +882,9 @@ attach_port(NMDevice *device, return FALSE; } } - success = nm_platform_link_enslave(nm_device_get_platform(device), - nm_device_get_ip_ifindex(device), - nm_device_get_ip_ifindex(port)); + success = nm_platform_link_attach_port(nm_device_get_platform(device), + nm_device_get_ip_ifindex(device), + nm_device_get_ip_ifindex(port)); nm_device_bring_up(port); if (!success) @@ -927,9 +928,9 @@ detach_port(NMDevice *device, if (ifindex_port <= 0) { _LOGD(LOGD_TEAM, "team port %s is already detached", port_iface); } else if (do_release) { - success = nm_platform_link_release(nm_device_get_platform(device), - nm_device_get_ip_ifindex(device), - ifindex_port); + success = nm_platform_link_release_port(nm_device_get_platform(device), + nm_device_get_ip_ifindex(device), + ifindex_port); if (success) _LOGI(LOGD_TEAM, "detached team port %s", port_iface); else @@ -974,7 +975,7 @@ create_and_realize(NMDevice *device, g_set_error(error, NM_DEVICE_ERROR, NM_DEVICE_ERROR_CREATION_FAILED, - "Failed to create team master interface '%s' for '%s': %s", + "Failed to create team controller interface '%s' for '%s': %s", iface, nm_connection_get_id(connection), nm_strerror(r)); @@ -1127,12 +1128,12 @@ nm_device_team_class_init(NMDeviceTeamClass *klass) device_class->connection_type_check_compatible = NM_SETTING_TEAM_SETTING_NAME; device_class->link_types = NM_DEVICE_DEFINE_LINK_TYPES(NM_LINK_TYPE_TEAM); - device_class->is_controller = TRUE; - device_class->create_and_realize = create_and_realize; - device_class->get_generic_capabilities = get_generic_capabilities; - device_class->complete_connection = complete_connection; - device_class->update_connection = update_connection; - device_class->master_update_slave_connection = master_update_slave_connection; + device_class->is_controller = TRUE; + device_class->create_and_realize = create_and_realize; + device_class->get_generic_capabilities = get_generic_capabilities; + device_class->complete_connection = complete_connection; + device_class->update_connection = update_connection; + device_class->controller_update_port_connection = controller_update_port_connection; device_class->act_stage1_prepare_also_for_external_or_assume = TRUE; device_class->act_stage1_prepare = act_stage1_prepare; diff --git a/src/core/devices/wifi/nm-device-wifi.c b/src/core/devices/wifi/nm-device-wifi.c index 206113e471..f24b973318 100644 --- a/src/core/devices/wifi/nm-device-wifi.c +++ b/src/core/devices/wifi/nm-device-wifi.c @@ -3293,8 +3293,8 @@ act_stage2_config(NMDevice *device, NMDeviceStateReason *out_failure_reason) GError *error = NULL; guint timeout; NMActRequest *request; - NMActiveConnection *master_ac; - NMDevice *master; + NMActiveConnection *controller_ac; + NMDevice *controller; nm_clear_g_source(&priv->sup_timeout_id); nm_clear_g_source(&priv->link_timeout_id); @@ -3374,10 +3374,10 @@ act_stage2_config(NMDevice *device, NMDeviceStateReason *out_failure_reason) /* Tell the supplicant in which bridge the interface is */ if ((request = nm_device_get_act_request(device)) - && (master_ac = nm_active_connection_get_controller(NM_ACTIVE_CONNECTION(request))) - && (master = nm_active_connection_get_device(master_ac)) - && nm_device_get_device_type(master) == NM_DEVICE_TYPE_BRIDGE) { - nm_supplicant_interface_set_bridge(priv->sup_iface, nm_device_get_iface(master)); + && (controller_ac = nm_active_connection_get_controller(NM_ACTIVE_CONNECTION(request))) + && (controller = nm_active_connection_get_device(controller_ac)) + && nm_device_get_device_type(controller) == NM_DEVICE_TYPE_BRIDGE) { + nm_supplicant_interface_set_bridge(priv->sup_iface, nm_device_get_iface(controller)); } else nm_supplicant_interface_set_bridge(priv->sup_iface, NULL); diff --git a/src/core/nm-act-request.c b/src/core/nm-act-request.c index bed7ffde18..b2ccc1ff6a 100644 --- a/src/core/nm-act-request.c +++ b/src/core/nm-act-request.c @@ -349,7 +349,7 @@ device_state_changed(NMActiveConnection *active, } static void -master_failed(NMActiveConnection *self) +controller_failed(NMActiveConnection *self) { NMDevice *device; NMDeviceState device_state; @@ -496,7 +496,7 @@ nm_act_request_class_init(NMActRequestClass *req_class) /* virtual methods */ object_class->dispose = dispose; object_class->get_property = get_property; - active_class->master_failed = master_failed; + active_class->controller_failed = controller_failed; active_class->device_state_changed = device_state_changed; /* properties */ diff --git a/src/core/nm-active-connection.c b/src/core/nm-active-connection.c index fd345495dc..ca1993cf67 100644 --- a/src/core/nm-active-connection.c +++ b/src/core/nm-active-connection.c @@ -157,12 +157,12 @@ static NM_UTILS_FLAGS2STR_DEFINE( _state_flags_to_string, NMActivationStateFlags, NM_UTILS_FLAGS2STR(NM_ACTIVATION_STATE_FLAG_NONE, "none"), - NM_UTILS_FLAGS2STR(NM_ACTIVATION_STATE_FLAG_IS_MASTER, "is-master"), - NM_UTILS_FLAGS2STR(NM_ACTIVATION_STATE_FLAG_IS_SLAVE, "is-slave"), + NM_UTILS_FLAGS2STR(NM_ACTIVATION_STATE_FLAG_IS_CONTROLLER, "is-controller"), + NM_UTILS_FLAGS2STR(NM_ACTIVATION_STATE_FLAG_IS_PORT, "is-port"), NM_UTILS_FLAGS2STR(NM_ACTIVATION_STATE_FLAG_LAYER2_READY, "layer2-ready"), NM_UTILS_FLAGS2STR(NM_ACTIVATION_STATE_FLAG_IP4_READY, "ip4-ready"), NM_UTILS_FLAGS2STR(NM_ACTIVATION_STATE_FLAG_IP6_READY, "ip6-ready"), - NM_UTILS_FLAGS2STR(NM_ACTIVATION_STATE_FLAG_MASTER_HAS_SLAVES, "master-has-slaves"), + NM_UTILS_FLAGS2STR(NM_ACTIVATION_STATE_FLAG_CONTROLLER_HAS_PORTS, "controller-has-ports"), NM_UTILS_FLAGS2STR(NM_ACTIVATION_STATE_FLAG_LIFETIME_BOUND_TO_PROFILE_VISIBILITY, "lifetime-bound-to-profile-visibility"), NM_UTILS_FLAGS2STR(NM_ACTIVATION_STATE_FLAG_EXTERNAL, "external"), ); @@ -444,19 +444,19 @@ _set_applied_connection_take(NMActiveConnection *self, NMConnection *applied_con priv->applied_connection = applied_connection; nm_connection_clear_secrets(priv->applied_connection); - /* we determine whether the connection is a master/slave, based solely + /* we determine whether the connection is a controller/port, based solely * on the connection properties itself. */ s_con = nm_connection_get_setting_connection(priv->applied_connection); if (nm_setting_connection_get_controller(s_con)) - flags_val |= NM_ACTIVATION_STATE_FLAG_IS_SLAVE; + flags_val |= NM_ACTIVATION_STATE_FLAG_IS_PORT; - if (_nm_connection_type_is_master(nm_setting_connection_get_connection_type(s_con))) - flags_val |= NM_ACTIVATION_STATE_FLAG_IS_MASTER; + if (_nm_connection_type_is_controller(nm_setting_connection_get_connection_type(s_con))) + flags_val |= NM_ACTIVATION_STATE_FLAG_IS_CONTROLLER; nm_active_connection_set_state_flags_full(self, flags_val, - NM_ACTIVATION_STATE_FLAG_IS_MASTER - | NM_ACTIVATION_STATE_FLAG_IS_SLAVE); + NM_ACTIVATION_STATE_FLAG_IS_CONTROLLER + | NM_ACTIVATION_STATE_FLAG_IS_PORT); } void @@ -642,12 +642,12 @@ device_state_changed(NMDevice *device, } static void -device_master_changed(GObject *object, GParamSpec *pspec, gpointer user_data) +device_controller_changed(GObject *object, GParamSpec *pspec, gpointer user_data) { NMDevice *device = NM_DEVICE(object); NMActiveConnection *self = NM_ACTIVE_CONNECTION(user_data); - NMActiveConnection *master; - NMActiveConnectionState master_state; + NMActiveConnection *controller; + NMActiveConnectionState controller_state; if (NM_ACTIVE_CONNECTION(nm_device_get_act_request(device)) != self) return; @@ -655,14 +655,14 @@ device_master_changed(GObject *object, GParamSpec *pspec, gpointer user_data) return; if (!nm_active_connection_get_controller(self)) return; - g_signal_handlers_disconnect_by_func(device, G_CALLBACK(device_master_changed), self); + g_signal_handlers_disconnect_by_func(device, G_CALLBACK(device_controller_changed), self); - master = nm_active_connection_get_controller(self); - master_state = nm_active_connection_get_state(master); - if (master_state >= NM_ACTIVE_CONNECTION_STATE_DEACTIVATING) { - /* Master failed before attaching the slave */ - if (NM_ACTIVE_CONNECTION_GET_CLASS(self)->master_failed) - NM_ACTIVE_CONNECTION_GET_CLASS(self)->master_failed(self); + controller = nm_active_connection_get_controller(self); + controller_state = nm_active_connection_get_state(controller); + if (controller_state >= NM_ACTIVE_CONNECTION_STATE_DEACTIVATING) { + /* Controller failed before attaching the port */ + if (NM_ACTIVE_CONNECTION_GET_CLASS(self)->controller_failed) + NM_ACTIVE_CONNECTION_GET_CLASS(self)->controller_failed(self); } } @@ -704,7 +704,7 @@ nm_active_connection_set_device(NMActiveConnection *self, NMDevice *device) _device_cleanup(self); if (device) { - /* Device obviously can't be its own master */ + /* Device obviously can't be its own controller */ g_return_val_if_fail(!priv->controller || device != nm_active_connection_get_device(priv->controller), FALSE); @@ -714,7 +714,7 @@ nm_active_connection_set_device(NMActiveConnection *self, NMDevice *device) g_signal_connect(device, NM_DEVICE_STATE_CHANGED, G_CALLBACK(device_state_changed), self); g_signal_connect(device, "notify::" NM_DEVICE_CONTROLLER, - G_CALLBACK(device_master_changed), + G_CALLBACK(device_controller_changed), self); g_signal_connect(device, "notify::" NM_DEVICE_METERED, @@ -777,8 +777,8 @@ check_controller_ready(NMActiveConnection *self) gboolean signalling = FALSE; /* ActiveConnetions don't enter the ACTIVATING state until they have a - * NMDevice in PREPARE or higher states, so the master active connection's - * device will be ready to accept slaves when the master is in ACTIVATING + * NMDevice in PREPARE or higher states, so the controller active connection's + * device will be ready to accept ports when the controller is in ACTIVATING * or higher states. */ if (!priv->controller_ready && priv->controller @@ -812,18 +812,18 @@ check_controller_ready(NMActiveConnection *self) } static void -master_state_cb(NMActiveConnection *master, GParamSpec *pspec, gpointer user_data) +controller_state_cb(NMActiveConnection *controller, GParamSpec *pspec, gpointer user_data) { - NMActiveConnection *self = NM_ACTIVE_CONNECTION(user_data); - NMActiveConnectionPrivate *priv = NM_ACTIVE_CONNECTION_GET_PRIVATE(self); - NMActiveConnectionState master_state = nm_active_connection_get_state(master); + NMActiveConnection *self = NM_ACTIVE_CONNECTION(user_data); + NMActiveConnectionPrivate *priv = NM_ACTIVE_CONNECTION_GET_PRIVATE(self); + NMActiveConnectionState controller_state = nm_active_connection_get_state(controller); check_controller_ready(self); - if (master_state == NM_ACTIVE_CONNECTION_STATE_DEACTIVATING && !priv->controller_ready) { - /* Master disconnected before the slave was added */ - if (NM_ACTIVE_CONNECTION_GET_CLASS(self)->master_failed) - NM_ACTIVE_CONNECTION_GET_CLASS(self)->master_failed(self); + if (controller_state == NM_ACTIVE_CONNECTION_STATE_DEACTIVATING && !priv->controller_ready) { + /* Controller disconnected before the port was added */ + if (NM_ACTIVE_CONNECTION_GET_CLASS(self)->controller_failed) + NM_ACTIVE_CONNECTION_GET_CLASS(self)->controller_failed(self); } } @@ -880,7 +880,7 @@ nm_active_connection_set_controller(NMActiveConnection *self, NMActiveConnection } if (priv->device) { - /* Note, the master ActiveConnection may not yet have a device */ + /* Note, the controller ActiveConnection may not yet have a device */ g_return_if_fail(priv->device != nm_active_connection_get_device(controller)); } @@ -895,7 +895,7 @@ nm_active_connection_set_controller(NMActiveConnection *self, NMActiveConnection g_signal_connect(priv->controller, "notify::" NM_ACTIVE_CONNECTION_STATE, - G_CALLBACK(master_state_cb), + G_CALLBACK(controller_state_cb), self); check_controller_ready(self); @@ -1323,7 +1323,9 @@ _device_cleanup(NMActiveConnection *self) if (priv->device) { g_signal_handlers_disconnect_by_func(priv->device, G_CALLBACK(device_state_changed), self); - g_signal_handlers_disconnect_by_func(priv->device, G_CALLBACK(device_master_changed), self); + g_signal_handlers_disconnect_by_func(priv->device, + G_CALLBACK(device_controller_changed), + self); g_signal_handlers_disconnect_by_func(priv->device, G_CALLBACK(device_metered_changed), self); @@ -1345,7 +1347,7 @@ get_property(GObject *object, guint prop_id, GValue *value, GParamSpec *pspec) NMActiveConnection *self = NM_ACTIVE_CONNECTION(object); NMActiveConnectionPrivate *priv = NM_ACTIVE_CONNECTION_GET_PRIVATE(self); char **strv; - NMDevice *master_device = NULL; + NMDevice *controller_device = NULL; switch (prop_id) { /* note that while priv->settings_connection.obj might not be set initially, @@ -1418,8 +1420,8 @@ get_property(GObject *object, guint prop_id, GValue *value, GParamSpec *pspec) case PROP_CONTROLLER: case PROP_MASTER: if (priv->controller) - master_device = nm_active_connection_get_device(priv->controller); - nm_dbus_utils_g_value_set_object_path(value, master_device); + controller_device = nm_active_connection_get_device(priv->controller); + nm_dbus_utils_g_value_set_object_path(value, controller_device); break; case PROP_INT_SUBJECT: g_value_set_object(value, priv->subject); @@ -1600,7 +1602,9 @@ dispose(GObject *object) _device_cleanup(self); if (priv->controller) { - g_signal_handlers_disconnect_by_func(priv->controller, G_CALLBACK(master_state_cb), self); + g_signal_handlers_disconnect_by_func(priv->controller, + G_CALLBACK(controller_state_cb), + self); } if (priv->controller_dev) { g_signal_handlers_disconnect_by_func(priv->controller_dev, diff --git a/src/core/nm-active-connection.h b/src/core/nm-active-connection.h index ba32830257..81c8fd0350 100644 --- a/src/core/nm-active-connection.h +++ b/src/core/nm-active-connection.h @@ -80,7 +80,7 @@ typedef struct { NMDeviceState new_state, NMDeviceState old_state, NMDeviceStateReason reason); - void (*master_failed)(NMActiveConnection *connection); + void (*controller_failed)(NMActiveConnection *connection); void (*device_changed)(NMActiveConnection *connection, NMDevice *new_device, diff --git a/src/core/nm-bond-manager.c b/src/core/nm-bond-manager.c index 9985fccf11..71cd4ee732 100644 --- a/src/core/nm-bond-manager.c +++ b/src/core/nm-bond-manager.c @@ -696,7 +696,7 @@ _reconfigure_check(NMBondManager *self, gboolean reapply) /* Find all the connected ports that are IFF_RUNNING. */ pl_links_head_entry = nm_platform_lookup_obj_type(self->platform, NMP_OBJECT_TYPE_LINK); nmp_cache_iter_for_each_link (&pliter, pl_links_head_entry, &plink_port) { - if (plink_port->master != self->ifindex) + if (plink_port->controller != self->ifindex) continue; if (!NM_FLAGS_HAS(plink_port->n_ifi_flags, IFF_RUNNING)) continue; @@ -814,7 +814,7 @@ _link_changed_cb(NMPlatform *platform, if (ifindex == self->ifindex) goto schedule; - if (plink->master == self->ifindex) + if (plink->controller == self->ifindex) goto schedule; if (g_hash_table_contains(self->previous_ifindexes, GINT_TO_POINTER(ifindex))) diff --git a/src/core/nm-config-data.c b/src/core/nm-config-data.c index ef514bc76b..0a73695a13 100644 --- a/src/core/nm-config-data.c +++ b/src/core/nm-config-data.c @@ -383,8 +383,8 @@ nm_config_data_get_iwd_config_path(const NMConfigData *self) gboolean nm_config_data_get_ignore_carrier_for_port(const NMConfigData *self, - const char *master, - const char *slave_type) + const char *controller, + const char *port_type) { const char *value; gboolean has_match; @@ -393,15 +393,15 @@ nm_config_data_get_ignore_carrier_for_port(const NMConfigData *self, g_return_val_if_fail(NM_IS_CONFIG_DATA(self), FALSE); - if (!master || !slave_type) + if (!controller || !port_type) goto out_default; - if (!nm_utils_ifname_valid_kernel(master, NULL)) + if (!nm_utils_ifname_valid_kernel(controller, NULL)) goto out_default; match_data = (NMMatchSpecDeviceData){ - .interface_name = master, - .device_type = slave_type, + .interface_name = controller, + .device_type = port_type, }; value = _config_data_get_device_config(self, @@ -422,7 +422,7 @@ nm_config_data_get_ignore_carrier_for_port(const NMConfigData *self, return m; out_default: - /* if ignore-carrier is not explicitly or detected for the master, then we assume it's + /* if ignore-carrier is not explicitly or detected for the controller, then we assume it's * enabled. This is in line with nm_config_data_get_ignore_carrier_by_device(), where * ignore-carrier is enabled based on nm_device_ignore_carrier_by_default(). */ diff --git a/src/core/nm-config-data.h b/src/core/nm-config-data.h index 5eaf458f99..1ea0ccf25c 100644 --- a/src/core/nm-config-data.h +++ b/src/core/nm-config-data.h @@ -188,8 +188,8 @@ const char *nm_config_data_get_rc_manager(const NMConfigData *self); gboolean nm_config_data_get_systemd_resolved(const NMConfigData *self); gboolean nm_config_data_get_ignore_carrier_for_port(const NMConfigData *self, - const char *master, - const char *slave_type); + const char *controller, + const char *port_type); gboolean nm_config_data_get_ignore_carrier_by_device(const NMConfigData *self, NMDevice *device); gboolean nm_config_data_get_assume_ipv6ll_only(const NMConfigData *self, NMDevice *device); diff --git a/src/core/nm-l3-config-data.c b/src/core/nm-l3-config-data.c index 908c4d65d5..03c66ce01c 100644 --- a/src/core/nm-l3-config-data.c +++ b/src/core/nm-l3-config-data.c @@ -3082,8 +3082,8 @@ nm_l3_config_data_new_from_platform(NMDedupMultiIndex *multi_idx, nm_assert(NM_IS_PLATFORM(platform)); nm_assert(ifindex > 0); - /* Slaves have no IP configuration */ - if (nm_platform_link_get_master(platform, ifindex) > 0) + /* Ports have no IP configuration */ + if (nm_platform_link_get_controller(platform, ifindex) > 0) return NULL; self = nm_l3_config_data_new(multi_idx, ifindex, NM_IP_CONFIG_SOURCE_KERNEL); diff --git a/src/core/nm-manager.c b/src/core/nm-manager.c index e949ea1189..0a7e7b2e4a 100644 --- a/src/core/nm-manager.c +++ b/src/core/nm-manager.c @@ -390,13 +390,13 @@ static void policy_activating_ac_changed(GObject *object, GParamSpec *pspec, gpo static void device_has_pending_action_changed(NMDevice *device, GParamSpec *pspec, NMManager *self); static void check_if_startup_complete(NMManager *self); -static gboolean find_master(NMManager *self, - NMConnection *connection, - NMDevice *device, - NMSettingsConnection **out_master_connection, - NMDevice **out_master_device, - NMActiveConnection **out_master_ac, - GError **error); +static gboolean find_controller(NMManager *self, + NMConnection *connection, + NMDevice *device, + NMSettingsConnection **out_controller_connection, + NMDevice **out_controller_device, + NMActiveConnection **out_controller_ac, + GError **error); static void nm_manager_update_state(NMManager *manager); @@ -1908,11 +1908,11 @@ find_device_by_ip_iface(NMManager *self, const char *iface) * @self: the #NMManager * @iface: the device interface to find * @connection: a connection to ensure the returned device is compatible with - * @slave: a slave connection to ensure a master is compatible with + * @port: a port connection to ensure a controller is compatible with * - * Finds a device by interface name, preferring realized devices. If @slave - * is given, this function will only return master devices and will ensure - * @slave, when activated, can be a slave of the returned master device. If + * Finds a device by interface name, preferring realized devices. If @port + * is given, this function will only return controller devices and will ensure + * @port, when activated, can be a port of the returned controller device. If * @connection is given, this function will only consider devices that are * compatible with @connection. If @child is given, this function will only * return parent device. @@ -1923,7 +1923,7 @@ static NMDevice * find_device_by_iface(NMManager *self, const char *iface, NMConnection *connection, - NMConnection *slave, + NMConnection *port, NMConnection *child) { NMManagerPrivate *priv = NM_MANAGER_GET_PRIVATE(self); @@ -1937,10 +1937,10 @@ find_device_by_iface(NMManager *self, continue; if (connection && !nm_device_check_connection_compatible(candidate, connection, TRUE, NULL)) continue; - if (slave) { + if (port) { if (!nm_device_is_controller(candidate)) continue; - if (!nm_device_check_slave_connection_compatible(candidate, slave)) + if (!nm_device_check_port_connection_compatible(candidate, port)) continue; } if (child && !nm_device_can_be_parent(candidate)) @@ -2348,7 +2348,7 @@ remove_device(NMManager *self, NMDevice *device, gboolean quitting) _emit_device_added_removed(self, device, FALSE); } else { - /* unrealize() does not release a slave device from master and + /* unrealize() does not release a port device from controller and * clear IP configurations, do it here */ nm_device_removed(device, TRUE); } @@ -2676,7 +2676,7 @@ system_create_virtual_device(NMManager *self, NMConnection *connection) return device; } - if (!find_master(self, connection, device, NULL, NULL, NULL, &error)) { + if (!find_controller(self, connection, device, NULL, NULL, NULL, &error)) { _LOG3D(LOGD_DEVICE, connection, "skip activation: %s", error->message); return device; } @@ -3350,7 +3350,7 @@ get_existing_connection(NMManager *self, NMDevice *device, gboolean *out_generat NMSettingsConnection *added; GError *error = NULL; gs_free_error GError *gen_error = NULL; - NMDevice *master = NULL; + NMDevice *controller = NULL; int ifindex = nm_device_get_ifindex(device); NMSettingsConnection *matched = NULL; NMSettingsConnection *connection_checked = NULL; @@ -3368,31 +3368,31 @@ get_existing_connection(NMManager *self, NMDevice *device, gboolean *out_generat } if (ifindex) { - int master_ifindex = nm_platform_link_get_master(priv->platform, ifindex); + int controller_ifindex = nm_platform_link_get_controller(priv->platform, ifindex); - /* Check that the master is activating before assuming a - * slave connection. However, ignore ovs-system/ovs-netdev master as + /* Check that the controller is activating before assuming a + * port connection. However, ignore ovs-system/ovs-netdev controller as * we never manage it. */ - if (master_ifindex - && nm_platform_link_get_type(priv->platform, master_ifindex) + if (controller_ifindex + && nm_platform_link_get_type(priv->platform, controller_ifindex) != NM_LINK_TYPE_OPENVSWITCH) { - master = nm_manager_get_device_by_ifindex(self, master_ifindex); - if (!master) { + controller = nm_manager_get_device_by_ifindex(self, controller_ifindex); + if (!controller) { _LOG2D(LOGD_DEVICE, device, "assume: don't assume because " - "cannot generate connection for slave before its master (%s/%d)", - nm_platform_link_get_name(priv->platform, master_ifindex), - master_ifindex); + "cannot generate connection for port before its controller (%s/%d)", + nm_platform_link_get_name(priv->platform, controller_ifindex), + controller_ifindex); return NULL; } - if (!nm_device_get_act_request(master)) { + if (!nm_device_get_act_request(controller)) { _LOG2D(LOGD_DEVICE, device, "assume: don't assume because " - "cannot generate connection for slave before master %s activates", - nm_device_get_iface(master)); + "cannot generate connection for port before controller %s activates", + nm_device_get_iface(controller)); return NULL; } } @@ -3409,7 +3409,7 @@ get_existing_connection(NMManager *self, NMDevice *device, gboolean *out_generat * class attribute. Devices that support assuming existing connections must * have update_connection() implemented, otherwise * nm_device_generate_connection() returns NULL. */ - connection = nm_device_generate_connection(device, master, &maybe_later, &gen_error); + connection = nm_device_generate_connection(device, controller, &maybe_later, &gen_error); if (!connection) { if (maybe_later) { /* The device can potentially assume connections, but at this @@ -3716,7 +3716,7 @@ recheck_assume_connection(NMManager *self, NMDevice *device) { gs_unref_object NMActiveConnection *active = NULL; gs_unref_object NMAuthSubject *subject = NULL; - NMActiveConnection *master_ac; + NMActiveConnection *controller_ac; GError *error = NULL; subject = nm_auth_subject_new_internal(); @@ -3771,17 +3771,17 @@ recheck_assume_connection(NMManager *self, NMDevice *device) return FALSE; } - /* If the device is a slave or VLAN, find the master ActiveConnection */ - master_ac = NULL; - if (find_master(self, - nm_settings_connection_get_connection(sett_conn), - device, - NULL, - NULL, - &master_ac, - NULL) - && master_ac) - nm_active_connection_set_controller(active, master_ac); + /* If the device is a port or VLAN, find the controller ActiveConnection */ + controller_ac = NULL; + if (find_controller(self, + nm_settings_connection_get_connection(sett_conn), + device, + NULL, + NULL, + &controller_ac, + NULL) + && controller_ac) + nm_active_connection_set_controller(active, controller_ac); active_connection_add(self, active); nm_device_queue_activation(device, NM_ACT_REQUEST(active)); @@ -4863,131 +4863,132 @@ impl_manager_get_device_by_ip_iface(NMDBusObject *obj, } static gboolean -is_compatible_with_slave(NMConnection *master, NMConnection *slave) +is_compatible_with_port(NMConnection *controller, NMConnection *port) { NMSettingConnection *s_con; - g_return_val_if_fail(master, FALSE); - g_return_val_if_fail(slave, FALSE); + g_return_val_if_fail(controller, FALSE); + g_return_val_if_fail(port, FALSE); - s_con = nm_connection_get_setting_connection(slave); + s_con = nm_connection_get_setting_connection(port); g_assert(s_con); - return nm_connection_is_type(master, nm_setting_connection_get_port_type(s_con)); + return nm_connection_is_type(controller, nm_setting_connection_get_port_type(s_con)); } /** - * find_master: + * find_controller: * @self: #NMManager object - * @connection: the #NMConnection to find the master connection and device for + * @connection: the #NMConnection to find the controller connection and device for * @device: the #NMDevice, if any, which will activate @connection - * @out_master_connection: on success, the master connection of @connection if - * that master connection was found - * @out_master_device: on success, the master device of @connection if that - * master device was found - * @out_master_ac: on success, the master ActiveConnection of @connection if + * @out_controller_connection: on success, the controller connection of @connection if + * that controller connection was found + * @out_controller_device: on success, the controller device of @connection if that + * controller device was found + * @out_controller_ac: on success, the controller ActiveConnection of @connection if * there already is one * @error: the error, if an error occurred * - * Given an #NMConnection, attempts to find its master. If @connection has - * no master, this will return %TRUE and @out_master_connection and - * @out_master_device will be untouched. + * Given an #NMConnection, attempts to find its controller. If @connection has + * no controller, this will return %TRUE and @out_controller_connection and + * @out_controller_device will be untouched. * - * If @connection does have a master, then the outputs depend on what is in its - * #NMSettingConnection:master property: + * If @connection does have a controller, then the outputs depend on what is in its + * #NMSettingConnection:controller property: * - * If "master" is the ifname of an existing #NMDevice, and that device has a - * compatible master connection activated or activating on it, then - * @out_master_device, @out_master_connection, and @out_master_ac will all be - * set. If the device exists and is idle, only @out_master_device will be set. + * If "controller" is the ifname of an existing #NMDevice, and that device has a + * compatible controller connection activated or activating on it, then + * @out_controller_device, @out_controller_connection, and @out_controller_ac will all be + * set. If the device exists and is idle, only @out_controller_device will be set. * If the device exists and has an incompatible connection on it, an error * will be returned. * - * If "master" is the ifname of a non-existent device, then @out_master_device - * will be %NULL, and @out_master_connection will be a connection whose - * activation would cause the creation of that device. @out_master_ac MAY be + * If "controller" is the ifname of a non-existent device, then @out_controller_device + * will be %NULL, and @out_controller_connection will be a connection whose + * activation would cause the creation of that device. @out_controller_ac MAY be * set in this case as well (if the connection has started activating, but has * not yet created its device). * - * If "master" is the UUID of a compatible master connection, then - * @out_master_connection will be the identified connection, and @out_master_device - * and/or @out_master_ac will be set if the connection is currently activating. - * (@out_master_device will not be set if the device exists but does not have - * @out_master_connection active/activating on it.) + * If "controller" is the UUID of a compatible controller connection, then + * @out_controller_connection will be the identified connection, and @out_controller_device + * and/or @out_controller_ac will be set if the connection is currently activating. + * (@out_controller_device will not be set if the device exists but does not have + * @out_controller_connection active/activating on it.) * - * Returns: %TRUE if the master device and/or connection could be found or if - * the connection did not require a master, %FALSE otherwise + * Returns: %TRUE if the controller device and/or connection could be found or if + * the connection did not require a controller, %FALSE otherwise **/ static gboolean -find_master(NMManager *self, - NMConnection *connection, - NMDevice *device, - NMSettingsConnection **out_master_connection, - NMDevice **out_master_device, - NMActiveConnection **out_master_ac, - GError **error) +find_controller(NMManager *self, + NMConnection *connection, + NMDevice *device, + NMSettingsConnection **out_controller_connection, + NMDevice **out_controller_device, + NMActiveConnection **out_controller_ac, + GError **error) { NMManagerPrivate *priv = NM_MANAGER_GET_PRIVATE(self); NMSettingConnection *s_con; - const char *master; - NMDevice *master_device = NULL; - NMSettingsConnection *master_connection = NULL; + const char *controller; + NMDevice *controller_device = NULL; + NMSettingsConnection *controller_connection = NULL; NMSettingsConnection *const *connections; guint i; - nm_assert(!out_master_connection || !*out_master_connection); - nm_assert(!out_master_device || !*out_master_device); - nm_assert(!out_master_ac || !*out_master_ac); + nm_assert(!out_controller_connection || !*out_controller_connection); + nm_assert(!out_controller_device || !*out_controller_device); + nm_assert(!out_controller_ac || !*out_controller_ac); - s_con = nm_connection_get_setting_connection(connection); - master = nm_setting_connection_get_controller(s_con); + s_con = nm_connection_get_setting_connection(connection); + controller = nm_setting_connection_get_controller(s_con); - if (master == NULL) - return TRUE; /* success, but no master */ + if (controller == NULL) + return TRUE; /* success, but no controller */ _LOGD(LOGD_CORE, - "Looking for a master '%s' for connection '%s' (%s)", - master, + "Looking for a controller '%s' for connection '%s' (%s)", + controller, nm_connection_get_id(connection), nm_connection_get_uuid(connection)); connections = nm_settings_get_connections_sorted_by_autoconnect_priority(priv->settings, NULL); for (i = 0; connections[i]; i++) { - NMConnection *master_candidate = nm_settings_connection_get_connection(connections[i]); + NMConnection *controller_candidate = nm_settings_connection_get_connection(connections[i]); NMDevice *device_candidate; - if (nm_streq(nm_connection_get_uuid(master_candidate), master)) { - if (!is_compatible_with_slave(master_candidate, connection)) { + if (nm_streq(nm_connection_get_uuid(controller_candidate), controller)) { + if (!is_compatible_with_port(controller_candidate, connection)) { g_set_error(error, NM_MANAGER_ERROR, NM_MANAGER_ERROR_DEPENDENCY_FAILED, "The active connection on %s is not compatible", - nm_device_get_iface(master_device)); + nm_device_get_iface(controller_device)); return FALSE; } _LOGD(LOGD_CORE, - "Will consider using connection '%s' (%s) as a master for '%s' (%s) " + "Will consider using connection '%s' (%s) as a controller for '%s' (%s) " "because UUID matches", - nm_connection_get_id(master_candidate), - nm_connection_get_uuid(master_candidate), + nm_connection_get_id(controller_candidate), + nm_connection_get_uuid(controller_candidate), nm_connection_get_id(connection), nm_connection_get_uuid(connection)); - master_connection = connections[i]; - } else if (nm_connection_get_interface_name(master_candidate) - && nm_streq(nm_connection_get_interface_name(master_candidate), master)) { - if (!is_compatible_with_slave(master_candidate, connection)) + controller_connection = connections[i]; + } else if (nm_connection_get_interface_name(controller_candidate) + && nm_streq(nm_connection_get_interface_name(controller_candidate), + controller)) { + if (!is_compatible_with_port(controller_candidate, connection)) continue; /* This might be good enough unless we find a better one (already active or UUID match) */ - if (!master_connection) { - master_connection = connections[i]; + if (!controller_connection) { + controller_connection = connections[i]; _LOGD(LOGD_CORE, - "Will consider using connection '%s' (%s) as a master for '%s' (%s) " + "Will consider using connection '%s' (%s) as a controller for '%s' (%s) " "because device matches", - nm_connection_get_id(master_candidate), - nm_connection_get_uuid(master_candidate), + nm_connection_get_id(controller_candidate), + nm_connection_get_uuid(controller_candidate), nm_connection_get_id(connection), nm_connection_get_uuid(connection)); } @@ -4996,24 +4997,24 @@ find_master(NMManager *self, continue; } - /* Check if the master connection is activated on some device already */ + /* Check if the controller connection is activated on some device already */ c_list_for_each_entry (device_candidate, &priv->devices_lst_head, devices_lst) { if (device_candidate == device) continue; if (nm_device_get_settings_connection(device_candidate) == connections[i]) { - master_device = device_candidate; - master_connection = connections[i]; + controller_device = device_candidate; + controller_connection = connections[i]; break; } } - if (master_device) { + if (controller_device) { /* Now we got a connection and also a device. Look no further. */ _LOGD(LOGD_CORE, - "Will use connection '%s' (%s) as a master for '%s' (%s)", - nm_connection_get_id(master_candidate), - nm_connection_get_uuid(master_candidate), + "Will use connection '%s' (%s) as a controller for '%s' (%s)", + nm_connection_get_id(controller_candidate), + nm_connection_get_uuid(controller_candidate), nm_connection_get_id(connection), nm_connection_get_uuid(connection)); @@ -5021,119 +5022,120 @@ find_master(NMManager *self, } } - if (!master_connection) { - master_device = find_device_by_iface(self, master, NULL, connection, NULL); - if (!master_device) { + if (!controller_connection) { + controller_device = find_device_by_iface(self, controller, NULL, connection, NULL); + if (!controller_device) { g_set_error(error, NM_MANAGER_ERROR, NM_MANAGER_ERROR_DEPENDENCY_FAILED, "Connection or device %s not found", - master); + controller); return FALSE; } - if (master_device == device) { + if (controller_device == device) { g_set_error_literal(error, NM_MANAGER_ERROR, NM_MANAGER_ERROR_DEPENDENCY_FAILED, - "Device cannot be its own master"); + "Device cannot be its own controller"); return FALSE; } _LOGD(LOGD_CORE, - "Master connection for '%s' (%s) not found, will use device '%s'", + "Controller connection for '%s' (%s) not found, will use device '%s'", nm_connection_get_id(connection), nm_connection_get_uuid(connection), - nm_device_get_iface(master_device)); + nm_device_get_iface(controller_device)); } - if (!master_device && !master_connection) { + if (!controller_device && !controller_connection) { g_set_error_literal(error, NM_MANAGER_ERROR, NM_MANAGER_ERROR_UNKNOWN_DEVICE, - "Master connection not found or invalid"); + "Controller connection not found or invalid"); return FALSE; } - NM_SET_OUT(out_master_connection, master_connection); - NM_SET_OUT(out_master_device, master_device); - if (out_master_ac && master_connection) { - *out_master_ac = active_connection_find(self, - master_connection, - NULL, - NM_ACTIVE_CONNECTION_STATE_DEACTIVATING, - FALSE, - NULL); + NM_SET_OUT(out_controller_connection, controller_connection); + NM_SET_OUT(out_controller_device, controller_device); + if (out_controller_ac && controller_connection) { + *out_controller_ac = active_connection_find(self, + controller_connection, + NULL, + NM_ACTIVE_CONNECTION_STATE_DEACTIVATING, + FALSE, + NULL); } return TRUE; } /** - * ensure_master_active_connection: + * ensure_controller_active_connection: * @self: the #NMManager * @subject: the #NMAuthSubject representing the requestor of this activation - * @connection: the connection that should depend on @master_connection + * @connection: the connection that should depend on @controller_connection * @device: the #NMDevice, if any, which will activate @connection - * @master_connection: the master connection, or %NULL - * @master_device: the master device, or %NULL + * @controller_connection: the controller connection, or %NULL + * @controller_device: the controller device, or %NULL * @activation_reason: the reason for activation * @error: the error, if an error occurred * * Determines whether a given #NMConnection depends on another connection to - * be activated, and if so, finds that master connection or creates it. + * be activated, and if so, finds that controller connection or creates it. * - * If @master_device and @master_connection are both set then @master_connection - * MUST already be activated or activating on @master_device, and the function will + * If @controller_device and @controller_connection are both set then @controller_connection + * MUST already be activated or activating on @controller_device, and the function will * return the existing #NMActiveConnection. * - * If only @master_device is set, and it has an #NMActiveConnection, then the - * function will return it if it is a compatible master, or an error if not. If it - * doesn't have an AC, then the function will create one if a compatible master + * If only @controller_device is set, and it has an #NMActiveConnection, then the + * function will return it if it is a compatible controller, or an error if not. If it + * doesn't have an AC, then the function will create one if a compatible controller * connection exists, or return an error if not. * - * If only @master_connection is set, then this will try to find or create a compatible - * #NMDevice, and either activate @master_connection on that device or return an error. + * If only @controller_connection is set, then this will try to find or create a compatible + * #NMDevice, and either activate @controller_connection on that device or return an error. * - * Returns: the master #NMActiveConnection that the caller should depend on, or + * Returns: the controller #NMActiveConnection that the caller should depend on, or * %NULL if an error occurred */ static NMActiveConnection * -ensure_master_active_connection(NMManager *self, - NMAuthSubject *subject, - NMConnection *connection, - NMDevice *device, - NMSettingsConnection *master_connection, - NMDevice *master_device, - NMActivationReason activation_reason, - GError **error) +ensure_controller_active_connection(NMManager *self, + NMAuthSubject *subject, + NMConnection *connection, + NMDevice *device, + NMSettingsConnection *controller_connection, + NMDevice *controller_device, + NMActivationReason activation_reason, + GError **error) { NMManagerPrivate *priv = NM_MANAGER_GET_PRIVATE(self); NMActiveConnection *ac; - NMActiveConnection *master_ac = NULL; - NMDeviceState master_state; + NMActiveConnection *controller_ac = NULL; + NMDeviceState controller_state; gboolean bind_lifetime_to_profile_visibility; g_return_val_if_fail(connection, NULL); - g_return_val_if_fail(master_connection || master_device, FALSE); + g_return_val_if_fail(controller_connection || controller_device, FALSE); bind_lifetime_to_profile_visibility = NM_FLAGS_HAS(nm_device_get_activation_state_flags(device), NM_ACTIVATION_STATE_FLAG_LIFETIME_BOUND_TO_PROFILE_VISIBILITY); - /* If the master device isn't activated then we need to activate it using + /* If the controller device isn't activated then we need to activate it using * compatible connection. If it's already activating we can just proceed. */ - if (master_device) { - NMSettingsConnection *device_connection = nm_device_get_settings_connection(master_device); + if (controller_device) { + NMSettingsConnection *device_connection = + nm_device_get_settings_connection(controller_device); /* If we're passed a connection and a device, we require that connection - * be already activated on the device, eg returned from find_master(). + * be already activated on the device, eg returned from find_controller(). */ - g_assert(!master_connection || master_connection == device_connection); + g_assert(!controller_connection || controller_connection == device_connection); if (device_connection - && !is_compatible_with_slave(nm_settings_connection_get_connection(device_connection), - connection)) { + && !is_compatible_with_port(nm_settings_connection_get_connection(device_connection), + connection)) { g_set_error(error, NM_MANAGER_ERROR, NM_MANAGER_ERROR_DEPENDENCY_FAILED, @@ -5142,10 +5144,11 @@ ensure_master_active_connection(NMManager *self, return NULL; } - master_state = nm_device_get_state(master_device); - if ((master_state == NM_DEVICE_STATE_ACTIVATED) || nm_device_is_activating(master_device)) { - /* Device already using master_connection */ - ac = NM_ACTIVE_CONNECTION(nm_device_get_act_request(master_device)); + controller_state = nm_device_get_state(controller_device); + if ((controller_state == NM_DEVICE_STATE_ACTIVATED) + || nm_device_is_activating(controller_device)) { + /* Device already using controller_connection */ + ac = NM_ACTIVE_CONNECTION(nm_device_get_act_request(controller_device)); g_return_val_if_fail(device_connection, ac); if (!bind_lifetime_to_profile_visibility) { @@ -5161,11 +5164,12 @@ ensure_master_active_connection(NMManager *self, /* If the device is disconnected, find a compatible connection and * activate it on the device. */ - if (master_state == NM_DEVICE_STATE_DISCONNECTED || !nm_device_is_real(master_device)) { + if (controller_state == NM_DEVICE_STATE_DISCONNECTED + || !nm_device_is_real(controller_device)) { gs_free NMSettingsConnection **connections = NULL; guint i; - g_assert(master_connection == NULL); + g_assert(controller_connection == NULL); /* Find a compatible connection and activate this device using it */ connections = nm_manager_get_activatable_connections(self, FALSE, TRUE, NULL); @@ -5173,24 +5177,24 @@ ensure_master_active_connection(NMManager *self, NMSettingsConnection *candidate = connections[i]; NMConnection *cand_conn = nm_settings_connection_get_connection(candidate); - /* Ensure eg bond/team slave and the candidate master is a - * bond/team master + /* Ensure eg bond/team port and the candidate controller is a + * bond/team controller */ - if (!is_compatible_with_slave(cand_conn, connection)) + if (!is_compatible_with_port(cand_conn, connection)) continue; if (nm_device_check_connection_available( - master_device, + controller_device, cand_conn, NM_DEVICE_CHECK_CON_AVAILABLE_FOR_USER_REQUEST, NULL, NULL)) { - master_ac = nm_manager_activate_connection( + controller_ac = nm_manager_activate_connection( self, candidate, NULL, NULL, - master_device, + controller_device, subject, NM_ACTIVATION_TYPE_MANAGED, activation_reason, @@ -5198,7 +5202,7 @@ ensure_master_active_connection(NMManager *self, ? NM_ACTIVATION_STATE_FLAG_LIFETIME_BOUND_TO_PROFILE_VISIBILITY : NM_ACTIVATION_STATE_FLAG_NONE, error); - return master_ac; + return controller_ac; } } @@ -5214,19 +5218,19 @@ ensure_master_active_connection(NMManager *self, NM_MANAGER_ERROR, NM_MANAGER_ERROR_DEPENDENCY_FAILED, "Device unmanaged or not available for activation"); - } else if (master_connection) { + } else if (controller_connection) { NMDevice *candidate; /* Find a compatible device and activate it using this connection */ c_list_for_each_entry (candidate, &priv->devices_lst_head, devices_lst) { if (candidate == device) { - /* A device obviously can't be its own master */ + /* A device obviously can't be its own controller */ continue; } if (!nm_device_check_connection_available( candidate, - nm_settings_connection_get_connection(master_connection), + nm_settings_connection_get_connection(controller_connection), NM_DEVICE_CHECK_CON_AVAILABLE_FOR_USER_REQUEST, NULL, NULL)) @@ -5238,9 +5242,9 @@ ensure_master_active_connection(NMManager *self, NM_DEVICE_STATE_DEACTIVATING)) continue; - master_ac = nm_manager_activate_connection( + controller_ac = nm_manager_activate_connection( self, - master_connection, + controller_connection, NULL, NULL, candidate, @@ -5251,7 +5255,7 @@ ensure_master_active_connection(NMManager *self, ? NM_ACTIVATION_STATE_FLAG_LIFETIME_BOUND_TO_PROFILE_VISIBILITY : NM_ACTIVATION_STATE_FLAG_NONE, error); - return master_ac; + return controller_ac; } g_set_error(error, @@ -5267,37 +5271,37 @@ ensure_master_active_connection(NMManager *self, typedef struct { NMSettingsConnection *connection; NMDevice *device; -} SlaveConnectionInfo; +} PortConnectionInfo; /** - * find_slaves: + * find_ports: * @manager: #NMManager object - * @sett_conn: the master #NMSettingsConnection to find slave connections for - * @device: the master #NMDevice for the @sett_conn - * @out_n_slaves: on return, the number of slaves found + * @sett_conn: the controller #NMSettingsConnection to find port connections for + * @device: the controller #NMDevice for the @sett_conn + * @out_n_ports: on return, the number of ports found * - * Given an #NMSettingsConnection, attempts to find its slaves. If @sett_conn is not - * master, or has not any slaves, this will return %NULL. + * Given an #NMSettingsConnection, attempts to find its ports. If @sett_conn is not + * controller, or has not any ports, this will return %NULL. * - * Returns: an array of #SlaveConnectionInfo for given master @sett_conn, or %NULL + * Returns: an array of #PortConnectionInfo for given controller @sett_conn, or %NULL **/ -static SlaveConnectionInfo * -find_slaves(NMManager *manager, - NMSettingsConnection *sett_conn, - NMDevice *device, - guint *out_n_slaves, - gboolean for_user_request) +static PortConnectionInfo * +find_ports(NMManager *manager, + NMSettingsConnection *sett_conn, + NMDevice *device, + guint *out_n_ports, + gboolean for_user_request) { NMManagerPrivate *priv = NM_MANAGER_GET_PRIVATE(manager); NMSettingsConnection *const *all_connections = NULL; guint n_all_connections; guint i; - SlaveConnectionInfo *slaves = NULL; - guint n_slaves = 0; + PortConnectionInfo *ports = NULL; + guint n_ports = 0; NMSettingConnection *s_con; gs_unref_hashtable GHashTable *devices = NULL; - nm_assert(out_n_slaves); + nm_assert(out_n_ports); s_con = nm_connection_get_setting_connection(nm_settings_connection_get_connection(sett_conn)); g_return_val_if_fail(s_con, NULL); @@ -5305,59 +5309,59 @@ find_slaves(NMManager *manager, devices = g_hash_table_new(nm_direct_hash, NULL); /* Search through all connections, not only inactive ones, because - * even if a slave was already active, it might be deactivated during - * master reactivation. + * even if a port was already active, it might be deactivated during + * controller reactivation. */ all_connections = nm_settings_get_connections_sorted_by_autoconnect_priority(priv->settings, &n_all_connections); for (i = 0; i < n_all_connections; i++) { - NMSettingsConnection *master_connection = NULL; - NMDevice *master_device = NULL; - NMDevice *slave_device; + NMSettingsConnection *controller_connection = NULL; + NMDevice *controller_device = NULL; + NMDevice *port_device; NMSettingsConnection *candidate = all_connections[i]; - find_master(manager, - nm_settings_connection_get_connection(candidate), - NULL, - &master_connection, - &master_device, - NULL, - NULL); - if ((master_connection && master_connection == sett_conn) - || (master_device && master_device == device)) { - slave_device = nm_manager_get_best_device_for_connection(manager, - candidate, - NULL, - for_user_request, - devices, - NULL); + find_controller(manager, + nm_settings_connection_get_connection(candidate), + NULL, + &controller_connection, + &controller_device, + NULL, + NULL); + if ((controller_connection && controller_connection == sett_conn) + || (controller_device && controller_device == device)) { + port_device = nm_manager_get_best_device_for_connection(manager, + candidate, + NULL, + for_user_request, + devices, + NULL); - if (!slaves) { + if (!ports) { /* what we allocate is quite likely much too large. Don't bother, it is only * a temporary buffer. */ - slaves = g_new(SlaveConnectionInfo, n_all_connections); + ports = g_new(PortConnectionInfo, n_all_connections); } - nm_assert(n_slaves < n_all_connections); - slaves[n_slaves++] = (SlaveConnectionInfo){ + nm_assert(n_ports < n_all_connections); + ports[n_ports++] = (PortConnectionInfo){ .connection = candidate, - .device = slave_device, + .device = port_device, }; - if (slave_device) - g_hash_table_add(devices, slave_device); + if (port_device) + g_hash_table_add(devices, port_device); } } - *out_n_slaves = n_slaves; + *out_n_ports = n_ports; - /* Warning: returns NULL if n_slaves is zero. */ - return slaves; + /* Warning: returns NULL if n_ports is zero. */ + return ports; } static gboolean -should_connect_slaves(NMConnection *connection, NMDevice *device) +should_connect_ports(NMConnection *connection, NMDevice *device) { NMSettingConnection *s_con; NMTernary val; @@ -5371,12 +5375,22 @@ should_connect_slaves(NMConnection *connection, NMDevice *device) val = nm_config_data_get_connection_default_int64(NM_CONFIG_GET_DATA, - NM_CON_DEFAULT("connection.autoconnect-slaves"), + NM_CON_DEFAULT("connection.autoconnect-ports"), device, 0, 1, -1); + /* Trust "connection.autoconnect-ports" first, if set to default fallback to the deprecated term. */ + if (val == NM_TERNARY_DEFAULT) + val = nm_config_data_get_connection_default_int64( + NM_CONFIG_GET_DATA, + NM_CON_DEFAULT("connection.autoconnect-slaves"), + device, + 0, + 1, + -1); + out: if (val == NM_TERNARY_FALSE) return FALSE; @@ -5386,12 +5400,12 @@ out: } static int -compare_slaves(gconstpointer a, gconstpointer b) +compare_ports(gconstpointer a, gconstpointer b) { - const SlaveConnectionInfo *a_info = a; - const SlaveConnectionInfo *b_info = b; + const PortConnectionInfo *a_info = a; + const PortConnectionInfo *b_info = b; - /* Slaves without a device at the end */ + /* Ports without a device at the end */ if (!a_info->device) return 1; if (!b_info->device) @@ -5401,93 +5415,95 @@ compare_slaves(gconstpointer a, gconstpointer b) } static void -autoconnect_slaves(NMManager *self, - NMSettingsConnection *master_connection, - NMDevice *master_device, - NMAuthSubject *subject, - gboolean for_user_request) +autoconnect_ports(NMManager *self, + NMSettingsConnection *controller_connection, + NMDevice *controller_device, + NMAuthSubject *subject, + gboolean for_user_request) { GError *local_err = NULL; - if (should_connect_slaves(nm_settings_connection_get_connection(master_connection), - master_device)) { - gs_free SlaveConnectionInfo *slaves = NULL; - guint i, n_slaves = 0; - gboolean bind_lifetime_to_profile_visibility; + if (should_connect_ports(nm_settings_connection_get_connection(controller_connection), + controller_device)) { + gs_free PortConnectionInfo *ports = NULL; + guint i, n_ports = 0; + gboolean bind_lifetime_to_profile_visibility; - slaves = find_slaves(self, master_connection, master_device, &n_slaves, for_user_request); - if (n_slaves > 1) { - qsort(slaves, n_slaves, sizeof(slaves[0]), compare_slaves); + ports = + find_ports(self, controller_connection, controller_device, &n_ports, for_user_request); + if (n_ports > 1) { + qsort(ports, n_ports, sizeof(ports[0]), compare_ports); } bind_lifetime_to_profile_visibility = - n_slaves > 0 - && NM_FLAGS_HAS(nm_device_get_activation_state_flags(master_device), + n_ports > 0 + && NM_FLAGS_HAS(nm_device_get_activation_state_flags(controller_device), NM_ACTIVATION_STATE_FLAG_LIFETIME_BOUND_TO_PROFILE_VISIBILITY); - for (i = 0; i < n_slaves; i++) { - SlaveConnectionInfo *slave = &slaves[i]; - const char *uuid; + for (i = 0; i < n_ports; i++) { + PortConnectionInfo *port = &ports[i]; + const char *uuid; - /* To avoid loops when autoconnecting slaves, we propagate - * the UUID of the initial connection down to slaves until + /* To avoid loops when autoconnecting ports, we propagate + * the UUID of the initial connection down to ports until * the same connection is found. */ - uuid = g_object_get_qdata(G_OBJECT(master_connection), autoconnect_root_quark()); - if (nm_streq0(nm_settings_connection_get_uuid(slave->connection), uuid)) { + uuid = g_object_get_qdata(G_OBJECT(controller_connection), autoconnect_root_quark()); + if (nm_streq0(nm_settings_connection_get_uuid(port->connection), uuid)) { _LOGI(LOGD_CORE, - "will NOT activate slave connection '%s' (%s) as a dependency for master " + "will NOT activate port connection '%s' (%s) as a dependency for controller " "'%s' (%s): " "circular dependency detected", - nm_settings_connection_get_id(slave->connection), - nm_settings_connection_get_uuid(slave->connection), - nm_settings_connection_get_id(master_connection), - nm_settings_connection_get_uuid(master_connection)); + nm_settings_connection_get_id(port->connection), + nm_settings_connection_get_uuid(port->connection), + nm_settings_connection_get_id(controller_connection), + nm_settings_connection_get_uuid(controller_connection)); continue; } if (!uuid) - uuid = nm_settings_connection_get_uuid(master_connection); - g_object_set_qdata_full(G_OBJECT(slave->connection), + uuid = nm_settings_connection_get_uuid(controller_connection); + g_object_set_qdata_full(G_OBJECT(port->connection), autoconnect_root_quark(), g_strdup(uuid), g_free); - if (!slave->device) { + if (!port->device) { _LOGD(LOGD_CORE, - "will NOT activate slave connection '%s' (%s) as a dependency for master " + "will NOT activate port connection '%s' (%s) as a dependency for controller " "'%s' (%s): " "no compatible device found", - nm_settings_connection_get_id(slave->connection), - nm_settings_connection_get_uuid(slave->connection), - nm_settings_connection_get_id(master_connection), - nm_settings_connection_get_uuid(master_connection)); + nm_settings_connection_get_id(port->connection), + nm_settings_connection_get_uuid(port->connection), + nm_settings_connection_get_id(controller_connection), + nm_settings_connection_get_uuid(controller_connection)); continue; } - _LOGD(LOGD_CORE, - "will activate slave connection '%s' (%s) as a dependency for master '%s' (%s)", - nm_settings_connection_get_id(slave->connection), - nm_settings_connection_get_uuid(slave->connection), - nm_settings_connection_get_id(master_connection), - nm_settings_connection_get_uuid(master_connection)); + _LOGD( + LOGD_CORE, + "will activate port connection '%s' (%s) as a dependency for controller '%s' (%s)", + nm_settings_connection_get_id(port->connection), + nm_settings_connection_get_uuid(port->connection), + nm_settings_connection_get_id(controller_connection), + nm_settings_connection_get_uuid(controller_connection)); - /* Schedule slave activation */ + /* Schedule port activation */ nm_manager_activate_connection( self, - slave->connection, + port->connection, NULL, NULL, - slave->device, + port->device, subject, NM_ACTIVATION_TYPE_MANAGED, - NM_ACTIVATION_REASON_AUTOCONNECT_SLAVES, + NM_ACTIVATION_REASON_AUTOCONNECT_PORTS, bind_lifetime_to_profile_visibility ? NM_ACTIVATION_STATE_FLAG_LIFETIME_BOUND_TO_PROFILE_VISIBILITY : NM_ACTIVATION_STATE_FLAG_NONE, &local_err); if (local_err) { - _LOGW(LOGD_CORE, "Slave connection activation failed: %s", local_err->message); + _LOGW(LOGD_CORE, "Port connection activation failed: %s", local_err->message); g_clear_error(&local_err); } } @@ -5633,9 +5649,9 @@ active_connection_parent_active(NMActiveConnection *active, static gboolean _check_autoconnect_port(NMActiveConnection *active, - NMSettingsConnection *master_connection, - NMDevice *master_device, - NMActiveConnection *master_ac) + NMSettingsConnection *controller_connection, + NMDevice *controller_device, + NMActiveConnection *controller_ac) { NMSettingConnection *s_con; NMDevice *device; @@ -5645,7 +5661,7 @@ _check_autoconnect_port(NMActiveConnection *active, return TRUE; } - if (!master_connection) { + if (!controller_connection) { /* This is not a port. Proceed. */ return TRUE; } @@ -5667,7 +5683,8 @@ _check_autoconnect_port(NMActiveConnection *active, return TRUE; } - s_con = nm_settings_connection_get_setting(master_connection, NM_META_SETTING_TYPE_CONNECTION); + s_con = + nm_settings_connection_get_setting(controller_connection, NM_META_SETTING_TYPE_CONNECTION); if (nm_setting_connection_get_autoconnect(s_con)) { /* The controller profile has autoconnect enabled. Here we want to honor @@ -5680,7 +5697,7 @@ _check_autoconnect_port(NMActiveConnection *active, NM_CONFIG_GET_DATA, nm_setting_connection_get_interface_name(s_con), nm_setting_connection_get_connection_type(s_con))) { - /* We ignore carrier on the master (as we would do by default). Proceed. */ + /* We ignore carrier on the controller (as we would do by default). Proceed. */ return TRUE; } @@ -5691,12 +5708,12 @@ static gboolean _internal_activate_device(NMManager *self, NMActiveConnection *active, GError **error) { NMDevice *device; - NMDevice *master_device = NULL; + NMDevice *controller_device = NULL; NMConnection *applied; NMSettingsConnection *sett_conn; - NMSettingsConnection *master_connection = NULL; - NMConnection *existing_connection = NULL; - NMActiveConnection *master_ac = NULL; + NMSettingsConnection *controller_connection = NULL; + NMConnection *existing_connection = NULL; + NMActiveConnection *controller_ac = NULL; NMAuthSubject *subject; GError *local = NULL; NMConnectionMultiConnect multi_connect; @@ -5753,16 +5770,16 @@ _internal_activate_device(NMManager *self, NMActiveConnection *active, GError ** if (nm_active_connection_get_activation_type(active) == NM_ACTIVATION_TYPE_MANAGED) nm_device_sys_iface_state_set(device, NM_DEVICE_SYS_IFACE_STATE_MANAGED); - /* Try to find the master connection/device if the connection has a dependency */ - if (!find_master(self, - applied, - device, - &master_connection, - &master_device, - &master_ac, - error)) { + /* Try to find the controller connection/device if the connection has a dependency */ + if (!find_controller(self, + applied, + device, + &controller_connection, + &controller_device, + &controller_ac, + error)) { g_prefix_error(error, - "Can not find a master for %s: ", + "Can not find a controller for %s: ", nm_settings_connection_get_id(sett_conn)); return FALSE; } @@ -5786,7 +5803,7 @@ _internal_activate_device(NMManager *self, NMActiveConnection *active, GError ** * before they have layer 2 set up. */ - if (!_check_autoconnect_port(active, master_connection, master_device, master_ac)) { + if (!_check_autoconnect_port(active, controller_connection, controller_device, controller_ac)) { /* Usually, port and controller devices can (auto)connect without carrier. However, * the controller has "ignore-carrier=no" configured. If the port autoconnects, * has no carrier and the controller has ignore-carrier=no, then autoconnect @@ -5878,66 +5895,67 @@ _internal_activate_device(NMManager *self, NMActiveConnection *active, GError ** } } - /* Ensure there's a master active connection the new connection we're + /* Ensure there's a controller active connection the new connection we're * activating can depend on. */ - if (master_connection || master_device) { - if (master_connection) { + if (controller_connection || controller_device) { + if (controller_connection) { _LOGD(LOGD_CORE, - "Activation of '%s' requires master connection '%s'", + "Activation of '%s' requires controller connection '%s'", nm_settings_connection_get_id(sett_conn), - nm_settings_connection_get_id(master_connection)); + nm_settings_connection_get_id(controller_connection)); } - if (master_device) { + if (controller_device) { _LOGD(LOGD_CORE, - "Activation of '%s' requires master device '%s'", + "Activation of '%s' requires controller device '%s'", nm_settings_connection_get_id(sett_conn), - nm_device_get_ip_iface(master_device)); + nm_device_get_ip_iface(controller_device)); } - /* Ensure eg bond slave and the candidate master is a bond master */ - if (master_connection - && !is_compatible_with_slave(nm_settings_connection_get_connection(master_connection), - applied)) { + /* Ensure eg bond port and the candidate controller is a bond controller */ + if (controller_connection + && !is_compatible_with_port( + nm_settings_connection_get_connection(controller_connection), + applied)) { g_set_error(error, NM_MANAGER_ERROR, NM_MANAGER_ERROR_DEPENDENCY_FAILED, - "The master connection '%s' is not compatible with '%s'", - nm_settings_connection_get_id(master_connection), + "The controller connection '%s' is not compatible with '%s'", + nm_settings_connection_get_id(controller_connection), nm_settings_connection_get_id(sett_conn)); return FALSE; } - if (!master_ac) { - master_ac = - ensure_master_active_connection(self, - nm_active_connection_get_subject(active), - applied, - device, - master_connection, - master_device, - nm_active_connection_get_activation_reason(active), - error); - if (!master_ac) { - if (master_device) { + if (!controller_ac) { + controller_ac = ensure_controller_active_connection( + self, + nm_active_connection_get_subject(active), + applied, + device, + controller_connection, + controller_device, + nm_active_connection_get_activation_reason(active), + error); + if (!controller_ac) { + if (controller_device) { g_prefix_error(error, - "Master device '%s' can't be activated: ", - nm_device_get_ip_iface(master_device)); + "Controller device '%s' can't be activated: ", + nm_device_get_ip_iface(controller_device)); } else { g_prefix_error(error, - "Master connection '%s' can't be activated: ", - nm_settings_connection_get_id(master_connection)); + "Controller connection '%s' can't be activated: ", + nm_settings_connection_get_id(controller_connection)); } return FALSE; } } - /* Now that we're activating a slave for that master, make sure the master just - * decides to go unmanaged while we're activating (perhaps because other slaves + /* Now that we're activating a port for that controller, make sure the controller just + * decides to go unmanaged while we're activating (perhaps because other ports * go away leaving him with no kids). */ - if (master_device) { - nm_device_set_unmanaged_by_flags(master_device, + if (controller_device) { + nm_device_set_unmanaged_by_flags(controller_device, NM_UNMANAGED_EXTERNAL_DOWN, NM_UNMAN_FLAG_OP_FORGET, NM_DEVICE_STATE_REASON_USER_REQUESTED); @@ -5948,35 +5966,36 @@ _internal_activate_device(NMManager *self, NMActiveConnection *active, GError ** * controller device state change to between NM_DEVICE_STATE_PREPARE and * NM_DEVICE_STATE_ACTIVATED. */ - if ((nm_active_connection_get_state(master_ac) >= NM_ACTIVE_CONNECTION_STATE_DEACTIVATING) - && master_device - && (nm_device_get_state_reason(master_device) + if ((nm_active_connection_get_state(controller_ac) + >= NM_ACTIVE_CONNECTION_STATE_DEACTIVATING) + && controller_device + && (nm_device_get_state_reason(controller_device) == NM_DEVICE_STATE_REASON_NEW_ACTIVATION)) { - nm_active_connection_set_controller_dev(active, master_device); + nm_active_connection_set_controller_dev(active, controller_device); _LOGD(LOGD_CORE, "Activation of '%s'(%s) depends on controller device %p %s", nm_settings_connection_get_id(sett_conn), nm_settings_connection_get_connection_type(sett_conn), - master_device, - nm_dbus_object_get_path(NM_DBUS_OBJECT(master_device)) ?: ""); + controller_device, + nm_dbus_object_get_path(NM_DBUS_OBJECT(controller_device)) ?: ""); } else { - nm_active_connection_set_controller(active, master_ac); + nm_active_connection_set_controller(active, controller_ac); _LOGD(LOGD_CORE, "Activation of '%s'(%s) depends on active connection %p %s", nm_settings_connection_get_id(sett_conn), nm_settings_connection_get_connection_type(sett_conn), - master_ac, - nm_dbus_object_get_path(NM_DBUS_OBJECT(master_ac)) ?: ""); + controller_ac, + nm_dbus_object_get_path(NM_DBUS_OBJECT(controller_ac)) ?: ""); } } - /* Check slaves for master connection and possibly activate them */ - autoconnect_slaves(self, - sett_conn, - device, - nm_active_connection_get_subject(active), - nm_active_connection_get_activation_reason(active) - == NM_ACTIVATION_REASON_USER_REQUEST); + /* Check ports for controller connection and possibly activate them */ + autoconnect_ports(self, + sett_conn, + device, + nm_active_connection_get_subject(active), + nm_active_connection_get_activation_reason(active) + == NM_ACTIVATION_REASON_USER_REQUEST); multi_connect = _nm_connection_get_multi_connect(nm_settings_connection_get_connection(sett_conn)); @@ -5984,7 +6003,7 @@ _internal_activate_device(NMManager *self, NMActiveConnection *active, GError ** || (multi_connect == NM_CONNECTION_MULTI_CONNECT_MANUAL_MULTIPLE && NM_IN_SET(nm_active_connection_get_activation_reason(active), NM_ACTIVATION_REASON_ASSUME, - NM_ACTIVATION_REASON_AUTOCONNECT_SLAVES, + NM_ACTIVATION_REASON_AUTOCONNECT_PORTS, NM_ACTIVATION_REASON_USER_REQUEST))) { /* the profile can be activated multiple times. Proceed. */ } else { @@ -6335,8 +6354,8 @@ nm_manager_activate_connection(NMManager *self, /* Look for a active connection that's equivalent and is already pending authorization * and eventual activation. This is used to de-duplicate concurrent activations which would * otherwise race and cause the device to disconnect and reconnect repeatedly. - * In particular, this allows the master and multiple slaves to concurrently auto-activate - * while all the slaves would use the same active-connection. */ + * In particular, this allows the controller and multiple ports to concurrently auto-activate + * while all the ports would use the same active-connection. */ c_list_for_each_entry (async_op_data, &priv->async_op_lst_head, async_op_lst) { if (async_op_data->async_op_type != ASYNC_OP_TYPE_AC_AUTH_ACTIVATE_INTERNAL) continue; diff --git a/src/core/nm-policy.c b/src/core/nm-policy.c index 2f77d44044..c9561aebd5 100644 --- a/src/core/nm-policy.c +++ b/src/core/nm-policy.c @@ -1844,9 +1844,9 @@ unblock_autoconnect_for_children(NMPolicy *self, static void unblock_autoconnect_for_ports(NMPolicy *self, - const char *master_device, - const char *master_uuid_settings, - const char *master_uuid_applied, + const char *controller_device, + const char *controller_uuid_settings, + const char *controller_uuid_applied, gboolean reset_devcon_autoconnect) { NMPolicyPrivate *priv = NM_POLICY_GET_PRIVATE(self); @@ -1857,11 +1857,11 @@ unblock_autoconnect_for_ports(NMPolicy *self, _LOGT(LOGD_CORE, "block-autoconnect: unblocking port profiles for controller ifname=%s%s%s, uuid=%s%s%s" "%s%s%s", - NM_PRINT_FMT_QUOTE_STRING(master_device), - NM_PRINT_FMT_QUOTE_STRING(master_uuid_settings), - NM_PRINT_FMT_QUOTED(master_uuid_applied, + NM_PRINT_FMT_QUOTE_STRING(controller_device), + NM_PRINT_FMT_QUOTE_STRING(controller_uuid_settings), + NM_PRINT_FMT_QUOTED(controller_uuid_applied, ", applied-uuid=\"", - master_uuid_applied, + controller_uuid_applied, "\"", "")); @@ -1869,16 +1869,18 @@ unblock_autoconnect_for_ports(NMPolicy *self, connections = nm_settings_get_connections(priv->settings, NULL); for (i = 0; connections[i]; i++) { NMSettingsConnection *sett_conn = connections[i]; - NMSettingConnection *s_slave_con; - const char *slave_master; + NMSettingConnection *s_port_con; + const char *port_controller; - s_slave_con = - nm_settings_connection_get_setting(sett_conn, NM_META_SETTING_TYPE_CONNECTION); - slave_master = nm_setting_connection_get_controller(s_slave_con); - if (!slave_master) + s_port_con = nm_settings_connection_get_setting(sett_conn, NM_META_SETTING_TYPE_CONNECTION); + port_controller = nm_setting_connection_get_controller(s_port_con); + if (!port_controller) continue; - if (!NM_IN_STRSET(slave_master, master_device, master_uuid_applied, master_uuid_settings)) + if (!NM_IN_STRSET(port_controller, + controller_device, + controller_uuid_applied, + controller_uuid_settings)) continue; if (reset_devcon_autoconnect) { @@ -1905,8 +1907,8 @@ unblock_autoconnect_for_ports(NMPolicy *self, static void unblock_autoconnect_for_ports_for_sett_conn(NMPolicy *self, NMSettingsConnection *sett_conn) { - const char *master_device; - const char *master_uuid_settings; + const char *controller_device; + const char *controller_uuid_settings; NMSettingConnection *s_con; nm_assert(NM_IS_POLICY(self)); @@ -1916,10 +1918,10 @@ unblock_autoconnect_for_ports_for_sett_conn(NMPolicy *self, NMSettingsConnection nm_assert(NM_IS_SETTING_CONNECTION(s_con)); - master_uuid_settings = nm_setting_connection_get_uuid(s_con); - master_device = nm_setting_connection_get_interface_name(s_con); + controller_uuid_settings = nm_setting_connection_get_uuid(s_con); + controller_device = nm_setting_connection_get_interface_name(s_con); - unblock_autoconnect_for_ports(self, master_device, master_uuid_settings, NULL, TRUE); + unblock_autoconnect_for_ports(self, controller_device, controller_uuid_settings, NULL, TRUE); } static void diff --git a/src/core/nm-types.h b/src/core/nm-types.h index 6dfdc8e240..907da0bb83 100644 --- a/src/core/nm-types.h +++ b/src/core/nm-types.h @@ -68,7 +68,7 @@ typedef enum { NM_ACTIVATION_REASON_EXTERNAL, NM_ACTIVATION_REASON_ASSUME, NM_ACTIVATION_REASON_AUTOCONNECT, - NM_ACTIVATION_REASON_AUTOCONNECT_SLAVES, + NM_ACTIVATION_REASON_AUTOCONNECT_PORTS, NM_ACTIVATION_REASON_USER_REQUEST, } NMActivationReason; diff --git a/src/core/platform/nm-fake-platform.c b/src/core/platform/nm-fake-platform.c index 74bbe4fb58..6a64746e45 100644 --- a/src/core/platform/nm-fake-platform.c +++ b/src/core/platform/nm-fake-platform.c @@ -199,14 +199,14 @@ link_add_prepare(NMPlatform *platform, NMFakePlatformLink *device, NMPObject *ob if (NM_FLAGS_HAS(obj_tmp->link.n_ifi_flags, IFF_UP)) { NMPLookup lookup; NMDedupMultiIter iter; - const NMPObject *slave_candidate = NULL; + const NMPObject *port_candidate = NULL; nmp_cache_iter_for_each ( &iter, nmp_cache_lookup(nm_platform_get_cache(platform), nmp_lookup_init_obj_type(&lookup, NMP_OBJECT_TYPE_LINK)), - &slave_candidate) { - if (nmp_cache_link_connected_for_slave(obj_tmp->link.ifindex, slave_candidate)) { + &port_candidate) { + if (nmp_cache_link_connected_for_port(obj_tmp->link.ifindex, port_candidate)) { connected = TRUE; break; } @@ -589,11 +589,11 @@ link_changed(NMPlatform *platform, ip6_address_delete(platform, device->obj->link.ifindex, device->ip6_lladdr, 64); } - if (device->obj->link.master) { - NMFakePlatformLink *master; + if (device->obj->link.controller) { + NMFakePlatformLink *controller; - master = link_get(platform, device->obj->link.master); - link_set_obj(platform, master, NULL); + controller = link_get(platform, device->obj->link.controller); + link_set_obj(platform, controller, NULL); } } @@ -736,20 +736,20 @@ link_change(NMPlatform *platform, } static gboolean -link_enslave(NMPlatform *platform, int master, int slave) +link_attach_port(NMPlatform *platform, int controller, int port) { - NMFakePlatformLink *device = link_get(platform, slave); - NMFakePlatformLink *master_device = link_get(platform, master); + NMFakePlatformLink *device = link_get(platform, port); + NMFakePlatformLink *controller_device = link_get(platform, controller); g_return_val_if_fail(device, FALSE); - g_return_val_if_fail(master_device, FALSE); + g_return_val_if_fail(controller_device, FALSE); - if (device->obj->link.master != master) { + if (device->obj->link.controller != controller) { nm_auto_nmpobj NMPObject *obj_tmp = NULL; - obj_tmp = nmp_object_clone(device->obj, FALSE); - obj_tmp->link.master = master; - if (NM_IN_SET(master_device->obj->link.type, NM_LINK_TYPE_BOND, NM_LINK_TYPE_TEAM)) + obj_tmp = nmp_object_clone(device->obj, FALSE); + obj_tmp->link.controller = controller; + if (NM_IN_SET(controller_device->obj->link.type, NM_LINK_TYPE_BOND, NM_LINK_TYPE_TEAM)) obj_tmp->link.n_ifi_flags = NM_FLAGS_SET(device->obj->link.n_ifi_flags, IFF_UP); link_set_obj(platform, device, obj_tmp); } @@ -758,21 +758,21 @@ link_enslave(NMPlatform *platform, int master, int slave) } static gboolean -link_release(NMPlatform *platform, int master_idx, int slave_idx) +link_release_port(NMPlatform *platform, int controller_idx, int port_idx) { - NMFakePlatformLink *master = link_get(platform, master_idx); - NMFakePlatformLink *slave = link_get(platform, slave_idx); - nm_auto_nmpobj NMPObject *obj_tmp = NULL; + NMFakePlatformLink *controller = link_get(platform, controller_idx); + NMFakePlatformLink *port = link_get(platform, port_idx); + nm_auto_nmpobj NMPObject *obj_tmp = NULL; - g_return_val_if_fail(master, FALSE); - g_return_val_if_fail(slave, FALSE); + g_return_val_if_fail(controller, FALSE); + g_return_val_if_fail(port, FALSE); - if (slave->obj->link.master != master->obj->link.ifindex) + if (port->obj->link.controller != controller->obj->link.ifindex) return FALSE; - obj_tmp = nmp_object_clone(slave->obj, FALSE); - obj_tmp->link.master = 0; - link_set_obj(platform, slave, obj_tmp); + obj_tmp = nmp_object_clone(port->obj, FALSE); + obj_tmp->link.controller = 0; + link_set_obj(platform, port, obj_tmp); return TRUE; } @@ -1438,8 +1438,8 @@ nm_fake_platform_class_init(NMFakePlatformClass *klass) platform_class->link_supports_vlans = link_supports_vlans; platform_class->link_supports_sriov = link_supports_sriov; - platform_class->link_enslave = link_enslave; - platform_class->link_release = link_release; + platform_class->link_attach_port = link_attach_port; + platform_class->link_release_port = link_release_port; platform_class->link_vlan_change = link_vlan_change; diff --git a/src/core/platform/tests/test-link.c b/src/core/platform/tests/test-link.c index 1d0bfdbe13..9f63b896ac 100644 --- a/src/core/platform/tests/test-link.c +++ b/src/core/platform/tests/test-link.c @@ -27,7 +27,7 @@ #define DUMMY_TYPEDESC "dummy" #define BOGUS_NAME "nm-bogus-device" #define BOGUS_IFINDEX INT_MAX -#define SLAVE_NAME "nm-test-slave" +#define PORT_NAME "nm-test-port" #define PARENT_NAME "nm-test-parent" #define VLAN_ID 4077 #define VLAN_FLAGS 0 @@ -228,7 +228,7 @@ test_port(int controller, int port_type, SignalData *controller_changed) SignalData *link_added = add_signal_ifname(NM_PLATFORM_SIGNAL_LINK_CHANGED, NM_PLATFORM_SIGNAL_ADDED, link_callback, - SLAVE_NAME); + PORT_NAME); SignalData *link_changed, *link_removed; NMLinkType controller_type = nm_platform_link_get_type(NM_PLATFORM_GET, controller); gboolean test_link_changed_signal_arg1; @@ -236,8 +236,8 @@ test_port(int controller, int port_type, SignalData *controller_changed) g_assert(NM_IN_SET(controller_type, NM_LINK_TYPE_TEAM, NM_LINK_TYPE_BOND, NM_LINK_TYPE_BRIDGE)); - g_assert(software_add(port_type, SLAVE_NAME)); - ifindex_port = nm_platform_link_get_ifindex(NM_PLATFORM_GET, SLAVE_NAME); + g_assert(software_add(port_type, PORT_NAME)); + ifindex_port = nm_platform_link_get_ifindex(NM_PLATFORM_GET, PORT_NAME); g_assert(ifindex_port > 0); link_changed = add_signal_ifindex(NM_PLATFORM_SIGNAL_LINK_CHANGED, NM_PLATFORM_SIGNAL_CHANGED, @@ -260,8 +260,8 @@ test_port(int controller, int port_type, SignalData *controller_changed) /* Attach port */ link_changed->ifindex = ifindex_port; - g_assert(nm_platform_link_enslave(NM_PLATFORM_GET, controller, ifindex_port)); - g_assert_cmpint(nm_platform_link_get_master(NM_PLATFORM_GET, ifindex_port), ==, controller); + g_assert(nm_platform_link_attach_port(NM_PLATFORM_GET, controller, ifindex_port)); + g_assert_cmpint(nm_platform_link_get_controller(NM_PLATFORM_GET, ifindex_port), ==, controller); accept_signals(link_changed, 1, 3); accept_signals(controller_changed, 0, 2); @@ -279,7 +279,7 @@ test_port(int controller, int port_type, SignalData *controller_changed) const NMPlatformLink *link; const NMPlatformLnkBond *lnk; - link = nmtstp_link_get_typed(NM_PLATFORM_GET, 0, SLAVE_NAME, NM_LINK_TYPE_DUMMY); + link = nmtstp_link_get_typed(NM_PLATFORM_GET, 0, PORT_NAME, NM_LINK_TYPE_DUMMY); g_assert(link); lnk = nm_platform_link_get_lnk_bond(NM_PLATFORM_GET, controller, NULL); @@ -298,7 +298,7 @@ test_port(int controller, int port_type, SignalData *controller_changed) g_assert(nm_platform_link_change(NM_PLATFORM_GET, ifindex_port, NULL, &bond_port, NULL, 0)); accept_signals(link_changed, 1, 3); - link = nmtstp_link_get(NM_PLATFORM_GET, ifindex_port, SLAVE_NAME); + link = nmtstp_link_get(NM_PLATFORM_GET, ifindex_port, PORT_NAME); g_assert(link); g_assert_cmpint(link->port_data.bond.queue_id, ==, 5); g_assert(link->port_data.bond.prio_has || link->port_data.bond.prio == 0); @@ -309,7 +309,7 @@ test_port(int controller, int port_type, SignalData *controller_changed) const NMPlatformLink *link; const NMPlatformLnkBridge *lnk; - link = nmtstp_link_get_typed(NM_PLATFORM_GET, 0, SLAVE_NAME, NM_LINK_TYPE_DUMMY); + link = nmtstp_link_get_typed(NM_PLATFORM_GET, 0, PORT_NAME, NM_LINK_TYPE_DUMMY); g_assert(link); lnk = nm_platform_link_get_lnk_bridge(NM_PLATFORM_GET, controller, NULL); @@ -329,7 +329,7 @@ test_port(int controller, int port_type, SignalData *controller_changed) 0)); accept_signals(link_changed, 1, 3); - link = nmtstp_link_get(NM_PLATFORM_GET, ifindex_port, SLAVE_NAME); + link = nmtstp_link_get(NM_PLATFORM_GET, ifindex_port, PORT_NAME); g_assert(link); g_assert_cmpint(link->port_data.bridge.path_cost, ==, 100); g_assert_cmpint(link->port_data.bridge.priority, ==, 614); @@ -415,7 +415,7 @@ test_port(int controller, int port_type, SignalData *controller_changed) * Gracefully succeed if already attached port. */ ensure_no_signal(link_changed); - g_assert(nm_platform_link_enslave(NM_PLATFORM_GET, controller, ifindex_port)); + g_assert(nm_platform_link_attach_port(NM_PLATFORM_GET, controller, ifindex_port)); accept_signals(link_changed, 0, 2); accept_signals(controller_changed, 0, 2); @@ -423,8 +423,8 @@ test_port(int controller, int port_type, SignalData *controller_changed) ensure_no_signal(link_added); ensure_no_signal(link_changed); ensure_no_signal(link_removed); - g_assert(nm_platform_link_release(NM_PLATFORM_GET, controller, ifindex_port)); - g_assert_cmpint(nm_platform_link_get_master(NM_PLATFORM_GET, ifindex_port), ==, 0); + g_assert(nm_platform_link_release_port(NM_PLATFORM_GET, controller, ifindex_port)); + g_assert_cmpint(nm_platform_link_get_controller(NM_PLATFORM_GET, ifindex_port), ==, 0); if (link_changed->received_count > 0) { accept_signals(link_added, 0, 1); accept_signals(link_changed, 1, 5); @@ -442,7 +442,7 @@ test_port(int controller, int port_type, SignalData *controller_changed) /* Release again */ ensure_no_signal(link_changed); - g_assert(!nm_platform_link_release(NM_PLATFORM_GET, controller, ifindex_port)); + g_assert(!nm_platform_link_release_port(NM_PLATFORM_GET, controller, ifindex_port)); ensure_no_signal(controller_changed); @@ -517,28 +517,29 @@ test_software(NMLinkType link_type, const char *link_typename) g_assert(nm_platform_link_uses_arp(NM_PLATFORM_GET, ifindex)); accept_signal(link_changed); - /* Set master option */ + /* Set controller option */ if (nmtstp_is_root_test()) { switch (link_type) { case NM_LINK_TYPE_BRIDGE: if (nmtstp_is_sysfs_writable()) { - g_assert(nm_platform_sysctl_master_set_option(NM_PLATFORM_GET, - ifindex, - "forward_delay", - "628")); - value = - nm_platform_sysctl_master_get_option(NM_PLATFORM_GET, ifindex, "forward_delay"); + g_assert(nm_platform_sysctl_controller_set_option(NM_PLATFORM_GET, + ifindex, + "forward_delay", + "628")); + value = nm_platform_sysctl_controller_get_option(NM_PLATFORM_GET, + ifindex, + "forward_delay"); g_assert_cmpstr(value, ==, "628"); g_free(value); } break; case NM_LINK_TYPE_BOND: if (nmtstp_is_sysfs_writable()) { - g_assert(nm_platform_sysctl_master_set_option(NM_PLATFORM_GET, - ifindex, - "mode", - "active-backup")); - value = nm_platform_sysctl_master_get_option(NM_PLATFORM_GET, ifindex, "mode"); + g_assert(nm_platform_sysctl_controller_set_option(NM_PLATFORM_GET, + ifindex, + "mode", + "active-backup")); + value = nm_platform_sysctl_controller_get_option(NM_PLATFORM_GET, ifindex, "mode"); /* When reading back, the output looks slightly different. */ g_assert(g_str_has_prefix(value, "active-backup")); g_free(value); @@ -549,7 +550,7 @@ test_software(NMLinkType link_type, const char *link_typename) } } - /* Enslave and release */ + /* Attach port and release */ switch (link_type) { case NM_LINK_TYPE_BRIDGE: case NM_LINK_TYPE_BOND: @@ -2908,7 +2909,7 @@ test_nl_bugs_spuroius_newlink(void) pllink = nm_platform_link_get(NM_PLATFORM_GET, ifindex_dummy0); g_assert(pllink); g_assert(!nm_platform_link_get_permanent_address(NM_PLATFORM_GET, pllink, &hw_perm_addr)); - if (pllink->master == ifindex_bond0) + if (pllink->controller == ifindex_bond0) break; }); @@ -2965,7 +2966,7 @@ test_nl_bugs_spuroius_dellink(void) pllink = nm_platform_link_get(NM_PLATFORM_GET, ifindex_dummy0); g_assert(pllink); g_assert(!nm_platform_link_get_permanent_address(NM_PLATFORM_GET, pllink, &hw_perm_addr)); - if (pllink->master == ifindex_bridge0) + if (pllink->controller == ifindex_bridge0) break; }); @@ -4064,10 +4065,10 @@ void _nmtstp_setup_tests(void) { nmtstp_link_delete(NM_PLATFORM_GET, -1, -1, DEVICE_NAME, FALSE); - nmtstp_link_delete(NM_PLATFORM_GET, -1, -1, SLAVE_NAME, FALSE); + nmtstp_link_delete(NM_PLATFORM_GET, -1, -1, PORT_NAME, FALSE); nmtstp_link_delete(NM_PLATFORM_GET, -1, -1, PARENT_NAME, FALSE); g_assert(!nm_platform_link_get_by_ifname(NM_PLATFORM_GET, DEVICE_NAME)); - g_assert(!nm_platform_link_get_by_ifname(NM_PLATFORM_GET, SLAVE_NAME)); + g_assert(!nm_platform_link_get_by_ifname(NM_PLATFORM_GET, PORT_NAME)); g_assert(!nm_platform_link_get_by_ifname(NM_PLATFORM_GET, PARENT_NAME)); g_test_add_func("/link/bogus", test_bogus); diff --git a/src/core/ppp/nm-ppp-status.h b/src/core/ppp/nm-ppp-status.h index a2576e9cc0..9f7dab052b 100644 --- a/src/core/ppp/nm-ppp-status.h +++ b/src/core/ppp/nm-ppp-status.h @@ -22,7 +22,7 @@ typedef enum { NM_PPP_STATUS_TERMINATE = 9, NM_PPP_STATUS_DISCONNECT = 10, NM_PPP_STATUS_HOLDOFF = 11, - NM_PPP_STATUS_MASTER = 12, + NM_PPP_STATUS_CONTROLLER = 12, /* these states are internal and not announced by the pppd plugin. */ NM_PPP_STATUS_INTERN_UNKNOWN = 20, diff --git a/src/core/ppp/nm-pppd-compat.c b/src/core/ppp/nm-pppd-compat.c index f7940c5501..04e26f2264 100644 --- a/src/core/ppp/nm-pppd-compat.c +++ b/src/core/ppp/nm-pppd-compat.c @@ -91,7 +91,7 @@ G_STATIC_ASSERT((gint64) NM_PPP_STATUS_RUNNING == PHASE_RUNNING); G_STATIC_ASSERT((gint64) NM_PPP_STATUS_TERMINATE == PHASE_TERMINATE); G_STATIC_ASSERT((gint64) NM_PPP_STATUS_DISCONNECT == PHASE_DISCONNECT); G_STATIC_ASSERT((gint64) NM_PPP_STATUS_HOLDOFF == PHASE_HOLDOFF); -G_STATIC_ASSERT((gint64) NM_PPP_STATUS_MASTER == PHASE_MASTER); +G_STATIC_ASSERT((gint64) NM_PPP_STATUS_CONTROLLER == PHASE_MASTER); G_STATIC_ASSERT(NM_PPPD_COMPAT_MAXNAMELEN == MAXNAMELEN); G_STATIC_ASSERT(NM_PPPD_COMPAT_MAXSECRETLEN == MAXSECRETLEN); diff --git a/src/core/ppp/nm-pppd-plugin.c b/src/core/ppp/nm-pppd-plugin.c index 93425f382c..c8a866ec50 100644 --- a/src/core/ppp/nm-pppd-plugin.c +++ b/src/core/ppp/nm-pppd-plugin.c @@ -73,8 +73,8 @@ nm_phasechange(int arg) case NM_PPP_STATUS_HOLDOFF: ppp_phase = "holdoff"; break; - case NM_PPP_STATUS_MASTER: - ppp_phase = "master"; + case NM_PPP_STATUS_CONTROLLER: + ppp_phase = "controller"; break; default: 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 7c2b202607..81964de6c3 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 @@ -286,21 +286,21 @@ _cert_set_from_ifcfg(gpointer setting, /*****************************************************************************/ static void -check_if_bond_slave(shvarFile *ifcfg, NMSettingConnection *s_con) +check_if_bond_port(shvarFile *ifcfg, NMSettingConnection *s_con) { gs_free char *value = NULL; const char *v; - const char *master; + const char *controller; v = svGetValueStr(ifcfg, "MASTER_UUID", &value); if (!v) v = svGetValueStr(ifcfg, "MASTER", &value); if (v) { - master = nm_setting_connection_get_controller(s_con); - if (master) { - PARSE_WARNING("Already configured as slave of %s. Ignoring MASTER{_UUID}=\"%s\"", - master, + controller = nm_setting_connection_get_controller(s_con); + if (controller) { + PARSE_WARNING("Already configured as port of %s. Ignoring MASTER{_UUID}=\"%s\"", + controller, v); return; } @@ -319,11 +319,11 @@ check_if_bond_slave(shvarFile *ifcfg, NMSettingConnection *s_con) } static void -check_if_team_slave(shvarFile *ifcfg, NMSettingConnection *s_con) +check_if_team_port(shvarFile *ifcfg, NMSettingConnection *s_con) { gs_free char *value = NULL; const char *v; - const char *master; + const char *controller; v = svGetValueStr(ifcfg, "TEAM_MASTER_UUID", &value); if (!v) @@ -331,10 +331,10 @@ check_if_team_slave(shvarFile *ifcfg, NMSettingConnection *s_con) if (!v) return; - master = nm_setting_connection_get_controller(s_con); - if (master) { - PARSE_WARNING("Already configured as slave of %s. Ignoring TEAM_MASTER{_UUID}=\"%s\"", - master, + controller = nm_setting_connection_get_controller(s_con); + if (controller) { + PARSE_WARNING("Already configured as port of %s. Ignoring TEAM_MASTER{_UUID}=\"%s\"", + controller, v); return; } @@ -508,9 +508,7 @@ make_connection_setting(const char *file, const char *old_value; if ((old_value = nm_setting_connection_get_controller(s_con))) { - PARSE_WARNING("Already configured as slave of %s. Ignoring BRIDGE=\"%s\"", - old_value, - v); + PARSE_WARNING("Already configured as port of %s. Ignoring BRIDGE=\"%s\"", old_value, v); } else { g_object_set(s_con, NM_SETTING_CONNECTION_CONTROLLER, v, NULL); g_object_set(s_con, @@ -520,8 +518,8 @@ make_connection_setting(const char *file, } } - check_if_bond_slave(ifcfg, s_con); - check_if_team_slave(ifcfg, s_con); + check_if_bond_port(ifcfg, s_con); + check_if_team_port(ifcfg, s_con); nm_clear_g_free(&value); v = svGetValueStr(ifcfg, "OVS_PORT_UUID", &value); @@ -531,7 +529,7 @@ make_connection_setting(const char *file, const char *old_value; if ((old_value = nm_setting_connection_get_controller(s_con))) { - PARSE_WARNING("Already configured as slave of %s. Ignoring OVS_PORT=\"%s\"", + PARSE_WARNING("Already configured as port of %s. Ignoring OVS_PORT=\"%s\"", old_value, v); } else { @@ -551,7 +549,7 @@ make_connection_setting(const char *file, const char *old_value; if ((old_value = nm_setting_connection_get_controller(s_con))) { - PARSE_WARNING("Already configured as slave of %s. Ignoring VRF{_UUID}=\"%s\"", + PARSE_WARNING("Already configured as port of %s. Ignoring VRF{_UUID}=\"%s\"", old_value, v); } else { @@ -6683,7 +6681,7 @@ connection_from_file_full(const char *filename, gs_free char *bond_options = NULL; if (svGetValueStr(main_ifcfg, "BONDING_OPTS", &bond_options)) { - /* initscripts consider these as bond masters */ + /* initscripts consider these as bond controllers */ g_free(type); type = g_strdup(TYPE_BOND); } 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 f4598e2d13..21f31d8b83 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 @@ -2161,7 +2161,7 @@ write_connection_setting(NMSettingConnection *s_con, shvarFile *ifcfg, const cha { guint32 n, i; nm_auto_free_gstring GString *str = NULL; - const char *master, *master_iface = NULL, *type; + const char *controller, *controller_iface = NULL, *type; int vint; gint32 vint32; NMSettingConnectionMdns mdns; @@ -2191,16 +2191,16 @@ write_connection_setting(NMSettingConnection *s_con, shvarFile *ifcfg, const cha vint = nm_setting_connection_get_multi_connect(s_con); svSetValueInt64_cond(ifcfg, "MULTI_CONNECT", vint != NM_CONNECTION_MULTI_CONNECT_DEFAULT, vint); - /* Only save the value for master connections */ + /* Only save the value for controller connections */ type = nm_setting_connection_get_connection_type(s_con); - if (_nm_connection_type_is_master(type)) { - NMSettingConnectionAutoconnectSlaves autoconnect_slaves; - autoconnect_slaves = nm_setting_connection_get_autoconnect_slaves(s_con); + if (_nm_connection_type_is_controller(type)) { + NMTernary autoconnect_ports; + autoconnect_ports = nm_setting_connection_get_autoconnect_ports(s_con); svSetValueStr(ifcfg, "AUTOCONNECT_SLAVES", - autoconnect_slaves == NM_SETTING_CONNECTION_AUTOCONNECT_SLAVES_YES ? "yes" - : autoconnect_slaves == NM_SETTING_CONNECTION_AUTOCONNECT_SLAVES_NO ? "no" - : NULL); + autoconnect_ports == NM_TERNARY_TRUE ? "yes" + : autoconnect_ports == NM_TERNARY_FALSE ? "no" + : NULL); } switch (nm_setting_connection_get_lldp(s_con)) { case NM_SETTING_CONNECTION_LLDP_ENABLE_RX: @@ -2251,50 +2251,50 @@ 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_controller(s_con); - if (master) { + controller = nm_setting_connection_get_controller(s_con); + if (controller) { /* The reader prefers the *_UUID variants, however we still try to resolve * it into an interface name, so that legacy tooling is not confused. */ if (!nm_utils_get_testing()) { /* This is conditional for easier testing. */ - master_iface = nm_manager_iface_for_uuid(NM_MANAGER_GET, master); + controller_iface = nm_manager_iface_for_uuid(NM_MANAGER_GET, controller); } - if (!master_iface) { - master_iface = master; - master = NULL; + if (!controller_iface) { + controller_iface = controller; + controller = NULL; } if (nm_streq0(nm_setting_connection_get_port_type(s_con), NM_SETTING_BOND_SETTING_NAME)) { - svSetValueStr(ifcfg, "MASTER_UUID", master); - svSetValueStr(ifcfg, "MASTER", master_iface); + svSetValueStr(ifcfg, "MASTER_UUID", controller); + svSetValueStr(ifcfg, "MASTER", controller_iface); svSetValueStr(ifcfg, "SLAVE", "yes"); } else if (nm_streq0(nm_setting_connection_get_port_type(s_con), NM_SETTING_BRIDGE_SETTING_NAME)) { - svSetValueStr(ifcfg, "BRIDGE_UUID", master); - svSetValueStr(ifcfg, "BRIDGE", master_iface); + svSetValueStr(ifcfg, "BRIDGE_UUID", controller); + svSetValueStr(ifcfg, "BRIDGE", controller_iface); } else if (nm_streq0(nm_setting_connection_get_port_type(s_con), NM_SETTING_TEAM_SETTING_NAME)) { - svSetValueStr(ifcfg, "TEAM_MASTER_UUID", master); - svSetValueStr(ifcfg, "TEAM_MASTER", master_iface); + svSetValueStr(ifcfg, "TEAM_MASTER_UUID", controller); + svSetValueStr(ifcfg, "TEAM_MASTER", controller_iface); if (NM_IN_STRSET(type, NM_SETTING_WIRED_SETTING_NAME, NM_SETTING_VLAN_SETTING_NAME)) svUnsetValue(ifcfg, "TYPE"); } else if (nm_streq0(nm_setting_connection_get_port_type(s_con), NM_SETTING_OVS_PORT_SETTING_NAME)) { - svSetValueStr(ifcfg, "OVS_PORT_UUID", master); - svSetValueStr(ifcfg, "OVS_PORT", master_iface); + svSetValueStr(ifcfg, "OVS_PORT_UUID", controller); + svSetValueStr(ifcfg, "OVS_PORT", controller_iface); } else if (nm_streq0(nm_setting_connection_get_port_type(s_con), NM_SETTING_VRF_SETTING_NAME)) { - svSetValueStr(ifcfg, "VRF_UUID", master); - svSetValueStr(ifcfg, "VRF", master_iface); + svSetValueStr(ifcfg, "VRF_UUID", controller); + svSetValueStr(ifcfg, "VRF", controller_iface); } else { - _LOGW("don't know how to set master for a %s slave", + _LOGW("don't know how to set controller for a %s port", nm_setting_connection_get_port_type(s_con)); } } if (nm_streq0(type, NM_SETTING_TEAM_SETTING_NAME)) svSetValueStr(ifcfg, "DEVICETYPE", TYPE_TEAM); - else if (master_iface + else if (controller_iface && nm_streq0(nm_setting_connection_get_port_type(s_con), NM_SETTING_TEAM_SETTING_NAME)) svSetValueStr(ifcfg, "DEVICETYPE", TYPE_TEAM_PORT); @@ -3056,7 +3056,7 @@ write_ip4_aliases(NMConnection *connection, const char *base_ifcfg_path) s_ip4 = nm_connection_get_setting_ip4_config(connection); if (!s_ip4) { - /* slave-type: no alias files */ + /* port-type: no alias files */ return; } diff --git a/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-team-slave-enp31s0f1-142.cexpected b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-team-port-enp31s0f1-142.cexpected similarity index 86% rename from src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-team-slave-enp31s0f1-142.cexpected rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-team-port-enp31s0f1-142.cexpected index b01372af29..f79e5a0786 100644 --- a/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-team-slave-enp31s0f1-142.cexpected +++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-team-port-enp31s0f1-142.cexpected @@ -5,7 +5,7 @@ REORDER_HDR=yes GVRP=no MVRP=no HWADDR= -NAME=team-slave-enp31s0f1-142 +NAME=team-port-enp31s0f1-142 UUID=74f435bb-ede4-415a-9d48-f580b60eba04 DEVICE=enp31s0f1-142 ONBOOT=no diff --git a/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-slave b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-port-bond0 similarity index 100% rename from src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-slave rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-port-bond0 diff --git a/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-slave-ib b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-port-ib similarity index 100% rename from src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-slave-ib rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-port-ib diff --git a/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-master-1 b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-controller-1 similarity index 100% rename from src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-master-1 rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-controller-1 diff --git a/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-master-2 b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-controller-2 similarity index 100% rename from src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-master-2 rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-controller-2 diff --git a/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-master-invalid b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-controller-invalid similarity index 100% rename from src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-master-invalid rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-controller-invalid 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 40a188531b..334662c363 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 @@ -2212,7 +2212,7 @@ test_read_dns_options(void) } static void -test_clear_master(void) +test_clear_controller(void) { nmtst_auto_unlinkfile char *testfile = NULL; gs_free char *keyfile = NULL; @@ -2221,7 +2221,7 @@ test_clear_master(void) char *unmanaged = NULL; shvarFile *f; - /* 1. load the bridge slave connection from disk */ + /* 1. load the bridge port connection from disk */ connection = _connection_from_file(TEST_IFCFG_DIR "/ifcfg-test-bridge-component", NULL, TYPE_ETHERNET, @@ -2239,7 +2239,7 @@ test_clear_master(void) TEST_IFCFG_DIR "/ifcfg-System_test-bridge-component-a.cexpected", &testfile); - /* 3. clear master and slave-type */ + /* 3. clear controller and port-type */ g_object_set(s_con, NM_SETTING_CONNECTION_MASTER, NULL, @@ -8251,13 +8251,15 @@ test_write_bond_main(void) } static void -test_read_bond_slave(void) +test_read_bond_port(void) { gs_unref_object NMConnection *connection = NULL; NMSettingConnection *s_con; - connection = - _connection_from_file(TEST_IFCFG_DIR "/ifcfg-test-bond-slave", NULL, TYPE_ETHERNET, NULL); + connection = _connection_from_file(TEST_IFCFG_DIR "/ifcfg-test-bond-port-bond0", + NULL, + TYPE_ETHERNET, + NULL); g_test_assert_expected_messages(); s_con = nmtst_connection_assert_setting(connection, NM_TYPE_SETTING_CONNECTION); @@ -8268,7 +8270,7 @@ test_read_bond_slave(void) } static void -test_write_bond_slave(void) +test_write_bond_port(void) { nmtst_auto_unlinkfile char *testfile = NULL; gs_unref_object NMConnection *connection = NULL; @@ -8309,7 +8311,7 @@ test_write_bond_slave(void) } static void -test_read_bond_port(void) +test_read_bond_port_setting(void) { gs_unref_object NMConnection *connection = NULL; NMSettingConnection *s_con = NULL; @@ -8327,7 +8329,7 @@ test_read_bond_port(void) } static void -test_write_bond_port(void) +test_write_bond_port_setting(void) { nmtst_auto_unlinkfile char *testfile = NULL; gs_unref_object NMConnection *connection = NULL; @@ -8548,13 +8550,12 @@ test_write_infiniband(gconstpointer test_data) } static void -test_read_bond_slave_ib(void) +test_read_bond_port_ib(void) { gs_unref_object NMConnection *connection = NULL; NMSettingConnection *s_con; - connection = - _connection_from_file(TEST_IFCFG_DIR "/ifcfg-test-bond-slave-ib", NULL, NULL, NULL); + connection = _connection_from_file(TEST_IFCFG_DIR "/ifcfg-test-bond-port-ib", NULL, NULL, NULL); s_con = nmtst_connection_assert_setting(connection, NM_TYPE_SETTING_CONNECTION); @@ -8563,7 +8564,7 @@ test_read_bond_slave_ib(void) } static void -test_write_bond_slave_ib(void) +test_write_bond_port_ib(void) { nmtst_auto_unlinkfile char *testfile = NULL; gs_unref_object NMConnection *connection = NULL; @@ -8990,7 +8991,7 @@ test_write_fcoe_mode(gconstpointer user_data) } static void -test_read_team_master(gconstpointer user_data) +test_read_team_controller(gconstpointer user_data) { const char *const PATH_NAME = user_data; gs_unref_object NMConnection *connection = NULL; @@ -9013,7 +9014,7 @@ test_read_team_master(gconstpointer user_data) } static void -test_read_team_master_invalid(gconstpointer user_data) +test_read_team_controller_invalid(gconstpointer user_data) { const char *const PATH_NAME = user_data; gs_free_error GError *error = NULL; @@ -9029,7 +9030,7 @@ test_read_team_master_invalid(gconstpointer user_data) } static void -test_write_team_master(void) +test_write_team_controller(void) { nmtst_auto_unlinkfile char *testfile = NULL; gs_unref_object NMConnection *connection = NULL; @@ -9236,7 +9237,7 @@ test_read_team_port_empty_config(void) } static void -test_team_reread_slave(void) +test_team_reread_port(void) { nmtst_auto_unlinkfile char *testfile = NULL; gs_unref_object NMConnection *connection_1 = NULL; @@ -9247,14 +9248,14 @@ test_team_reread_slave(void) connection_1 = nmtst_create_connection_from_keyfile("[connection]\n" - "id=team-slave-enp31s0f1-142\n" + "id=team-port-enp31s0f1-142\n" "uuid=74f435bb-ede4-415a-9d48-f580b60eba04\n" "type=vlan\n" "autoconnect=false\n" "interface-name=enp31s0f1-142\n" - "master=team142\n" + "controller=team142\n" "permissions=\n" - "slave-type=team\n" + "port-type=team\n" "\n" "[vlan]\n" "egress-priority-map=\n" @@ -9262,10 +9263,10 @@ test_team_reread_slave(void) "id=142\n" "ingress-priority-map=\n" "parent=enp31s0f1\n", - "/test_team_reread_slave"); + "/test_team_reread_port"); /* to double-check keyfile syntax, re-create the connection by hand. */ - connection_2 = nmtst_create_minimal_connection("team-slave-enp31s0f1-142", + connection_2 = nmtst_create_minimal_connection("team-port-enp31s0f1-142", "74f435bb-ede4-415a-9d48-f580b60eba04", NM_SETTING_VLAN_SETTING_NAME, &s_con); @@ -9297,7 +9298,7 @@ test_team_reread_slave(void) _writer_new_connection_reread((nmtst_get_rand_uint32() % 2) ? connection_1 : connection_2, TEST_SCRATCH_DIR, &testfile, - TEST_IFCFG_DIR "/ifcfg-team-slave-enp31s0f1-142.cexpected", + TEST_IFCFG_DIR "/ifcfg-team-port-enp31s0f1-142.cexpected", &reread, &reread_same); _assert_reread_same((nmtst_get_rand_uint32() % 2) ? connection_1 : connection_2, reread); @@ -10534,7 +10535,7 @@ main(int argc, char **argv) test_write_wired_static_ip6_only_gw); g_test_add_func(TPATH "ip6/disabled", test_write_ip6_disabled); g_test_add_func(TPATH "read-dns-options", test_read_dns_options); - g_test_add_func(TPATH "clear-master", test_clear_master); + g_test_add_func(TPATH "clear-controller", test_clear_controller); nmtst_add_test_func(TPATH "read-static", test_read_wired_static, @@ -10892,33 +10893,33 @@ main(int argc, char **argv) (gpointer) NM_SETTING_DCB_FCOE_MODE_VN2VN, test_write_fcoe_mode); - g_test_add_func(TPATH "bond/read-master", test_read_bond_main); - g_test_add_func(TPATH "bond/read-master-eth-type", test_read_bond_eth_type); - g_test_add_func(TPATH "bond/read-slave", test_read_bond_slave); - g_test_add_func(TPATH "bond/read-slave-ib", test_read_bond_slave_ib); - g_test_add_func(TPATH "bond/write-master", test_write_bond_main); - g_test_add_func(TPATH "bond/write-slave", test_write_bond_slave); - g_test_add_func(TPATH "bond/write-slave-ib", test_write_bond_slave_ib); + g_test_add_func(TPATH "bond/read-controller", test_read_bond_main); + g_test_add_func(TPATH "bond/read-controller-eth-type", test_read_bond_eth_type); + g_test_add_func(TPATH "bond/read-port", test_read_bond_port); + g_test_add_func(TPATH "bond/read-port-ib", test_read_bond_port_ib); + g_test_add_func(TPATH "bond/write-controller", test_write_bond_main); + g_test_add_func(TPATH "bond/write-port", test_write_bond_port); + g_test_add_func(TPATH "bond/write-port-ib", test_write_bond_port_ib); g_test_add_func(TPATH "bond/bonding-opts-numeric-mode", test_read_bond_opts_mode_numeric); - g_test_add_func(TPATH "bond/read-bond-port", test_read_bond_port); - g_test_add_func(TPATH "bond/write-bond-port", test_write_bond_port); + g_test_add_func(TPATH "bond/read-bond-port", test_read_bond_port_setting); + g_test_add_func(TPATH "bond/write-bond-port_setting", test_write_bond_port_setting); - g_test_add_func(TPATH "bridge/read-master", test_read_bridge_main); - g_test_add_func(TPATH "bridge/write-master", test_write_bridge_main); + g_test_add_func(TPATH "bridge/read-controller", test_read_bridge_main); + g_test_add_func(TPATH "bridge/write-controller", test_write_bridge_main); g_test_add_func(TPATH "bridge/read-component", test_read_bridge_component); g_test_add_func(TPATH "bridge/write-component", test_write_bridge_component); g_test_add_func(TPATH "bridge/read-missing-stp", test_read_bridge_missing_stp); - g_test_add_data_func(TPATH "team/read-master-1", - TEST_IFCFG_DIR "/ifcfg-test-team-master-1", - test_read_team_master); - g_test_add_data_func(TPATH "team/read-master-2", - TEST_IFCFG_DIR "/ifcfg-test-team-master-2", - test_read_team_master); - g_test_add_data_func(TPATH "team/read-master-invalid", - TEST_IFCFG_DIR "/ifcfg-test-team-master-invalid", - test_read_team_master_invalid); - g_test_add_func(TPATH "team/write-master", test_write_team_master); + g_test_add_data_func(TPATH "team/read-controller-1", + TEST_IFCFG_DIR "/ifcfg-test-team-controller-1", + test_read_team_controller); + g_test_add_data_func(TPATH "team/read-controller-2", + TEST_IFCFG_DIR "/ifcfg-test-team-controller-2", + test_read_team_controller); + g_test_add_data_func(TPATH "team/read-controller-invalid", + TEST_IFCFG_DIR "/ifcfg-test-team-controller-invalid", + test_read_team_controller_invalid); + g_test_add_func(TPATH "team/write-controller", test_write_team_controller); g_test_add_data_func(TPATH "team/read-port-1", TEST_IFCFG_DIR "/ifcfg-test-team-port-1", test_read_team_port); @@ -10928,7 +10929,7 @@ main(int argc, char **argv) g_test_add_func(TPATH "team/write-port", test_write_team_port); g_test_add_func(TPATH "team/write-infiniband-port", test_write_team_infiniband_port); g_test_add_func(TPATH "team/read-port-empty-config", test_read_team_port_empty_config); - g_test_add_func(TPATH "team/reread-slave", test_team_reread_slave); + g_test_add_func(TPATH "team/reread-port", test_team_reread_port); g_test_add_func(TPATH "proxy/read-proxy-basic", test_read_proxy_basic); g_test_add_func(TPATH "proxy/write-proxy-basic", test_write_proxy_basic); diff --git a/src/core/settings/plugins/keyfile/tests/keyfiles/Test_Bridge_Component b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_Bridge_Component index f5463ed004..0837f97836 100644 --- a/src/core/settings/plugins/keyfile/tests/keyfiles/Test_Bridge_Component +++ b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_Bridge_Component @@ -2,8 +2,8 @@ id=Test Bridge Component uuid=d7b4f96c-c45e-4298-bef8-f48574f8c1c0 type=802-3-ethernet -master=br0 -slave-type=bridge +controller=br0 +port-type=bridge [802-3-ethernet] mac-address=00:22:15:59:62:97 diff --git a/src/core/settings/plugins/keyfile/tests/keyfiles/Test_minimal_slave_1 b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_minimal_port_1 similarity index 50% rename from src/core/settings/plugins/keyfile/tests/keyfiles/Test_minimal_slave_1 rename to src/core/settings/plugins/keyfile/tests/keyfiles/Test_minimal_port_1 index d3122d5395..c801f16457 100644 --- a/src/core/settings/plugins/keyfile/tests/keyfiles/Test_minimal_slave_1 +++ b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_minimal_port_1 @@ -1,4 +1,4 @@ [connection] type=802-3-ethernet -master=br0 -slave-type=bridge +controller=br0 +port-type=bridge diff --git a/src/core/settings/plugins/keyfile/tests/keyfiles/Test_minimal_slave_2 b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_minimal_port_2 similarity index 75% rename from src/core/settings/plugins/keyfile/tests/keyfiles/Test_minimal_slave_2 rename to src/core/settings/plugins/keyfile/tests/keyfiles/Test_minimal_port_2 index eb1cdacebd..820608f8c2 100644 --- a/src/core/settings/plugins/keyfile/tests/keyfiles/Test_minimal_slave_2 +++ b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_minimal_port_2 @@ -1,5 +1,5 @@ [connection] -master=br0 +controller=br0 [802-3-ethernet] diff --git a/src/core/settings/plugins/keyfile/tests/keyfiles/Test_minimal_port_3 b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_minimal_port_3 new file mode 100644 index 0000000000..9e3f940254 --- /dev/null +++ b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_minimal_port_3 @@ -0,0 +1,4 @@ +[connection] +controller=br0 +port-type=bridge +[802-3-ethernet] diff --git a/src/core/settings/plugins/keyfile/tests/keyfiles/Test_minimal_slave_4 b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_minimal_port_4 similarity index 75% rename from src/core/settings/plugins/keyfile/tests/keyfiles/Test_minimal_slave_4 rename to src/core/settings/plugins/keyfile/tests/keyfiles/Test_minimal_port_4 index 626b6f6840..a9acf205ff 100644 --- a/src/core/settings/plugins/keyfile/tests/keyfiles/Test_minimal_slave_4 +++ b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_minimal_port_4 @@ -1,4 +1,4 @@ [connection] type=802-3-ethernet -master=br0 +controller=br0 [bridge-port] diff --git a/src/core/settings/plugins/keyfile/tests/keyfiles/Test_minimal_slave_3 b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_minimal_slave_3 deleted file mode 100644 index 7419e97dd2..0000000000 --- a/src/core/settings/plugins/keyfile/tests/keyfiles/Test_minimal_slave_3 +++ /dev/null @@ -1,4 +0,0 @@ -[connection] -master=br0 -slave-type=bridge -[802-3-ethernet] 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 e3e5f84ff9..f999105ad2 100644 --- a/src/core/settings/plugins/keyfile/tests/test-keyfile-settings.c +++ b/src/core/settings/plugins/keyfile/tests/test-keyfile-settings.c @@ -2346,13 +2346,13 @@ test_read_minimal(void) } static void -test_read_minimal_slave(void) +test_read_minimal_port(void) { gs_unref_object NMConnection *connection = NULL; gs_unref_object NMConnection *con_archetype = NULL; NMSettingConnection *s_con; - con_archetype = nmtst_create_minimal_connection("Test_minimal_slave_x", + con_archetype = nmtst_create_minimal_connection("Test_minimal_port_x", "a56b4ca5-7075-43d4-82c7-5d0cb15f7654", NM_SETTING_WIRED_SETTING_NAME, &s_con); @@ -2364,7 +2364,7 @@ test_read_minimal_slave(void) NULL); nmtst_connection_normalize(con_archetype); - connection = keyfile_read_connection_from_file(TEST_KEYFILES_DIR "/Test_minimal_slave_1"); + connection = keyfile_read_connection_from_file(TEST_KEYFILES_DIR "/Test_minimal_port_1"); g_object_set(s_con, NM_SETTING_CONNECTION_ID, nm_connection_get_id(connection), @@ -2374,7 +2374,7 @@ test_read_minimal_slave(void) nmtst_assert_connection_equals(con_archetype, FALSE, connection, FALSE); g_clear_object(&connection); - connection = keyfile_read_connection_from_file(TEST_KEYFILES_DIR "/Test_minimal_slave_2"); + connection = keyfile_read_connection_from_file(TEST_KEYFILES_DIR "/Test_minimal_port_2"); g_object_set(s_con, NM_SETTING_CONNECTION_ID, nm_connection_get_id(connection), @@ -2384,7 +2384,7 @@ test_read_minimal_slave(void) nmtst_assert_connection_equals(con_archetype, FALSE, connection, FALSE); g_clear_object(&connection); - connection = keyfile_read_connection_from_file(TEST_KEYFILES_DIR "/Test_minimal_slave_3"); + connection = keyfile_read_connection_from_file(TEST_KEYFILES_DIR "/Test_minimal_port_3"); g_object_set(s_con, NM_SETTING_CONNECTION_ID, nm_connection_get_id(connection), @@ -2394,7 +2394,7 @@ test_read_minimal_slave(void) nmtst_assert_connection_equals(con_archetype, FALSE, connection, FALSE); g_clear_object(&connection); - connection = keyfile_read_connection_from_file(TEST_KEYFILES_DIR "/Test_minimal_slave_4"); + connection = keyfile_read_connection_from_file(TEST_KEYFILES_DIR "/Test_minimal_port_4"); g_object_set(s_con, NM_SETTING_CONNECTION_ID, nm_connection_get_id(connection), @@ -2921,7 +2921,7 @@ main(int argc, char **argv) g_test_add_func("/keyfile/test_read_missing_id_uuid", test_read_missing_id_uuid); g_test_add_func("/keyfile/test_read_minimal", test_read_minimal); - g_test_add_func("/keyfile/test_read_minimal_slave", test_read_minimal_slave); + g_test_add_func("/keyfile/test_read_minimal_port", test_read_minimal_port); g_test_add_func("/keyfile/test_read_enum_property", test_read_enum_property); g_test_add_func("/keyfile/test_write_enum_property", test_write_enum_property); diff --git a/src/core/tests/test-core.c b/src/core/tests/test-core.c index e90cf6e959..c5a598a695 100644 --- a/src/core/tests/test-core.c +++ b/src/core/tests/test-core.c @@ -303,7 +303,7 @@ test_nm_utils_log_connection_diff(void) NM_SETTING_CONNECTION_ID, "id2", NM_SETTING_CONNECTION_CONTROLLER, - "master2", + "controller2", NULL); nm_utils_log_connection_diff(connection, connection2, diff --git a/src/libnm-client-impl/nm-active-connection.c b/src/libnm-client-impl/nm-active-connection.c index 6a138f3eee..0d18636169 100644 --- a/src/libnm-client-impl/nm-active-connection.c +++ b/src/libnm-client-impl/nm-active-connection.c @@ -381,9 +381,9 @@ nm_active_connection_get_vpn(NMActiveConnection *connection) * nm_active_connection_get_master: * @connection: a #NMActiveConnection * - * Gets the master #NMDevice of the connection. + * Gets the controller #NMDevice of the connection. * - * Returns: (transfer none): the master #NMDevice of the #NMActiveConnection. + * Returns: (transfer none): the controller #NMDevice of the #NMActiveConnection. * * Deprecated: 1.44: Use nm_active_connection_get_controller() instead. **/ @@ -880,7 +880,7 @@ nm_active_connection_class_init(NMActiveConnectionClass *klass) /** * NMActiveConnection:master: * - * The master device if one exists. Replaced by the "controller" property. + * The controller device if one exists. Replaced by the "controller" property. * * Deprecated: 1.44 **/ diff --git a/src/libnm-client-impl/nm-client.c b/src/libnm-client-impl/nm-client.c index 1598fb308d..4ecc83899c 100644 --- a/src/libnm-client-impl/nm-client.c +++ b/src/libnm-client-impl/nm-client.c @@ -9221,17 +9221,17 @@ nm_client_wait_shutdown_finish(GAsyncResult *result, GError **error) /***************************************************************************** * Backported symbols. Usually, new API is only added in new major versions - * of NetworkManager (that is, on "master" branch). Sometimes however, we might + * of NetworkManager (that is, on "main" branch). Sometimes however, we might * have to backport some API to an older stable branch. In that case, we backport * the symbols with a different version corresponding to the minor API. * - * To allow upgrading from such a extended minor-release, "master" contains these + * To allow upgrading from such a extended minor-release, "main" contains these * backported symbols too. * * For example, 1.2.0 added nm_setting_connection_autoconnect_slaves_get_type. * This was backported for 1.0.4 as nm_setting_connection_autoconnect_slaves_get_type@libnm_1_0_4 * To allow an application that was linked against 1.0.4 to seamlessly upgrade to - * a newer major version, the same symbols is also exposed on "master". Note, that + * a newer major version, the same symbols is also exposed on "main". Note, that * a user can only seamlessly upgrade to a newer major version, that is released * *after* 1.0.4 is out. In this example, 1.2.0 was released after 1.4.0, and thus * a 1.0.4 user can upgrade to 1.2.0 ABI. diff --git a/src/libnm-client-impl/nm-device-bond.c b/src/libnm-client-impl/nm-device-bond.c index affcb9934f..9942c8dee9 100644 --- a/src/libnm-client-impl/nm-device-bond.c +++ b/src/libnm-client-impl/nm-device-bond.c @@ -76,7 +76,7 @@ nm_device_bond_get_carrier(NMDeviceBond *device) * nm_device_bond_get_slaves: * @device: a #NMDeviceBond * - * Gets the devices currently enslaved to @device. + * Gets the devices currently attached as port to @device. * * Returns: (element-type NMDevice): the #GPtrArray containing * #NMDevices that are slaves of @device. This is the internal @@ -105,7 +105,7 @@ connection_compatible(NMDevice *device, NMConnection *connection, GError **error return FALSE; } - /* FIXME: check slaves? */ + /* FIXME: check ports? */ return TRUE; } @@ -183,7 +183,7 @@ nm_device_bond_class_init(NMDeviceBondClass *klass) /** * NMDeviceBond:slaves: (type GPtrArray(NMDevice)) * - * The devices enslaved to the bond device. + * The devices attached as port to the bond device. **/ obj_properties[PROP_SLAVES] = g_param_spec_boxed(NM_DEVICE_BOND_SLAVES, "", @@ -193,5 +193,5 @@ nm_device_bond_class_init(NMDeviceBondClass *klass) _nml_dbus_meta_class_init_with_properties(object_class, &_nml_dbus_meta_iface_nm_device_bond); - device_class->slaves_param_spec = obj_properties[PROP_SLAVES]; + device_class->ports_param_spec = obj_properties[PROP_SLAVES]; } diff --git a/src/libnm-client-impl/nm-device-bridge.c b/src/libnm-client-impl/nm-device-bridge.c index abb78ced3c..8405a4ffda 100644 --- a/src/libnm-client-impl/nm-device-bridge.c +++ b/src/libnm-client-impl/nm-device-bridge.c @@ -76,10 +76,10 @@ nm_device_bridge_get_carrier(NMDeviceBridge *device) * nm_device_bridge_get_slaves: * @device: a #NMDeviceBridge * - * Gets the devices currently enslaved to @device. + * Gets the devices currently attached as port to @device. * * Returns: (element-type NMDevice): the #GPtrArray containing - * #NMDevices that are slaves of @device. This is the internal + * #NMDevices that are ports of @device. This is the internal * copy used by the device, and must not be modified. * * Deprecated: 1.34: Use nm_device_get_ports() instead. @@ -188,7 +188,7 @@ nm_device_bridge_class_init(NMDeviceBridgeClass *klass) /** * NMDeviceBridge:slaves: (type GPtrArray(NMDevice)) * - * The devices enslaved to the bridge device. + * The devices attached as port to the bridge device. **/ obj_properties[PROP_SLAVES] = g_param_spec_boxed(NM_DEVICE_BRIDGE_SLAVES, "", @@ -198,5 +198,5 @@ nm_device_bridge_class_init(NMDeviceBridgeClass *klass) _nml_dbus_meta_class_init_with_properties(object_class, &_nml_dbus_meta_iface_nm_device_bridge); - device_class->slaves_param_spec = obj_properties[PROP_SLAVES]; + device_class->ports_param_spec = obj_properties[PROP_SLAVES]; } diff --git a/src/libnm-client-impl/nm-device-ovs-bridge.c b/src/libnm-client-impl/nm-device-ovs-bridge.c index ef134798dd..56b76e9054 100644 --- a/src/libnm-client-impl/nm-device-ovs-bridge.c +++ b/src/libnm-client-impl/nm-device-ovs-bridge.c @@ -36,10 +36,10 @@ G_DEFINE_TYPE(NMDeviceOvsBridge, nm_device_ovs_bridge, NM_TYPE_DEVICE) * nm_device_ovs_bridge_get_slaves: * @device: a #NMDeviceOvsBridge * - * Gets the ports currently enslaved to @device. + * Gets the ports currently attached as port to @device. * * Returns: (element-type NMDevice): the #GPtrArray containing - * #NMDevices that are slaves of @device. This is the internal + * #NMDevices that are ports of @device. This is the internal * copy used by the device, and must not be modified. * * Since: 1.14 @@ -142,7 +142,7 @@ nm_device_ovs_bridge_class_init(NMDeviceOvsBridgeClass *klass) /** * NMDeviceOvsBridge:slaves: (type GPtrArray(NMDevice)) * - * Gets the ports currently enslaved to the device. + * Gets the ports currently attached as port to the device. * * Since: 1.22 */ @@ -155,5 +155,5 @@ nm_device_ovs_bridge_class_init(NMDeviceOvsBridgeClass *klass) _nml_dbus_meta_class_init_with_properties(object_class, &_nml_dbus_meta_iface_nm_device_ovsbridge); - device_class->slaves_param_spec = obj_properties[PROP_SLAVES]; + device_class->ports_param_spec = obj_properties[PROP_SLAVES]; } diff --git a/src/libnm-client-impl/nm-device-ovs-port.c b/src/libnm-client-impl/nm-device-ovs-port.c index 5bcef73c4c..38e9523106 100644 --- a/src/libnm-client-impl/nm-device-ovs-port.c +++ b/src/libnm-client-impl/nm-device-ovs-port.c @@ -36,10 +36,10 @@ G_DEFINE_TYPE(NMDeviceOvsPort, nm_device_ovs_port, NM_TYPE_DEVICE) * nm_device_ovs_port_get_slaves: * @device: a #NMDeviceOvsPort * - * Gets the interfaces currently enslaved to @device. + * Gets the interfaces currently attached as port to @device. * * Returns: (element-type NMDevice): the #GPtrArray containing - * #NMDevices that are slaves of @device. This is the internal + * #NMDevices that are ports of @device. This is the internal * copy used by the device, and must not be modified. * * Since: 1.14 @@ -142,7 +142,7 @@ nm_device_ovs_port_class_init(NMDeviceOvsPortClass *klass) /** * NMDeviceOvsPort:slaves: (type GPtrArray(NMDevice)) * - * Gets the interfaces currently enslaved to the device. + * Gets the interfaces currently attached as port to the device. * * Since: 1.22 */ @@ -155,5 +155,5 @@ nm_device_ovs_port_class_init(NMDeviceOvsPortClass *klass) _nml_dbus_meta_class_init_with_properties(object_class, &_nml_dbus_meta_iface_nm_device_ovsport); - device_class->slaves_param_spec = obj_properties[PROP_SLAVES]; + device_class->ports_param_spec = obj_properties[PROP_SLAVES]; } diff --git a/src/libnm-client-impl/nm-device-team.c b/src/libnm-client-impl/nm-device-team.c index e0b21e8e93..bf951ca148 100644 --- a/src/libnm-client-impl/nm-device-team.c +++ b/src/libnm-client-impl/nm-device-team.c @@ -77,10 +77,10 @@ nm_device_team_get_carrier(NMDeviceTeam *device) * nm_device_team_get_slaves: * @device: a #NMDeviceTeam * - * Gets the devices currently enslaved to @device. + * Gets the devices currently attach as port to @device. * * Returns: (element-type NMDevice): the #GPtrArray containing - * #NMDevices that are slaves of @device. This is the internal + * #NMDevices that are ports of @device. This is the internal * copy used by the device, and must not be modified. * * Deprecated: 1.34: Use nm_device_get_ports() instead. @@ -125,7 +125,7 @@ connection_compatible(NMDevice *device, NMConnection *connection, GError **error return FALSE; } - /* FIXME: check slaves? */ + /* FIXME: check ports? */ return TRUE; } @@ -218,7 +218,7 @@ nm_device_team_class_init(NMDeviceTeamClass *klass) /** * NMDeviceTeam:slaves: (type GPtrArray(NMDevice)) * - * The devices enslaved to the team device. + * The devices attached as port to the team device. **/ obj_properties[PROP_SLAVES] = g_param_spec_boxed(NM_DEVICE_TEAM_SLAVES, "", @@ -241,5 +241,5 @@ nm_device_team_class_init(NMDeviceTeamClass *klass) _nml_dbus_meta_class_init_with_properties(object_class, &_nml_dbus_meta_iface_nm_device_team); - device_class->slaves_param_spec = obj_properties[PROP_SLAVES]; + device_class->ports_param_spec = obj_properties[PROP_SLAVES]; } diff --git a/src/libnm-client-impl/nm-device.c b/src/libnm-client-impl/nm-device.c index 2d3be64c8e..dc868f5b96 100644 --- a/src/libnm-client-impl/nm-device.c +++ b/src/libnm-client-impl/nm-device.c @@ -1283,7 +1283,7 @@ nm_device_get_type_description(NMDevice *device) * Gets the devices currently set as port of @device. * * Returns: (element-type NMDevice): the #GPtrArray containing #NMDevices that - * are slaves of @device. This is the internal copy used by the device and + * are ports of @device. This is the internal copy used by the device and * must not be modified. * * Since: 1.34 @@ -1397,8 +1397,8 @@ _nm_device_notify_update_prop_ports(NMClient *client, nm_assert(notify_update_prop_flags == NML_DBUS_NOTIFY_UPDATE_PROP_FLAGS_NOTIFY); klass = NM_DEVICE_GET_CLASS(self); - if (klass->slaves_param_spec) - _nm_client_queue_notify_object(client, self, klass->slaves_param_spec); + if (klass->ports_param_spec) + _nm_client_queue_notify_object(client, self, klass->ports_param_spec); out: return NML_DBUS_NOTIFY_UPDATE_PROP_FLAGS_NONE; } diff --git a/src/libnm-client-impl/nm-libnm-utils.h b/src/libnm-client-impl/nm-libnm-utils.h index 53fa36be18..fddda077c4 100644 --- a/src/libnm-client-impl/nm-libnm-utils.h +++ b/src/libnm-client-impl/nm-libnm-utils.h @@ -852,7 +852,7 @@ struct _NMDeviceClass { /* Slaves was originally part of some subtypes of NMDevice. It was deprecated and * a new NMDevice::ports property was added. When that property changes, we need * to notify about the subclass' respective property. This is the property. */ - const GParamSpec *slaves_param_spec; + const GParamSpec *ports_param_spec; }; #define _NML_DEVICE_META_PROPERTY_INDEX_PORTS 27 diff --git a/src/libnm-core-impl/nm-connection-private.h b/src/libnm-core-impl/nm-connection-private.h index 3b2c36fdfe..9f9007b689 100644 --- a/src/libnm-core-impl/nm-connection-private.h +++ b/src/libnm-core-impl/nm-connection-private.h @@ -15,15 +15,15 @@ NMSetting *_nm_connection_find_base_type_setting(NMConnection *connection); -const char *_nm_connection_detect_slave_type(NMConnection *connection, NMSetting **out_s_port); +const char *_nm_connection_detect_port_type(NMConnection *connection, NMSetting **out_s_port); -gboolean _nm_connection_detect_slave_type_full(NMSettingConnection *s_con, - NMConnection *connection, - const char **out_slave_type, - const char **out_normerr_slave_setting_type, - const char **out_normerr_missing_slave_type, - const char **out_normerr_missing_slave_type_port, - GError **error); +gboolean _nm_connection_detect_port_type_full(NMSettingConnection *s_con, + NMConnection *connection, + const char **out_port_type, + const char **out_normerr_port_setting_type, + const char **out_normerr_missing_port_type, + const char **out_normerr_missing_port_type_port, + GError **error); const char *_nm_connection_detect_bluetooth_type(NMConnection *self); diff --git a/src/libnm-core-impl/nm-connection.c b/src/libnm-core-impl/nm-connection.c index 73c3af0295..6dace2b73c 100644 --- a/src/libnm-core-impl/nm-connection.c +++ b/src/libnm-core-impl/nm-connection.c @@ -1047,11 +1047,11 @@ _nm_connection_detect_bluetooth_type(NMConnection *self) } const char * -_nm_connection_detect_slave_type(NMConnection *connection, NMSetting **out_s_port) +_nm_connection_detect_port_type(NMConnection *connection, NMSetting **out_s_port) { - NMConnectionPrivate *priv = NM_CONNECTION_GET_PRIVATE(connection); - const char *slave_type = NULL; - NMSetting *s_port = NULL; + NMConnectionPrivate *priv = NM_CONNECTION_GET_PRIVATE(connection); + const char *port_type = NULL; + NMSetting *s_port = NULL; int i; static const struct { NMMetaSettingType meta_type; @@ -1070,40 +1070,40 @@ _nm_connection_detect_slave_type(NMConnection *connection, NMSetting **out_s_por if (!setting) continue; - if (slave_type) { - /* there are more then one matching port types, cannot detect the slave type. */ - slave_type = NULL; - s_port = NULL; + if (port_type) { + /* there are more then one matching port types, cannot detect the port type. */ + port_type = NULL; + s_port = NULL; break; } - slave_type = infos[i].controller_type_name; - s_port = setting; + port_type = infos[i].controller_type_name; + s_port = setting; } if (out_s_port) *out_s_port = s_port; - return slave_type; + return port_type; } static gboolean -_normalize_connection_slave_type(NMConnection *self) +_normalize_connection_port_type(NMConnection *self) { NMSettingConnection *s_con = nm_connection_get_setting_connection(self); - const char *slave_type, *port_type; + const char *port_type, *port_setting_type; if (!s_con) return FALSE; if (!nm_setting_connection_get_controller(s_con)) return FALSE; - slave_type = nm_setting_connection_get_port_type(s_con); - if (slave_type) { - if (_nm_setting_slave_type_is_valid(slave_type, &port_type) && port_type) { + port_type = nm_setting_connection_get_port_type(s_con); + if (port_type) { + if (_nm_setting_port_type_is_valid(port_type, &port_setting_type) && port_setting_type) { NMSetting *s_port; - s_port = nm_connection_get_setting_by_name(self, port_type); + s_port = nm_connection_get_setting_by_name(self, port_setting_type); if (!s_port) { - GType p_type = nm_setting_lookup_type(port_type); + GType p_type = nm_setting_lookup_type(port_setting_type); g_return_val_if_fail(p_type, FALSE); nm_connection_add_setting(self, g_object_new(p_type, NULL)); @@ -1111,8 +1111,8 @@ _normalize_connection_slave_type(NMConnection *self) } } } else { - if ((slave_type = _nm_connection_detect_slave_type(self, NULL))) { - g_object_set(s_con, NM_SETTING_CONNECTION_PORT_TYPE, slave_type, NULL); + if ((port_type = _nm_connection_detect_port_type(self, NULL))) { + g_object_set(s_con, NM_SETTING_CONNECTION_PORT_TYPE, port_type, NULL); return TRUE; } } @@ -1762,23 +1762,23 @@ _normalize_required_settings(NMConnection *self) } static gboolean -_normalize_invalid_slave_port_settings(NMConnection *self) +_normalize_invalid_port_port_settings(NMConnection *self) { NMSettingConnection *s_con = nm_connection_get_setting_connection(self); - const char *slave_type; + const char *port_type; gboolean changed = FALSE; - slave_type = nm_setting_connection_get_port_type(s_con); + port_type = nm_setting_connection_get_port_type(s_con); - if (!nm_streq0(slave_type, NM_SETTING_BRIDGE_SETTING_NAME) + if (!nm_streq0(port_type, NM_SETTING_BRIDGE_SETTING_NAME) && _nm_connection_remove_setting(self, NM_TYPE_SETTING_BRIDGE_PORT)) changed = TRUE; - if (!nm_streq0(slave_type, NM_SETTING_BOND_SETTING_NAME) + if (!nm_streq0(port_type, NM_SETTING_BOND_SETTING_NAME) && _nm_connection_remove_setting(self, NM_TYPE_SETTING_BOND_PORT)) changed = TRUE; - if (!nm_streq0(slave_type, NM_SETTING_TEAM_SETTING_NAME) + if (!nm_streq0(port_type, NM_SETTING_TEAM_SETTING_NAME) && _nm_connection_remove_setting(self, NM_TYPE_SETTING_TEAM_PORT)) changed = TRUE; @@ -1890,10 +1890,10 @@ _nm_connection_verify(NMConnection *connection, GError **error) g_set_error_literal(&normalizable_error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_MISSING_SETTING, - _("setting is required for non-slave connections")); + _("setting is required for non-port connections")); g_prefix_error(&normalizable_error, "%s: ", NM_SETTING_IP4_CONFIG_SETTING_NAME); - /* having a master without IP config was not a verify() error, accept + /* having a controller without IP config was not a verify() error, accept * it for backward compatibility. */ normalizable_error_type = NM_SETTING_VERIFY_NORMALIZABLE; } @@ -1903,9 +1903,9 @@ _nm_connection_verify(NMConnection *connection, GError **error) g_set_error_literal(&normalizable_error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_INVALID_SETTING, - _("setting not allowed in slave connection")); + _("setting not allowed in port connection")); g_prefix_error(&normalizable_error, "%s: ", NM_SETTING_IP4_CONFIG_SETTING_NAME); - /* having a slave with IP config *was* and is a verify() error. */ + /* having a port with IP config *was* and is a verify() error. */ normalizable_error_type = NM_SETTING_VERIFY_NORMALIZABLE_ERROR; } } @@ -1915,10 +1915,10 @@ _nm_connection_verify(NMConnection *connection, GError **error) g_set_error_literal(&normalizable_error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_MISSING_SETTING, - _("setting is required for non-slave connections")); + _("setting is required for non-port connections")); g_prefix_error(&normalizable_error, "%s: ", NM_SETTING_IP6_CONFIG_SETTING_NAME); - /* having a master without IP config was not a verify() error, accept + /* having a controller without IP config was not a verify() error, accept * it for backward compatibility. */ normalizable_error_type = NM_SETTING_VERIFY_NORMALIZABLE; } @@ -1928,9 +1928,9 @@ _nm_connection_verify(NMConnection *connection, GError **error) g_set_error_literal(&normalizable_error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_INVALID_SETTING, - _("setting not allowed in slave connection")); + _("setting not allowed in port connection")); g_prefix_error(&normalizable_error, "%s: ", NM_SETTING_IP6_CONFIG_SETTING_NAME); - /* having a slave with IP config *was* and is a verify() error. */ + /* having a port with IP config *was* and is a verify() error. */ normalizable_error_type = NM_SETTING_VERIFY_NORMALIZABLE_ERROR; } } @@ -1940,10 +1940,10 @@ _nm_connection_verify(NMConnection *connection, GError **error) g_set_error_literal(&normalizable_error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_MISSING_SETTING, - _("setting is required for non-slave connections")); + _("setting is required for non-port connections")); g_prefix_error(&normalizable_error, "%s: ", NM_SETTING_PROXY_SETTING_NAME); - /* having a master without proxy config was not a verify() error, accept + /* having a controller without proxy config was not a verify() error, accept * it for backward compatibility. */ normalizable_error_type = NM_SETTING_VERIFY_NORMALIZABLE; } @@ -1953,9 +1953,9 @@ _nm_connection_verify(NMConnection *connection, GError **error) g_set_error_literal(&normalizable_error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_INVALID_SETTING, - _("setting not allowed in slave connection")); + _("setting not allowed in port connection")); g_prefix_error(&normalizable_error, "%s: ", NM_SETTING_PROXY_SETTING_NAME); - /* having a slave with proxy config *was* and is a verify() error. */ + /* having a port with proxy config *was* and is a verify() error. */ normalizable_error_type = NM_SETTING_VERIFY_NORMALIZABLE_ERROR; } } @@ -2026,11 +2026,11 @@ _connection_normalize(NMConnection *connection, was_modified |= _normalize_connection_uuid(connection); was_modified |= _normalize_connection_type(connection); - was_modified |= _normalize_connection_slave_type(connection); + was_modified |= _normalize_connection_port_type(connection); was_modified |= _normalize_connection_secondaries(connection); was_modified |= _normalize_connection(connection); was_modified |= _normalize_required_settings(connection); - was_modified |= _normalize_invalid_slave_port_settings(connection); + was_modified |= _normalize_invalid_port_port_settings(connection); was_modified |= _normalize_ip_config(connection, parameters); was_modified |= _normalize_ethernet_link_neg(connection); was_modified |= _normalize_infiniband(connection); diff --git a/src/libnm-core-impl/nm-keyfile.c b/src/libnm-core-impl/nm-keyfile.c index 81f7170ea5..8dadf3cdf9 100644 --- a/src/libnm-core-impl/nm-keyfile.c +++ b/src/libnm-core-impl/nm-keyfile.c @@ -233,7 +233,7 @@ _secret_flags_persist_secret(NMSettingSecretFlags flags) /*****************************************************************************/ /* Some setting properties also contain setting names, such as * NMSettingConnection's 'type' property (which specifies the base type of the - * connection, e.g. ethernet or wifi) or 'slave-type' (specifies type of slave + * connection, e.g. ethernet or wifi) or 'port-type' (specifies type of port * connection, e.g. bond or bridge). This function handles translating those * properties' values to the real setting name if they are an alias. */ diff --git a/src/libnm-core-impl/nm-setting-6lowpan.c b/src/libnm-core-impl/nm-setting-6lowpan.c index d318ab007b..1da30062c7 100644 --- a/src/libnm-core-impl/nm-setting-6lowpan.c +++ b/src/libnm-core-impl/nm-setting-6lowpan.c @@ -87,24 +87,24 @@ verify(NMSetting *setting, NMConnection *connection, GError **error) } if (nm_utils_is_uuid(priv->parent)) { - /* If we have an NMSettingConnection:master with slave-type="6lowpan", + /* If we have an NMSettingConnection:controller with port-type="6lowpan", * then it must be the same UUID. */ if (s_con) { - const char *master = NULL, *slave_type = NULL; + const char *controller = NULL, *port_type = NULL; - 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_controller(s_con); + port_type = nm_setting_connection_get_port_type(s_con); + if (!g_strcmp0(port_type, NM_SETTING_6LOWPAN_SETTING_NAME)) + controller = nm_setting_connection_get_controller(s_con); - if (master && g_strcmp0(priv->parent, master) != 0) { + if (controller && g_strcmp0(priv->parent, controller) != 0) { g_set_error(error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_INVALID_PROPERTY, _("'%s' value doesn't match '%s=%s'"), priv->parent, NM_SETTING_CONNECTION_CONTROLLER, - master); + controller); g_prefix_error(error, "%s.%s: ", NM_SETTING_6LOWPAN_SETTING_NAME, diff --git a/src/libnm-core-impl/nm-setting-bond-port.c b/src/libnm-core-impl/nm-setting-bond-port.c index 342d6dd060..4f1270a81b 100644 --- a/src/libnm-core-impl/nm-setting-bond-port.c +++ b/src/libnm-core-impl/nm-setting-bond-port.c @@ -89,7 +89,7 @@ verify(NMSetting *setting, NMConnection *connection, GError **error) { if (connection) { NMSettingConnection *s_con; - const char *slave_type; + const char *port_type; s_con = nm_connection_get_setting_connection(connection); if (!s_con) { @@ -101,16 +101,16 @@ verify(NMSetting *setting, NMConnection *connection, GError **error) return FALSE; } - slave_type = nm_setting_connection_get_port_type(s_con); - if (slave_type && !nm_streq(slave_type, NM_SETTING_BOND_SETTING_NAME)) { + port_type = nm_setting_connection_get_port_type(s_con); + if (port_type && !nm_streq(port_type, NM_SETTING_BOND_SETTING_NAME)) { g_set_error(error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_INVALID_PROPERTY, - _("A connection with a '%s' setting must have the slave-type set to '%s'. " + _("A connection with a '%s' setting must have the port-type set to '%s'. " "Instead it is '%s'"), NM_SETTING_BOND_PORT_SETTING_NAME, NM_SETTING_BOND_SETTING_NAME, - slave_type); + port_type); g_prefix_error(error, "%s.%s: ", NM_SETTING_CONNECTION_SETTING_NAME, diff --git a/src/libnm-core-impl/nm-setting-bridge-port.c b/src/libnm-core-impl/nm-setting-bridge-port.c index dcb17896dc..e5f0e1754f 100644 --- a/src/libnm-core-impl/nm-setting-bridge-port.c +++ b/src/libnm-core-impl/nm-setting-bridge-port.c @@ -316,7 +316,7 @@ verify(NMSetting *setting, NMConnection *connection, GError **error) if (connection) { NMSettingConnection *s_con; - const char *slave_type; + const char *port_type; s_con = nm_connection_get_setting_connection(connection); if (!s_con) { @@ -328,16 +328,16 @@ verify(NMSetting *setting, NMConnection *connection, GError **error) return FALSE; } - slave_type = nm_setting_connection_get_port_type(s_con); - if (slave_type && strcmp(slave_type, NM_SETTING_BRIDGE_SETTING_NAME)) { + port_type = nm_setting_connection_get_port_type(s_con); + if (port_type && strcmp(port_type, NM_SETTING_BRIDGE_SETTING_NAME)) { g_set_error(error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_INVALID_PROPERTY, - _("A connection with a '%s' setting must have the slave-type set to '%s'. " + _("A connection with a '%s' setting must have the port-type set to '%s'. " "Instead it is '%s'"), NM_SETTING_BRIDGE_PORT_SETTING_NAME, NM_SETTING_BRIDGE_SETTING_NAME, - slave_type); + port_type); g_prefix_error(error, "%s.%s: ", NM_SETTING_CONNECTION_SETTING_NAME, diff --git a/src/libnm-core-impl/nm-setting-connection.c b/src/libnm-core-impl/nm-setting-connection.c index 30a9509b6d..b51cd46bdd 100644 --- a/src/libnm-core-impl/nm-setting-connection.c +++ b/src/libnm-core-impl/nm-setting-connection.c @@ -712,7 +712,7 @@ nm_setting_connection_get_zone(NMSettingConnection *setting) * * Returns the #NMSettingConnection:master property of the connection. * - * Returns: interface name of the master device or UUID of the master + * Returns: interface name of the controller device or UUID of the controller * connection. * * Deprecated: 1.46. Use nm_setting_connection_get_master() instead which @@ -767,7 +767,7 @@ nm_setting_connection_get_port_type(NMSettingConnection *setting) * * Returns the #NMSettingConnection:slave-type property of the connection. * - * Returns: the type of slave this connection is, if any + * Returns: the type of port this connection is, if any * * Deprecated: 1.46. Use nm_setting_connection_get_port_type() instead which * is just an alias. @@ -782,9 +782,9 @@ nm_setting_connection_get_slave_type(NMSettingConnection *setting) * nm_setting_connection_is_slave_type: * @setting: the #NMSettingConnection * @type: the setting name (ie #NM_SETTING_BOND_SETTING_NAME) to be matched - * against @setting's slave type + * against @setting's port type * - * Returns: %TRUE if connection is of the given slave @type + * Returns: %TRUE if connection is of the given port @type * * Deprecated: 1.46. */ @@ -875,7 +875,7 @@ nm_setting_connection_get_autoconnect_ports(NMSettingConnection *setting) * * Returns the #NMSettingConnection:autoconnect-slaves property of the connection. * - * Returns: whether slaves of the connection should be activated together + * Returns: whether ports of the connection should be activated together * with the connection. * * Since: 1.2 @@ -1149,33 +1149,33 @@ _set_error_missing_base_setting(GError **error, const char *type) } gboolean -_nm_connection_detect_slave_type_full(NMSettingConnection *s_con, - NMConnection *connection, - const char **out_slave_type, - const char **out_normerr_slave_setting_type, - const char **out_normerr_missing_slave_type, - const char **out_normerr_missing_slave_type_port, - GError **error) +_nm_connection_detect_port_type_full(NMSettingConnection *s_con, + NMConnection *connection, + const char **out_port_type, + const char **out_normerr_port_setting_type, + const char **out_normerr_missing_port_type, + const char **out_normerr_missing_port_type_port, + GError **error) { NMSettingConnectionPrivate *priv = NM_SETTING_CONNECTION_GET_PRIVATE(s_con); - gboolean is_slave; - const char *slave_setting_type; - const char *slave_type; - const char *normerr_slave_setting_type = NULL; - const char *normerr_missing_slave_type = NULL; - const char *normerr_missing_slave_type_port = NULL; + gboolean is_port; + const char *port_setting_type; + const char *port_type; + const char *normerr_port_setting_type = NULL; + const char *normerr_missing_port_type = NULL; + const char *normerr_missing_port_type_port = NULL; - is_slave = FALSE; - slave_setting_type = NULL; - slave_type = priv->port_type; - if (slave_type) { - is_slave = _nm_setting_slave_type_is_valid(slave_type, &slave_setting_type); - if (!is_slave) { + is_port = FALSE; + port_setting_type = NULL; + port_type = priv->port_type; + if (port_type) { + is_port = _nm_setting_port_type_is_valid(port_type, &port_setting_type); + if (!is_port) { g_set_error(error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_INVALID_PROPERTY, - _("Unknown slave type '%s'"), - slave_type); + _("Unknown port type '%s'"), + port_type); g_prefix_error(error, "%s.%s: ", NM_SETTING_CONNECTION_SETTING_NAME, @@ -1184,7 +1184,7 @@ _nm_connection_detect_slave_type_full(NMSettingConnection *s_con, } } - if (is_slave) { + if (is_port) { if (!priv->controller) { g_set_error(error, NM_CONNECTION_ERROR, @@ -1197,18 +1197,17 @@ _nm_connection_detect_slave_type_full(NMSettingConnection *s_con, NM_SETTING_CONNECTION_CONTROLLER); return FALSE; } - if (slave_setting_type && connection - && !nm_connection_get_setting_by_name(connection, slave_setting_type)) - normerr_slave_setting_type = slave_setting_type; + if (port_setting_type && connection + && !nm_connection_get_setting_by_name(connection, port_setting_type)) + normerr_port_setting_type = port_setting_type; } else { - nm_assert(!slave_type); + nm_assert(!port_type); if (priv->controller) { NMSetting *s_port; - if (connection - && (slave_type = _nm_connection_detect_slave_type(connection, &s_port))) { - normerr_missing_slave_type = slave_type; - normerr_missing_slave_type_port = nm_setting_get_name(s_port); + if (connection && (port_type = _nm_connection_detect_port_type(connection, &s_port))) { + normerr_missing_port_type = port_type; + normerr_missing_port_type_port = nm_setting_get_name(s_port); } else { g_set_error(error, NM_CONNECTION_ERROR, @@ -1225,10 +1224,10 @@ _nm_connection_detect_slave_type_full(NMSettingConnection *s_con, } } - NM_SET_OUT(out_slave_type, slave_type); - NM_SET_OUT(out_normerr_slave_setting_type, normerr_slave_setting_type); - NM_SET_OUT(out_normerr_missing_slave_type, normerr_missing_slave_type); - NM_SET_OUT(out_normerr_missing_slave_type_port, normerr_missing_slave_type_port); + NM_SET_OUT(out_port_type, port_type); + NM_SET_OUT(out_normerr_port_setting_type, normerr_port_setting_type); + NM_SET_OUT(out_normerr_missing_port_type, normerr_missing_port_type); + NM_SET_OUT(out_normerr_missing_port_type_port, normerr_missing_port_type_port); return TRUE; } @@ -1239,12 +1238,12 @@ verify(NMSetting *setting, NMConnection *connection, GError **error) NMSettingConnectionPrivate *priv = NM_SETTING_CONNECTION_GET_PRIVATE(self); NMSetting *normerr_base_type = NULL; const char *type; - const char *slave_type; - const char *normerr_slave_setting_type = NULL; - const char *normerr_missing_slave_type = NULL; - const char *normerr_missing_slave_type_port = NULL; - gboolean normerr_base_setting = FALSE; - gboolean uuid_was_normalized = FALSE; + const char *port_type; + const char *normerr_port_setting_type = NULL; + const char *normerr_missing_port_type = NULL; + const char *normerr_missing_port_type_port = NULL; + gboolean normerr_base_setting = FALSE; + gboolean uuid_was_normalized = FALSE; if (!priv->id) { g_set_error_literal(error, @@ -1409,24 +1408,24 @@ verify(NMSetting *setting, NMConnection *connection, GError **error) } after_interface_name: - if (!_nm_connection_detect_slave_type_full(self, - connection, - &slave_type, - &normerr_slave_setting_type, - &normerr_missing_slave_type, - &normerr_missing_slave_type_port, - error)) + if (!_nm_connection_detect_port_type_full(self, + connection, + &port_type, + &normerr_port_setting_type, + &normerr_missing_port_type, + &normerr_missing_port_type_port, + error)) return FALSE; - if (nm_streq(type, NM_SETTING_OVS_PORT_SETTING_NAME) && slave_type - && !nm_streq(slave_type, NM_SETTING_OVS_BRIDGE_SETTING_NAME)) { + if (nm_streq(type, NM_SETTING_OVS_PORT_SETTING_NAME) && port_type + && !nm_streq(port_type, NM_SETTING_OVS_BRIDGE_SETTING_NAME)) { g_set_error(error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_MISSING_PROPERTY, - _("'%s' connections must be enslaved to '%s', not '%s'"), + _("'%s' connections must be attached as port to '%s', not '%s'"), NM_SETTING_OVS_PORT_SETTING_NAME, NM_SETTING_OVS_BRIDGE_SETTING_NAME, - slave_type); + port_type); g_prefix_error(error, "%s.%s: ", NM_SETTING_CONNECTION_SETTING_NAME, @@ -1643,27 +1642,27 @@ after_interface_name: return NM_SETTING_VERIFY_NORMALIZABLE_ERROR; } - if (normerr_slave_setting_type) { + if (normerr_port_setting_type) { g_set_error(error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_MISSING_SETTING, _("port-type '%s' requires a '%s' setting in the connection"), priv->port_type, - normerr_slave_setting_type); - g_prefix_error(error, "%s: ", normerr_slave_setting_type); + normerr_port_setting_type); + g_prefix_error(error, "%s: ", normerr_port_setting_type); return NM_SETTING_VERIFY_NORMALIZABLE_ERROR; } - if (normerr_missing_slave_type) { + if (normerr_missing_port_type) { g_set_error(error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_MISSING_PROPERTY, - _("Detect a slave connection with '%s' set and a port type '%s'. '%s' should " + _("Detect a port connection with '%s' set and a port type '%s'. '%s' should " "be set to '%s'"), NM_SETTING_CONNECTION_CONTROLLER, - normerr_missing_slave_type_port, + normerr_missing_port_type_port, NM_SETTING_CONNECTION_PORT_TYPE, - normerr_missing_slave_type); + normerr_missing_port_type); g_prefix_error(error, "%s.%s: ", NM_SETTING_CONNECTION_SETTING_NAME, @@ -1684,7 +1683,7 @@ after_interface_name: g_set_error(error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_INVALID_SETTING, - _("A slave connection with '%s' set to '%s' cannot have a '%s' setting"), + _("A port connection with '%s' set to '%s' cannot have a '%s' setting"), NM_SETTING_CONNECTION_PORT_TYPE, priv->port_type ?: "", has_bridge_port ? NM_SETTING_BRIDGE_PORT_SETTING_NAME @@ -2531,14 +2530,14 @@ nm_setting_connection_class_init(NMSettingConnectionClass *klass) /** * NMSettingConnection:master: * - * Interface name of the master device or UUID of the master connection. + * Interface name of the controller device or UUID of the controller connection. * * Deprecated 1.46. Use #NMSettingConnection:controller instead, this is just an alias. **/ /* ---ifcfg-rh--- * property: master * variable: MASTER, MASTER_UUID, TEAM_MASTER, TEAM_MASTER_UUID, BRIDGE, BRIDGE_UUID - * description: Reference to master connection. The variable used depends on + * description: Reference to controller connection. The variable used depends on * the connection type and the value. In general, if the *_UUID variant is present, * the variant without *_UUID is ignored. NetworkManager attempts to write both * for compatibility with legacy tooling. @@ -2589,9 +2588,9 @@ nm_setting_connection_class_init(NMSettingConnectionClass *klass) /** * NMSettingConnection:slave-type: * - * Setting name of the device type of this slave's master connection (eg, + * Setting name of the device type of this port's controller connection (eg, * %NM_SETTING_BOND_SETTING_NAME), or %NULL if this connection is not a - * slave. + * port. * * Deprecated 1.46. Use #NMSettingConnection:port-type instead, this is just an alias. **/ @@ -2655,13 +2654,13 @@ nm_setting_connection_class_init(NMSettingConnectionClass *klass) /** * NMSettingConnection:autoconnect-slaves: * - * Whether or not slaves of this connection should be automatically brought up + * Whether or not ports of this connection should be automatically brought up * when NetworkManager activates this connection. This only has a real effect - * for master connections. The properties #NMSettingConnection:autoconnect, + * for controller connections. The properties #NMSettingConnection:autoconnect, * #NMSettingConnection:autoconnect-priority and #NMSettingConnection:autoconnect-retries * are unrelated to this setting. - * The permitted values are: 0: leave slave connections untouched, - * 1: activate all the slave connections with this connection, -1: default. + * The permitted values are: 0: leave port connections untouched, + * 1: activate all the port connections with this connection, -1: default. * If -1 (default) is set, global connection.autoconnect-slaves is read to * determine the real value. If it is default as well, this fallbacks to 0. * diff --git a/src/libnm-core-impl/nm-setting-macsec.c b/src/libnm-core-impl/nm-setting-macsec.c index 5732fa0788..74d99c2e58 100644 --- a/src/libnm-core-impl/nm-setting-macsec.c +++ b/src/libnm-core-impl/nm-setting-macsec.c @@ -316,24 +316,24 @@ verify(NMSetting *setting, NMConnection *connection, GError **error) if (priv->parent) { if (nm_utils_is_uuid(priv->parent)) { - /* If we have an NMSettingConnection:master with slave-type="macsec", + /* If we have an NMSettingConnection:controller with port-type="macsec", * then it must be the same UUID. */ if (s_con) { - const char *master = NULL, *slave_type = NULL; + const char *controller = NULL, *port_type = NULL; - 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_controller(s_con); + port_type = nm_setting_connection_get_port_type(s_con); + if (!g_strcmp0(port_type, NM_SETTING_MACSEC_SETTING_NAME)) + controller = nm_setting_connection_get_controller(s_con); - if (master && g_strcmp0(priv->parent, master) != 0) { + if (controller && g_strcmp0(priv->parent, controller) != 0) { g_set_error(error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_INVALID_PROPERTY, _("'%s' value doesn't match '%s=%s'"), priv->parent, NM_SETTING_CONNECTION_CONTROLLER, - master); + controller); g_prefix_error(error, "%s.%s: ", NM_SETTING_MACSEC_SETTING_NAME, diff --git a/src/libnm-core-impl/nm-setting-ovs-bridge.c b/src/libnm-core-impl/nm-setting-ovs-bridge.c index 410d877101..bbbb1a46b9 100644 --- a/src/libnm-core-impl/nm-setting-ovs-bridge.c +++ b/src/libnm-core-impl/nm-setting-ovs-bridge.c @@ -157,7 +157,7 @@ verify(NMSetting *setting, NMConnection *connection, GError **error) g_set_error(error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_INVALID_PROPERTY, - _("A connection with a '%s' setting must not have a master."), + _("A connection with a '%s' setting must not have a controller."), NM_SETTING_OVS_BRIDGE_SETTING_NAME); g_prefix_error(error, "%s.%s: ", diff --git a/src/libnm-core-impl/nm-setting-ovs-external-ids.c b/src/libnm-core-impl/nm-setting-ovs-external-ids.c index 0cdf3e6bf6..9acdae6c5f 100644 --- a/src/libnm-core-impl/nm-setting-ovs-external-ids.c +++ b/src/libnm-core-impl/nm-setting-ovs-external-ids.c @@ -124,7 +124,7 @@ _nm_setting_ovs_verify_connection_type(GType gtype, NMConnection *connection, GE { NMSettingConnection *s_con; const char *type; - const char *slave_type; + const char *port_type; nm_assert(!connection || NM_IS_CONNECTION(connection)); nm_assert(NM_IN_SET(gtype, NM_TYPE_SETTING_OVS_EXTERNAL_IDS, NM_TYPE_SETTING_OVS_OTHER_CONFIG)); @@ -150,14 +150,14 @@ _nm_setting_ovs_verify_connection_type(GType gtype, NMConnection *connection, GE return TRUE; if ((s_con = nm_connection_get_setting_connection(connection)) - && _nm_connection_detect_slave_type_full(s_con, - connection, - &slave_type, - NULL, - NULL, - NULL, - NULL) - && nm_streq0(slave_type, NM_SETTING_OVS_PORT_SETTING_NAME)) + && _nm_connection_detect_port_type_full(s_con, + connection, + &port_type, + NULL, + NULL, + NULL, + NULL) + && nm_streq0(port_type, NM_SETTING_OVS_PORT_SETTING_NAME)) return TRUE; g_set_error(error, diff --git a/src/libnm-core-impl/nm-setting-ovs-interface.c b/src/libnm-core-impl/nm-setting-ovs-interface.c index 47c736659c..22b3bf9e34 100644 --- a/src/libnm-core-impl/nm-setting-ovs-interface.c +++ b/src/libnm-core-impl/nm-setting-ovs-interface.c @@ -296,7 +296,7 @@ verify(NMSetting *setting, NMConnection *connection, GError **error) NMSettingConnection *s_con = NULL; if (connection) { - const char *slave_type; + const char *port_type; s_con = nm_connection_get_setting_connection(connection); if (!s_con) { @@ -321,16 +321,16 @@ verify(NMSetting *setting, NMConnection *connection, GError **error) return FALSE; } - slave_type = nm_setting_connection_get_port_type(s_con); - if (slave_type && !nm_streq(slave_type, NM_SETTING_OVS_PORT_SETTING_NAME)) { + port_type = nm_setting_connection_get_port_type(s_con); + if (port_type && !nm_streq(port_type, NM_SETTING_OVS_PORT_SETTING_NAME)) { g_set_error(error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_INVALID_PROPERTY, - _("A connection with a '%s' setting must have the slave-type set to '%s'. " + _("A connection with a '%s' setting must have the port-type set to '%s'. " "Instead it is '%s'"), NM_SETTING_OVS_INTERFACE_SETTING_NAME, NM_SETTING_OVS_PORT_SETTING_NAME, - slave_type); + port_type); g_prefix_error(error, "%s.%s: ", NM_SETTING_CONNECTION_SETTING_NAME, diff --git a/src/libnm-core-impl/nm-setting-ovs-port.c b/src/libnm-core-impl/nm-setting-ovs-port.c index 107d76cd04..7e5e5e14e0 100644 --- a/src/libnm-core-impl/nm-setting-ovs-port.c +++ b/src/libnm-core-impl/nm-setting-ovs-port.c @@ -401,7 +401,7 @@ verify(NMSetting *setting, NMConnection *connection, GError **error) if (connection) { NMSettingConnection *s_con; - const char *slave_type; + const char *port_type; s_con = nm_connection_get_setting_connection(connection); if (!s_con) { @@ -417,7 +417,7 @@ verify(NMSetting *setting, NMConnection *connection, GError **error) g_set_error(error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_INVALID_PROPERTY, - _("A connection with a '%s' setting must have a master."), + _("A connection with a '%s' setting must have a controller."), NM_SETTING_OVS_PORT_SETTING_NAME); g_prefix_error(error, "%s.%s: ", @@ -426,8 +426,8 @@ verify(NMSetting *setting, NMConnection *connection, GError **error) return FALSE; } - slave_type = nm_setting_connection_get_port_type(s_con); - if (slave_type && strcmp(slave_type, NM_SETTING_OVS_BRIDGE_SETTING_NAME)) { + port_type = nm_setting_connection_get_port_type(s_con); + if (port_type && strcmp(port_type, NM_SETTING_OVS_BRIDGE_SETTING_NAME)) { g_set_error(error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_INVALID_PROPERTY, @@ -435,7 +435,7 @@ verify(NMSetting *setting, NMConnection *connection, GError **error) "Instead it is '%s'"), NM_SETTING_OVS_PORT_SETTING_NAME, NM_SETTING_OVS_BRIDGE_SETTING_NAME, - slave_type); + port_type); g_prefix_error(error, "%s.%s: ", NM_SETTING_CONNECTION_SETTING_NAME, diff --git a/src/libnm-core-impl/nm-setting-private.h b/src/libnm-core-impl/nm-setting-private.h index 7d49324845..da7fdbb70c 100644 --- a/src/libnm-core-impl/nm-setting-private.h +++ b/src/libnm-core-impl/nm-setting-private.h @@ -357,7 +357,7 @@ gboolean _nm_setting_verify_secret_string(const char *str, gboolean _nm_setting_aggregate(NMSetting *setting, NMConnectionAggregateType type, gpointer arg); -gboolean _nm_setting_slave_type_is_valid(const char *slave_type, const char **out_port_type); +gboolean _nm_setting_port_type_is_valid(const char *port_type, const char **out_port_type); gboolean _nm_setting_compare_flags_check(const GParamSpec *param_spec, NMSettingCompareFlags flags, @@ -407,20 +407,20 @@ GVariant *_nm_setting_connection_controller_to_dbus(_NM_SETT_INFO_PROP_TO_DBUS_F gboolean _nm_setting_connection_master_from_dbus(_NM_SETT_INFO_PROP_FROM_DBUS_FCN_ARGS _nm_nil); -gboolean _nm_setting_connection_port_type_from_dbus(_NM_SETT_INFO_PROP_FROM_DBUS_FCN_ARGS _nm_nil); +gboolean _nm_setting_connection_slave_type_from_dbus(_NM_SETT_INFO_PROP_FROM_DBUS_FCN_ARGS _nm_nil); GVariant *_nm_setting_connection_port_type_to_dbus(_NM_SETT_INFO_PROP_TO_DBUS_FCN_ARGS _nm_nil); -gboolean _nm_setting_connection_slave_type_from_dbus(_NM_SETT_INFO_PROP_FROM_DBUS_FCN_ARGS _nm_nil); +gboolean _nm_setting_connection_port_type_from_dbus(_NM_SETT_INFO_PROP_FROM_DBUS_FCN_ARGS _nm_nil); gboolean -_nm_setting_connection_autoconnect_ports_from_dbus(_NM_SETT_INFO_PROP_FROM_DBUS_FCN_ARGS _nm_nil); +_nm_setting_connection_autoconnect_slaves_from_dbus(_NM_SETT_INFO_PROP_FROM_DBUS_FCN_ARGS _nm_nil); GVariant * _nm_setting_connection_autoconnect_ports_to_dbus(_NM_SETT_INFO_PROP_TO_DBUS_FCN_ARGS _nm_nil); gboolean -_nm_setting_connection_autoconnect_slaves_from_dbus(_NM_SETT_INFO_PROP_FROM_DBUS_FCN_ARGS _nm_nil); +_nm_setting_connection_autoconnect_ports_from_dbus(_NM_SETT_INFO_PROP_FROM_DBUS_FCN_ARGS _nm_nil); gboolean _nm_setting_wireless_mac_denylist_from_dbus(_NM_SETT_INFO_PROP_FROM_DBUS_FCN_ARGS _nm_nil); diff --git a/src/libnm-core-impl/nm-setting-team-port.c b/src/libnm-core-impl/nm-setting-team-port.c index a881ec5f09..5c04e1575d 100644 --- a/src/libnm-core-impl/nm-setting-team-port.c +++ b/src/libnm-core-impl/nm-setting-team-port.c @@ -311,7 +311,7 @@ verify(NMSetting *setting, NMConnection *connection, GError **error) if (connection) { NMSettingConnection *s_con; - const char *slave_type; + const char *port_type; s_con = nm_connection_get_setting_connection(connection); if (!s_con) { @@ -323,16 +323,16 @@ verify(NMSetting *setting, NMConnection *connection, GError **error) return FALSE; } - slave_type = nm_setting_connection_get_port_type(s_con); - if (slave_type && strcmp(slave_type, NM_SETTING_TEAM_SETTING_NAME)) { + port_type = nm_setting_connection_get_port_type(s_con); + if (port_type && strcmp(port_type, NM_SETTING_TEAM_SETTING_NAME)) { g_set_error(error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_INVALID_PROPERTY, - _("A connection with a '%s' setting must have the slave-type set to '%s'. " + _("A connection with a '%s' setting must have the port-type set to '%s'. " "Instead it is '%s'"), NM_SETTING_TEAM_PORT_SETTING_NAME, NM_SETTING_TEAM_SETTING_NAME, - slave_type); + port_type); g_prefix_error(error, "%s.%s: ", NM_SETTING_CONNECTION_SETTING_NAME, diff --git a/src/libnm-core-impl/nm-setting-team.c b/src/libnm-core-impl/nm-setting-team.c index 08364af88f..59fbdcb23d 100644 --- a/src/libnm-core-impl/nm-setting-team.c +++ b/src/libnm-core-impl/nm-setting-team.c @@ -592,7 +592,7 @@ nm_team_link_watcher_get_delay_down(const NMTeamLinkWatcher *watcher) * nm_team_link_watcher_get_init_wait: * @watcher: the #NMTeamLinkWatcher * - * Gets the init_wait interval (in milliseconds) that the team slave should + * Gets the init_wait interval (in milliseconds) that the team port should * wait before sending the first packet to the target host. * * Since: 1.12 @@ -613,7 +613,7 @@ nm_team_link_watcher_get_init_wait(const NMTeamLinkWatcher *watcher) * nm_team_link_watcher_get_interval: * @watcher: the #NMTeamLinkWatcher * - * Gets the interval (in milliseconds) that the team slave should wait between + * Gets the interval (in milliseconds) that the team port should wait between * sending two check packets to the target host. * * Since: 1.12 @@ -727,7 +727,7 @@ nm_team_link_watcher_get_flags(const NMTeamLinkWatcher *watcher) /*****************************************************************************/ -static GParamSpec *obj_properties[_NM_TEAM_ATTRIBUTE_MASTER_NUM] = { +static GParamSpec *obj_properties[_NM_TEAM_ATTRIBUTE_CONTROLLER_NUM] = { NULL, }; @@ -804,7 +804,7 @@ nm_setting_team_get_notify_peers_count(NMSettingTeam *setting) { g_return_val_if_fail(NM_IS_SETTING_TEAM(setting), 0); - return NM_SETTING_TEAM_GET_PRIVATE(setting)->team_setting->d.master.notify_peers_count; + return NM_SETTING_TEAM_GET_PRIVATE(setting)->team_setting->d.controller.notify_peers_count; } /** @@ -820,7 +820,7 @@ nm_setting_team_get_notify_peers_interval(NMSettingTeam *setting) { g_return_val_if_fail(NM_IS_SETTING_TEAM(setting), 0); - return NM_SETTING_TEAM_GET_PRIVATE(setting)->team_setting->d.master.notify_peers_interval; + return NM_SETTING_TEAM_GET_PRIVATE(setting)->team_setting->d.controller.notify_peers_interval; } /** @@ -836,7 +836,7 @@ nm_setting_team_get_mcast_rejoin_count(NMSettingTeam *setting) { g_return_val_if_fail(NM_IS_SETTING_TEAM(setting), 0); - return NM_SETTING_TEAM_GET_PRIVATE(setting)->team_setting->d.master.mcast_rejoin_count; + return NM_SETTING_TEAM_GET_PRIVATE(setting)->team_setting->d.controller.mcast_rejoin_count; } /** @@ -852,7 +852,7 @@ nm_setting_team_get_mcast_rejoin_interval(NMSettingTeam *setting) { g_return_val_if_fail(NM_IS_SETTING_TEAM(setting), 0); - return NM_SETTING_TEAM_GET_PRIVATE(setting)->team_setting->d.master.mcast_rejoin_interval; + return NM_SETTING_TEAM_GET_PRIVATE(setting)->team_setting->d.controller.mcast_rejoin_interval; } /** @@ -868,7 +868,7 @@ nm_setting_team_get_runner(NMSettingTeam *setting) { g_return_val_if_fail(NM_IS_SETTING_TEAM(setting), NULL); - return NM_SETTING_TEAM_GET_PRIVATE(setting)->team_setting->d.master.runner; + return NM_SETTING_TEAM_GET_PRIVATE(setting)->team_setting->d.controller.runner; } /** @@ -884,7 +884,7 @@ nm_setting_team_get_runner_hwaddr_policy(NMSettingTeam *setting) { g_return_val_if_fail(NM_IS_SETTING_TEAM(setting), NULL); - return NM_SETTING_TEAM_GET_PRIVATE(setting)->team_setting->d.master.runner_hwaddr_policy; + return NM_SETTING_TEAM_GET_PRIVATE(setting)->team_setting->d.controller.runner_hwaddr_policy; } /** @@ -900,7 +900,7 @@ nm_setting_team_get_runner_tx_balancer(NMSettingTeam *setting) { g_return_val_if_fail(NM_IS_SETTING_TEAM(setting), NULL); - return NM_SETTING_TEAM_GET_PRIVATE(setting)->team_setting->d.master.runner_tx_balancer; + return NM_SETTING_TEAM_GET_PRIVATE(setting)->team_setting->d.controller.runner_tx_balancer; } /** @@ -916,7 +916,8 @@ nm_setting_team_get_runner_tx_balancer_interval(NMSettingTeam *setting) { g_return_val_if_fail(NM_IS_SETTING_TEAM(setting), 0); - return NM_SETTING_TEAM_GET_PRIVATE(setting)->team_setting->d.master.runner_tx_balancer_interval; + return NM_SETTING_TEAM_GET_PRIVATE(setting) + ->team_setting->d.controller.runner_tx_balancer_interval; } /** @@ -932,7 +933,7 @@ nm_setting_team_get_runner_active(NMSettingTeam *setting) { g_return_val_if_fail(NM_IS_SETTING_TEAM(setting), FALSE); - return NM_SETTING_TEAM_GET_PRIVATE(setting)->team_setting->d.master.runner_active; + return NM_SETTING_TEAM_GET_PRIVATE(setting)->team_setting->d.controller.runner_active; } /** @@ -948,7 +949,7 @@ nm_setting_team_get_runner_fast_rate(NMSettingTeam *setting) { g_return_val_if_fail(NM_IS_SETTING_TEAM(setting), FALSE); - return NM_SETTING_TEAM_GET_PRIVATE(setting)->team_setting->d.master.runner_fast_rate; + return NM_SETTING_TEAM_GET_PRIVATE(setting)->team_setting->d.controller.runner_fast_rate; } /** @@ -964,7 +965,7 @@ nm_setting_team_get_runner_sys_prio(NMSettingTeam *setting) { g_return_val_if_fail(NM_IS_SETTING_TEAM(setting), 0); - return NM_SETTING_TEAM_GET_PRIVATE(setting)->team_setting->d.master.runner_sys_prio; + return NM_SETTING_TEAM_GET_PRIVATE(setting)->team_setting->d.controller.runner_sys_prio; } /** @@ -980,7 +981,7 @@ nm_setting_team_get_runner_min_ports(NMSettingTeam *setting) { g_return_val_if_fail(NM_IS_SETTING_TEAM(setting), 0); - return NM_SETTING_TEAM_GET_PRIVATE(setting)->team_setting->d.master.runner_min_ports; + return NM_SETTING_TEAM_GET_PRIVATE(setting)->team_setting->d.controller.runner_min_ports; } /** @@ -996,7 +997,8 @@ nm_setting_team_get_runner_agg_select_policy(NMSettingTeam *setting) { g_return_val_if_fail(NM_IS_SETTING_TEAM(setting), NULL); - return NM_SETTING_TEAM_GET_PRIVATE(setting)->team_setting->d.master.runner_agg_select_policy; + return NM_SETTING_TEAM_GET_PRIVATE(setting) + ->team_setting->d.controller.runner_agg_select_policy; } /** @@ -1020,13 +1022,13 @@ nm_setting_team_remove_runner_tx_hash_by_value(NMSettingTeam *setting, const cha g_return_val_if_fail(NM_IS_SETTING_TEAM(setting), FALSE); g_return_val_if_fail(txhash != NULL, FALSE); - arr = priv->team_setting->d.master.runner_tx_hash; + arr = priv->team_setting->d.controller.runner_tx_hash; if (arr) { for (i = 0; i < arr->len; i++) { if (nm_streq(txhash, arr->pdata[i])) { _maybe_changed_with_assert( setting, - nm_team_setting_value_master_runner_tx_hash_remove(priv->team_setting, i)); + nm_team_setting_value_controller_runner_tx_hash_remove(priv->team_setting, i)); return TRUE; } } @@ -1049,7 +1051,7 @@ nm_setting_team_get_num_runner_tx_hash(NMSettingTeam *setting) g_return_val_if_fail(NM_IS_SETTING_TEAM(setting), 0); - arr = NM_SETTING_TEAM_GET_PRIVATE(setting)->team_setting->d.master.runner_tx_hash; + arr = NM_SETTING_TEAM_GET_PRIVATE(setting)->team_setting->d.controller.runner_tx_hash; return arr ? arr->len : 0u; } @@ -1069,7 +1071,7 @@ nm_setting_team_get_runner_tx_hash(NMSettingTeam *setting, guint idx) g_return_val_if_fail(NM_IS_SETTING_TEAM(setting), NULL); - arr = NM_SETTING_TEAM_GET_PRIVATE(setting)->team_setting->d.master.runner_tx_hash; + arr = NM_SETTING_TEAM_GET_PRIVATE(setting)->team_setting->d.controller.runner_tx_hash; g_return_val_if_fail(arr, NULL); g_return_val_if_fail(idx < arr->len, NULL); @@ -1095,12 +1097,12 @@ nm_setting_team_remove_runner_tx_hash(NMSettingTeam *setting, guint idx) priv = NM_SETTING_TEAM_GET_PRIVATE(setting); - g_return_if_fail(priv->team_setting->d.master.runner_tx_hash); - g_return_if_fail(idx < priv->team_setting->d.master.runner_tx_hash->len); + g_return_if_fail(priv->team_setting->d.controller.runner_tx_hash); + g_return_if_fail(idx < priv->team_setting->d.controller.runner_tx_hash->len); _maybe_changed_with_assert( setting, - nm_team_setting_value_master_runner_tx_hash_remove(priv->team_setting, idx)); + nm_team_setting_value_controller_runner_tx_hash_remove(priv->team_setting, idx)); } /** @@ -1122,7 +1124,7 @@ nm_setting_team_add_runner_tx_hash(NMSettingTeam *setting, const char *txhash) g_return_val_if_fail(txhash, FALSE); return _maybe_changed(setting, - nm_team_setting_value_master_runner_tx_hash_add( + nm_team_setting_value_controller_runner_tx_hash_add( NM_SETTING_TEAM_GET_PRIVATE(setting)->team_setting, txhash)); } @@ -1359,27 +1361,27 @@ get_property(GObject *object, guint prop_id, GValue *value, GParamSpec *pspec) case NM_TEAM_ATTRIBUTE_CONFIG: g_value_set_string(value, nm_team_setting_config_get(priv->team_setting)); break; - case NM_TEAM_ATTRIBUTE_MASTER_RUNNER_ACTIVE: - case NM_TEAM_ATTRIBUTE_MASTER_RUNNER_FAST_RATE: + case NM_TEAM_ATTRIBUTE_CONTROLLER_RUNNER_ACTIVE: + case NM_TEAM_ATTRIBUTE_CONTROLLER_RUNNER_FAST_RATE: g_value_set_boolean(value, nm_team_setting_value_get_bool(priv->team_setting, prop_id)); break; - case NM_TEAM_ATTRIBUTE_MASTER_NOTIFY_PEERS_COUNT: - case NM_TEAM_ATTRIBUTE_MASTER_NOTIFY_PEERS_INTERVAL: - case NM_TEAM_ATTRIBUTE_MASTER_MCAST_REJOIN_COUNT: - case NM_TEAM_ATTRIBUTE_MASTER_MCAST_REJOIN_INTERVAL: - case NM_TEAM_ATTRIBUTE_MASTER_RUNNER_TX_BALANCER_INTERVAL: - case NM_TEAM_ATTRIBUTE_MASTER_RUNNER_SYS_PRIO: - case NM_TEAM_ATTRIBUTE_MASTER_RUNNER_MIN_PORTS: + case NM_TEAM_ATTRIBUTE_CONTROLLER_NOTIFY_PEERS_COUNT: + case NM_TEAM_ATTRIBUTE_CONTROLLER_NOTIFY_PEERS_INTERVAL: + case NM_TEAM_ATTRIBUTE_CONTROLLER_MCAST_REJOIN_COUNT: + case NM_TEAM_ATTRIBUTE_CONTROLLER_MCAST_REJOIN_INTERVAL: + case NM_TEAM_ATTRIBUTE_CONTROLLER_RUNNER_TX_BALANCER_INTERVAL: + case NM_TEAM_ATTRIBUTE_CONTROLLER_RUNNER_SYS_PRIO: + case NM_TEAM_ATTRIBUTE_CONTROLLER_RUNNER_MIN_PORTS: g_value_set_int(value, nm_team_setting_value_get_int32(priv->team_setting, prop_id)); break; - case NM_TEAM_ATTRIBUTE_MASTER_RUNNER: - case NM_TEAM_ATTRIBUTE_MASTER_RUNNER_HWADDR_POLICY: - case NM_TEAM_ATTRIBUTE_MASTER_RUNNER_TX_BALANCER: - case NM_TEAM_ATTRIBUTE_MASTER_RUNNER_AGG_SELECT_POLICY: + case NM_TEAM_ATTRIBUTE_CONTROLLER_RUNNER: + case NM_TEAM_ATTRIBUTE_CONTROLLER_RUNNER_HWADDR_POLICY: + case NM_TEAM_ATTRIBUTE_CONTROLLER_RUNNER_TX_BALANCER: + case NM_TEAM_ATTRIBUTE_CONTROLLER_RUNNER_AGG_SELECT_POLICY: g_value_set_string(value, nm_team_setting_value_get_string(priv->team_setting, prop_id)); break; - case NM_TEAM_ATTRIBUTE_MASTER_RUNNER_TX_HASH: - v_ptrarr = priv->team_setting->d.master.runner_tx_hash; + case NM_TEAM_ATTRIBUTE_CONTROLLER_RUNNER_TX_HASH: + v_ptrarr = priv->team_setting->d.controller.runner_tx_hash; g_value_take_boxed(value, nm_strv_ptrarray_to_strv_full(v_ptrarr, FALSE)); break; case NM_TEAM_ATTRIBUTE_LINK_WATCHERS: @@ -1406,32 +1408,32 @@ set_property(GObject *object, guint prop_id, const GValue *value, GParamSpec *ps case NM_TEAM_ATTRIBUTE_CONFIG: changed = nm_team_setting_config_set(priv->team_setting, g_value_get_string(value)); break; - case NM_TEAM_ATTRIBUTE_MASTER_RUNNER_ACTIVE: - case NM_TEAM_ATTRIBUTE_MASTER_RUNNER_FAST_RATE: + case NM_TEAM_ATTRIBUTE_CONTROLLER_RUNNER_ACTIVE: + case NM_TEAM_ATTRIBUTE_CONTROLLER_RUNNER_FAST_RATE: changed = nm_team_setting_value_set_bool(priv->team_setting, prop_id, g_value_get_boolean(value)); break; - case NM_TEAM_ATTRIBUTE_MASTER_NOTIFY_PEERS_COUNT: - case NM_TEAM_ATTRIBUTE_MASTER_NOTIFY_PEERS_INTERVAL: - case NM_TEAM_ATTRIBUTE_MASTER_MCAST_REJOIN_COUNT: - case NM_TEAM_ATTRIBUTE_MASTER_MCAST_REJOIN_INTERVAL: - case NM_TEAM_ATTRIBUTE_MASTER_RUNNER_TX_BALANCER_INTERVAL: - case NM_TEAM_ATTRIBUTE_MASTER_RUNNER_SYS_PRIO: - case NM_TEAM_ATTRIBUTE_MASTER_RUNNER_MIN_PORTS: + case NM_TEAM_ATTRIBUTE_CONTROLLER_NOTIFY_PEERS_COUNT: + case NM_TEAM_ATTRIBUTE_CONTROLLER_NOTIFY_PEERS_INTERVAL: + case NM_TEAM_ATTRIBUTE_CONTROLLER_MCAST_REJOIN_COUNT: + case NM_TEAM_ATTRIBUTE_CONTROLLER_MCAST_REJOIN_INTERVAL: + case NM_TEAM_ATTRIBUTE_CONTROLLER_RUNNER_TX_BALANCER_INTERVAL: + case NM_TEAM_ATTRIBUTE_CONTROLLER_RUNNER_SYS_PRIO: + case NM_TEAM_ATTRIBUTE_CONTROLLER_RUNNER_MIN_PORTS: changed = nm_team_setting_value_set_int32(priv->team_setting, prop_id, g_value_get_int(value)); break; - case NM_TEAM_ATTRIBUTE_MASTER_RUNNER: - case NM_TEAM_ATTRIBUTE_MASTER_RUNNER_TX_BALANCER: - case NM_TEAM_ATTRIBUTE_MASTER_RUNNER_HWADDR_POLICY: - case NM_TEAM_ATTRIBUTE_MASTER_RUNNER_AGG_SELECT_POLICY: + case NM_TEAM_ATTRIBUTE_CONTROLLER_RUNNER: + case NM_TEAM_ATTRIBUTE_CONTROLLER_RUNNER_TX_BALANCER: + case NM_TEAM_ATTRIBUTE_CONTROLLER_RUNNER_HWADDR_POLICY: + case NM_TEAM_ATTRIBUTE_CONTROLLER_RUNNER_AGG_SELECT_POLICY: changed = nm_team_setting_value_set_string(priv->team_setting, prop_id, g_value_get_string(value)); break; - case NM_TEAM_ATTRIBUTE_MASTER_RUNNER_TX_HASH: + case NM_TEAM_ATTRIBUTE_CONTROLLER_RUNNER_TX_HASH: v_ptrarr = g_value_get_boxed(value); - changed = nm_team_setting_value_master_runner_tx_hash_set_list( + changed = nm_team_setting_value_controller_runner_tx_hash_set_list( priv->team_setting, v_ptrarr ? (const char *const *) v_ptrarr->pdata : NULL, v_ptrarr ? v_ptrarr->len : 0u); @@ -1535,7 +1537,7 @@ nm_setting_team_class_init(NMSettingTeamClass *klass) * * Since: 1.12 **/ - obj_properties[NM_TEAM_ATTRIBUTE_MASTER_NOTIFY_PEERS_COUNT] = + obj_properties[NM_TEAM_ATTRIBUTE_CONTROLLER_NOTIFY_PEERS_COUNT] = g_param_spec_int(NM_SETTING_TEAM_NOTIFY_PEERS_COUNT, "", "", @@ -1544,7 +1546,7 @@ nm_setting_team_class_init(NMSettingTeamClass *klass) -1, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); _nm_properties_override_gobj(properties_override, - obj_properties[NM_TEAM_ATTRIBUTE_MASTER_NOTIFY_PEERS_COUNT], + obj_properties[NM_TEAM_ATTRIBUTE_CONTROLLER_NOTIFY_PEERS_COUNT], &nm_sett_info_propert_type_team_i); /** @@ -1554,7 +1556,7 @@ nm_setting_team_class_init(NMSettingTeamClass *klass) * * Since: 1.12 **/ - obj_properties[NM_TEAM_ATTRIBUTE_MASTER_NOTIFY_PEERS_INTERVAL] = + obj_properties[NM_TEAM_ATTRIBUTE_CONTROLLER_NOTIFY_PEERS_INTERVAL] = g_param_spec_int(NM_SETTING_TEAM_NOTIFY_PEERS_INTERVAL, "", "", @@ -1563,7 +1565,7 @@ nm_setting_team_class_init(NMSettingTeamClass *klass) -1, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); _nm_properties_override_gobj(properties_override, - obj_properties[NM_TEAM_ATTRIBUTE_MASTER_NOTIFY_PEERS_INTERVAL], + obj_properties[NM_TEAM_ATTRIBUTE_CONTROLLER_NOTIFY_PEERS_INTERVAL], &nm_sett_info_propert_type_team_i); /** @@ -1573,7 +1575,7 @@ nm_setting_team_class_init(NMSettingTeamClass *klass) * * Since: 1.12 **/ - obj_properties[NM_TEAM_ATTRIBUTE_MASTER_MCAST_REJOIN_COUNT] = + obj_properties[NM_TEAM_ATTRIBUTE_CONTROLLER_MCAST_REJOIN_COUNT] = g_param_spec_int(NM_SETTING_TEAM_MCAST_REJOIN_COUNT, "", "", @@ -1582,7 +1584,7 @@ nm_setting_team_class_init(NMSettingTeamClass *klass) -1, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); _nm_properties_override_gobj(properties_override, - obj_properties[NM_TEAM_ATTRIBUTE_MASTER_MCAST_REJOIN_COUNT], + obj_properties[NM_TEAM_ATTRIBUTE_CONTROLLER_MCAST_REJOIN_COUNT], &nm_sett_info_propert_type_team_i); /** @@ -1592,7 +1594,7 @@ nm_setting_team_class_init(NMSettingTeamClass *klass) * * Since: 1.12 **/ - obj_properties[NM_TEAM_ATTRIBUTE_MASTER_MCAST_REJOIN_INTERVAL] = + obj_properties[NM_TEAM_ATTRIBUTE_CONTROLLER_MCAST_REJOIN_INTERVAL] = g_param_spec_int(NM_SETTING_TEAM_MCAST_REJOIN_INTERVAL, "", "", @@ -1601,7 +1603,7 @@ nm_setting_team_class_init(NMSettingTeamClass *klass) -1, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); _nm_properties_override_gobj(properties_override, - obj_properties[NM_TEAM_ATTRIBUTE_MASTER_MCAST_REJOIN_INTERVAL], + obj_properties[NM_TEAM_ATTRIBUTE_CONTROLLER_MCAST_REJOIN_INTERVAL], &nm_sett_info_propert_type_team_i); /** @@ -1613,14 +1615,14 @@ nm_setting_team_class_init(NMSettingTeamClass *klass) * * Since: 1.12 **/ - obj_properties[NM_TEAM_ATTRIBUTE_MASTER_RUNNER] = + obj_properties[NM_TEAM_ATTRIBUTE_CONTROLLER_RUNNER] = g_param_spec_string(NM_SETTING_TEAM_RUNNER, "", "", NULL, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); _nm_properties_override_gobj(properties_override, - obj_properties[NM_TEAM_ATTRIBUTE_MASTER_RUNNER], + obj_properties[NM_TEAM_ATTRIBUTE_CONTROLLER_RUNNER], &nm_sett_info_propert_type_team_s); /** @@ -1630,14 +1632,14 @@ nm_setting_team_class_init(NMSettingTeamClass *klass) * * Since: 1.12 **/ - obj_properties[NM_TEAM_ATTRIBUTE_MASTER_RUNNER_HWADDR_POLICY] = + obj_properties[NM_TEAM_ATTRIBUTE_CONTROLLER_RUNNER_HWADDR_POLICY] = g_param_spec_string(NM_SETTING_TEAM_RUNNER_HWADDR_POLICY, "", "", NULL, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); _nm_properties_override_gobj(properties_override, - obj_properties[NM_TEAM_ATTRIBUTE_MASTER_RUNNER_HWADDR_POLICY], + obj_properties[NM_TEAM_ATTRIBUTE_CONTROLLER_RUNNER_HWADDR_POLICY], &nm_sett_info_propert_type_team_s); /** @@ -1647,14 +1649,14 @@ nm_setting_team_class_init(NMSettingTeamClass *klass) * * Since: 1.12 **/ - obj_properties[NM_TEAM_ATTRIBUTE_MASTER_RUNNER_TX_HASH] = g_param_spec_boxed( + obj_properties[NM_TEAM_ATTRIBUTE_CONTROLLER_RUNNER_TX_HASH] = g_param_spec_boxed( NM_SETTING_TEAM_RUNNER_TX_HASH, "", "", G_TYPE_STRV, G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS); _nm_properties_override_gobj(properties_override, - obj_properties[NM_TEAM_ATTRIBUTE_MASTER_RUNNER_TX_HASH], + obj_properties[NM_TEAM_ATTRIBUTE_CONTROLLER_RUNNER_TX_HASH], &nm_sett_info_propert_type_team_as); /** @@ -1664,14 +1666,14 @@ nm_setting_team_class_init(NMSettingTeamClass *klass) * * Since: 1.12 **/ - obj_properties[NM_TEAM_ATTRIBUTE_MASTER_RUNNER_TX_BALANCER] = + obj_properties[NM_TEAM_ATTRIBUTE_CONTROLLER_RUNNER_TX_BALANCER] = g_param_spec_string(NM_SETTING_TEAM_RUNNER_TX_BALANCER, "", "", NULL, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); _nm_properties_override_gobj(properties_override, - obj_properties[NM_TEAM_ATTRIBUTE_MASTER_RUNNER_TX_BALANCER], + obj_properties[NM_TEAM_ATTRIBUTE_CONTROLLER_RUNNER_TX_BALANCER], &nm_sett_info_propert_type_team_s); /** @@ -1681,7 +1683,7 @@ nm_setting_team_class_init(NMSettingTeamClass *klass) * * Since: 1.12 **/ - obj_properties[NM_TEAM_ATTRIBUTE_MASTER_RUNNER_TX_BALANCER_INTERVAL] = + obj_properties[NM_TEAM_ATTRIBUTE_CONTROLLER_RUNNER_TX_BALANCER_INTERVAL] = g_param_spec_int(NM_SETTING_TEAM_RUNNER_TX_BALANCER_INTERVAL, "", "", @@ -1691,7 +1693,7 @@ nm_setting_team_class_init(NMSettingTeamClass *klass) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); _nm_properties_override_gobj( properties_override, - obj_properties[NM_TEAM_ATTRIBUTE_MASTER_RUNNER_TX_BALANCER_INTERVAL], + obj_properties[NM_TEAM_ATTRIBUTE_CONTROLLER_RUNNER_TX_BALANCER_INTERVAL], &nm_sett_info_propert_type_team_i); /** @@ -1701,14 +1703,14 @@ nm_setting_team_class_init(NMSettingTeamClass *klass) * * Since: 1.12 **/ - obj_properties[NM_TEAM_ATTRIBUTE_MASTER_RUNNER_ACTIVE] = + obj_properties[NM_TEAM_ATTRIBUTE_CONTROLLER_RUNNER_ACTIVE] = g_param_spec_boolean(NM_SETTING_TEAM_RUNNER_ACTIVE, "", "", TRUE, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); _nm_properties_override_gobj(properties_override, - obj_properties[NM_TEAM_ATTRIBUTE_MASTER_RUNNER_ACTIVE], + obj_properties[NM_TEAM_ATTRIBUTE_CONTROLLER_RUNNER_ACTIVE], &nm_sett_info_propert_type_team_b); /** @@ -1718,14 +1720,14 @@ nm_setting_team_class_init(NMSettingTeamClass *klass) * * Since: 1.12 **/ - obj_properties[NM_TEAM_ATTRIBUTE_MASTER_RUNNER_FAST_RATE] = + obj_properties[NM_TEAM_ATTRIBUTE_CONTROLLER_RUNNER_FAST_RATE] = g_param_spec_boolean(NM_SETTING_TEAM_RUNNER_FAST_RATE, "", "", FALSE, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); _nm_properties_override_gobj(properties_override, - obj_properties[NM_TEAM_ATTRIBUTE_MASTER_RUNNER_FAST_RATE], + obj_properties[NM_TEAM_ATTRIBUTE_CONTROLLER_RUNNER_FAST_RATE], &nm_sett_info_propert_type_team_b); /** @@ -1735,7 +1737,7 @@ nm_setting_team_class_init(NMSettingTeamClass *klass) * * Since: 1.12 **/ - obj_properties[NM_TEAM_ATTRIBUTE_MASTER_RUNNER_SYS_PRIO] = + obj_properties[NM_TEAM_ATTRIBUTE_CONTROLLER_RUNNER_SYS_PRIO] = g_param_spec_int(NM_SETTING_TEAM_RUNNER_SYS_PRIO, "", "", @@ -1744,7 +1746,7 @@ nm_setting_team_class_init(NMSettingTeamClass *klass) -1, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); _nm_properties_override_gobj(properties_override, - obj_properties[NM_TEAM_ATTRIBUTE_MASTER_RUNNER_SYS_PRIO], + obj_properties[NM_TEAM_ATTRIBUTE_CONTROLLER_RUNNER_SYS_PRIO], &nm_sett_info_propert_type_team_i); /** @@ -1754,7 +1756,7 @@ nm_setting_team_class_init(NMSettingTeamClass *klass) * * Since: 1.12 **/ - obj_properties[NM_TEAM_ATTRIBUTE_MASTER_RUNNER_MIN_PORTS] = + obj_properties[NM_TEAM_ATTRIBUTE_CONTROLLER_RUNNER_MIN_PORTS] = g_param_spec_int(NM_SETTING_TEAM_RUNNER_MIN_PORTS, "", "", @@ -1763,7 +1765,7 @@ nm_setting_team_class_init(NMSettingTeamClass *klass) -1, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); _nm_properties_override_gobj(properties_override, - obj_properties[NM_TEAM_ATTRIBUTE_MASTER_RUNNER_MIN_PORTS], + obj_properties[NM_TEAM_ATTRIBUTE_CONTROLLER_RUNNER_MIN_PORTS], &nm_sett_info_propert_type_team_i); /** @@ -1773,15 +1775,16 @@ nm_setting_team_class_init(NMSettingTeamClass *klass) * * Since: 1.12 **/ - obj_properties[NM_TEAM_ATTRIBUTE_MASTER_RUNNER_AGG_SELECT_POLICY] = + obj_properties[NM_TEAM_ATTRIBUTE_CONTROLLER_RUNNER_AGG_SELECT_POLICY] = g_param_spec_string(NM_SETTING_TEAM_RUNNER_AGG_SELECT_POLICY, "", "", NULL, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); - _nm_properties_override_gobj(properties_override, - obj_properties[NM_TEAM_ATTRIBUTE_MASTER_RUNNER_AGG_SELECT_POLICY], - &nm_sett_info_propert_type_team_s); + _nm_properties_override_gobj( + properties_override, + obj_properties[NM_TEAM_ATTRIBUTE_CONTROLLER_RUNNER_AGG_SELECT_POLICY], + &nm_sett_info_propert_type_team_s); /** * NMSettingTeam:link-watchers: (type GPtrArray(NMTeamLinkWatcher)) diff --git a/src/libnm-core-impl/nm-setting-vlan.c b/src/libnm-core-impl/nm-setting-vlan.c index 16e3cf2acb..3a1f093013 100644 --- a/src/libnm-core-impl/nm-setting-vlan.c +++ b/src/libnm-core-impl/nm-setting-vlan.c @@ -608,24 +608,24 @@ verify(NMSetting *setting, NMConnection *connection, GError **error) if (priv->parent) { if (nm_utils_is_uuid(priv->parent)) { - /* If we have an NMSettingConnection:master with slave-type="vlan", + /* If we have an NMSettingConnection:controller with port-type="vlan", * then it must be the same UUID. */ if (s_con) { - const char *master = NULL, *slave_type = NULL; + const char *controller = NULL, *port_type = NULL; - 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_controller(s_con); + port_type = nm_setting_connection_get_port_type(s_con); + if (!g_strcmp0(port_type, NM_SETTING_VLAN_SETTING_NAME)) + controller = nm_setting_connection_get_controller(s_con); - if (master && g_strcmp0(priv->parent, master) != 0) { + if (controller && g_strcmp0(priv->parent, controller) != 0) { g_set_error(error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_INVALID_PROPERTY, _("'%s' value doesn't match '%s=%s'"), priv->parent, NM_SETTING_CONNECTION_CONTROLLER, - master); + controller); g_prefix_error(error, "%s.%s: ", NM_SETTING_VLAN_SETTING_NAME, @@ -908,7 +908,7 @@ nm_setting_vlan_class_init(NMSettingVlanClass *klass) * interface. Flags include %NM_VLAN_FLAG_REORDER_HEADERS (reordering of * output packet headers), %NM_VLAN_FLAG_GVRP (use of the GVRP protocol), * and %NM_VLAN_FLAG_LOOSE_BINDING (loose binding of the interface to its - * master device's operating state). %NM_VLAN_FLAG_MVRP (use of the MVRP + * controller device's operating state). %NM_VLAN_FLAG_MVRP (use of the MVRP * protocol). * * The default value of this property is NM_VLAN_FLAG_REORDER_HEADERS, diff --git a/src/libnm-core-impl/nm-setting.c b/src/libnm-core-impl/nm-setting.c index a97edc2aae..ed34db76fd 100644 --- a/src/libnm-core-impl/nm-setting.c +++ b/src/libnm-core-impl/nm-setting.c @@ -138,22 +138,24 @@ _nm_setting_compare_priority(gconstpointer a, gconstpointer b) /*****************************************************************************/ gboolean -_nm_setting_slave_type_is_valid(const char *slave_type, const char **out_port_type) +_nm_setting_port_type_is_valid(const char *port_setting_type, const char **out_port_type) { const char *port_type = NULL; gboolean found = TRUE; - if (!slave_type) + if (!port_setting_type) found = FALSE; - else if (NM_IN_STRSET(slave_type, NM_SETTING_BOND_SETTING_NAME, NM_SETTING_VRF_SETTING_NAME)) { + else if (NM_IN_STRSET(port_setting_type, + NM_SETTING_BOND_SETTING_NAME, + NM_SETTING_VRF_SETTING_NAME)) { /* pass */ - } else if (nm_streq(slave_type, NM_SETTING_BRIDGE_SETTING_NAME)) + } else if (nm_streq(port_setting_type, NM_SETTING_BRIDGE_SETTING_NAME)) port_type = NM_SETTING_BRIDGE_PORT_SETTING_NAME; - else if (nm_streq(slave_type, NM_SETTING_OVS_BRIDGE_SETTING_NAME)) + else if (nm_streq(port_setting_type, NM_SETTING_OVS_BRIDGE_SETTING_NAME)) port_type = NM_SETTING_OVS_PORT_SETTING_NAME; - else if (nm_streq(slave_type, NM_SETTING_OVS_PORT_SETTING_NAME)) + else if (nm_streq(port_setting_type, NM_SETTING_OVS_PORT_SETTING_NAME)) port_type = NM_SETTING_OVS_INTERFACE_SETTING_NAME; - else if (nm_streq(slave_type, NM_SETTING_TEAM_SETTING_NAME)) + else if (nm_streq(port_setting_type, NM_SETTING_TEAM_SETTING_NAME)) port_type = NM_SETTING_TEAM_PORT_SETTING_NAME; else found = FALSE; diff --git a/src/libnm-core-impl/nm-team-utils.c b/src/libnm-core-impl/nm-team-utils.c index 171194e03f..6e7f85c7ec 100644 --- a/src/libnm-core-impl/nm-team-utils.c +++ b/src/libnm-core-impl/nm-team-utils.c @@ -94,39 +94,39 @@ typedef struct { static const RunnerCompatElem _runner_compat_lst[] = { { - NM_TEAM_ATTRIBUTE_MASTER_RUNNER_HWADDR_POLICY, + NM_TEAM_ATTRIBUTE_CONTROLLER_RUNNER_HWADDR_POLICY, NM_MAKE_STRV(NM_SETTING_TEAM_RUNNER_ACTIVEBACKUP), }, { - NM_TEAM_ATTRIBUTE_MASTER_RUNNER_TX_HASH, + NM_TEAM_ATTRIBUTE_CONTROLLER_RUNNER_TX_HASH, NM_MAKE_STRV(NM_SETTING_TEAM_RUNNER_LOADBALANCE, NM_SETTING_TEAM_RUNNER_LACP), }, { - NM_TEAM_ATTRIBUTE_MASTER_RUNNER_TX_BALANCER, + NM_TEAM_ATTRIBUTE_CONTROLLER_RUNNER_TX_BALANCER, NM_MAKE_STRV(NM_SETTING_TEAM_RUNNER_LOADBALANCE, NM_SETTING_TEAM_RUNNER_LACP), }, { - NM_TEAM_ATTRIBUTE_MASTER_RUNNER_TX_BALANCER_INTERVAL, + NM_TEAM_ATTRIBUTE_CONTROLLER_RUNNER_TX_BALANCER_INTERVAL, NM_MAKE_STRV(NM_SETTING_TEAM_RUNNER_LOADBALANCE, NM_SETTING_TEAM_RUNNER_LACP), }, { - NM_TEAM_ATTRIBUTE_MASTER_RUNNER_ACTIVE, + NM_TEAM_ATTRIBUTE_CONTROLLER_RUNNER_ACTIVE, NM_MAKE_STRV(NM_SETTING_TEAM_RUNNER_LACP), }, { - NM_TEAM_ATTRIBUTE_MASTER_RUNNER_FAST_RATE, + NM_TEAM_ATTRIBUTE_CONTROLLER_RUNNER_FAST_RATE, NM_MAKE_STRV(NM_SETTING_TEAM_RUNNER_LACP), }, { - NM_TEAM_ATTRIBUTE_MASTER_RUNNER_SYS_PRIO, + NM_TEAM_ATTRIBUTE_CONTROLLER_RUNNER_SYS_PRIO, NM_MAKE_STRV(NM_SETTING_TEAM_RUNNER_LACP), }, { - NM_TEAM_ATTRIBUTE_MASTER_RUNNER_MIN_PORTS, + NM_TEAM_ATTRIBUTE_CONTROLLER_RUNNER_MIN_PORTS, NM_MAKE_STRV(NM_SETTING_TEAM_RUNNER_LACP), }, { - NM_TEAM_ATTRIBUTE_MASTER_RUNNER_AGG_SELECT_POLICY, + NM_TEAM_ATTRIBUTE_CONTROLLER_RUNNER_AGG_SELECT_POLICY, NM_MAKE_STRV(NM_SETTING_TEAM_RUNNER_LACP), }, }; @@ -148,16 +148,16 @@ typedef struct { NMValueType value_type; guint8 field_offset; guint8 js_keys_len; - bool for_master : 1; + bool for_controller : 1; bool for_port : 1; bool has_range : 1; } TeamAttrData; -#define TEAM_ATTR_IDX(_is_port, _team_attr) \ - (((!(_is_port) || (_team_attr) < _NM_TEAM_ATTRIBUTE_START) \ - ? (int) (_team_attr) \ - : (((int) (_NM_TEAM_ATTRIBUTE_MASTER_NUM - _NM_TEAM_ATTRIBUTE_START)) \ - + ((int) (_team_attr)))) \ +#define TEAM_ATTR_IDX(_is_port, _team_attr) \ + (((!(_is_port) || (_team_attr) < _NM_TEAM_ATTRIBUTE_START) \ + ? (int) (_team_attr) \ + : (((int) (_NM_TEAM_ATTRIBUTE_CONTROLLER_NUM - _NM_TEAM_ATTRIBUTE_START)) \ + + ((int) (_team_attr)))) \ - 1) #define TEAM_ATTR_IDX_CONFIG (TEAM_ATTR_IDX(FALSE, NM_TEAM_ATTRIBUTE_CONFIG)) @@ -187,15 +187,15 @@ static const TeamAttrData team_attr_datas[] = { #define _VAL_UNSPEC() .default_val.v_string = (NULL) -#define _INIT(_is_port, _team_attr, field, _value_type, _property_name, ...) \ - [TEAM_ATTR_IDX(_is_port, _team_attr)] = { \ - .for_master = (_team_attr) < _NM_TEAM_ATTRIBUTE_START || !(_is_port), \ - .for_port = (_team_attr) < _NM_TEAM_ATTRIBUTE_START || (_is_port), \ - .team_attr = (_team_attr), \ - .field_offset = G_STRUCT_OFFSET(NMTeamSetting, _data_priv.field), \ - .value_type = (_value_type), \ - .property_name = ""_property_name \ - "", \ +#define _INIT(_is_port, _team_attr, field, _value_type, _property_name, ...) \ + [TEAM_ATTR_IDX(_is_port, _team_attr)] = { \ + .for_controller = (_team_attr) < _NM_TEAM_ATTRIBUTE_START || !(_is_port), \ + .for_port = (_team_attr) < _NM_TEAM_ATTRIBUTE_START || (_is_port), \ + .team_attr = (_team_attr), \ + .field_offset = G_STRUCT_OFFSET(NMTeamSetting, _data_priv.field), \ + .value_type = (_value_type), \ + .property_name = ""_property_name \ + "", \ __VA_ARGS__} _INIT(0, NM_TEAM_ATTRIBUTE_CONFIG, _js_str, NM_VALUE_TYPE_UNSPEC, NM_SETTING_TEAM_CONFIG, ), @@ -209,99 +209,99 @@ static const TeamAttrData team_attr_datas[] = { _VAL_UNSPEC(), ), _INIT(0, - NM_TEAM_ATTRIBUTE_MASTER_NOTIFY_PEERS_COUNT, - master.notify_peers_count, + NM_TEAM_ATTRIBUTE_CONTROLLER_NOTIFY_PEERS_COUNT, + controller.notify_peers_count, NM_VALUE_TYPE_INT32, NM_SETTING_TEAM_NOTIFY_PEERS_COUNT, _JS_KEYS("notify_peers", "count"), _VAL_INT32_RANGE(-1, 0, G_MAXINT32), ), _INIT(0, - NM_TEAM_ATTRIBUTE_MASTER_NOTIFY_PEERS_INTERVAL, - master.notify_peers_interval, + NM_TEAM_ATTRIBUTE_CONTROLLER_NOTIFY_PEERS_INTERVAL, + controller.notify_peers_interval, NM_VALUE_TYPE_INT32, NM_SETTING_TEAM_NOTIFY_PEERS_INTERVAL, _JS_KEYS("notify_peers", "interval"), _VAL_INT32_RANGE(-1, 0, G_MAXINT32), ), _INIT(0, - NM_TEAM_ATTRIBUTE_MASTER_MCAST_REJOIN_COUNT, - master.mcast_rejoin_count, + NM_TEAM_ATTRIBUTE_CONTROLLER_MCAST_REJOIN_COUNT, + controller.mcast_rejoin_count, NM_VALUE_TYPE_INT32, NM_SETTING_TEAM_MCAST_REJOIN_COUNT, _JS_KEYS("mcast_rejoin", "count"), _VAL_INT32_RANGE(-1, 0, G_MAXINT32), ), _INIT(0, - NM_TEAM_ATTRIBUTE_MASTER_MCAST_REJOIN_INTERVAL, - master.mcast_rejoin_interval, + NM_TEAM_ATTRIBUTE_CONTROLLER_MCAST_REJOIN_INTERVAL, + controller.mcast_rejoin_interval, NM_VALUE_TYPE_INT32, NM_SETTING_TEAM_MCAST_REJOIN_INTERVAL, _JS_KEYS("mcast_rejoin", "interval"), _VAL_INT32_RANGE(-1, 0, G_MAXINT32), ), _INIT(0, - NM_TEAM_ATTRIBUTE_MASTER_RUNNER, - master.runner, + NM_TEAM_ATTRIBUTE_CONTROLLER_RUNNER, + controller.runner, NM_VALUE_TYPE_STRING, NM_SETTING_TEAM_RUNNER, _JS_KEYS("runner", "name"), _VAL_STRING_RANGE(_valid_names_runner), ), _INIT(0, - NM_TEAM_ATTRIBUTE_MASTER_RUNNER_HWADDR_POLICY, - master.runner_hwaddr_policy, + NM_TEAM_ATTRIBUTE_CONTROLLER_RUNNER_HWADDR_POLICY, + controller.runner_hwaddr_policy, NM_VALUE_TYPE_STRING, NM_SETTING_TEAM_RUNNER_HWADDR_POLICY, _JS_KEYS("runner", "hwaddr_policy"), _VAL_STRING_RANGE(_valid_names_runner_hwaddr_policy), ), _INIT(0, - NM_TEAM_ATTRIBUTE_MASTER_RUNNER_TX_HASH, - master.runner_tx_hash, + NM_TEAM_ATTRIBUTE_CONTROLLER_RUNNER_TX_HASH, + controller.runner_tx_hash, NM_VALUE_TYPE_UNSPEC, NM_SETTING_TEAM_RUNNER_TX_HASH, _JS_KEYS("runner", "tx_hash"), _VAL_UNSPEC(), ), _INIT(0, - NM_TEAM_ATTRIBUTE_MASTER_RUNNER_TX_BALANCER, - master.runner_tx_balancer, + NM_TEAM_ATTRIBUTE_CONTROLLER_RUNNER_TX_BALANCER, + controller.runner_tx_balancer, NM_VALUE_TYPE_STRING, NM_SETTING_TEAM_RUNNER_TX_BALANCER, _JS_KEYS("runner", "tx_balancer", "name"), _VAL_STRING_RANGE(_valid_names_runner_tx_balancer), ), _INIT(0, - NM_TEAM_ATTRIBUTE_MASTER_RUNNER_TX_BALANCER_INTERVAL, - master.runner_tx_balancer_interval, + NM_TEAM_ATTRIBUTE_CONTROLLER_RUNNER_TX_BALANCER_INTERVAL, + controller.runner_tx_balancer_interval, NM_VALUE_TYPE_INT32, NM_SETTING_TEAM_RUNNER_TX_BALANCER_INTERVAL, _JS_KEYS("runner", "tx_balancer", "balancing_interval"), _VAL_INT32_RANGE(-1, 0, G_MAXINT32), ), _INIT(0, - NM_TEAM_ATTRIBUTE_MASTER_RUNNER_ACTIVE, - master.runner_active, + NM_TEAM_ATTRIBUTE_CONTROLLER_RUNNER_ACTIVE, + controller.runner_active, NM_VALUE_TYPE_BOOL, NM_SETTING_TEAM_RUNNER_ACTIVE, _JS_KEYS("runner", "active"), _VAL_BOOL(TRUE), ), _INIT(0, - NM_TEAM_ATTRIBUTE_MASTER_RUNNER_FAST_RATE, - master.runner_fast_rate, + NM_TEAM_ATTRIBUTE_CONTROLLER_RUNNER_FAST_RATE, + controller.runner_fast_rate, NM_VALUE_TYPE_BOOL, NM_SETTING_TEAM_RUNNER_FAST_RATE, _JS_KEYS("runner", "fast_rate"), _VAL_BOOL(FALSE), ), _INIT(0, - NM_TEAM_ATTRIBUTE_MASTER_RUNNER_SYS_PRIO, - master.runner_sys_prio, + NM_TEAM_ATTRIBUTE_CONTROLLER_RUNNER_SYS_PRIO, + controller.runner_sys_prio, NM_VALUE_TYPE_INT32, NM_SETTING_TEAM_RUNNER_SYS_PRIO, _JS_KEYS("runner", "sys_prio"), _VAL_INT32_RANGE(-1, 0, USHRT_MAX + 1), ), _INIT(0, - NM_TEAM_ATTRIBUTE_MASTER_RUNNER_MIN_PORTS, - master.runner_min_ports, + NM_TEAM_ATTRIBUTE_CONTROLLER_RUNNER_MIN_PORTS, + controller.runner_min_ports, NM_VALUE_TYPE_INT32, NM_SETTING_TEAM_RUNNER_MIN_PORTS, _JS_KEYS("runner", "min_ports"), _VAL_INT32_RANGE(-1, 1, UCHAR_MAX + 1), ), _INIT(0, - NM_TEAM_ATTRIBUTE_MASTER_RUNNER_AGG_SELECT_POLICY, - master.runner_agg_select_policy, + NM_TEAM_ATTRIBUTE_CONTROLLER_RUNNER_AGG_SELECT_POLICY, + controller.runner_agg_select_policy, NM_VALUE_TYPE_STRING, NM_SETTING_TEAM_RUNNER_AGG_SELECT_POLICY, _JS_KEYS("runner", "agg_select_policy"), @@ -437,7 +437,7 @@ _team_attr_data_ASSERT(const TeamAttrData *attr_data) nm_assert(attr_data); if (attr_data->for_port) nm_assert(attr_data == _team_attr_data_get(TRUE, attr_data->team_attr)); - if (attr_data->for_master) + if (attr_data->for_controller) nm_assert(attr_data == _team_attr_data_get(FALSE, attr_data->team_attr)); nm_assert((attr_data - team_attr_datas) == TEAM_ATTR_IDX(attr_data->for_port, attr_data->team_attr)); @@ -463,7 +463,7 @@ _team_attr_data_ASSERT(const TeamAttrData *attr_data) static gboolean _team_attr_data_is_relevant(const TeamAttrData *attr_data, gboolean is_port) { - return is_port ? attr_data->for_port : attr_data->for_master; + return is_port ? attr_data->for_port : attr_data->for_controller; } static const TeamAttrData * @@ -520,7 +520,7 @@ _team_attr_data_cmp(const TeamAttrData *attr_data, len, FALSE)); } - } else if (!is_port && attr_data->team_attr == NM_TEAM_ATTRIBUTE_MASTER_RUNNER_TX_HASH) { + } else if (!is_port && attr_data->team_attr == NM_TEAM_ATTRIBUTE_CONTROLLER_RUNNER_TX_HASH) { v_ptrarray_a = *((const GPtrArray *const *) val_a); v_ptrarray_b = *((const GPtrArray *const *) val_b); NM_CMP_RETURN(nm_strv_cmp_n(v_ptrarray_a ? (const char *const *) v_ptrarray_a->pdata : NULL, @@ -574,7 +574,7 @@ _team_attr_data_copy(const TeamAttrData *attr_data, g_ptr_array_unref(v_ptrarray_dst); *((GPtrArray **) dst) = dst_array; } - } else if (!is_port && attr_data->team_attr == NM_TEAM_ATTRIBUTE_MASTER_RUNNER_TX_HASH) { + } else if (!is_port && attr_data->team_attr == NM_TEAM_ATTRIBUTE_CONTROLLER_RUNNER_TX_HASH) { v_ptrarray_src = *((const GPtrArray *const *) src); v_ptrarray_dst = *((GPtrArray **) dst); len = (v_ptrarray_src ? v_ptrarray_src->len : 0u); @@ -631,7 +631,7 @@ _team_attr_data_to_json(const TeamAttrData *attr_data, return; } - if (!is_port && attr_data->team_attr == NM_TEAM_ATTRIBUTE_MASTER_RUNNER_TX_HASH) { + if (!is_port && attr_data->team_attr == NM_TEAM_ATTRIBUTE_CONTROLLER_RUNNER_TX_HASH) { const GPtrArray *v_ptrarray = *((const GPtrArray *const *) p_field); if (!v_ptrarray) @@ -664,8 +664,8 @@ _team_setting_ASSERT(const NMTeamSetting *self) nm_assert(self->d._js_str); } nm_assert(self->d.link_watchers); - nm_assert(self->d.is_port || !self->d.master.runner_tx_hash - || self->d.master.runner_tx_hash->len > 0); + nm_assert(self->d.is_port || !self->d.controller.runner_tx_hash + || self->d.controller.runner_tx_hash->len > 0); #endif } @@ -736,9 +736,10 @@ _team_setting_get_field(const NMTeamSetting *self, const TeamAttrData *attr_data nm_assert(_team_attr_data_is_relevant(attr_data, self->d.is_port)); #if NM_MORE_ASSERTS > 5 - if (attr_data->for_master && attr_data->team_attr == NM_TEAM_ATTRIBUTE_MASTER_RUNNER_SYS_PRIO) + if (attr_data->for_controller + && attr_data->team_attr == NM_TEAM_ATTRIBUTE_CONTROLLER_RUNNER_SYS_PRIO) nm_assert((gpointer) (((char *) self) + attr_data->field_offset) - == &self->d.master.runner_sys_prio); + == &self->d.controller.runner_sys_prio); #endif return (((char *) self) + attr_data->field_offset); @@ -1088,57 +1089,58 @@ nm_team_setting_value_link_watchers_set_list(NMTeamSetting *sel /*****************************************************************************/ guint32 -nm_team_setting_value_master_runner_tx_hash_add(NMTeamSetting *self, const char *txhash) +nm_team_setting_value_controller_runner_tx_hash_add(NMTeamSetting *self, const char *txhash) { gboolean changed; guint i; - if (!self->d.master.runner_tx_hash) - self->_data_priv.master.runner_tx_hash = g_ptr_array_new_with_free_func(g_free); + if (!self->d.controller.runner_tx_hash) + self->_data_priv.controller.runner_tx_hash = g_ptr_array_new_with_free_func(g_free); else { - for (i = 0; i < self->d.master.runner_tx_hash->len; i++) { - if (nm_streq(txhash, self->d.master.runner_tx_hash->pdata[i])) { + for (i = 0; i < self->d.controller.runner_tx_hash->len; i++) { + if (nm_streq(txhash, self->d.controller.runner_tx_hash->pdata[i])) { changed = FALSE; goto out; } } } changed = TRUE; - g_ptr_array_add((GPtrArray *) self->d.master.runner_tx_hash, g_strdup(txhash)); + g_ptr_array_add((GPtrArray *) self->d.controller.runner_tx_hash, g_strdup(txhash)); out: return _team_setting_attribute_changed_attr(self, - NM_TEAM_ATTRIBUTE_MASTER_RUNNER_TX_HASH, + NM_TEAM_ATTRIBUTE_CONTROLLER_RUNNER_TX_HASH, changed, SET_FIELD_MODE_SET_UNLESS_DEFAULT, RESET_JSON_YES); } guint32 -nm_team_setting_value_master_runner_tx_hash_remove(NMTeamSetting *self, guint idx) +nm_team_setting_value_controller_runner_tx_hash_remove(NMTeamSetting *self, guint idx) { - g_ptr_array_remove_index((GPtrArray *) self->d.master.runner_tx_hash, idx); + g_ptr_array_remove_index((GPtrArray *) self->d.controller.runner_tx_hash, idx); return _team_setting_attribute_changed_attr(self, - NM_TEAM_ATTRIBUTE_MASTER_RUNNER_TX_HASH, + NM_TEAM_ATTRIBUTE_CONTROLLER_RUNNER_TX_HASH, TRUE, SET_FIELD_MODE_SET_UNLESS_DEFAULT, RESET_JSON_YES); } static guint32 -_team_setting_value_master_runner_tx_hash_set_list(NMTeamSetting *self, - const char *const *arr, - guint len, - SetFieldModeEnum set_field_mode, - ResetJsonEnum reset_json) +_team_setting_value_controller_runner_tx_hash_set_list(NMTeamSetting *self, + const char *const *arr, + guint len, + SetFieldModeEnum set_field_mode, + ResetJsonEnum reset_json) { _nm_unused gs_unref_ptrarray GPtrArray *old_val_destroy = NULL; gboolean changed; guint i; - if (nm_strv_cmp_n(self->d.master.runner_tx_hash - ? (const char *const *) self->d.master.runner_tx_hash->pdata + if (nm_strv_cmp_n(self->d.controller.runner_tx_hash + ? (const char *const *) self->d.controller.runner_tx_hash->pdata : NULL, - self->d.master.runner_tx_hash ? self->d.master.runner_tx_hash->len : 0u, + self->d.controller.runner_tx_hash ? self->d.controller.runner_tx_hash->len + : 0u, arr, len) == 0) { @@ -1148,34 +1150,34 @@ _team_setting_value_master_runner_tx_hash_set_list(NMTeamSetting *self, changed = TRUE; - old_val_destroy = (GPtrArray *) g_steal_pointer(&self->_data_priv.master.runner_tx_hash); + old_val_destroy = (GPtrArray *) g_steal_pointer(&self->_data_priv.controller.runner_tx_hash); for (i = 0; i < len; i++) { if (!arr[i]) continue; - if (!self->d.master.runner_tx_hash) - self->_data_priv.master.runner_tx_hash = g_ptr_array_new_with_free_func(g_free); - g_ptr_array_add((GPtrArray *) self->d.master.runner_tx_hash, g_strdup(arr[i])); + if (!self->d.controller.runner_tx_hash) + self->_data_priv.controller.runner_tx_hash = g_ptr_array_new_with_free_func(g_free); + g_ptr_array_add((GPtrArray *) self->d.controller.runner_tx_hash, g_strdup(arr[i])); } out: return _team_setting_attribute_changed_attr(self, - NM_TEAM_ATTRIBUTE_MASTER_RUNNER_TX_HASH, + NM_TEAM_ATTRIBUTE_CONTROLLER_RUNNER_TX_HASH, changed, set_field_mode, reset_json); } guint32 -nm_team_setting_value_master_runner_tx_hash_set_list(NMTeamSetting *self, - const char *const *arr, - guint len) +nm_team_setting_value_controller_runner_tx_hash_set_list(NMTeamSetting *self, + const char *const *arr, + guint len) { - return _team_setting_value_master_runner_tx_hash_set_list(self, - arr, - len, - SET_FIELD_MODE_SET_UNLESS_DEFAULT, - RESET_JSON_YES); + return _team_setting_value_controller_runner_tx_hash_set_list(self, + arr, + len, + SET_FIELD_MODE_SET_UNLESS_DEFAULT, + RESET_JSON_YES); } /*****************************************************************************/ @@ -1769,28 +1771,28 @@ nm_team_setting_config_get(const NMTeamSetting *self) list_is_empty = FALSE; } else { static const NMTeamAttribute attr_lst_runner_pt1[] = { - NM_TEAM_ATTRIBUTE_MASTER_RUNNER, - NM_TEAM_ATTRIBUTE_MASTER_RUNNER_HWADDR_POLICY, - NM_TEAM_ATTRIBUTE_MASTER_RUNNER_TX_HASH, + NM_TEAM_ATTRIBUTE_CONTROLLER_RUNNER, + NM_TEAM_ATTRIBUTE_CONTROLLER_RUNNER_HWADDR_POLICY, + NM_TEAM_ATTRIBUTE_CONTROLLER_RUNNER_TX_HASH, }; static const NMTeamAttribute attr_lst_runner_pt2[] = { - NM_TEAM_ATTRIBUTE_MASTER_RUNNER_TX_BALANCER, - NM_TEAM_ATTRIBUTE_MASTER_RUNNER_TX_BALANCER_INTERVAL, + NM_TEAM_ATTRIBUTE_CONTROLLER_RUNNER_TX_BALANCER, + NM_TEAM_ATTRIBUTE_CONTROLLER_RUNNER_TX_BALANCER_INTERVAL, }; static const NMTeamAttribute attr_lst_runner_pt3[] = { - NM_TEAM_ATTRIBUTE_MASTER_RUNNER_ACTIVE, - NM_TEAM_ATTRIBUTE_MASTER_RUNNER_FAST_RATE, - NM_TEAM_ATTRIBUTE_MASTER_RUNNER_SYS_PRIO, - NM_TEAM_ATTRIBUTE_MASTER_RUNNER_MIN_PORTS, - NM_TEAM_ATTRIBUTE_MASTER_RUNNER_AGG_SELECT_POLICY, + NM_TEAM_ATTRIBUTE_CONTROLLER_RUNNER_ACTIVE, + NM_TEAM_ATTRIBUTE_CONTROLLER_RUNNER_FAST_RATE, + NM_TEAM_ATTRIBUTE_CONTROLLER_RUNNER_SYS_PRIO, + NM_TEAM_ATTRIBUTE_CONTROLLER_RUNNER_MIN_PORTS, + NM_TEAM_ATTRIBUTE_CONTROLLER_RUNNER_AGG_SELECT_POLICY, }; static const NMTeamAttribute attr_lst_notify_peers[] = { - NM_TEAM_ATTRIBUTE_MASTER_NOTIFY_PEERS_COUNT, - NM_TEAM_ATTRIBUTE_MASTER_NOTIFY_PEERS_INTERVAL, + NM_TEAM_ATTRIBUTE_CONTROLLER_NOTIFY_PEERS_COUNT, + NM_TEAM_ATTRIBUTE_CONTROLLER_NOTIFY_PEERS_INTERVAL, }; static const NMTeamAttribute attr_lst_mcast_rejoin[] = { - NM_TEAM_ATTRIBUTE_MASTER_MCAST_REJOIN_COUNT, - NM_TEAM_ATTRIBUTE_MASTER_MCAST_REJOIN_INTERVAL, + NM_TEAM_ATTRIBUTE_CONTROLLER_MCAST_REJOIN_COUNT, + NM_TEAM_ATTRIBUTE_CONTROLLER_MCAST_REJOIN_INTERVAL, }; if (_team_setting_has_fields_any_v(self, @@ -2012,7 +2014,7 @@ _js_parse_unpack(const NMJsonVt *vt, NMValueTypUnion out_val_lst[static _NM_TEAM_ATTRIBUTE_NUM], gboolean *out_unrecognized_content, GPtrArray **out_ptr_array_link_watchers_free, - GPtrArray **out_ptr_array_master_runner_tx_hash_free) + GPtrArray **out_ptr_array_controller_runner_tx_hash_free) { const TeamAttrData *attr_data; @@ -2069,11 +2071,12 @@ _js_parse_unpack(const NMJsonVt *vt, p_out_val->v_ptrarray = link_watchers; *out_ptr_array_link_watchers_free = link_watchers; } - } else if (!is_port && attr_data->team_attr == NM_TEAM_ATTRIBUTE_MASTER_RUNNER_TX_HASH) { + } else if (!is_port + && attr_data->team_attr == NM_TEAM_ATTRIBUTE_CONTROLLER_RUNNER_TX_HASH) { GPtrArray *strv = NULL; - nm_assert(out_ptr_array_master_runner_tx_hash_free - && !*out_ptr_array_master_runner_tx_hash_free); + nm_assert(out_ptr_array_controller_runner_tx_hash_free + && !*out_ptr_array_controller_runner_tx_hash_free); if (nm_json_is_array(arg_js_obj)) { gsize i, len; @@ -2096,8 +2099,8 @@ _js_parse_unpack(const NMJsonVt *vt, g_ptr_array_add(strv, (char *) v_string); } } - valid = TRUE; - *out_ptr_array_master_runner_tx_hash_free = strv; + valid = TRUE; + *out_ptr_array_controller_runner_tx_hash_free = strv; } p_out_val->v_ptrarray = strv; } else @@ -2154,8 +2157,8 @@ nm_team_setting_config_set(NMTeamSetting *self, const char *js_str) nm_json_t *found_keys[_NM_TEAM_ATTRIBUTE_NUM] = { NULL, }; - gs_unref_ptrarray GPtrArray *ptr_array_master_runner_tx_hash_free = NULL; - gs_unref_ptrarray GPtrArray *ptr_array_link_watchers_free = NULL; + gs_unref_ptrarray GPtrArray *ptr_array_controller_runner_tx_hash_free = NULL; + gs_unref_ptrarray GPtrArray *ptr_array_link_watchers_free = NULL; _js_parse_locate_keys(vt, self, root_js_obj, found_keys, &unrecognized_content); @@ -2166,7 +2169,7 @@ nm_team_setting_config_set(NMTeamSetting *self, const char *js_str) val_lst, &unrecognized_content, &ptr_array_link_watchers_free, - &ptr_array_master_runner_tx_hash_free); + &ptr_array_controller_runner_tx_hash_free); do_set_default = FALSE; @@ -2199,14 +2202,14 @@ _team_setting_prefix_error_plain(gboolean is_port, const char *property_name, GE static void _team_setting_prefix_error(const NMTeamSetting *self, - const char *prop_name_master, + const char *prop_name_controller, const char *prop_name_port, GError **error) { _team_setting_ASSERT(self); - nm_assert(self->d.is_port ? (!!prop_name_port) : (!!prop_name_master)); + nm_assert(self->d.is_port ? (!!prop_name_port) : (!!prop_name_controller)); _team_setting_prefix_error_plain(self->d.is_port, - self->d.is_port ? prop_name_port : prop_name_master, + self->d.is_port ? prop_name_port : prop_name_controller, error); } @@ -2258,10 +2261,11 @@ _team_setting_verify_properties(const NMTeamSetting *self, GError **error) nm_assert_not_reached(); } - if (!self->d.is_port && attr_data->team_attr == NM_TEAM_ATTRIBUTE_MASTER_RUNNER_TX_HASH) { - if (self->d.master.runner_tx_hash) { - for (i = 0; i < self->d.master.runner_tx_hash->len; i++) { - const char *val = self->d.master.runner_tx_hash->pdata[i]; + if (!self->d.is_port + && attr_data->team_attr == NM_TEAM_ATTRIBUTE_CONTROLLER_RUNNER_TX_HASH) { + if (self->d.controller.runner_tx_hash) { + for (i = 0; i < self->d.controller.runner_tx_hash->len; i++) { + const char *val = self->d.controller.runner_tx_hash->pdata[i]; if (!val || !nm_strv_contains(_valid_names_runner_tx_hash, -1, val)) { g_set_error(error, @@ -2288,8 +2292,8 @@ _team_setting_verify_properties(const NMTeamSetting *self, GError **error) if (!_team_setting_has_field(self, attr_data)) continue; - if (self->d.master.runner - && nm_strv_contains(e->valid_runners, -1, self->d.master.runner)) + if (self->d.controller.runner + && nm_strv_contains(e->valid_runners, -1, self->d.controller.runner)) continue; if (e->valid_runners[1] == NULL) { g_set_error(error, @@ -2542,7 +2546,7 @@ nm_team_setting_reset_from_dbus(NMTeamSetting *self, else if (attr_data->team_attr == NM_TEAM_ATTRIBUTE_LINK_WATCHERS) variant_type = G_VARIANT_TYPE("aa{sv}"); else if (!self->d.is_port - && attr_data->team_attr == NM_TEAM_ATTRIBUTE_MASTER_RUNNER_TX_HASH) + && attr_data->team_attr == NM_TEAM_ATTRIBUTE_CONTROLLER_RUNNER_TX_HASH) variant_type = G_VARIANT_TYPE_STRING_ARRAY; else nm_assert_not_reached(); @@ -2645,12 +2649,12 @@ nm_team_setting_reset_from_dbus(NMTeamSetting *self, SET_FIELD_MODE_SET, RESET_JSON_NO); } else if (!self->d.is_port - && attr_data->team_attr == NM_TEAM_ATTRIBUTE_MASTER_RUNNER_TX_HASH) { + && attr_data->team_attr == NM_TEAM_ATTRIBUTE_CONTROLLER_RUNNER_TX_HASH) { gs_free const char **strv = NULL; gsize len; strv = g_variant_get_strv(variants[attr_data->team_attr], &len); - changed_flags = _team_setting_value_master_runner_tx_hash_set_list( + changed_flags = _team_setting_value_controller_runner_tx_hash_set_list( self, strv, NM_MIN(len, (gsize) G_MAXUINT), @@ -2756,12 +2760,12 @@ _nm_team_settings_property_to_dbus(_NM_SETT_INFO_PROP_TO_DBUS_FCN_ARGS _nm_nil) } if (attr_data->team_attr == NM_TEAM_ATTRIBUTE_LINK_WATCHERS) return _nm_utils_team_link_watchers_to_variant(self->d.link_watchers); - if (!self->d.is_port && attr_data->team_attr == NM_TEAM_ATTRIBUTE_MASTER_RUNNER_TX_HASH) { - return g_variant_new_strv(self->d.master.runner_tx_hash - ? (const char *const *) self->d.master.runner_tx_hash->pdata - : NULL, - self->d.master.runner_tx_hash ? self->d.master.runner_tx_hash->len - : 0u); + if (!self->d.is_port && attr_data->team_attr == NM_TEAM_ATTRIBUTE_CONTROLLER_RUNNER_TX_HASH) { + return g_variant_new_strv( + self->d.controller.runner_tx_hash + ? (const char *const *) self->d.controller.runner_tx_hash->pdata + : NULL, + self->d.controller.runner_tx_hash ? self->d.controller.runner_tx_hash->len : 0u); } nm_assert_not_reached(); @@ -2836,12 +2840,12 @@ nm_team_setting_free(NMTeamSetting *self) _team_setting_ASSERT(self); if (!self->d.is_port) { - nm_clear_pointer(((GPtrArray **) &self->_data_priv.master.runner_tx_hash), + nm_clear_pointer(((GPtrArray **) &self->_data_priv.controller.runner_tx_hash), g_ptr_array_unref); - g_free((char *) self->_data_priv.master.runner); - g_free((char *) self->_data_priv.master.runner_hwaddr_policy); - g_free((char *) self->_data_priv.master.runner_tx_balancer); - g_free((char *) self->_data_priv.master.runner_agg_select_policy); + g_free((char *) self->_data_priv.controller.runner); + g_free((char *) self->_data_priv.controller.runner_hwaddr_policy); + g_free((char *) self->_data_priv.controller.runner_tx_balancer); + g_free((char *) self->_data_priv.controller.runner_agg_select_policy); } g_ptr_array_unref((GPtrArray *) self->_data_priv.link_watchers); g_free((char *) self->_data_priv._js_str); diff --git a/src/libnm-core-impl/nm-team-utils.h b/src/libnm-core-impl/nm-team-utils.h index 0210cb263b..5df14235c4 100644 --- a/src/libnm-core-impl/nm-team-utils.h +++ b/src/libnm-core-impl/nm-team-utils.h @@ -25,21 +25,21 @@ typedef enum { _NM_TEAM_ATTRIBUTE_START = 3, - NM_TEAM_ATTRIBUTE_MASTER_NOTIFY_PEERS_COUNT = _NM_TEAM_ATTRIBUTE_START, - NM_TEAM_ATTRIBUTE_MASTER_NOTIFY_PEERS_INTERVAL, - NM_TEAM_ATTRIBUTE_MASTER_MCAST_REJOIN_COUNT, - NM_TEAM_ATTRIBUTE_MASTER_MCAST_REJOIN_INTERVAL, - NM_TEAM_ATTRIBUTE_MASTER_RUNNER, - NM_TEAM_ATTRIBUTE_MASTER_RUNNER_HWADDR_POLICY, - NM_TEAM_ATTRIBUTE_MASTER_RUNNER_TX_HASH, - NM_TEAM_ATTRIBUTE_MASTER_RUNNER_TX_BALANCER, - NM_TEAM_ATTRIBUTE_MASTER_RUNNER_TX_BALANCER_INTERVAL, - NM_TEAM_ATTRIBUTE_MASTER_RUNNER_ACTIVE, - NM_TEAM_ATTRIBUTE_MASTER_RUNNER_FAST_RATE, - NM_TEAM_ATTRIBUTE_MASTER_RUNNER_SYS_PRIO, - NM_TEAM_ATTRIBUTE_MASTER_RUNNER_MIN_PORTS, - NM_TEAM_ATTRIBUTE_MASTER_RUNNER_AGG_SELECT_POLICY, - _NM_TEAM_ATTRIBUTE_MASTER_NUM, + NM_TEAM_ATTRIBUTE_CONTROLLER_NOTIFY_PEERS_COUNT = _NM_TEAM_ATTRIBUTE_START, + NM_TEAM_ATTRIBUTE_CONTROLLER_NOTIFY_PEERS_INTERVAL, + NM_TEAM_ATTRIBUTE_CONTROLLER_MCAST_REJOIN_COUNT, + NM_TEAM_ATTRIBUTE_CONTROLLER_MCAST_REJOIN_INTERVAL, + NM_TEAM_ATTRIBUTE_CONTROLLER_RUNNER, + NM_TEAM_ATTRIBUTE_CONTROLLER_RUNNER_HWADDR_POLICY, + NM_TEAM_ATTRIBUTE_CONTROLLER_RUNNER_TX_HASH, + NM_TEAM_ATTRIBUTE_CONTROLLER_RUNNER_TX_BALANCER, + NM_TEAM_ATTRIBUTE_CONTROLLER_RUNNER_TX_BALANCER_INTERVAL, + NM_TEAM_ATTRIBUTE_CONTROLLER_RUNNER_ACTIVE, + NM_TEAM_ATTRIBUTE_CONTROLLER_RUNNER_FAST_RATE, + NM_TEAM_ATTRIBUTE_CONTROLLER_RUNNER_SYS_PRIO, + NM_TEAM_ATTRIBUTE_CONTROLLER_RUNNER_MIN_PORTS, + NM_TEAM_ATTRIBUTE_CONTROLLER_RUNNER_AGG_SELECT_POLICY, + _NM_TEAM_ATTRIBUTE_CONTROLLER_NUM, NM_TEAM_ATTRIBUTE_PORT_QUEUE_ID = _NM_TEAM_ATTRIBUTE_START, NM_TEAM_ATTRIBUTE_PORT_PRIO, @@ -49,7 +49,7 @@ typedef enum { _NM_TEAM_ATTRIBUTE_PORT_NUM, _NM_TEAM_ATTRIBUTE_NUM = - NM_MAX_CONST(_NM_TEAM_ATTRIBUTE_MASTER_NUM, _NM_TEAM_ATTRIBUTE_PORT_NUM), + NM_MAX_CONST(_NM_TEAM_ATTRIBUTE_CONTROLLER_NUM, _NM_TEAM_ATTRIBUTE_PORT_NUM), } NMTeamAttribute; @@ -101,7 +101,7 @@ struct _NMTeamSettingData { gint32 runner_tx_balancer_interval; bool runner_active; bool runner_fast_rate; - } master; + } controller; struct { gint32 queue_id; gint32 prio; @@ -216,13 +216,14 @@ guint32 nm_team_setting_value_link_watchers_set_list(NMTeamSetting /*****************************************************************************/ -guint32 nm_team_setting_value_master_runner_tx_hash_add(NMTeamSetting *self, const char *txhash); +guint32 nm_team_setting_value_controller_runner_tx_hash_add(NMTeamSetting *self, + const char *txhash); -guint32 nm_team_setting_value_master_runner_tx_hash_remove(NMTeamSetting *self, guint idx); +guint32 nm_team_setting_value_controller_runner_tx_hash_remove(NMTeamSetting *self, guint idx); -guint32 nm_team_setting_value_master_runner_tx_hash_set_list(NMTeamSetting *self, - const char *const *arr, - guint len); +guint32 nm_team_setting_value_controller_runner_tx_hash_set_list(NMTeamSetting *self, + const char *const *arr, + guint len); /*****************************************************************************/ diff --git a/src/libnm-core-impl/nm-utils.c b/src/libnm-core-impl/nm-utils.c index 745b1f3322..f7f4e770aa 100644 --- a/src/libnm-core-impl/nm-utils.c +++ b/src/libnm-core-impl/nm-utils.c @@ -4903,9 +4903,9 @@ _nm_utils_dhcp_duid_valid(const char *duid, GBytes **out_duid_bin) * If @virtual_type is %NM_TYPE_SETTING_VLAN, then this checks if * @other_type is a valid type for the parent of a VLAN. * - * If @virtual_type is a "master" type (eg, %NM_TYPE_SETTING_BRIDGE), - * then this checks if @other_type is a valid type for a slave of that - * master. + * If @virtual_type is a "controller" type (eg, %NM_TYPE_SETTING_BRIDGE), + * then this checks if @other_type is a valid type for a port of that + * controller. * * Note that even if this returns %TRUE it is not guaranteed that * every connection of type @other_type is diff --git a/src/libnm-core-impl/tests/test-general.c b/src/libnm-core-impl/tests/test-general.c index f745d0596d..0a39010c11 100644 --- a/src/libnm-core-impl/tests/test-general.c +++ b/src/libnm-core-impl/tests/test-general.c @@ -6231,19 +6231,19 @@ test_connection_normalize_type(void) } static void -test_connection_normalize_slave_type_1(void) +test_connection_normalize_port_type_1(void) { gs_unref_object NMConnection *con = NULL; NMSettingConnection *s_con; - con = nmtst_create_minimal_connection("test_connection_normalize_slave_type_1", + con = nmtst_create_minimal_connection("test_connection_normalize_port_type_1", "cc4cd5df-45dc-483e-b291-6b76c2338ecb", NM_SETTING_WIRED_SETTING_NAME, &s_con); g_object_set(s_con, NM_SETTING_CONNECTION_CONTROLLER, - "master0", + "controller0", NM_SETTING_CONNECTION_PORT_TYPE, "invalid-type", NULL); @@ -6265,19 +6265,19 @@ test_connection_normalize_slave_type_1(void) } static void -test_connection_normalize_slave_type_2(void) +test_connection_normalize_port_type_2(void) { gs_unref_object NMConnection *con = NULL; NMSettingConnection *s_con; - con = nmtst_create_minimal_connection("test_connection_normalize_slave_type_2", + con = nmtst_create_minimal_connection("test_connection_normalize_port_type_2", "40bea008-ca72-439a-946b-e65f827656f9", NM_SETTING_WIRED_SETTING_NAME, &s_con); g_object_set(s_con, NM_SETTING_CONNECTION_CONTROLLER, - "master0", + "controller0", NM_SETTING_CONNECTION_PORT_TYPE, "invalid-type", NULL); @@ -6576,7 +6576,7 @@ test_connection_normalize_ovs_interface_type_system(gconstpointer test_data) case 1: g_object_set(s_con, NM_SETTING_CONNECTION_CONTROLLER, - "master0", + "controller0", NM_SETTING_CONNECTION_PORT_TYPE, NM_SETTING_OVS_PORT_SETTING_NAME, NULL); @@ -6597,7 +6597,7 @@ test_connection_normalize_ovs_interface_type_system(gconstpointer test_data) case 2: g_object_set(s_con, NM_SETTING_CONNECTION_CONTROLLER, - "master0", + "controller0", NM_SETTING_CONNECTION_PORT_TYPE, NM_SETTING_OVS_PORT_SETTING_NAME, NULL); @@ -6620,7 +6620,7 @@ test_connection_normalize_ovs_interface_type_system(gconstpointer test_data) case 3: g_object_set(s_con, NM_SETTING_CONNECTION_CONTROLLER, - "master0", + "controller0", NM_SETTING_CONNECTION_PORT_TYPE, NM_SETTING_OVS_PORT_SETTING_NAME, NULL); @@ -6638,7 +6638,7 @@ test_connection_normalize_ovs_interface_type_system(gconstpointer test_data) case 4: g_object_set(s_con, NM_SETTING_CONNECTION_CONTROLLER, - "master0", + "controller0", NM_SETTING_CONNECTION_PORT_TYPE, NM_SETTING_OVS_PORT_SETTING_NAME, NULL); @@ -6653,7 +6653,7 @@ test_connection_normalize_ovs_interface_type_system(gconstpointer test_data) NM_CONNECTION_ERROR_INVALID_PROPERTY); break; case 5: - g_object_set(s_con, NM_SETTING_CONNECTION_CONTROLLER, "master0", NULL); + g_object_set(s_con, NM_SETTING_CONNECTION_CONTROLLER, "controller0", NULL); s_ovs_if = NM_SETTING_OVS_INTERFACE(nm_setting_ovs_interface_new()); nm_connection_add_setting(con, NM_SETTING(s_ovs_if)); @@ -6675,7 +6675,7 @@ test_connection_normalize_ovs_interface_type_system(gconstpointer test_data) case 6: g_object_set(s_con, NM_SETTING_CONNECTION_CONTROLLER, - "master0", + "controller0", NM_SETTING_CONNECTION_PORT_TYPE, NM_SETTING_BRIDGE_SETTING_NAME, NULL); @@ -6691,7 +6691,7 @@ test_connection_normalize_ovs_interface_type_system(gconstpointer test_data) case 7: g_object_set(s_con, NM_SETTING_CONNECTION_CONTROLLER, - "master0", + "controller0", NM_SETTING_CONNECTION_PORT_TYPE, NM_SETTING_BRIDGE_SETTING_NAME, NULL); @@ -6738,7 +6738,7 @@ test_connection_normalize_ovs_interface_type_ovs_interface(gconstpointer test_da NM_CONNECTION_ERROR_INVALID_PROPERTY); break; case 2: - g_object_set(s_con, NM_SETTING_CONNECTION_CONTROLLER, "master0", NULL); + g_object_set(s_con, NM_SETTING_CONNECTION_CONTROLLER, "controller0", NULL); nmtst_assert_connection_verifies_after_normalization(con, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_MISSING_PROPERTY); @@ -6759,7 +6759,7 @@ test_connection_normalize_ovs_interface_type_ovs_interface(gconstpointer test_da case 3: g_object_set(s_con, NM_SETTING_CONNECTION_CONTROLLER, - "master0", + "controller0", NM_SETTING_CONNECTION_PORT_TYPE, NM_SETTING_OVS_PORT_SETTING_NAME, NULL); @@ -6781,7 +6781,7 @@ test_connection_normalize_ovs_interface_type_ovs_interface(gconstpointer test_da g_assert_cmpstr(nm_setting_ovs_interface_get_interface_type(s_ovs_if), ==, "internal"); break; case 4: - g_object_set(s_con, NM_SETTING_CONNECTION_CONTROLLER, "master0", NULL); + g_object_set(s_con, NM_SETTING_CONNECTION_CONTROLLER, "controller0", NULL); g_object_set(s_ovs_if, NM_SETTING_OVS_INTERFACE_TYPE, "internal", NULL); nmtst_assert_connection_verifies_after_normalization(con, NM_CONNECTION_ERROR, @@ -6803,7 +6803,7 @@ test_connection_normalize_ovs_interface_type_ovs_interface(gconstpointer test_da case 5: g_object_set(s_con, NM_SETTING_CONNECTION_CONTROLLER, - "master0", + "controller0", NM_SETTING_CONNECTION_PORT_TYPE, NM_SETTING_OVS_PORT_SETTING_NAME, NULL); @@ -6826,7 +6826,7 @@ test_connection_normalize_ovs_interface_type_ovs_interface(gconstpointer test_da case 6: g_object_set(s_con, NM_SETTING_CONNECTION_CONTROLLER, - "master0", + "controller0", NM_SETTING_CONNECTION_PORT_TYPE, NM_SETTING_OVS_PORT_SETTING_NAME, NULL); @@ -6849,7 +6849,7 @@ test_connection_normalize_ovs_interface_type_ovs_interface(gconstpointer test_da case 7: g_object_set(s_con, NM_SETTING_CONNECTION_CONTROLLER, - "master0", + "controller0", NM_SETTING_CONNECTION_PORT_TYPE, NM_SETTING_OVS_PORT_SETTING_NAME, NULL); @@ -6861,7 +6861,7 @@ test_connection_normalize_ovs_interface_type_ovs_interface(gconstpointer test_da case 8: g_object_set(s_con, NM_SETTING_CONNECTION_CONTROLLER, - "master0", + "controller0", NM_SETTING_CONNECTION_PORT_TYPE, NM_SETTING_OVS_PORT_SETTING_NAME, NULL); @@ -6873,7 +6873,7 @@ test_connection_normalize_ovs_interface_type_ovs_interface(gconstpointer test_da case 9: g_object_set(s_con, NM_SETTING_CONNECTION_CONTROLLER, - "master0", + "controller0", NM_SETTING_CONNECTION_PORT_TYPE, NM_SETTING_OVS_PORT_SETTING_NAME, NULL); @@ -6885,7 +6885,7 @@ test_connection_normalize_ovs_interface_type_ovs_interface(gconstpointer test_da case 10: g_object_set(s_con, NM_SETTING_CONNECTION_CONTROLLER, - "master0", + "controller0", NM_SETTING_CONNECTION_PORT_TYPE, NM_SETTING_OVS_PORT_SETTING_NAME, NULL); @@ -6898,7 +6898,7 @@ test_connection_normalize_ovs_interface_type_ovs_interface(gconstpointer test_da case 11: g_object_set(s_con, NM_SETTING_CONNECTION_CONTROLLER, - "master0", + "controller0", NM_SETTING_CONNECTION_PORT_TYPE, NM_SETTING_OVS_PORT_SETTING_NAME, NM_SETTING_CONNECTION_INTERFACE_NAME, @@ -6913,7 +6913,7 @@ test_connection_normalize_ovs_interface_type_ovs_interface(gconstpointer test_da case 12: g_object_set(s_con, NM_SETTING_CONNECTION_CONTROLLER, - "master0", + "controller0", NM_SETTING_CONNECTION_PORT_TYPE, NM_SETTING_OVS_PORT_SETTING_NAME, NM_SETTING_CONNECTION_INTERFACE_NAME, @@ -10705,7 +10705,7 @@ test_connection_ovs_ifname(gconstpointer test_data) g_object_set(s_con, NM_SETTING_CONNECTION_CONTROLLER, - "master0", + "controller0", NM_SETTING_CONNECTION_PORT_TYPE, NM_SETTING_OVS_BRIDGE_SETTING_NAME, NULL); @@ -10723,7 +10723,7 @@ test_connection_ovs_ifname(gconstpointer test_data) g_object_set(s_con, NM_SETTING_CONNECTION_CONTROLLER, - "master0", + "controller0", NM_SETTING_CONNECTION_PORT_TYPE, NM_SETTING_OVS_PORT_SETTING_NAME, NULL); @@ -10750,7 +10750,7 @@ test_connection_ovs_ifname(gconstpointer test_data) g_object_set(s_con, NM_SETTING_CONNECTION_CONTROLLER, - "master0", + "controller0", NM_SETTING_CONNECTION_PORT_TYPE, NM_SETTING_OVS_PORT_SETTING_NAME, NULL); @@ -10766,7 +10766,7 @@ test_connection_ovs_ifname(gconstpointer test_data) g_object_set(s_con, NM_SETTING_CONNECTION_CONTROLLER, - "master0", + "controller0", NM_SETTING_CONNECTION_PORT_TYPE, NM_SETTING_OVS_PORT_SETTING_NAME, NULL); @@ -10792,7 +10792,7 @@ test_connection_ovs_ifname(gconstpointer test_data) g_object_set(s_con, NM_SETTING_CONNECTION_CONTROLLER, - "master0", + "controller0", NM_SETTING_CONNECTION_PORT_TYPE, NM_SETTING_OVS_PORT_SETTING_NAME, NULL); @@ -11717,10 +11717,10 @@ main(int argc, char **argv) test_connection_normalize_virtual_iface_name); g_test_add_func("/core/general/test_connection_normalize_uuid", test_connection_normalize_uuid); g_test_add_func("/core/general/test_connection_normalize_type", test_connection_normalize_type); - g_test_add_func("/core/general/test_connection_normalize_slave_type_1", - test_connection_normalize_slave_type_1); - g_test_add_func("/core/general/test_connection_normalize_slave_type_2", - test_connection_normalize_slave_type_2); + g_test_add_func("/core/general/test_connection_normalize_port_type_1", + test_connection_normalize_port_type_1); + g_test_add_func("/core/general/test_connection_normalize_port_type_2", + test_connection_normalize_port_type_2); g_test_add_func("/core/general/test_connection_normalize_infiniband", test_connection_normalize_infiniband); g_test_add_func("/core/general/test_connection_normalize_gateway_never_default", diff --git a/src/libnm-core-impl/tests/test-keyfile.c b/src/libnm-core-impl/tests/test-keyfile.c index 9f54697140..1912782e23 100644 --- a/src/libnm-core-impl/tests/test-keyfile.c +++ b/src/libnm-core-impl/tests/test-keyfile.c @@ -196,7 +196,7 @@ _nm_keyfile_read(GKeyFile *keyfile, { NMSettingConnection *s_con; - /* a non-slave connection must have a proxy setting, but + /* a non-port connection must have a proxy setting, but * keyfile reader does not add that (unless a [proxy] section * is present. */ s_con = nm_connection_get_setting_connection(con); @@ -857,8 +857,8 @@ test_bridge_port_vlans(void) "id=t\n" "type=dummy\n" "interface-name=dummy1\n" - "master=br0\n" - "slave-type=bridge\n" + "controller=br0\n" + "port-type=bridge\n" "\n" "[bridge-port]\n" "vlans=4094 pvid , 10-20 untagged\n" diff --git a/src/libnm-core-intern/nm-core-internal.h b/src/libnm-core-intern/nm-core-internal.h index fc157c5881..4677fb1634 100644 --- a/src/libnm-core-intern/nm-core-internal.h +++ b/src/libnm-core-intern/nm-core-internal.h @@ -581,7 +581,7 @@ GHashTable *_nm_tc_action_get_attributes(NMTCAction *action); /*****************************************************************************/ static inline gboolean -_nm_connection_type_is_master(const char *type) +_nm_connection_type_is_controller(const char *type) { return (NM_IN_STRSET(type, NM_SETTING_BOND_SETTING_NAME, diff --git a/src/libnm-core-public/nm-dbus-interface.h b/src/libnm-core-public/nm-dbus-interface.h index cf6e8090aa..5eedd7da3a 100644 --- a/src/libnm-core-public/nm-dbus-interface.h +++ b/src/libnm-core-public/nm-dbus-interface.h @@ -213,11 +213,11 @@ typedef enum { * @NM_DEVICE_TYPE_MODEM: a modem supporting analog telephone, CDMA/EVDO, * GSM/UMTS, or LTE network access protocols * @NM_DEVICE_TYPE_INFINIBAND: an IP-over-InfiniBand device - * @NM_DEVICE_TYPE_BOND: a bond master interface + * @NM_DEVICE_TYPE_BOND: a bond controller interface * @NM_DEVICE_TYPE_VLAN: an 802.1Q VLAN interface * @NM_DEVICE_TYPE_ADSL: ADSL modem - * @NM_DEVICE_TYPE_BRIDGE: a bridge master interface - * @NM_DEVICE_TYPE_TEAM: a team master interface + * @NM_DEVICE_TYPE_BRIDGE: a bridge controller interface + * @NM_DEVICE_TYPE_TEAM: a team controller interface * @NM_DEVICE_TYPE_TUN: a TUN or TAP interface * @NM_DEVICE_TYPE_IP_TUNNEL: a IP tunnel interface * @NM_DEVICE_TYPE_MACVLAN: a MACVLAN interface @@ -1091,13 +1091,13 @@ typedef enum /*< flags >*/ { /** * NMActivationStateFlags: * @NM_ACTIVATION_STATE_FLAG_NONE: an alias for numeric zero, no flags set. - * @NM_ACTIVATION_STATE_FLAG_IS_MASTER: the device is a master. - * @NM_ACTIVATION_STATE_FLAG_IS_SLAVE: the device is a slave. + * @NM_ACTIVATION_STATE_FLAG_IS_CONTROLLER: the device is a controller. + * @NM_ACTIVATION_STATE_FLAG_IS_PORT: the device is a port. * @NM_ACTIVATION_STATE_FLAG_LAYER2_READY: layer2 is activated and ready. * @NM_ACTIVATION_STATE_FLAG_IP4_READY: IPv4 setting is completed. * @NM_ACTIVATION_STATE_FLAG_IP6_READY: IPv6 setting is completed. - * @NM_ACTIVATION_STATE_FLAG_MASTER_HAS_SLAVES: The master has any slave devices attached. - * This only makes sense if the device is a master. + * @NM_ACTIVATION_STATE_FLAG_CONTROLLER_HAS_PORTS: The controller has any port devices attached. + * This only makes sense if the device is a controller. * @NM_ACTIVATION_STATE_FLAG_LIFETIME_BOUND_TO_PROFILE_VISIBILITY: the lifetime * of the activation is bound to the visibility of the connection profile, * which in turn depends on "connection.permissions" and whether a session @@ -1112,16 +1112,20 @@ typedef enum /*< flags >*/ { typedef enum /*< flags >*/ { NM_ACTIVATION_STATE_FLAG_NONE = 0, - NM_ACTIVATION_STATE_FLAG_IS_MASTER = 0x1, - NM_ACTIVATION_STATE_FLAG_IS_SLAVE = 0x2, + NM_ACTIVATION_STATE_FLAG_IS_CONTROLLER = 0x1, + NM_ACTIVATION_STATE_FLAG_IS_PORT = 0x2, NM_ACTIVATION_STATE_FLAG_LAYER2_READY = 0x4, NM_ACTIVATION_STATE_FLAG_IP4_READY = 0x8, NM_ACTIVATION_STATE_FLAG_IP6_READY = 0x10, - NM_ACTIVATION_STATE_FLAG_MASTER_HAS_SLAVES = 0x20, + NM_ACTIVATION_STATE_FLAG_CONTROLLER_HAS_PORTS = 0x20, NM_ACTIVATION_STATE_FLAG_LIFETIME_BOUND_TO_PROFILE_VISIBILITY = 0x40, NM_ACTIVATION_STATE_FLAG_EXTERNAL = 0x80, } NMActivationStateFlags; +#define NM_ACTIVATION_STATE_FLAG_IS_MASTER NM_ACTIVATION_STATE_FLAG_IS_CONTROLLER +#define NM_ACTIVATION_STATE_FLAG_IS_SLAVE NM_ACTIVATION_STATE_FLAG_IS_PORT +#define NM_ACTIVATION_STATE_FLAG_MASTER_HAS_SLAVES NM_ACTIVATION_FLAG_CONTROLLER_HAS_PORTS + /** * NMSettingsAddConnection2Flags: * @NM_SETTINGS_ADD_CONNECTION2_FLAG_NONE: an alias for numeric zero, no flags set. diff --git a/src/libnm-core-public/nm-setting-connection.h b/src/libnm-core-public/nm-setting-connection.h index 298fb14472..4cf6734676 100644 --- a/src/libnm-core-public/nm-setting-connection.h +++ b/src/libnm-core-public/nm-setting-connection.h @@ -71,12 +71,12 @@ G_BEGIN_DECLS * NMSettingConnectionAutoconnectSlaves: * @NM_SETTING_CONNECTION_AUTOCONNECT_SLAVES_DEFAULT: default value * @NM_SETTING_CONNECTION_AUTOCONNECT_SLAVES_NO: slaves are not brought up when - * master is activated + * controller is activated * @NM_SETTING_CONNECTION_AUTOCONNECT_SLAVES_YES: slaves are brought up when - * master is activated + * controller is activated * * #NMSettingConnectionAutoconnectSlaves values indicate whether slave connections - * should be activated when master is activated. + * should be activated when controller is activated. * * Since: 1.2 * diff --git a/src/libnm-glib-aux/nm-errno.c b/src/libnm-glib-aux/nm-errno.c index 682bfea2a7..9feac2adb9 100644 --- a/src/libnm-glib-aux/nm-errno.c +++ b/src/libnm-glib-aux/nm-errno.c @@ -39,7 +39,7 @@ static NM_UTILS_LOOKUP_STR_DEFINE( NM_UTILS_LOOKUP_STR_ITEM(NME_PL_NOT_FOUND, "not-found"), NM_UTILS_LOOKUP_STR_ITEM(NME_PL_EXISTS, "exists"), NM_UTILS_LOOKUP_STR_ITEM(NME_PL_WRONG_TYPE, "wrong-type"), - NM_UTILS_LOOKUP_STR_ITEM(NME_PL_NOT_SLAVE, "not-slave"), + NM_UTILS_LOOKUP_STR_ITEM(NME_PL_NOT_SLAVE, "not-port"), NM_UTILS_LOOKUP_STR_ITEM(NME_PL_NO_FIRMWARE, "no-firmware"), NM_UTILS_LOOKUP_STR_ITEM(NME_PL_OPNOTSUPP, "not-supported"), NM_UTILS_LOOKUP_STR_ITEM(NME_PL_NETLINK, "netlink"), diff --git a/src/libnm-glib-aux/nm-shared-utils.h b/src/libnm-glib-aux/nm-shared-utils.h index d350d32e41..ca9feb6080 100644 --- a/src/libnm-glib-aux/nm-shared-utils.h +++ b/src/libnm-glib-aux/nm-shared-utils.h @@ -154,13 +154,13 @@ typedef enum { NM_LINK_TYPE_WIREGUARD, #define _NM_LINK_TYPE_SW_LAST NM_LINK_TYPE_WIREGUARD -/* Software types with slaves */ -#define _NM_LINK_TYPE_SW_MASTER_FIRST NM_LINK_TYPE_BRIDGE +/* Software types with ports */ +#define _NM_LINK_TYPE_SW_CONTROLLER_FIRST NM_LINK_TYPE_BRIDGE NM_LINK_TYPE_BRIDGE, NM_LINK_TYPE_BOND, NM_LINK_TYPE_HSR, NM_LINK_TYPE_TEAM, -#define _NM_LINK_TYPE_SW_MASTER_LAST NM_LINK_TYPE_TEAM +#define _NM_LINK_TYPE_SW_CONTROLLER_LAST NM_LINK_TYPE_TEAM #define _NM_LINK_TYPE_REAL_LAST NM_LINK_TYPE_TEAM @@ -171,15 +171,16 @@ typedef enum { static inline gboolean nm_link_type_is_software(NMLinkType link_type) { - G_STATIC_ASSERT(_NM_LINK_TYPE_SW_LAST + 1 == _NM_LINK_TYPE_SW_MASTER_FIRST); + G_STATIC_ASSERT(_NM_LINK_TYPE_SW_LAST + 1 == _NM_LINK_TYPE_SW_CONTROLLER_FIRST); - return link_type >= _NM_LINK_TYPE_SW_FIRST && link_type <= _NM_LINK_TYPE_SW_MASTER_LAST; + return link_type >= _NM_LINK_TYPE_SW_FIRST && link_type <= _NM_LINK_TYPE_SW_CONTROLLER_LAST; } static inline gboolean -nm_link_type_supports_slaves(NMLinkType link_type) +nm_link_type_supports_ports(NMLinkType link_type) { - return link_type >= _NM_LINK_TYPE_SW_MASTER_FIRST && link_type <= _NM_LINK_TYPE_SW_MASTER_LAST; + return link_type >= _NM_LINK_TYPE_SW_CONTROLLER_FIRST + && link_type <= _NM_LINK_TYPE_SW_CONTROLLER_LAST; } /*****************************************************************************/ diff --git a/src/libnm-platform/nm-linux-platform.c b/src/libnm-platform/nm-linux-platform.c index 36d200953a..c8a4c56376 100644 --- a/src/libnm-platform/nm-linux-platform.c +++ b/src/libnm-platform/nm-linux-platform.c @@ -108,6 +108,9 @@ typedef enum _nm_packed { /*****************************************************************************/ +#define IFLA_INFO_PORT_KIND IFLA_INFO_SLAVE_KIND +#define IFLA_INFO_PORT_DATA IFLA_INFO_SLAVE_DATA + #ifndef IFLA_PROMISCUITY #define IFLA_PROMISCUITY 30 #endif @@ -161,6 +164,10 @@ typedef enum _nm_packed { #define __IFLA_TUN_MAX 10 #define IFLA_TUN_MAX (__IFLA_TUN_MAX - 1) +#define IFLA_CONTROLLER IFLA_MASTER + +#define BRIDGE_FLAGS_CONTROLLER BRIDGE_FLAGS_MASTER + G_STATIC_ASSERT(RTA_MAX == (__RTA_MAX - 1)); #define RTA_PREF 20 #undef RTA_MAX @@ -180,7 +187,10 @@ G_STATIC_ASSERT(RTA_MAX == (__RTA_MAX - 1)); /*****************************************************************************/ -#define IFLA_BOND_SLAVE_PRIO 9 +#define IFLA_BOND_ACTIVE_PORT IFLA_BOND_ACTIVE_SLAVE +#define IFLA_BOND_PORT_PRIO IFLA_BOND_SLAVE_PRIO +#define IFLA_BOND_ALL_PORTS_ACTIVE IFLA_BOND_ALL_SLAVES_ACTIVE +#define IFLA_BOND_PACKETS_PER_PORT IFLA_BOND_PACKETS_PER_SLAVE #define IFLA_BOND_PEER_NOTIF_DELAY 28 #define IFLA_BOND_AD_LACP_ACTIVE 29 @@ -432,7 +442,7 @@ typedef enum _nm_packed { DELAYED_ACTION_TYPE_WAIT_FOR_RESPONSE_RTNL = 1 << 12, DELAYED_ACTION_TYPE_WAIT_FOR_RESPONSE_GENL = 1 << 13, DELAYED_ACTION_TYPE_REFRESH_LINK = 1 << 14, - DELAYED_ACTION_TYPE_MASTER_CONNECTED = 1 << 15, + DELAYED_ACTION_TYPE_CONTROLLER_CONNECTED = 1 << 15, __DELAYED_ACTION_TYPE_MAX, @@ -559,7 +569,7 @@ typedef struct { * by type. */ int refresh_all_in_progress[_REFRESH_ALL_TYPE_NUM]; - GPtrArray *list_master_connected; + GPtrArray *list_controller_connected; GPtrArray *list_refresh_link; union { struct { @@ -1623,7 +1633,7 @@ _parse_lnk_bond(const char *kind, struct nlattr *info_data) { static const struct nla_policy policy[] = { [IFLA_BOND_MODE] = {.type = NLA_U8}, - [IFLA_BOND_ACTIVE_SLAVE] = {.type = NLA_U32}, + [IFLA_BOND_ACTIVE_PORT] = {.type = NLA_U32}, [IFLA_BOND_MIIMON] = {.type = NLA_U32}, [IFLA_BOND_UPDELAY] = {.type = NLA_U32}, [IFLA_BOND_DOWNDELAY] = {.type = NLA_U32}, @@ -1638,10 +1648,10 @@ _parse_lnk_bond(const char *kind, struct nlattr *info_data) [IFLA_BOND_XMIT_HASH_POLICY] = {.type = NLA_U8}, [IFLA_BOND_RESEND_IGMP] = {.type = NLA_U32}, [IFLA_BOND_NUM_PEER_NOTIF] = {.type = NLA_U8}, - [IFLA_BOND_ALL_SLAVES_ACTIVE] = {.type = NLA_U8}, + [IFLA_BOND_ALL_PORTS_ACTIVE] = {.type = NLA_U8}, [IFLA_BOND_MIN_LINKS] = {.type = NLA_U32}, [IFLA_BOND_LP_INTERVAL] = {.type = NLA_U32}, - [IFLA_BOND_PACKETS_PER_SLAVE] = {.type = NLA_U32}, + [IFLA_BOND_PACKETS_PER_PORT] = {.type = NLA_U32}, [IFLA_BOND_AD_LACP_RATE] = {.type = NLA_U8}, [IFLA_BOND_AD_SELECT] = {.type = NLA_U8}, [IFLA_BOND_AD_ACTOR_SYS_PRIO] = {.type = NLA_U16}, @@ -1737,16 +1747,16 @@ _parse_lnk_bond(const char *kind, struct nlattr *info_data) } if (tb[IFLA_BOND_NUM_PEER_NOTIF]) props->num_grat_arp = nla_get_u8(tb[IFLA_BOND_NUM_PEER_NOTIF]); - if (tb[IFLA_BOND_ALL_SLAVES_ACTIVE]) - props->all_ports_active = nla_get_u8(tb[IFLA_BOND_ALL_SLAVES_ACTIVE]); + if (tb[IFLA_BOND_ALL_PORTS_ACTIVE]) + props->all_ports_active = nla_get_u8(tb[IFLA_BOND_ALL_PORTS_ACTIVE]); if (tb[IFLA_BOND_MISSED_MAX]) props->arp_missed_max = nla_get_u8(tb[IFLA_BOND_MISSED_MAX]); if (tb[IFLA_BOND_MIN_LINKS]) props->min_links = nla_get_u32(tb[IFLA_BOND_MIN_LINKS]); if (tb[IFLA_BOND_LP_INTERVAL]) props->lp_interval = nla_get_u32(tb[IFLA_BOND_LP_INTERVAL]); - if (tb[IFLA_BOND_PACKETS_PER_SLAVE]) - props->packets_per_port = nla_get_u32(tb[IFLA_BOND_PACKETS_PER_SLAVE]); + if (tb[IFLA_BOND_PACKETS_PER_PORT]) + props->packets_per_port = nla_get_u32(tb[IFLA_BOND_PACKETS_PER_PORT]); if (tb[IFLA_BOND_AD_LACP_RATE]) props->lacp_rate = nla_get_u8(tb[IFLA_BOND_AD_LACP_RATE]); if (tb[IFLA_BOND_AD_LACP_ACTIVE]) { @@ -3377,7 +3387,7 @@ _new_from_nl_link(NMPlatform *platform, [IFLA_GRO_MAX_SIZE] = {.type = NLA_U32}, [IFLA_LINK] = {.type = NLA_U32}, [IFLA_WEIGHT] = {.type = NLA_U32}, - [IFLA_MASTER] = {.type = NLA_U32}, + [IFLA_CONTROLLER] = {.type = NLA_U32}, [IFLA_OPERSTATE] = {.type = NLA_U8}, [IFLA_LINKMODE] = {.type = NLA_U8}, [IFLA_LINKINFO] = {.type = NLA_NESTED}, @@ -3459,11 +3469,11 @@ _new_from_nl_link(NMPlatform *platform, if (tb[IFLA_LINKINFO]) { static const struct nla_policy policy_link_info[] = { - [IFLA_INFO_KIND] = {.type = NLA_STRING}, - [IFLA_INFO_DATA] = {.type = NLA_NESTED}, - [IFLA_INFO_XSTATS] = {.type = NLA_NESTED}, - [IFLA_INFO_SLAVE_KIND] = {.type = NLA_STRING}, - [IFLA_INFO_SLAVE_DATA] = {.type = NLA_NESTED}, + [IFLA_INFO_KIND] = {.type = NLA_STRING}, + [IFLA_INFO_DATA] = {.type = NLA_NESTED}, + [IFLA_INFO_XSTATS] = {.type = NLA_NESTED}, + [IFLA_INFO_PORT_KIND] = {.type = NLA_STRING}, + [IFLA_INFO_PORT_DATA] = {.type = NLA_NESTED}, }; struct nlattr *li[G_N_ELEMENTS(policy_link_info)]; @@ -3475,8 +3485,8 @@ _new_from_nl_link(NMPlatform *platform, nl_info_data = li[IFLA_INFO_DATA]; - if (li[IFLA_INFO_SLAVE_KIND]) { - const char *s = nla_get_string(li[IFLA_INFO_SLAVE_KIND]); + if (li[IFLA_INFO_PORT_KIND]) { + const char *s = nla_get_string(li[IFLA_INFO_PORT_KIND]); if (nm_streq(s, "bond")) obj->link.port_kind = NM_PORT_KIND_BOND; @@ -3484,10 +3494,10 @@ _new_from_nl_link(NMPlatform *platform, obj->link.port_kind = NM_PORT_KIND_BRIDGE; } - if (li[IFLA_INFO_SLAVE_DATA]) { + if (li[IFLA_INFO_PORT_DATA]) { static const struct nla_policy policy_bond_port[] = { [IFLA_BOND_SLAVE_QUEUE_ID] = {.type = NLA_U16}, - [IFLA_BOND_SLAVE_PRIO] = {.type = NLA_S32}, + [IFLA_BOND_PORT_PRIO] = {.type = NLA_S32}, }; struct nlattr *bp[G_N_ELEMENTS(policy_bond_port)]; static const struct nla_policy policy_bridge_port[] = { @@ -3499,30 +3509,30 @@ _new_from_nl_link(NMPlatform *platform, switch (obj->link.port_kind) { case NM_PORT_KIND_BOND: - if (nla_parse_nested_arr(bp, li[IFLA_INFO_SLAVE_DATA], policy_bond_port) < 0) + if (nla_parse_nested_arr(bp, li[IFLA_INFO_PORT_DATA], policy_bond_port) < 0) return NULL; if (bp[IFLA_BOND_SLAVE_QUEUE_ID]) obj->link.port_data.bond.queue_id = nla_get_u16(bp[IFLA_BOND_SLAVE_QUEUE_ID]); - if (bp[IFLA_BOND_SLAVE_PRIO]) { - obj->link.port_data.bond.prio = nla_get_s32(bp[IFLA_BOND_SLAVE_PRIO]); + if (bp[IFLA_BOND_PORT_PRIO]) { + obj->link.port_data.bond.prio = nla_get_s32(bp[IFLA_BOND_PORT_PRIO]); obj->link.port_data.bond.prio_has = TRUE; if (!_nm_platform_kernel_support_detected( - NM_PLATFORM_KERNEL_SUPPORT_TYPE_IFLA_BOND_SLAVE_PRIO)) { - /* support for IFLA_BOND_SLAVE_PRIO was added in 0a2ff7cc8ad48a86939a91bd3457f38e59e741a1, + NM_PLATFORM_KERNEL_SUPPORT_TYPE_IFLA_BOND_PORT_PRIO)) { + /* support for IFLA_BOND_PORT_PRIO was added in 0a2ff7cc8ad48a86939a91bd3457f38e59e741a1, * kernel 6.0, 2 October 2022. * * We can only detect support if the attribute is present. A missing attribute * is not conclusive. */ _nm_platform_kernel_support_init( - NM_PLATFORM_KERNEL_SUPPORT_TYPE_IFLA_BOND_SLAVE_PRIO, + NM_PLATFORM_KERNEL_SUPPORT_TYPE_IFLA_BOND_PORT_PRIO, 1); } } break; case NM_PORT_KIND_BRIDGE: - if (nla_parse_nested_arr(brp, li[IFLA_INFO_SLAVE_DATA], policy_bridge_port) < 0) + if (nla_parse_nested_arr(brp, li[IFLA_INFO_PORT_DATA], policy_bridge_port) < 0) return NULL; if (brp[IFLA_BRPORT_COST]) @@ -3577,8 +3587,8 @@ _new_from_nl_link(NMPlatform *platform, &link_cached, &obj->link.kind); - if (tb[IFLA_MASTER]) - obj->link.master = nla_get_u32(tb[IFLA_MASTER]); + if (tb[IFLA_CONTROLLER]) + obj->link.controller = nla_get_u32(tb[IFLA_CONTROLLER]); if (tb[IFLA_LINK]) { if (!tb[IFLA_LINK_NETNSID]) @@ -4948,7 +4958,7 @@ _nl_msg_new_link_set_linkinfo(struct nl_msg *msg, NMLinkType link_type, gconstpo if (props->min_links) NLA_PUT_U32(msg, IFLA_BOND_MIN_LINKS, props->min_links); if (props->packets_per_port) - NLA_PUT_U32(msg, IFLA_BOND_PACKETS_PER_SLAVE, props->packets_per_port); + NLA_PUT_U32(msg, IFLA_BOND_PACKETS_PER_PORT, props->packets_per_port); if (props->peer_notif_delay_has) NLA_PUT_U32(msg, IFLA_BOND_PEER_NOTIF_DELAY, props->peer_notif_delay); if (props->primary > 0) @@ -4971,7 +4981,7 @@ _nl_msg_new_link_set_linkinfo(struct nl_msg *msg, NMLinkType link_type, gconstpo if (props->arp_missed_max) NLA_PUT_U8(msg, IFLA_BOND_MISSED_MAX, props->arp_missed_max); - NLA_PUT_U8(msg, IFLA_BOND_ALL_SLAVES_ACTIVE, props->all_ports_active); + NLA_PUT_U8(msg, IFLA_BOND_ALL_PORTS_ACTIVE, props->all_ports_active); if (props->fail_over_mac) NLA_PUT_U8(msg, IFLA_BOND_FAIL_OVER_MAC, props->fail_over_mac); @@ -6781,7 +6791,7 @@ static NM_UTILS_LOOKUP_STR_DEFINE( NM_UTILS_LOOKUP_STR_ITEM(DELAYED_ACTION_TYPE_REFRESH_ALL_GENL_FAMILIES, "refresh-all-genl-families"), NM_UTILS_LOOKUP_STR_ITEM(DELAYED_ACTION_TYPE_REFRESH_LINK, "refresh-link"), - NM_UTILS_LOOKUP_STR_ITEM(DELAYED_ACTION_TYPE_MASTER_CONNECTED, "master-connected"), + NM_UTILS_LOOKUP_STR_ITEM(DELAYED_ACTION_TYPE_CONTROLLER_CONNECTED, "controller-connected"), NM_UTILS_LOOKUP_STR_ITEM(DELAYED_ACTION_TYPE_READ_RTNL, "read-rtnl"), NM_UTILS_LOOKUP_STR_ITEM(DELAYED_ACTION_TYPE_READ_GENL, "read-genl"), NM_UTILS_LOOKUP_STR_ITEM(DELAYED_ACTION_TYPE_WAIT_FOR_RESPONSE_RTNL, "wait-for-response-rtnl"), @@ -6809,8 +6819,8 @@ delayed_action_to_string_full(DelayedActionType action_type, nm_strbuf_append_str(&buf, &buf_size, delayed_action_to_string(action_type)); switch (action_type) { - case DELAYED_ACTION_TYPE_MASTER_CONNECTED: - nm_strbuf_append(&buf, &buf_size, " (master-ifindex %d)", GPOINTER_TO_INT(user_data)); + case DELAYED_ACTION_TYPE_CONTROLLER_CONNECTED: + nm_strbuf_append(&buf, &buf_size, " (controller-ifindex %d)", GPOINTER_TO_INT(user_data)); break; case DELAYED_ACTION_TYPE_REFRESH_LINK: nm_strbuf_append(&buf, &buf_size, " (ifindex %d)", GPOINTER_TO_INT(user_data)); @@ -6991,16 +7001,16 @@ delayed_action_wait_for_nl_response_complete_all(NMPlatform *platfor /*****************************************************************************/ static void -delayed_action_handle_MASTER_CONNECTED(NMPlatform *platform, int master_ifindex) +delayed_action_handle_CONTROLLER_CONNECTED(NMPlatform *platform, int controller_ifindex) { nm_auto_nmpobj const NMPObject *obj_old = NULL; nm_auto_nmpobj const NMPObject *obj_new = NULL; NMPCacheOpsType cache_op; - cache_op = nmp_cache_update_link_master_connected(nm_platform_get_cache(platform), - master_ifindex, - &obj_old, - &obj_new); + cache_op = nmp_cache_update_link_controller_connected(nm_platform_get_cache(platform), + controller_ifindex, + &obj_old, + &obj_new); if (cache_op == NMP_CACHE_OPS_UNCHANGED) return; cache_on_change(platform, cache_op, obj_old, obj_new); @@ -7042,27 +7052,27 @@ delayed_action_handle_one(NMPlatform *platform) if (priv->delayed_action.flags == DELAYED_ACTION_TYPE_NONE) return FALSE; - /* First process DELAYED_ACTION_TYPE_MASTER_CONNECTED actions. + /* First process DELAYED_ACTION_TYPE_CONTROLLER_CONNECTED actions. * This type of action is entirely cache-internal and is here to resolve a * cache inconsistency. It should be fixed right away. */ - if (NM_FLAGS_HAS(priv->delayed_action.flags, DELAYED_ACTION_TYPE_MASTER_CONNECTED)) { - nm_assert(priv->delayed_action.list_master_connected->len > 0); + if (NM_FLAGS_HAS(priv->delayed_action.flags, DELAYED_ACTION_TYPE_CONTROLLER_CONNECTED)) { + nm_assert(priv->delayed_action.list_controller_connected->len > 0); - user_data = priv->delayed_action.list_master_connected->pdata[0]; - g_ptr_array_remove_index_fast(priv->delayed_action.list_master_connected, 0); - if (priv->delayed_action.list_master_connected->len == 0) - priv->delayed_action.flags &= ~DELAYED_ACTION_TYPE_MASTER_CONNECTED; + user_data = priv->delayed_action.list_controller_connected->pdata[0]; + g_ptr_array_remove_index_fast(priv->delayed_action.list_controller_connected, 0); + if (priv->delayed_action.list_controller_connected->len == 0) + priv->delayed_action.flags &= ~DELAYED_ACTION_TYPE_CONTROLLER_CONNECTED; nm_assert(nm_utils_ptrarray_find_first( - (gconstpointer *) priv->delayed_action.list_master_connected->pdata, - priv->delayed_action.list_master_connected->len, + (gconstpointer *) priv->delayed_action.list_controller_connected->pdata, + priv->delayed_action.list_controller_connected->len, user_data) < 0); - _LOGt_delayed_action(DELAYED_ACTION_TYPE_MASTER_CONNECTED, user_data, "handle"); - delayed_action_handle_MASTER_CONNECTED(platform, GPOINTER_TO_INT(user_data)); + _LOGt_delayed_action(DELAYED_ACTION_TYPE_CONTROLLER_CONNECTED, user_data, "handle"); + delayed_action_handle_CONTROLLER_CONNECTED(platform, GPOINTER_TO_INT(user_data)); return TRUE; } - nm_assert(priv->delayed_action.list_master_connected->len == 0); + nm_assert(priv->delayed_action.list_controller_connected->len == 0); /* Next we prefer read-genl/read-rtnl, because the buffer size is limited and we want to process events * from netlink early. */ @@ -7178,13 +7188,13 @@ delayed_action_schedule(NMPlatform *platform, DelayedActionType action_type, gpo < 0) g_ptr_array_add(priv->delayed_action.list_refresh_link, user_data); break; - case DELAYED_ACTION_TYPE_MASTER_CONNECTED: + case DELAYED_ACTION_TYPE_CONTROLLER_CONNECTED: if (nm_utils_ptrarray_find_first( - (gconstpointer *) priv->delayed_action.list_master_connected->pdata, - priv->delayed_action.list_master_connected->len, + (gconstpointer *) priv->delayed_action.list_controller_connected->pdata, + priv->delayed_action.list_controller_connected->len, user_data) < 0) - g_ptr_array_add(priv->delayed_action.list_master_connected, user_data); + g_ptr_array_add(priv->delayed_action.list_controller_connected, user_data); break; case DELAYED_ACTION_TYPE_WAIT_FOR_RESPONSE_RTNL: g_array_append_vals(priv->delayed_action.list_wait_for_response_rtnl, user_data, 1); @@ -7198,7 +7208,7 @@ delayed_action_schedule(NMPlatform *platform, DelayedActionType action_type, gpo nm_assert(!user_data); nm_assert(!NM_FLAGS_ANY(action_type, DELAYED_ACTION_TYPE_REFRESH_LINK - | DELAYED_ACTION_TYPE_MASTER_CONNECTED + | DELAYED_ACTION_TYPE_CONTROLLER_CONNECTED | DELAYED_ACTION_TYPE_WAIT_FOR_RESPONSE_RTNL | DELAYED_ACTION_TYPE_WAIT_FOR_RESPONSE_GENL)); break; @@ -7365,30 +7375,30 @@ cache_on_change(NMPlatform *platform, switch (klass->obj_type) { case NMP_OBJECT_TYPE_LINK: { - /* check whether changing a slave link can cause a master link (bridge or bond) to go up/down */ + /* check whether changing a port link can cause a controller link (bridge or bond) to go up/down */ if (obj_old && nmp_cache_link_connected_needs_toggle_by_ifindex(cache, - obj_old->link.master, + obj_old->link.controller, obj_new, obj_old)) delayed_action_schedule(platform, - DELAYED_ACTION_TYPE_MASTER_CONNECTED, - GINT_TO_POINTER(obj_old->link.master)); - if (obj_new && (!obj_old || obj_old->link.master != obj_new->link.master) + DELAYED_ACTION_TYPE_CONTROLLER_CONNECTED, + GINT_TO_POINTER(obj_old->link.controller)); + if (obj_new && (!obj_old || obj_old->link.controller != obj_new->link.controller) && nmp_cache_link_connected_needs_toggle_by_ifindex(cache, - obj_new->link.master, + obj_new->link.controller, obj_new, obj_old)) delayed_action_schedule(platform, - DELAYED_ACTION_TYPE_MASTER_CONNECTED, - GINT_TO_POINTER(obj_new->link.master)); + DELAYED_ACTION_TYPE_CONTROLLER_CONNECTED, + GINT_TO_POINTER(obj_new->link.controller)); } { - /* check whether we are about to change a master link that needs toggling connected state. */ + /* check whether we are about to change a controller link that needs toggling connected state. */ if (obj_new /* <-- nonsensical, make coverity happy */ && nmp_cache_link_connected_needs_toggle(cache, obj_new, obj_new, obj_old)) delayed_action_schedule(platform, - DELAYED_ACTION_TYPE_MASTER_CONNECTED, + DELAYED_ACTION_TYPE_CONTROLLER_CONNECTED, GINT_TO_POINTER(obj_new->link.ifindex)); } { @@ -7527,16 +7537,16 @@ cache_on_change(NMPlatform *platform, } } { - /* on enslave/release, we also refresh the master. */ + /* on attach/release, we also refresh the controller. */ int ifindex1 = 0, ifindex2 = 0; - gboolean changed_master, changed_connected; + gboolean changed_controller, changed_connected; - changed_master = - (obj_new && obj_new->_link.netlink.is_in_netlink && obj_new->link.master > 0 - ? obj_new->link.master + changed_controller = + (obj_new && obj_new->_link.netlink.is_in_netlink && obj_new->link.controller > 0 + ? obj_new->link.controller : 0) - != (obj_old && obj_old->_link.netlink.is_in_netlink && obj_old->link.master > 0 - ? obj_old->link.master + != (obj_old && obj_old->_link.netlink.is_in_netlink && obj_old->link.controller > 0 + ? obj_old->link.controller : 0); changed_connected = (obj_new && obj_new->_link.netlink.is_in_netlink ? NM_FLAGS_HAS(obj_new->link.n_ifi_flags, IFF_LOWER_UP) @@ -7545,15 +7555,15 @@ cache_on_change(NMPlatform *platform, ? NM_FLAGS_HAS(obj_old->link.n_ifi_flags, IFF_LOWER_UP) : 2); - if (changed_master || changed_connected) { - ifindex1 = - (obj_old && obj_old->_link.netlink.is_in_netlink && obj_old->link.master > 0) - ? obj_old->link.master - : 0; - ifindex2 = - (obj_new && obj_new->_link.netlink.is_in_netlink && obj_new->link.master > 0) - ? obj_new->link.master - : 0; + if (changed_controller || changed_connected) { + ifindex1 = (obj_old && obj_old->_link.netlink.is_in_netlink + && obj_old->link.controller > 0) + ? obj_old->link.controller + : 0; + ifindex2 = (obj_new && obj_new->_link.netlink.is_in_netlink + && obj_new->link.controller > 0) + ? obj_new->link.controller + : 0; if (ifindex1 > 0) delayed_action_schedule(platform, @@ -8664,13 +8674,13 @@ link_add(NMPlatform *platform, if (type == NM_LINK_TYPE_BOND) { /* When the kernel loads the bond module, either via explicit modprobe - * or automatically in response to creating a bond master, it will also + * or automatically in response to creating a bond controller, it will also * create a 'bond0' interface. Since the bond we're about to create may * or may not be named 'bond0' prevent potential confusion about a bond * that the user didn't want by telling the bonding module not to create * bond0 automatically. */ - if (!g_file_test("/sys/class/net/bonding_masters", G_FILE_TEST_EXISTS)) + if (!g_file_test("/sys/class/net/bonding_controllers", G_FILE_TEST_EXISTS)) (void) nmp_utils_modprobe(NULL, TRUE, "bonding", "max_bonds=0", NULL); } @@ -8746,15 +8756,15 @@ link_change(NMPlatform *platform, goto nla_put_failure; nm_assert(nm_streq0("bond", nm_link_type_to_rtnl_type_string(NM_LINK_TYPE_BOND))); - NLA_PUT_STRING(nlmsg, IFLA_INFO_SLAVE_KIND, "bond"); + NLA_PUT_STRING(nlmsg, IFLA_INFO_PORT_KIND, "bond"); - if (!(nl_port_data = nla_nest_start(nlmsg, IFLA_INFO_SLAVE_DATA))) + if (!(nl_port_data = nla_nest_start(nlmsg, IFLA_INFO_PORT_DATA))) goto nla_put_failure; NLA_PUT_U16(nlmsg, IFLA_BOND_SLAVE_QUEUE_ID, port_data->bond.queue_id); if (port_data->bond.prio_has) - NLA_PUT_S32(nlmsg, IFLA_BOND_SLAVE_PRIO, port_data->bond.prio); + NLA_PUT_S32(nlmsg, IFLA_BOND_PORT_PRIO, port_data->bond.prio); nla_nest_end(nlmsg, nl_port_data); nla_nest_end(nlmsg, nl_info); @@ -8767,9 +8777,9 @@ link_change(NMPlatform *platform, goto nla_put_failure; nm_assert(nm_streq0("bridge", nm_link_type_to_rtnl_type_string(NM_LINK_TYPE_BRIDGE))); - NLA_PUT_STRING(nlmsg, IFLA_INFO_SLAVE_KIND, "bridge"); + NLA_PUT_STRING(nlmsg, IFLA_INFO_PORT_KIND, "bridge"); - if (!(nl_port_data = nla_nest_start(nlmsg, IFLA_INFO_SLAVE_DATA))) + if (!(nl_port_data = nla_nest_start(nlmsg, IFLA_INFO_PORT_DATA))) goto nla_put_failure; NLA_PUT_U32(nlmsg, IFLA_BRPORT_COST, port_data->bridge.path_cost); @@ -9494,7 +9504,7 @@ nla_put_failure: static gboolean link_set_bridge_vlans(NMPlatform *platform, int ifindex, - gboolean on_master, + gboolean on_controller, const NMPlatformBridgeVlan *const *vlans) { nm_auto_nlmsg struct nl_msg *nlmsg = NULL; @@ -9516,7 +9526,9 @@ link_set_bridge_vlans(NMPlatform *platform, if (!(list = nla_nest_start(nlmsg, IFLA_AF_SPEC))) goto nla_put_failure; - NLA_PUT_U16(nlmsg, IFLA_BRIDGE_FLAGS, on_master ? BRIDGE_FLAGS_MASTER : BRIDGE_FLAGS_SELF); + NLA_PUT_U16(nlmsg, + IFLA_BRIDGE_FLAGS, + on_controller ? BRIDGE_FLAGS_CONTROLLER : BRIDGE_FLAGS_SELF); if (vlans) { /* Add VLANs */ @@ -9821,16 +9833,16 @@ link_vlan_change(NMPlatform *platform, } static gboolean -link_enslave(NMPlatform *platform, int master, int slave) +link_attach_port(NMPlatform *platform, int controller, int port) { nm_auto_nlmsg struct nl_msg *nlmsg = NULL; - int ifindex = slave; + int ifindex = port; nlmsg = _nl_msg_new_link(RTM_NEWLINK, 0, ifindex, NULL); if (!nlmsg) return FALSE; - NLA_PUT_U32(nlmsg, IFLA_MASTER, master); + NLA_PUT_U32(nlmsg, IFLA_CONTROLLER, controller); return (do_change_link(platform, CHANGE_LINK_TYPE_UNSPEC, ifindex, nlmsg, NULL) >= 0); nla_put_failure: @@ -9838,9 +9850,9 @@ nla_put_failure: } static gboolean -link_release(NMPlatform *platform, int master, int slave) +link_release_port(NMPlatform *platform, int controller, int port) { - return link_enslave(platform, 0, slave); + return link_attach_port(platform, 0, port); } /*****************************************************************************/ @@ -10070,7 +10082,7 @@ link_can_assume(NMPlatform *platform, int ifindex) if (!NM_FLAGS_HAS(link->link.n_ifi_flags, IFF_UP)) return FALSE; - if (link->link.master > 0) + if (link->link.controller > 0) return TRUE; nmp_lookup_init_object_by_ifindex(&lookup, NMP_OBJECT_TYPE_IP4_ADDRESS, ifindex); @@ -11605,8 +11617,8 @@ nm_linux_platform_init(NMLinuxPlatform *self) c_list_init(&priv->sysctl_clear_cache_lst); c_list_init(&priv->sysctl_list); - priv->delayed_action.list_master_connected = g_ptr_array_new(); - priv->delayed_action.list_refresh_link = g_ptr_array_new(); + priv->delayed_action.list_controller_connected = g_ptr_array_new(); + priv->delayed_action.list_refresh_link = g_ptr_array_new(); priv->delayed_action.list_wait_for_response_rtnl = g_array_new(FALSE, TRUE, sizeof(DelayedActionWaitForNlResponseData)); priv->delayed_action.list_wait_for_response_genl = @@ -11819,7 +11831,7 @@ dispose(GObject *object) WAIT_FOR_NL_RESPONSE_RESULT_FAILED_DISPOSING); priv->delayed_action.flags = DELAYED_ACTION_TYPE_NONE; - g_ptr_array_set_size(priv->delayed_action.list_master_connected, 0); + g_ptr_array_set_size(priv->delayed_action.list_controller_connected, 0); g_ptr_array_set_size(priv->delayed_action.list_refresh_link, 0); G_OBJECT_CLASS(nm_linux_platform_parent_class)->dispose(object); @@ -11830,7 +11842,7 @@ finalize(GObject *object) { NMLinuxPlatformPrivate *priv = NM_LINUX_PLATFORM_GET_PRIVATE(object); - g_ptr_array_unref(priv->delayed_action.list_master_connected); + g_ptr_array_unref(priv->delayed_action.list_controller_connected); g_ptr_array_unref(priv->delayed_action.list_refresh_link); g_array_unref(priv->delayed_action.list_wait_for_response_rtnl); g_array_unref(priv->delayed_action.list_wait_for_response_genl); @@ -11908,8 +11920,8 @@ nm_linux_platform_class_init(NMLinuxPlatformClass *klass) platform_class->link_supports_vlans = link_supports_vlans; platform_class->link_supports_sriov = link_supports_sriov; - platform_class->link_enslave = link_enslave; - platform_class->link_release = link_release; + platform_class->link_attach_port = link_attach_port; + platform_class->link_release_port = link_release_port; platform_class->link_can_assume = link_can_assume; diff --git a/src/libnm-platform/nm-platform.c b/src/libnm-platform/nm-platform.c index cd5a54bb87..f82de7f9d7 100644 --- a/src/libnm-platform/nm-platform.c +++ b/src/libnm-platform/nm-platform.c @@ -1056,7 +1056,7 @@ nm_platform_link_get_all(NMPlatform *self) return NULL; /* first sort the links by their name. Below we will sort - * further by moving children/slaves to the end. */ + * further by moving children/ports to the end. */ g_ptr_array_sort(links, _link_get_all_presort); unseen = g_hash_table_new(nm_direct_hash, NULL); @@ -1074,10 +1074,10 @@ nm_platform_link_get_all(NMPlatform *self) if (!item->ifindex) continue; - if (item->master != 0) { - g_warn_if_fail(item->master > 0); - g_warn_if_fail(item->master != item->ifindex); - g_warn_if_fail(g_hash_table_contains(unseen, GINT_TO_POINTER(item->master))); + if (item->controller != 0) { + g_warn_if_fail(item->controller > 0); + g_warn_if_fail(item->controller != item->ifindex); + g_warn_if_fail(g_hash_table_contains(unseen, GINT_TO_POINTER(item->controller))); } if (item->parent != 0) { if (item->parent != NM_PLATFORM_LINK_OTHER_NETNS) { @@ -1089,7 +1089,7 @@ nm_platform_link_get_all(NMPlatform *self) } #endif - /* Re-order the links list such that children/slaves come after all ancestors */ + /* Re-order the links list such that children/ports come after all ancestors */ nm_assert(g_hash_table_size(unseen) == links->len); nresult = links->len; result = g_ptr_array_new_full(nresult, (GDestroyNotify) nmp_object_unref); @@ -1106,7 +1106,8 @@ nm_platform_link_get_all(NMPlatform *self) g_assert(g_hash_table_contains(unseen, GINT_TO_POINTER(item->ifindex))); - if (item->master > 0 && g_hash_table_contains(unseen, GINT_TO_POINTER(item->master))) + if (item->controller > 0 + && g_hash_table_contains(unseen, GINT_TO_POINTER(item->controller))) goto skip; if (item->parent > 0 && g_hash_table_contains(unseen, GINT_TO_POINTER(item->parent))) goto skip; @@ -1712,7 +1713,7 @@ nm_platform_link_is_software(NMPlatform *self, int ifindex) } /** - * nm_platform_link_supports_slaves: + * nm_platform_link_supports_ports: * @self: platform instance * @ifindex: Interface index. * @@ -1720,9 +1721,9 @@ nm_platform_link_is_software(NMPlatform *self, int ifindex) * other interfaces. */ gboolean -nm_platform_link_supports_slaves(NMPlatform *self, int ifindex) +nm_platform_link_supports_ports(NMPlatform *self, int ifindex) { - return nm_link_type_supports_slaves(nm_platform_link_get_type(self, ifindex)); + return nm_link_type_supports_ports(nm_platform_link_get_type(self, ifindex)); } /** @@ -2071,7 +2072,7 @@ nm_platform_link_set_sriov_vfs(NMPlatform *self, int ifindex, const NMPlatformVF gboolean nm_platform_link_set_bridge_vlans(NMPlatform *self, int ifindex, - gboolean on_master, + gboolean on_controller, const NMPlatformBridgeVlan *const *vlans) { guint i; @@ -2082,7 +2083,7 @@ nm_platform_link_set_bridge_vlans(NMPlatform *self, if (_LOGD_ENABLED()) { _LOG3D("link: %s bridge VLANs on %s", vlans ? "setting" : "clearing", - on_master ? "master" : "self"); + on_controller ? "controller" : "self"); if (vlans) { for (i = 0; vlans[i]; i++) { char sbuf[NM_UTILS_TO_STRING_BUFFER_SIZE]; @@ -2094,7 +2095,7 @@ nm_platform_link_set_bridge_vlans(NMPlatform *self, } } - return klass->link_set_bridge_vlans(self, ifindex, on_master, vlans); + return klass->link_set_bridge_vlans(self, ifindex, on_controller, vlans); } gboolean @@ -2376,65 +2377,65 @@ nm_platform_link_get_driver_info(NMPlatform *self, } /** - * nm_platform_link_enslave: + * nm_platform_link_attach_port: * @self: platform instance - * @master: Interface index of the master - * @ifindex: Interface index of the slave + * @controller: Interface index of the controller + * @ifindex: Interface index of the port * - * Enslave @ifindex to @master. + * Enport @ifindex to @controller. */ gboolean -nm_platform_link_enslave(NMPlatform *self, int master, int ifindex) +nm_platform_link_attach_port(NMPlatform *self, int controller, int ifindex) { _CHECK_SELF(self, klass, FALSE); - g_return_val_if_fail(master > 0, FALSE); + g_return_val_if_fail(controller > 0, FALSE); g_return_val_if_fail(ifindex > 0, FALSE); - _LOG3D("link: enslaving to master '%s'", nm_platform_link_get_name(self, master)); - return klass->link_enslave(self, master, ifindex); + _LOG3D("link: enslaving to controller '%s'", nm_platform_link_get_name(self, controller)); + return klass->link_attach_port(self, controller, ifindex); } /** - * nm_platform_link_release: + * nm_platform_link_release_port: * @self: platform instance - * @master: Interface index of the master - * @ifindex: Interface index of the slave + * @controller: Interface index of the controller + * @ifindex: Interface index of the port * - * Release @slave from @master. + * Release @port from @controller. */ gboolean -nm_platform_link_release(NMPlatform *self, int master, int ifindex) +nm_platform_link_release_port(NMPlatform *self, int controller, int ifindex) { _CHECK_SELF(self, klass, FALSE); - g_return_val_if_fail(master > 0, FALSE); + g_return_val_if_fail(controller > 0, FALSE); g_return_val_if_fail(ifindex > 0, FALSE); - if (nm_platform_link_get_master(self, ifindex) != master) + if (nm_platform_link_get_controller(self, ifindex) != controller) return FALSE; - _LOG3D("link: releasing %d from master '%s' (%d)", + _LOG3D("link: releasing %d from controller '%s' (%d)", ifindex, - nm_platform_link_get_name(self, master), - master); - return klass->link_release(self, master, ifindex); + nm_platform_link_get_name(self, controller), + controller); + return klass->link_release_port(self, controller, ifindex); } /** - * nm_platform_link_get_master: + * nm_platform_link_get_controller: * @self: platform instance - * @slave: Interface index of the slave. + * @port: Interface index of the port. * - * Returns: Interface index of the slave's master. + * Returns: Interface index of the port's controller. */ int -nm_platform_link_get_master(NMPlatform *self, int slave) +nm_platform_link_get_controller(NMPlatform *self, int port) { const NMPlatformLink *pllink; - pllink = nm_platform_link_get(self, slave); - return pllink ? pllink->master : 0; + pllink = nm_platform_link_get(self, port); + return pllink ? pllink->controller : 0; } /*****************************************************************************/ @@ -2852,9 +2853,9 @@ link_get_option(NMPlatform *self, int ifindex, const char *category, const char } static const char * -master_category(NMPlatform *self, int master) +controller_category(NMPlatform *self, int controller) { - switch (nm_platform_link_get_type(self, master)) { + switch (nm_platform_link_get_type(self, controller)) { case NM_LINK_TYPE_BRIDGE: return "bridge"; case NM_LINK_TYPE_BOND: @@ -2865,28 +2866,28 @@ master_category(NMPlatform *self, int master) } static const char * -slave_category(NMPlatform *self, int slave) +port_category(NMPlatform *self, int port) { - int master = nm_platform_link_get_master(self, slave); + int controller = nm_platform_link_get_controller(self, port); - if (master <= 0) + if (controller <= 0) return NULL; - switch (nm_platform_link_get_type(self, master)) { + switch (nm_platform_link_get_type(self, controller)) { case NM_LINK_TYPE_BRIDGE: return "brport"; case NM_LINK_TYPE_BOND: - return "bonding_slave"; + return "bonding_port"; default: return NULL; } } gboolean -nm_platform_sysctl_master_set_option(NMPlatform *self, - int ifindex, - const char *option, - const char *value) +nm_platform_sysctl_controller_set_option(NMPlatform *self, + int ifindex, + const char *option, + const char *value) { _CHECK_SELF(self, klass, FALSE); @@ -2894,25 +2895,25 @@ nm_platform_sysctl_master_set_option(NMPlatform *self, g_return_val_if_fail(option, FALSE); g_return_val_if_fail(value, FALSE); - return link_set_option(self, ifindex, master_category(self, ifindex), option, value); + return link_set_option(self, ifindex, controller_category(self, ifindex), option, value); } char * -nm_platform_sysctl_master_get_option(NMPlatform *self, int ifindex, const char *option) +nm_platform_sysctl_controller_get_option(NMPlatform *self, int ifindex, const char *option) { _CHECK_SELF(self, klass, NULL); g_return_val_if_fail(ifindex > 0, FALSE); g_return_val_if_fail(option, FALSE); - return link_get_option(self, ifindex, master_category(self, ifindex), option); + return link_get_option(self, ifindex, controller_category(self, ifindex), option); } gboolean -nm_platform_sysctl_slave_set_option(NMPlatform *self, - int ifindex, - const char *option, - const char *value) +nm_platform_sysctl_port_set_option(NMPlatform *self, + int ifindex, + const char *option, + const char *value) { _CHECK_SELF(self, klass, FALSE); @@ -2920,18 +2921,18 @@ nm_platform_sysctl_slave_set_option(NMPlatform *self, g_return_val_if_fail(option, FALSE); g_return_val_if_fail(value, FALSE); - return link_set_option(self, ifindex, slave_category(self, ifindex), option, value); + return link_set_option(self, ifindex, port_category(self, ifindex), option, value); } char * -nm_platform_sysctl_slave_get_option(NMPlatform *self, int ifindex, const char *option) +nm_platform_sysctl_port_get_option(NMPlatform *self, int ifindex, const char *option) { _CHECK_SELF(self, klass, NULL); g_return_val_if_fail(ifindex > 0, FALSE); g_return_val_if_fail(option, FALSE); - return link_get_option(self, ifindex, slave_category(self, ifindex), option); + return link_get_option(self, ifindex, port_category(self, ifindex), option); } /*****************************************************************************/ @@ -4866,8 +4867,8 @@ nm_platform_ip_route_get_prune_list(NMPlatform *self, return NULL; lnk_vrf = nm_platform_link_get_lnk_vrf(self, ifindex, &pllink); - if (!lnk_vrf && pllink && pllink->master > 0) - lnk_vrf = nm_platform_link_get_lnk_vrf(self, pllink->master, NULL); + if (!lnk_vrf && pllink && pllink->controller > 0) + lnk_vrf = nm_platform_link_get_lnk_vrf(self, pllink->controller, NULL); local_table = lnk_vrf ? lnk_vrf->table : RT_TABLE_LOCAL; c_list_for_each (iter, &head_entry->lst_entries_head) { @@ -6049,7 +6050,7 @@ nm_platform_vlan_qos_mapping_to_string(const char *name, const char * nm_platform_link_to_string(const NMPlatformLink *link, char *buf, gsize len) { - char master[20]; + char controller[20]; char parent[20]; char str_flags[1 + NM_PLATFORM_LINK_FLAGS2STR_MAX_LEN + 1]; char str_highlighted_flags[50]; @@ -6084,10 +6085,10 @@ nm_platform_link_to_string(const NMPlatformLink *link, char *buf, gsize len) } else str_flags[0] = '\0'; - if (link->master) - g_snprintf(master, sizeof(master), " master %d", link->master); + if (link->controller) + g_snprintf(controller, sizeof(controller), " controller %d", link->controller); else - master[0] = 0; + controller[0] = 0; if (link->parent > 0) g_snprintf(parent, sizeof(parent), "@%d", link->parent); @@ -6115,7 +6116,7 @@ nm_platform_link_to_string(const NMPlatformLink *link, char *buf, gsize len) "%s" /* parent */ " <%s%s>" /* flags */ " mtu %d" - "%s" /* master */ + "%s" /* controller */ " arp %u" /* arptype */ " %s" /* link->type */ "%s%s" /* kind */ @@ -6139,7 +6140,7 @@ nm_platform_link_to_string(const NMPlatformLink *link, char *buf, gsize len) str_highlighted_flags, str_flags, link->mtu, - master, + controller, link->arptype, str_link_type ?: "???", link->kind ? (g_strcmp0(str_link_type, link->kind) ? "/" : "*") : "?", @@ -8032,7 +8033,7 @@ nm_platform_link_hash_update(const NMPlatformLink *obj, NMHashState *h) { nm_hash_update_vals(h, obj->ifindex, - obj->master, + obj->controller, obj->parent, obj->n_ifi_flags, obj->mtu, @@ -8095,7 +8096,7 @@ nm_platform_link_cmp(const NMPlatformLink *a, const NMPlatformLink *b) NM_CMP_FIELD(a, b, ifindex); NM_CMP_FIELD(a, b, type); NM_CMP_FIELD_STR(a, b, name); - NM_CMP_FIELD(a, b, master); + NM_CMP_FIELD(a, b, controller); NM_CMP_FIELD(a, b, parent); NM_CMP_FIELD(a, b, n_ifi_flags); NM_CMP_FIELD_UNSAFE(a, b, connected); diff --git a/src/libnm-platform/nm-platform.h b/src/libnm-platform/nm-platform.h index f6a6ba082b..b05b1297a5 100644 --- a/src/libnm-platform/nm-platform.h +++ b/src/libnm-platform/nm-platform.h @@ -198,7 +198,7 @@ struct _NMPlatformLink { /* NMPlatform initializes this field with a static string. */ const char *driver; - int master; + int controller; /* rtnl_link_get_link(), IFLA_LINK. * If IFLA_LINK_NETNSID indicates that the parent is in another namespace, @@ -241,11 +241,11 @@ struct _NMPlatformLink { /* an interface can only hold IFLA_INFO_SLAVE_DATA for one link type */ NMPlatformLinkPortData port_data; - /* IFLA_INFO_SLAVE_KIND */ + /* IFLA_INFO_PORT_KIND */ NMPortKind port_kind; - /* @connected is mostly identical to (@n_ifi_flags & IFF_UP). Except for bridge/bond masters, - * where we coerce the link as disconnect if it has no slaves. */ + /* @connected is mostly identical to (@n_ifi_flags & IFF_UP). Except for bridge/bond controllers, + * where we coerce the link as disconnect if it has no ports. */ bool connected : 1; bool initialized : 1; @@ -1052,7 +1052,7 @@ typedef enum { * were added at the same time. */ NM_PLATFORM_KERNEL_SUPPORT_TYPE_FRA_IP_PROTO, - NM_PLATFORM_KERNEL_SUPPORT_TYPE_IFLA_BOND_SLAVE_PRIO, + NM_PLATFORM_KERNEL_SUPPORT_TYPE_IFLA_BOND_PORT_PRIO, _NM_PLATFORM_KERNEL_SUPPORT_NUM, } NMPlatformKernelSupportType; @@ -1187,7 +1187,7 @@ typedef struct { gboolean (*link_set_sriov_vfs)(NMPlatform *self, int ifindex, const NMPlatformVF *const *vfs); gboolean (*link_set_bridge_vlans)(NMPlatform *self, int ifindex, - gboolean on_master, + gboolean on_controller, const NMPlatformBridgeVlan *const *vlans); gboolean (*link_set_bridge_info)(NMPlatform *self, int ifindex, @@ -1206,8 +1206,8 @@ typedef struct { gboolean (*link_supports_vlans)(NMPlatform *self, int ifindex); gboolean (*link_supports_sriov)(NMPlatform *self, int ifindex); - gboolean (*link_enslave)(NMPlatform *self, int master, int slave); - gboolean (*link_release)(NMPlatform *self, int master, int slave); + gboolean (*link_attach_port)(NMPlatform *self, int controller, int port); + gboolean (*link_release_port)(NMPlatform *self, int controller, int port); gboolean (*link_can_assume)(NMPlatform *self, int ifindex); @@ -1973,12 +1973,12 @@ int nm_platform_link_get_inet6_addr_gen_mode(NMPlatform *self, int ifind gconstpointer nm_platform_link_get_address(NMPlatform *self, int ifindex, size_t *length); -int nm_platform_link_get_master(NMPlatform *self, int slave); +int nm_platform_link_get_controller(NMPlatform *self, int port); gboolean nm_platform_link_can_assume(NMPlatform *self, int ifindex); NMOptionBool nm_platform_link_get_unmanaged(NMPlatform *self, int ifindex); -gboolean nm_platform_link_supports_slaves(NMPlatform *self, int ifindex); +gboolean nm_platform_link_supports_ports(NMPlatform *self, int ifindex); const char *nm_platform_link_get_type_name(NMPlatform *self, int ifindex); gboolean nm_platform_link_refresh(NMPlatform *self, int ifindex); @@ -2051,7 +2051,7 @@ gboolean nm_platform_link_set_sriov_vfs(NMPlatform *self, int ifindex, const NMPlatformVF *const *vfs); gboolean nm_platform_link_set_bridge_vlans(NMPlatform *self, int ifindex, - gboolean on_master, + gboolean on_controller, const NMPlatformBridgeVlan *const *vlans); gboolean nm_platform_link_set_bridge_info(NMPlatform *self, int ifindex, @@ -2070,19 +2070,19 @@ gboolean nm_platform_link_supports_carrier_detect(NMPlatform *self, int ifindex) gboolean nm_platform_link_supports_vlans(NMPlatform *self, int ifindex); gboolean nm_platform_link_supports_sriov(NMPlatform *self, int ifindex); -gboolean nm_platform_link_enslave(NMPlatform *self, int master, int slave); -gboolean nm_platform_link_release(NMPlatform *self, int master, int slave); +gboolean nm_platform_link_attach_port(NMPlatform *self, int controller, int port); +gboolean nm_platform_link_release_port(NMPlatform *self, int controller, int port); -gboolean nm_platform_sysctl_master_set_option(NMPlatform *self, - int ifindex, - const char *option, - const char *value); -char *nm_platform_sysctl_master_get_option(NMPlatform *self, int ifindex, const char *option); -gboolean nm_platform_sysctl_slave_set_option(NMPlatform *self, - int ifindex, - const char *option, - const char *value); -char *nm_platform_sysctl_slave_get_option(NMPlatform *self, int ifindex, const char *option); +gboolean nm_platform_sysctl_controller_set_option(NMPlatform *self, + int ifindex, + const char *option, + const char *value); +char *nm_platform_sysctl_controller_get_option(NMPlatform *self, int ifindex, const char *option); +gboolean nm_platform_sysctl_port_set_option(NMPlatform *self, + int ifindex, + const char *option, + const char *value); +char *nm_platform_sysctl_port_get_option(NMPlatform *self, int ifindex, const char *option); const NMPObject *nm_platform_link_get_lnk(NMPlatform *self, int ifindex, @@ -2569,7 +2569,7 @@ void nm_platform_mptcp_addr_hash_update(const NMPlatformMptcpAddr *obj, NMHashSt guint nm_platform_mptcp_addr_index_addr_cmp(gconstpointer data); gboolean nm_platform_mptcp_addr_index_addr_equal(gconstpointer data_a, gconstpointer data_b); -#define NM_PLATFORM_LINK_FLAGS2STR_MAX_LEN ((gsize) 162) +#define NM_PLATFORM_LINK_FLAGS2STR_MAX_LEN ((gsize) 165) gboolean nm_platform_ethtool_set_wake_on_lan(NMPlatform *self, int ifindex, diff --git a/src/libnm-platform/nmp-base.c b/src/libnm-platform/nmp-base.c index c23190b307..9d13b78a7a 100644 --- a/src/libnm-platform/nmp-base.c +++ b/src/libnm-platform/nmp-base.c @@ -22,8 +22,8 @@ NM_UTILS_FLAGS2STR_DEFINE(nm_platform_link_flags2str, NM_UTILS_FLAGS2STR(IFF_NOARP, "noarp"), NM_UTILS_FLAGS2STR(IFF_ALLMULTI, "allmulti"), NM_UTILS_FLAGS2STR(IFF_PROMISC, "promisc"), - NM_UTILS_FLAGS2STR(IFF_MASTER, "master"), - NM_UTILS_FLAGS2STR(IFF_SLAVE, "slave"), + NM_UTILS_FLAGS2STR(IFF_MASTER, "controller"), + NM_UTILS_FLAGS2STR(IFF_SLAVE, "port"), NM_UTILS_FLAGS2STR(IFF_DEBUG, "debug"), NM_UTILS_FLAGS2STR(IFF_DYNAMIC, "dynamic"), NM_UTILS_FLAGS2STR(IFF_AUTOMEDIA, "automedia"), diff --git a/src/libnm-platform/nmp-object.c b/src/libnm-platform/nmp-object.c index 4ba9773c2c..1fdaa27555 100644 --- a/src/libnm-platform/nmp-object.c +++ b/src/libnm-platform/nmp-object.c @@ -701,9 +701,9 @@ _nmp_object_fixup_link_udev_fields(NMPObject **obj_new, NMPObject *obj_orig, gbo } static void -_nmp_object_fixup_link_master_connected(NMPObject **obj_new, - NMPObject *obj_orig, - const NMPCache *cache) +_nmp_object_fixup_link_controller_connected(NMPObject **obj_new, + NMPObject *obj_orig, + const NMPCache *cache) { NMPObject *obj; @@ -2035,58 +2035,58 @@ nmp_cache_use_udev_get(const NMPCache *cache) /*****************************************************************************/ gboolean -nmp_cache_link_connected_for_slave(int ifindex_master, const NMPObject *slave) +nmp_cache_link_connected_for_port(int ifindex_controller, const NMPObject *port) { - nm_assert(NMP_OBJECT_GET_TYPE(slave) == NMP_OBJECT_TYPE_LINK); + nm_assert(NMP_OBJECT_GET_TYPE(port) == NMP_OBJECT_TYPE_LINK); - return ifindex_master > 0 && slave->link.master == ifindex_master && slave->link.connected - && nmp_object_is_visible(slave); + return ifindex_controller > 0 && port->link.controller == ifindex_controller + && port->link.connected && nmp_object_is_visible(port); } /** * nmp_cache_link_connected_needs_toggle: * @cache: the platform cache - * @master: the link object, that is checked whether its connected property + * @controller: the link object, that is checked whether its connected property * needs to be toggled. - * @potential_slave: (nullable): an additional link object that is treated + * @potential_port: (nullable): an additional link object that is treated * as if it was inside @cache. If given, it shaddows a link in the cache * with the same ifindex. - * @ignore_slave: (nullable): if set, the check will pretend that @ignore_slave + * @ignore_port: (nullable): if set, the check will pretend that @ignore_port * is not in the cache. * - * NMPlatformLink has two connected flags: (master->link.flags&IFF_LOWER_UP) (as reported - * from netlink) and master->link.connected. For bond and bridge master, kernel reports - * those links as IFF_LOWER_UP if they have no slaves attached. We want to present instead - * a combined @connected flag that shows masters without slaves as down. + * NMPlatformLink has two connected flags: (controller->link.flags&IFF_LOWER_UP) (as reported + * from netlink) and controller->link.connected. For bond and bridge controller, kernel reports + * those links as IFF_LOWER_UP if they have no ports attached. We want to present instead + * a combined @connected flag that shows controllers without ports as down. * - * Check if the connected flag of @master should be toggled according to the content - * of @cache (including @potential_slave). + * Check if the connected flag of @controller should be toggled according to the content + * of @cache (including @potential_port). * - * Returns: %TRUE, if @master->link.connected should be flipped/toggled. + * Returns: %TRUE, if @controller->link.connected should be flipped/toggled. **/ gboolean nmp_cache_link_connected_needs_toggle(const NMPCache *cache, - const NMPObject *master, - const NMPObject *potential_slave, - const NMPObject *ignore_slave) + const NMPObject *controller, + const NMPObject *potential_port, + const NMPObject *ignore_port) { gboolean is_lower_up = FALSE; - if (!master || NMP_OBJECT_GET_TYPE(master) != NMP_OBJECT_TYPE_LINK || master->link.ifindex <= 0 - || !nmp_object_is_visible(master) - || !NM_IN_SET(master->link.type, NM_LINK_TYPE_BRIDGE, NM_LINK_TYPE_BOND)) + if (!controller || NMP_OBJECT_GET_TYPE(controller) != NMP_OBJECT_TYPE_LINK + || controller->link.ifindex <= 0 || !nmp_object_is_visible(controller) + || !NM_IN_SET(controller->link.type, NM_LINK_TYPE_BRIDGE, NM_LINK_TYPE_BOND)) return FALSE; /* if native IFF_LOWER_UP is down, link.connected must also be down - * regardless of the slaves. */ - if (!NM_FLAGS_HAS(master->link.n_ifi_flags, IFF_LOWER_UP)) - return !!master->link.connected; + * regardless of the ports. */ + if (!NM_FLAGS_HAS(controller->link.n_ifi_flags, IFF_LOWER_UP)) + return !!controller->link.connected; - if (potential_slave && NMP_OBJECT_GET_TYPE(potential_slave) != NMP_OBJECT_TYPE_LINK) - potential_slave = NULL; + if (potential_port && NMP_OBJECT_GET_TYPE(potential_port) != NMP_OBJECT_TYPE_LINK) + potential_port = NULL; - if (potential_slave - && nmp_cache_link_connected_for_slave(master->link.ifindex, potential_slave)) + if (potential_port + && nmp_cache_link_connected_for_port(controller->link.ifindex, potential_port)) is_lower_up = TRUE; else { NMPLookup lookup; @@ -2099,48 +2099,48 @@ nmp_cache_link_connected_needs_toggle(const NMPCache *cache, &link) { const NMPObject *obj = NMP_OBJECT_UP_CAST((NMPlatformObject *) link); - if ((!potential_slave || potential_slave->link.ifindex != link->ifindex) - && ignore_slave != obj - && nmp_cache_link_connected_for_slave(master->link.ifindex, obj)) { + if ((!potential_port || potential_port->link.ifindex != link->ifindex) + && ignore_port != obj + && nmp_cache_link_connected_for_port(controller->link.ifindex, obj)) { is_lower_up = TRUE; break; } } } - return !!master->link.connected != is_lower_up; + return !!controller->link.connected != is_lower_up; } /** * nmp_cache_link_connected_needs_toggle_by_ifindex: * @cache: - * @master_ifindex: the ifindex of a potential master that should be checked + * @controller_ifindex: the ifindex of a potential controller that should be checked * whether it needs toggling. - * @potential_slave: (nullable): passed to nmp_cache_link_connected_needs_toggle(). - * It considers @potential_slave as being inside the cache, replacing an existing + * @potential_port: (nullable): passed to nmp_cache_link_connected_needs_toggle(). + * It considers @potential_port as being inside the cache, replacing an existing * link with the same ifindex. - * @ignore_slave: (nullable): passed to nmp_cache_link_connected_needs_toggle(). + * @ignore_port: (nullable): passed to nmp_cache_link_connected_needs_toggle(). * * The flag obj->link.connected depends on the state of other links in the * @cache. See also nmp_cache_link_connected_needs_toggle(). Given an ifindex - * of a master, check if the cache contains such a master link that needs + * of a controller, check if the cache contains such a controller link that needs * toggling of the connected flag. * - * Returns: NULL if there is no master link with ifindex @master_ifindex that should be toggled. + * Returns: NULL if there is no controller link with ifindex @controller_ifindex that should be toggled. * Otherwise, return the link object from inside the cache with the given ifindex. - * The connected flag of that master should be toggled. + * The connected flag of that controller should be toggled. */ const NMPObject * nmp_cache_link_connected_needs_toggle_by_ifindex(const NMPCache *cache, - int master_ifindex, - const NMPObject *potential_slave, - const NMPObject *ignore_slave) + int controller_ifindex, + const NMPObject *potential_port, + const NMPObject *ignore_port) { - const NMPObject *master; + const NMPObject *controller; - if (master_ifindex > 0) { - master = nmp_cache_lookup_link(cache, master_ifindex); - if (nmp_cache_link_connected_needs_toggle(cache, master, potential_slave, ignore_slave)) - return master; + if (controller_ifindex > 0) { + controller = nmp_cache_lookup_link(cache, controller_ifindex); + if (nmp_cache_link_connected_needs_toggle(cache, controller, potential_port, ignore_port)) + return controller; } return NULL; } @@ -2804,7 +2804,7 @@ nmp_cache_remove_netlink(NMPCache *cache, obj_new = nmp_object_clone(obj_old, FALSE); obj_new->_link.netlink.is_in_netlink = FALSE; - _nmp_object_fixup_link_master_connected(&obj_new, NULL, cache); + _nmp_object_fixup_link_controller_connected(&obj_new, NULL, cache); _nmp_object_fixup_link_udev_fields(&obj_new, NULL, cache->use_udev); _idxcache_update(cache, entry_old, obj_new, FALSE, &entry_new); @@ -2878,7 +2878,7 @@ nmp_cache_update_netlink(NMPCache *cache, } if (NMP_OBJECT_GET_TYPE(obj_hand_over) == NMP_OBJECT_TYPE_LINK) { - _nmp_object_fixup_link_master_connected(&obj_hand_over, NULL, cache); + _nmp_object_fixup_link_controller_connected(&obj_hand_over, NULL, cache); _nmp_object_fixup_link_udev_fields(&obj_hand_over, NULL, cache->use_udev); } @@ -2914,7 +2914,7 @@ nmp_cache_update_netlink(NMPCache *cache, is_alive = TRUE; if (is_alive) { - _nmp_object_fixup_link_master_connected(&obj_hand_over, NULL, cache); + _nmp_object_fixup_link_controller_connected(&obj_hand_over, NULL, cache); /* Merge the netlink parts with what we have from udev. */ udev_device_unref(obj_hand_over->_link.udev.device); @@ -3193,10 +3193,10 @@ nmp_cache_update_link_udev(NMPCache *cache, } NMPCacheOpsType -nmp_cache_update_link_master_connected(NMPCache *cache, - int ifindex, - const NMPObject **out_obj_old, - const NMPObject **out_obj_new) +nmp_cache_update_link_controller_connected(NMPCache *cache, + int ifindex, + const NMPObject **out_obj_old, + const NMPObject **out_obj_new) { const NMDedupMultiEntry *entry_old; const NMDedupMultiEntry *entry_new = NULL; diff --git a/src/libnm-platform/nmp-object.h b/src/libnm-platform/nmp-object.h index 9406f65161..cd1793d454 100644 --- a/src/libnm-platform/nmp-object.h +++ b/src/libnm-platform/nmp-object.h @@ -952,15 +952,15 @@ const NMPObject *nmp_cache_lookup_link_full(const NMPCache *cache, NMPObjectMatchFn match_fn, gpointer user_data); -gboolean nmp_cache_link_connected_for_slave(int ifindex_master, const NMPObject *slave); +gboolean nmp_cache_link_connected_for_port(int ifindex_controller, const NMPObject *port); gboolean nmp_cache_link_connected_needs_toggle(const NMPCache *cache, - const NMPObject *master, - const NMPObject *potential_slave, - const NMPObject *ignore_slave); -const NMPObject *nmp_cache_link_connected_needs_toggle_by_ifindex(const NMPCache *cache, - int master_ifindex, - const NMPObject *potential_slave, - const NMPObject *ignore_slave); + const NMPObject *controller, + const NMPObject *potential_port, + const NMPObject *ignore_port); +const NMPObject *nmp_cache_link_connected_needs_toggle_by_ifindex(const NMPCache *cache, + int controller_ifindex, + const NMPObject *potential_port, + const NMPObject *ignore_port); gboolean nmp_cache_use_udev_get(const NMPCache *cache); @@ -994,10 +994,10 @@ NMPCacheOpsType nmp_cache_update_link_udev(NMPCache *cache, struct udev_device *udevice, const NMPObject **out_obj_old, const NMPObject **out_obj_new); -NMPCacheOpsType nmp_cache_update_link_master_connected(NMPCache *cache, - int ifindex, - const NMPObject **out_obj_old, - const NMPObject **out_obj_new); +NMPCacheOpsType nmp_cache_update_link_controller_connected(NMPCache *cache, + int ifindex, + const NMPObject **out_obj_old, + const NMPObject **out_obj_new); static inline const NMDedupMultiEntry * nmp_cache_reresolve_main_entry(NMPCache *cache, diff --git a/src/libnmc-base/nm-client-utils.c b/src/libnmc-base/nm-client-utils.c index 4c180e099b..4516bc3bd1 100644 --- a/src/libnmc-base/nm-client-utils.c +++ b/src/libnmc-base/nm-client-utils.c @@ -575,14 +575,14 @@ nmc_activation_get_effective_state(NMActiveConnection *active, } break; case NM_ACTIVE_CONNECTION_STATE_ACTIVATING: - /* activating master connection does not automatically activate any slaves, so their + /* activating controller connection does not automatically activate any ports, so their * active connection state will not progress beyond ACTIVATING state. * Monitor the device instead. */ if (device && (NM_IS_DEVICE_BOND(device) || NM_IS_DEVICE_TEAM(device) || NM_IS_DEVICE_BRIDGE(device)) && dev_state >= NM_DEVICE_STATE_IP_CONFIG && dev_state <= NM_DEVICE_STATE_ACTIVATED) { - *reason = "master waiting for slaves"; + *reason = "controller waiting for ports"; return NM_ACTIVE_CONNECTION_STATE_ACTIVATED; } break; diff --git a/src/libnmc-setting/nm-meta-setting-desc.c b/src/libnmc-setting/nm-meta-setting-desc.c index 50425df35a..b3a51ba00e 100644 --- a/src/libnmc-setting/nm-meta-setting-desc.c +++ b/src/libnmc-setting/nm-meta-setting-desc.c @@ -2667,9 +2667,9 @@ _complete_fcn_connection_type(ARGS_COMPLETE_FCN) guint i, j; char **result; gsize text_len; - const char *slave_types[] = {"bond-slave", "bridge-slave", "team-slave"}; + const char *port_types[] = {"bond-slave", "bridge-slave", "team-slave"}; - result = g_new(char *, _NM_META_SETTING_TYPE_NUM * 2 + G_N_ELEMENTS(slave_types) + 1); + result = g_new(char *, _NM_META_SETTING_TYPE_NUM * 2 + G_N_ELEMENTS(port_types) + 1); text_len = text ? strlen(text) : 0; @@ -2694,8 +2694,8 @@ _complete_fcn_connection_type(ARGS_COMPLETE_FCN) if (!text || strncmp(text, v, text_len) == 0) result[j++] = g_strdup(v); } - for (i = 0; i < G_N_ELEMENTS(slave_types); i++) { - const char *v = slave_types[i]; + for (i = 0; i < G_N_ELEMENTS(port_types); i++) { + const char *v = port_types[i]; if (!text || strncmp(text, v, text_len) == 0) result[j++] = g_strdup(v); @@ -2763,7 +2763,7 @@ _multilist_remove_by_value_fcn_connection_permissions(NMSetting *setting, const } static const char *const * -_complete_fcn_connection_master(ARGS_COMPLETE_FCN) +_complete_fcn_connection_controller(ARGS_COMPLETE_FCN) { NMRemoteConnection *const *connections = NULL; guint len = 0; @@ -2781,7 +2781,7 @@ _complete_fcn_connection_master(ARGS_COMPLETE_FCN) if ((!text || !*text) && operation_context && operation_context->connection) { /* if we have no text yet, initially only complete for matching - * slave-type. */ + * port-type. */ s_con = nm_connection_get_setting_connection(operation_context->connection); if (s_con) expected_type = nm_setting_connection_get_port_type(s_con); @@ -5584,7 +5584,7 @@ static const NMMetaPropertyInfo *const property_infos_CONNECTION[] = { .property_type = DEFINE_PROPERTY_TYPE ( .get_fcn = _get_fcn_gobject, .set_fcn = _set_fcn_gobject_string, - .complete_fcn = _complete_fcn_connection_master, + .complete_fcn = _complete_fcn_connection_controller, .doc_format = NM_META_PROPERTY_TYPE_FORMAT_STRING, ), ), @@ -5596,7 +5596,7 @@ static const NMMetaPropertyInfo *const property_infos_CONNECTION[] = { .property_type = DEFINE_PROPERTY_TYPE ( .get_fcn = _get_fcn_gobject, .set_fcn = _set_fcn_gobject_string, - .complete_fcn = _complete_fcn_connection_master, + .complete_fcn = _complete_fcn_connection_controller, .doc_format = NM_META_PROPERTY_TYPE_FORMAT_STRING, ), ), @@ -9091,7 +9091,7 @@ const NMMetaSettingValidPartItem *const nm_meta_setting_info_valid_parts_default /*****************************************************************************/ -static const NMMetaSettingValidPartItem *const valid_settings_noslave[] = { +static const NMMetaSettingValidPartItem *const valid_settings_noport[] = { NM_META_SETTING_VALID_PART_ITEM(MATCH, FALSE), NM_META_SETTING_VALID_PART_ITEM(IP4_CONFIG, FALSE), NM_META_SETTING_VALID_PART_ITEM(IP6_CONFIG, FALSE), @@ -9102,33 +9102,33 @@ static const NMMetaSettingValidPartItem *const valid_settings_noslave[] = { NULL, }; -static const NMMetaSettingValidPartItem *const valid_settings_slave_bond[] = { +static const NMMetaSettingValidPartItem *const valid_settings_port_bond[] = { NM_META_SETTING_VALID_PART_ITEM(BOND_PORT, TRUE), NM_META_SETTING_VALID_PART_ITEM(LINK, FALSE), NM_META_SETTING_VALID_PART_ITEM(MATCH, FALSE), NULL, }; -static const NMMetaSettingValidPartItem *const valid_settings_slave_bridge[] = { +static const NMMetaSettingValidPartItem *const valid_settings_port_bridge[] = { NM_META_SETTING_VALID_PART_ITEM(BRIDGE_PORT, TRUE), NM_META_SETTING_VALID_PART_ITEM(LINK, FALSE), NM_META_SETTING_VALID_PART_ITEM(MATCH, FALSE), NULL, }; -static const NMMetaSettingValidPartItem *const valid_settings_slave_ovs_bridge[] = { +static const NMMetaSettingValidPartItem *const valid_settings_port_ovs_bridge[] = { NM_META_SETTING_VALID_PART_ITEM(OVS_PORT, FALSE), NULL, }; -static const NMMetaSettingValidPartItem *const valid_settings_slave_ovs_port[] = { +static const NMMetaSettingValidPartItem *const valid_settings_port_ovs_port[] = { NM_META_SETTING_VALID_PART_ITEM(LINK, FALSE), NM_META_SETTING_VALID_PART_ITEM(MATCH, FALSE), NM_META_SETTING_VALID_PART_ITEM(OVS_INTERFACE, FALSE), NULL, }; -static const NMMetaSettingValidPartItem *const valid_settings_slave_team[] = { +static const NMMetaSettingValidPartItem *const valid_settings_port_team[] = { NM_META_SETTING_VALID_PART_ITEM(LINK, FALSE), NM_META_SETTING_VALID_PART_ITEM(MATCH, FALSE), NM_META_SETTING_VALID_PART_ITEM(TEAM_PORT, TRUE), @@ -9136,35 +9136,35 @@ static const NMMetaSettingValidPartItem *const valid_settings_slave_team[] = { }; const NMMetaSettingValidPartItem *const * -nm_meta_setting_info_valid_parts_for_slave_type(const char *slave_type, const char **out_slave_name) +nm_meta_setting_info_valid_parts_for_port_type(const char *port_type, const char **out_port_name) { - if (!slave_type) { - NM_SET_OUT(out_slave_name, NULL); - return valid_settings_noslave; + if (!port_type) { + NM_SET_OUT(out_port_name, NULL); + return valid_settings_noport; } - if (nm_streq(slave_type, NM_SETTING_BOND_SETTING_NAME)) { - NM_SET_OUT(out_slave_name, "bond-slave"); - return valid_settings_slave_bond; + if (nm_streq(port_type, NM_SETTING_BOND_SETTING_NAME)) { + NM_SET_OUT(out_port_name, "bond-slave"); + return valid_settings_port_bond; } - if (nm_streq(slave_type, NM_SETTING_BRIDGE_SETTING_NAME)) { - NM_SET_OUT(out_slave_name, "bridge-slave"); - return valid_settings_slave_bridge; + if (nm_streq(port_type, NM_SETTING_BRIDGE_SETTING_NAME)) { + NM_SET_OUT(out_port_name, "bridge-slave"); + return valid_settings_port_bridge; } - if (nm_streq(slave_type, NM_SETTING_OVS_BRIDGE_SETTING_NAME)) { - NM_SET_OUT(out_slave_name, "ovs-slave"); - return valid_settings_slave_ovs_bridge; + if (nm_streq(port_type, NM_SETTING_OVS_BRIDGE_SETTING_NAME)) { + NM_SET_OUT(out_port_name, "ovs-slave"); + return valid_settings_port_ovs_bridge; } - if (nm_streq(slave_type, NM_SETTING_OVS_PORT_SETTING_NAME)) { - NM_SET_OUT(out_slave_name, "ovs-slave"); - return valid_settings_slave_ovs_port; + if (nm_streq(port_type, NM_SETTING_OVS_PORT_SETTING_NAME)) { + NM_SET_OUT(out_port_name, "ovs-slave"); + return valid_settings_port_ovs_port; } - if (nm_streq(slave_type, NM_SETTING_TEAM_SETTING_NAME)) { - NM_SET_OUT(out_slave_name, "team-slave"); - return valid_settings_slave_team; + if (nm_streq(port_type, NM_SETTING_TEAM_SETTING_NAME)) { + NM_SET_OUT(out_port_name, "team-slave"); + return valid_settings_port_team; } - if (nm_streq(slave_type, NM_SETTING_VRF_SETTING_NAME)) { - NM_SET_OUT(out_slave_name, "vrf-slave"); - return valid_settings_noslave; + if (nm_streq(port_type, NM_SETTING_VRF_SETTING_NAME)) { + NM_SET_OUT(out_port_name, "vrf-slave"); + return valid_settings_noport; } return NULL; } diff --git a/src/libnmc-setting/nm-meta-setting-desc.h b/src/libnmc-setting/nm-meta-setting-desc.h index f8e36b0e0a..21d913826f 100644 --- a/src/libnmc-setting/nm-meta-setting-desc.h +++ b/src/libnmc-setting/nm-meta-setting-desc.h @@ -503,8 +503,7 @@ extern const NMMetaSettingInfoEditor nm_meta_setting_infos_editor[_NM_META_SETTI extern const NMMetaSettingValidPartItem *const nm_meta_setting_info_valid_parts_default[]; const NMMetaSettingValidPartItem *const * -nm_meta_setting_info_valid_parts_for_slave_type(const char *slave_type, - const char **out_slave_name); +nm_meta_setting_info_valid_parts_for_port_type(const char *port_type, const char **out_port_name); gboolean nm_meta_property_int_get_range(const NMMetaPropertyInfo *property_info, NMMetaSignUnsignInt64 *out_min, diff --git a/src/libnmc-setting/settings-docs.h.in b/src/libnmc-setting/settings-docs.h.in index 8e31794a36..091dcd64d0 100644 --- a/src/libnmc-setting/settings-docs.h.in +++ b/src/libnmc-setting/settings-docs.h.in @@ -5,7 +5,7 @@ #define DESCRIBE_DOC_NM_SETTING_CONNECTION_AUTOCONNECT_PORTS N_("Whether or not ports of this connection should be automatically brought up when NetworkManager activates this connection. This only has a real effect for controller connections. The properties \"autoconnect\", \"autoconnect-priority\" and \"autoconnect-retries\" are unrelated to this setting. The permitted values are: 0: leave port connections untouched, 1: activate all the port connections with this connection, -1: default. If -1 (default) is set, global connection.autoconnect-ports is read to determine the real value. If it is default as well, this fallbacks to 0.") #define DESCRIBE_DOC_NM_SETTING_CONNECTION_AUTOCONNECT_PRIORITY N_("The autoconnect priority in range -999 to 999. If the connection is set to autoconnect, connections with higher priority will be preferred. The higher number means higher priority. Defaults to 0. Note that this property only matters if there are more than one candidate profile to select for autoconnect. In case of equal priority, the profile used most recently is chosen.") #define DESCRIBE_DOC_NM_SETTING_CONNECTION_AUTOCONNECT_RETRIES N_("The number of times a connection should be tried when autoactivating before giving up. Zero means forever, -1 means the global default (4 times if not overridden). Setting this to 1 means to try activation only once before blocking autoconnect. Note that after a timeout, NetworkManager will try to autoconnect again.") -#define DESCRIBE_DOC_NM_SETTING_CONNECTION_AUTOCONNECT_SLAVES N_("Whether or not slaves of this connection should be automatically brought up when NetworkManager activates this connection. This only has a real effect for master connections. The properties \"autoconnect\", \"autoconnect-priority\" and \"autoconnect-retries\" are unrelated to this setting. The permitted values are: 0: leave slave connections untouched, 1: activate all the slave connections with this connection, -1: default. If -1 (default) is set, global connection.autoconnect-slaves is read to determine the real value. If it is default as well, this fallbacks to 0. Deprecated 1.46. Use \"autoconnect-ports\" instead, this is just an alias.") +#define DESCRIBE_DOC_NM_SETTING_CONNECTION_AUTOCONNECT_SLAVES N_("Whether or not ports of this connection should be automatically brought up when NetworkManager activates this connection. This only has a real effect for controller connections. The properties \"autoconnect\", \"autoconnect-priority\" and \"autoconnect-retries\" are unrelated to this setting. The permitted values are: 0: leave port connections untouched, 1: activate all the port connections with this connection, -1: default. If -1 (default) is set, global connection.autoconnect-slaves is read to determine the real value. If it is default as well, this fallbacks to 0. Deprecated 1.46. Use \"autoconnect-ports\" instead, this is just an alias.") #define DESCRIBE_DOC_NM_SETTING_CONNECTION_CONTROLLER N_("Interface name of the controller device or UUID of the controller connection.") #define DESCRIBE_DOC_NM_SETTING_CONNECTION_DNS_OVER_TLS N_("Whether DNSOverTls (dns-over-tls) is enabled for the connection. DNSOverTls is a technology which uses TLS to encrypt dns traffic. The permitted values are: \"yes\" (2) use DNSOverTls and disabled fallback, \"opportunistic\" (1) use DNSOverTls but allow fallback to unencrypted resolution, \"no\" (0) don't ever use DNSOverTls. If unspecified \"default\" depends on the plugin used. Systemd-resolved uses global setting. This feature requires a plugin which supports DNSOverTls. Otherwise, the setting has no effect. One such plugin is dns-systemd-resolved.") #define DESCRIBE_DOC_NM_SETTING_CONNECTION_DOWN_ON_POWEROFF N_("Whether the connection will be brought down before the system is powered off. The default value is \"default\" (-1). When the default value is specified, then the global value from NetworkManager configuration is looked up, if not set, it is considered as \"no\" (0).") @@ -14,7 +14,7 @@ #define DESCRIBE_DOC_NM_SETTING_CONNECTION_INTERFACE_NAME N_("The name of the network interface this connection is bound to. If not set, then the connection can be attached to any interface of the appropriate type (subject to restrictions imposed by other settings). For software devices this specifies the name of the created device. For connection types where interface names cannot easily be made persistent (e.g. mobile broadband or USB Ethernet), this property should not be used. Setting this property restricts the interfaces a connection can be used with, and if interface names change or are reordered the connection may be applied to the wrong interface.") #define DESCRIBE_DOC_NM_SETTING_CONNECTION_LLDP N_("Whether LLDP is enabled for the connection.") #define DESCRIBE_DOC_NM_SETTING_CONNECTION_LLMNR N_("Whether Link-Local Multicast Name Resolution (LLMNR) is enabled for the connection. LLMNR is a protocol based on the Domain Name System (DNS) packet format that allows both IPv4 and IPv6 hosts to perform name resolution for hosts on the same local link. The permitted values are: \"yes\" (2) register hostname and resolving for the connection, \"no\" (0) disable LLMNR for the interface, \"resolve\" (1) do not register hostname but allow resolving of LLMNR host names If unspecified, \"default\" ultimately depends on the DNS plugin (which for systemd-resolved currently means \"yes\"). This feature requires a plugin which supports LLMNR. Otherwise, the setting has no effect. One such plugin is dns-systemd-resolved.") -#define DESCRIBE_DOC_NM_SETTING_CONNECTION_MASTER N_("Interface name of the master device or UUID of the master connection. Deprecated 1.46. Use \"controller\" instead, this is just an alias.") +#define DESCRIBE_DOC_NM_SETTING_CONNECTION_MASTER N_("Interface name of the controller device or UUID of the controller connection. Deprecated 1.46. Use \"controller\" instead, this is just an alias.") #define DESCRIBE_DOC_NM_SETTING_CONNECTION_MDNS N_("Whether mDNS is enabled for the connection. The permitted values are: \"yes\" (2) register hostname and resolving for the connection, \"no\" (0) disable mDNS for the interface, \"resolve\" (1) do not register hostname but allow resolving of mDNS host names and \"default\" (-1) to allow lookup of a global default in NetworkManager.conf. If unspecified, \"default\" ultimately depends on the DNS plugin. This feature requires a plugin which supports mDNS. Otherwise, the setting has no effect. Currently the only supported DNS plugin is systemd-resolved. For systemd-resolved, the default is configurable via MulticastDNS= setting in resolved.conf.") #define DESCRIBE_DOC_NM_SETTING_CONNECTION_METERED N_("Whether the connection is metered. When updating this property on a currently activated connection, the change takes effect immediately.") #define DESCRIBE_DOC_NM_SETTING_CONNECTION_MPTCP_FLAGS N_("Whether to configure MPTCP endpoints and the address flags. If MPTCP is enabled in NetworkManager, it will configure the addresses of the interface as MPTCP endpoints. Note that IPv4 loopback addresses (127.0.0.0/8), IPv4 link local addresses (169.254.0.0/16), the IPv6 loopback address (::1), IPv6 link local addresses (fe80::/10), IPv6 unique local addresses (ULA, fc00::/7) and IPv6 privacy extension addresses (rfc3041, ipv6.ip6-privacy) will be excluded from being configured as endpoints. If \"disabled\" (0x1), MPTCP handling for the interface is disabled and no endpoints are registered. The \"enabled\" (0x2) flag means that MPTCP handling is enabled. This flag can also be implied from the presence of other flags. Even when enabled, MPTCP handling will by default still be disabled unless \"/proc/sys/net/mptcp/enabled\" sysctl is on. NetworkManager does not change the sysctl and this is up to the administrator or distribution. To configure endpoints even if the sysctl is disabled, \"also-without-sysctl\" (0x4) flag can be used. In that case, NetworkManager doesn't look at the sysctl and configures endpoints regardless. Even when enabled, NetworkManager will only configure MPTCP endpoints for a certain address family, if there is a unicast default route (0.0.0.0/0 or ::/0) in the main routing table. The flag \"also-without-default-route\" (0x8) can override that. When MPTCP handling is enabled then endpoints are configured with the specified address flags \"signal\" (0x10), \"subflow\" (0x20), \"backup\" (0x40), \"fullmesh\" (0x80). See ip-mptcp(8) manual for additional information about the flags. If the flags are zero (0x0), the global connection default from NetworkManager.conf is honored. If still unspecified, the fallback is \"enabled,subflow\". Note that this means that MPTCP is by default done depending on the \"/proc/sys/net/mptcp/enabled\" sysctl. NetworkManager does not change the MPTCP limits nor enable MPTCP via \"/proc/sys/net/mptcp/enabled\". That is a host configuration which the admin can change via sysctl and ip-mptcp. Strict reverse path filtering (rp_filter) breaks many MPTCP use cases, so when MPTCP handling for IPv4 addresses on the interface is enabled, NetworkManager would loosen the strict reverse path filtering (1) to the loose setting (2).") @@ -24,7 +24,7 @@ #define DESCRIBE_DOC_NM_SETTING_CONNECTION_PORT_TYPE N_("Setting name of the device type of this port's controller connection (eg, \"bond\"), or NULL if this connection is not a port.") #define DESCRIBE_DOC_NM_SETTING_CONNECTION_READ_ONLY N_("This property is deprecated and has no meaning.") #define DESCRIBE_DOC_NM_SETTING_CONNECTION_SECONDARIES N_("List of connection UUIDs that should be activated when the base connection itself is activated. Currently, only VPN connections are supported.") -#define DESCRIBE_DOC_NM_SETTING_CONNECTION_SLAVE_TYPE N_("Setting name of the device type of this slave's master connection (eg, \"bond\"), or NULL if this connection is not a slave. Deprecated 1.46. Use \"port-type\" instead, this is just an alias.") +#define DESCRIBE_DOC_NM_SETTING_CONNECTION_SLAVE_TYPE N_("Setting name of the device type of this port's controller connection (eg, \"bond\"), or NULL if this connection is not a port. Deprecated 1.46. Use \"port-type\" instead, this is just an alias.") #define DESCRIBE_DOC_NM_SETTING_CONNECTION_STABLE_ID N_("This represents the identity of the connection used for various purposes. It allows to configure multiple profiles to share the identity. Also, the stable-id can contain placeholders that are substituted dynamically and deterministically depending on the context. The stable-id is used for generating IPv6 stable private addresses with ipv6.addr-gen-mode=stable-privacy. It is also used to seed the generated cloned MAC address for ethernet.cloned-mac-address=stable and wifi.cloned-mac-address=stable. It is also used to derive the DHCP client identifier with ipv4.dhcp-client-id=stable, the DHCPv6 DUID with ipv6.dhcp-duid=stable-[llt,ll,uuid] and the DHCP IAID with ipv4.iaid=stable and ipv6.iaid=stable. Note that depending on the context where it is used, other parameters are also seeded into the generation algorithm. For example, a per-host key is commonly also included, so that different systems end up generating different IDs. Or with ipv6.addr-gen-mode=stable-privacy, also the device's name is included, so that different interfaces yield different addresses. The per-host key is the identity of your machine and stored in /var/lib/NetworkManager/secret_key. See NetworkManager(8) manual about the secret-key and the host identity. The '$' character is treated special to perform dynamic substitutions at activation time. Currently, supported are \"${CONNECTION}\", \"${DEVICE}\", \"${MAC}\", \"${NETWORK_SSID}\", \"${BOOT}\", \"${RANDOM}\". These effectively create unique IDs per-connection, per-device, per-SSID, per-boot, or every time. The \"${CONNECTION}\" uses the profile's connection.uuid, the \"${DEVICE}\" uses the interface name of the device and \"${MAC}\" the permanent MAC address of the device. \"${NETWORK_SSID}\" uses the SSID for Wi-Fi networks and falls back to \"${CONNECTION}\" on other networks. Any unrecognized patterns following '$' are treated verbatim, however are reserved for future use. You are thus advised to avoid '$' or escape it as \"$$\". For example, set it to \"${CONNECTION}-${BOOT}-${DEVICE}\" to create a unique id for this connection that changes with every reboot and differs depending on the interface where the profile activates. If the value is unset, a global connection default is consulted. If the value is still unset, the default is \"default${CONNECTION}\" go generate an ID unique per connection profile.") #define DESCRIBE_DOC_NM_SETTING_CONNECTION_TIMESTAMP N_("The time, in seconds since the Unix Epoch, that the connection was last _successfully_ fully activated. NetworkManager updates the connection timestamp periodically when the connection is active to ensure that an active connection has the latest timestamp. The property is only meant for reading (changes to this property will not be preserved).") #define DESCRIBE_DOC_NM_SETTING_CONNECTION_TYPE N_("Base type of the connection. For hardware-dependent connections, should contain the setting name of the hardware-type specific setting (ie, \"802-3-ethernet\" or \"802-11-wireless\" or \"bluetooth\", etc), and for non-hardware dependent connections like VPN or otherwise, should contain the setting name of that setting type (ie, \"vpn\" or \"bridge\", etc).") @@ -356,7 +356,7 @@ #define DESCRIBE_DOC_NM_SETTING_TUN_VNET_HDR N_("If TRUE the IFF_VNET_HDR the tunnel packets will include a virtio network header.") #define DESCRIBE_DOC_NM_SETTING_USER_DATA N_("A dictionary of key/value pairs with user data. This data is ignored by NetworkManager and can be used at the users discretion. The keys only support a strict ascii format, but the values can be arbitrary UTF8 strings up to a certain length.") #define DESCRIBE_DOC_NM_SETTING_VLAN_EGRESS_PRIORITY_MAP N_("For outgoing packets, a list of mappings from Linux SKB priorities to 802.1p priorities. The mapping is given in the format \"from:to\" where both \"from\" and \"to\" are unsigned integers, ie \"7:3\".") -#define DESCRIBE_DOC_NM_SETTING_VLAN_FLAGS N_("One or more flags which control the behavior and features of the VLAN interface. Flags include \"reorder-headers\" (0x1) (reordering of output packet headers), \"gvrp\" (0x2) (use of the GVRP protocol), and \"loose-binding\" (0x4) (loose binding of the interface to its master device's operating state). \"mvrp\" (0x8) (use of the MVRP protocol). The default value of this property is NM_VLAN_FLAG_REORDER_HEADERS, but it used to be 0. To preserve backward compatibility, the default-value in the D-Bus API continues to be 0 and a missing property on D-Bus is still considered as 0.") +#define DESCRIBE_DOC_NM_SETTING_VLAN_FLAGS N_("One or more flags which control the behavior and features of the VLAN interface. Flags include \"reorder-headers\" (0x1) (reordering of output packet headers), \"gvrp\" (0x2) (use of the GVRP protocol), and \"loose-binding\" (0x4) (loose binding of the interface to its controller device's operating state). \"mvrp\" (0x8) (use of the MVRP protocol). The default value of this property is NM_VLAN_FLAG_REORDER_HEADERS, but it used to be 0. To preserve backward compatibility, the default-value in the D-Bus API continues to be 0 and a missing property on D-Bus is still considered as 0.") #define DESCRIBE_DOC_NM_SETTING_VLAN_ID N_("The VLAN identifier that the interface created by this connection should be assigned. The valid range is from 0 to 4094, without the reserved id 4095.") #define DESCRIBE_DOC_NM_SETTING_VLAN_INGRESS_PRIORITY_MAP N_("For incoming packets, a list of mappings from 802.1p priorities to Linux SKB priorities. The mapping is given in the format \"from:to\" where both \"from\" and \"to\" are unsigned integers, ie \"7:3\".") #define DESCRIBE_DOC_NM_SETTING_VLAN_PARENT N_("If given, specifies the parent interface name or parent connection UUID from which this VLAN interface should be created. If this property is not specified, the connection must contain an \"802-3-ethernet\" setting with a \"mac-address\" property.") diff --git a/src/n-dhcp4/src/util/link.c b/src/n-dhcp4/src/util/link.c index 54d9a5c39b..ec7836d16e 100644 --- a/src/n-dhcp4/src/util/link.c +++ b/src/n-dhcp4/src/util/link.c @@ -223,28 +223,28 @@ void link_del_ip4(Link *link, const struct in_addr *addr, unsigned int prefix) { } /** - * link_set_master() - change the bridge master of an interface - * @link: link to operate on - * @if_master: bridge to set as master + * link_set_controller() - change the bridge controller of an interface + * @link: link to operate on + * @if_controller: bridge to set as controller * - * This sets @if_master as the new master bridge of @link. The specified bridge + * This sets @if_controller as the new controller bridge of @link. The specified bridge * must be in the same network namespace as @link. */ -void link_set_master(Link *link, int if_master) { +void link_set_controller(Link *link, int if_controller) { int oldns; netns_get(&oldns); { - char *p, ifname_master[IF_NAMESIZE + 1] = {}, ifname[IF_NAMESIZE + 1] = {}; + char *p, ifname_controller[IF_NAMESIZE + 1] = {}, ifname[IF_NAMESIZE + 1] = {}; int r; netns_set(link->netns); p = if_indextoname(link->ifindex, ifname); c_assert(p); - p = if_indextoname(if_master, ifname_master); + p = if_indextoname(if_controller, ifname_controller); c_assert(p); - r = asprintf(&p, "ip link set %s master %s", ifname, ifname_master); + r = asprintf(&p, "ip link set %s master %s", ifname, ifname_controller); c_assert(r > 0); r = system(p); c_assert(r == 0); diff --git a/src/nm-initrd-generator/nmi-cmdline-reader.c b/src/nm-initrd-generator/nmi-cmdline-reader.c index 8fcfc6d0e0..3703ff0cb4 100644 --- a/src/nm-initrd-generator/nmi-cmdline-reader.c +++ b/src/nm-initrd-generator/nmi-cmdline-reader.c @@ -232,7 +232,7 @@ reader_get_connection(Reader *reader, /* * If ifname was not given, we'll match the connection by type. - * If the type was not given either, then we're happy with any connection but slaves. + * If the type was not given either, then we're happy with any connection but ports. * This is so that things like "bond=bond0:eth1,eth2 nameserver=1.3.3.7 end up * slapping the nameserver to the most reasonable connection (bond0). */ @@ -866,25 +866,28 @@ reader_parse_ip(Reader *reader, const char *sysfs_dir, char *argument) } static void -reader_parse_master(Reader *reader, char *argument, const char *type_name, const char *default_name) +reader_parse_controller(Reader *reader, + char *argument, + const char *type_name, + const char *default_name) { NMConnection *connection; NMSettingConnection *s_con; - gs_free char *master_to_free = NULL; - const char *master; - char *slaves; - const char *slave; + gs_free char *controller_to_free = NULL; + const char *controller; + char *ports; + const char *port; char *opts; const char *mtu = NULL; - master = get_word(&argument, ':'); - if (!master) - master = master_to_free = g_strdup_printf("%s0", default_name ?: type_name); - slaves = get_word(&argument, ':'); + controller = get_word(&argument, ':'); + if (!controller) + controller = controller_to_free = g_strdup_printf("%s0", default_name ?: type_name); + ports = get_word(&argument, ':'); - connection = reader_get_connection(reader, master, type_name, TRUE); + connection = reader_get_connection(reader, controller, type_name, TRUE); s_con = nm_connection_get_setting_connection(connection); - master = nm_setting_connection_get_uuid(s_con); + controller = nm_setting_connection_get_uuid(s_con); if (nm_streq(type_name, NM_SETTING_BRIDGE_SETTING_NAME)) { NMSettingBridge *s_bridge = nm_connection_get_setting_bridge(connection); @@ -921,19 +924,19 @@ reader_parse_master(Reader *reader, char *argument, const char *type_name, const connection_set(connection, NM_SETTING_WIRED_SETTING_NAME, NM_SETTING_WIRED_MTU, mtu); do { - slave = get_word(&slaves, ','); - if (slave == NULL) - slave = "eth0"; + port = get_word(&ports, ','); + if (port == NULL) + port = "eth0"; - connection = reader_get_connection(reader, slave, NULL, TRUE); + connection = reader_get_connection(reader, port, NULL, TRUE); s_con = nm_connection_get_setting_connection(connection); g_object_set(s_con, NM_SETTING_CONNECTION_PORT_TYPE, type_name, NM_SETTING_CONNECTION_CONTROLLER, - master, + controller, NULL); - } while (slaves && *slaves != '\0'); + } while (ports && *ports != '\0'); if (argument && *argument) _LOGW(LOGD_CORE, "Ignoring extra: '%s'.", argument); @@ -1468,11 +1471,11 @@ nmi_cmdline_reader_parse(const char *etc_connections_dir, routes = g_ptr_array_new_with_free_func(g_free); g_ptr_array_add(routes, g_strdup(argument)); } else if (nm_streq(tag, "bridge")) - reader_parse_master(reader, argument, NM_SETTING_BRIDGE_SETTING_NAME, "br"); + reader_parse_controller(reader, argument, NM_SETTING_BRIDGE_SETTING_NAME, "br"); else if (nm_streq(tag, "bond")) - reader_parse_master(reader, argument, NM_SETTING_BOND_SETTING_NAME, NULL); + reader_parse_controller(reader, argument, NM_SETTING_BOND_SETTING_NAME, NULL); else if (nm_streq(tag, "team")) - reader_parse_master(reader, argument, NM_SETTING_TEAM_SETTING_NAME, NULL); + reader_parse_controller(reader, argument, NM_SETTING_TEAM_SETTING_NAME, NULL); else if (nm_streq(tag, "vlan")) reader_parse_vlan(reader, argument); else if (nm_streq(tag, "ib.pkey")) diff --git a/src/nm-initrd-generator/tests/test-cmdline-reader.c b/src/nm-initrd-generator/tests/test-cmdline-reader.c index 1f2141e61c..33b834979c 100644 --- a/src/nm-initrd-generator/tests/test-cmdline-reader.c +++ b/src/nm-initrd-generator/tests/test-cmdline-reader.c @@ -975,7 +975,7 @@ test_bond(void) NMSettingBond *s_bond; NMSettingWired *s_wired; NMIPRoute *ip_route; - const char *master_uuid; + const char *controller_uuid; connections = _parse_cons(ARGV); g_assert_cmpint(g_hash_table_size(connections), ==, 3); @@ -986,8 +986,8 @@ test_bond(void) ==, NM_SETTING_BOND_SETTING_NAME); g_assert_cmpstr(nm_connection_get_id(connection), ==, "bong0"); - master_uuid = nm_connection_get_uuid(connection); - g_assert(master_uuid); + controller_uuid = nm_connection_get_uuid(connection); + g_assert(controller_uuid); s_wired = nm_connection_get_setting_wired(connection); g_assert(s_wired); @@ -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_controller(s_con), ==, master_uuid); + g_assert_cmpstr(nm_setting_connection_get_controller(s_con), ==, controller_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_controller(s_con), ==, master_uuid); + g_assert_cmpstr(nm_setting_connection_get_controller(s_con), ==, controller_uuid); g_assert_cmpint(nm_setting_connection_get_multi_connect(s_con), ==, NM_CONNECTION_MULTI_CONNECT_SINGLE); @@ -1069,7 +1069,7 @@ test_bond_ip(void) NMSettingWired *s_wired; NMSettingBond *s_bond; NMIPAddress *ip_addr; - const char *master_uuid; + const char *controller_uuid; connections = _parse_cons(ARGV); g_assert_cmpint(g_hash_table_size(connections), ==, 3); @@ -1080,8 +1080,8 @@ test_bond_ip(void) ==, NM_SETTING_BOND_SETTING_NAME); g_assert_cmpstr(nm_connection_get_id(connection), ==, "bond0"); - master_uuid = nm_connection_get_uuid(connection); - g_assert(master_uuid); + controller_uuid = nm_connection_get_uuid(connection); + g_assert(controller_uuid); s_wired = nm_connection_get_setting_wired(connection); g_assert(s_wired); @@ -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_controller(s_con), ==, master_uuid); + g_assert_cmpstr(nm_setting_connection_get_controller(s_con), ==, controller_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_controller(s_con), ==, master_uuid); + g_assert_cmpstr(nm_setting_connection_get_controller(s_con), ==, controller_uuid); g_assert_cmpint(nm_setting_connection_get_multi_connect(s_con), ==, NM_CONNECTION_MULTI_CONNECT_SINGLE); @@ -1162,7 +1162,7 @@ test_bond_default(void) NMSettingIPConfig *s_ip4; NMSettingIPConfig *s_ip6; NMSettingBond *s_bond; - const char *master_uuid; + const char *controller_uuid; connections = _parse_cons(ARGV); g_assert_cmpint(g_hash_table_size(connections), ==, 2); @@ -1174,8 +1174,8 @@ test_bond_default(void) ==, NM_SETTING_BOND_SETTING_NAME); g_assert_cmpstr(nm_connection_get_id(connection), ==, "bond0"); - master_uuid = nm_connection_get_uuid(connection); - g_assert(master_uuid); + controller_uuid = nm_connection_get_uuid(connection); + g_assert(controller_uuid); s_ip4 = nm_connection_get_setting_ip4_config(connection); g_assert(s_ip4); @@ -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_controller(s_con), ==, master_uuid); + g_assert_cmpstr(nm_setting_connection_get_controller(s_con), ==, controller_uuid); g_assert_cmpint(nm_setting_connection_get_multi_connect(s_con), ==, NM_CONNECTION_MULTI_CONNECT_SINGLE); @@ -1228,7 +1228,7 @@ test_bridge(void) NMSettingIPConfig *s_ip6; NMSettingBridge *s_bridge; NMIPRoute *ip_route; - const char *master_uuid; + const char *controller_uuid; connections = _parse_cons(ARGV); g_assert_cmpint(g_hash_table_size(connections), ==, 3); @@ -1239,8 +1239,8 @@ test_bridge(void) ==, NM_SETTING_BRIDGE_SETTING_NAME); g_assert_cmpstr(nm_connection_get_id(connection), ==, "bridge0"); - master_uuid = nm_connection_get_uuid(connection); - g_assert(master_uuid); + controller_uuid = nm_connection_get_uuid(connection); + g_assert(controller_uuid); s_ip4 = nm_connection_get_setting_ip4_config(connection); g_assert(s_ip4); @@ -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_controller(s_con), ==, master_uuid); + g_assert_cmpstr(nm_setting_connection_get_controller(s_con), ==, controller_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_controller(s_con), ==, master_uuid); + g_assert_cmpstr(nm_setting_connection_get_controller(s_con), ==, controller_uuid); g_assert_cmpint(nm_setting_connection_get_multi_connect(s_con), ==, NM_CONNECTION_MULTI_CONNECT_SINGLE); @@ -1317,7 +1317,7 @@ test_bridge_default(void) NMSettingIPConfig *s_ip4; NMSettingIPConfig *s_ip6; NMSettingBridge *s_bridge; - const char *master_uuid; + const char *controller_uuid; connections = _parse_cons(ARGV); g_assert_cmpint(g_hash_table_size(connections), ==, 2); @@ -1329,8 +1329,8 @@ test_bridge_default(void) ==, NM_SETTING_BRIDGE_SETTING_NAME); g_assert_cmpstr(nm_connection_get_id(connection), ==, "br0"); - master_uuid = nm_connection_get_uuid(connection); - g_assert(master_uuid); + controller_uuid = nm_connection_get_uuid(connection); + g_assert(controller_uuid); s_ip4 = nm_connection_get_setting_ip4_config(connection); g_assert(s_ip4); @@ -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_controller(s_con), ==, master_uuid); + g_assert_cmpstr(nm_setting_connection_get_controller(s_con), ==, controller_uuid); g_assert_cmpint(nm_setting_connection_get_multi_connect(s_con), ==, NM_CONNECTION_MULTI_CONNECT_SINGLE); @@ -1381,7 +1381,7 @@ test_bridge_ip(void) NMSettingIPConfig *s_ip6; NMSettingWired *s_wired; NMSettingBridge *s_bridge; - const char *master_uuid; + const char *controller_uuid; guint i; connections = _parse_cons(ARGV); @@ -1393,8 +1393,8 @@ test_bridge_ip(void) ==, NM_SETTING_BRIDGE_SETTING_NAME); g_assert_cmpstr(nm_connection_get_id(connection), ==, "bridge123"); - master_uuid = nm_connection_get_uuid(connection); - g_assert(master_uuid); + controller_uuid = nm_connection_get_uuid(connection); + g_assert(controller_uuid); s_wired = nm_connection_get_setting_wired(connection); g_assert(s_wired); @@ -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_controller(s_con), ==, master_uuid); + g_assert_cmpstr(nm_setting_connection_get_controller(s_con), ==, controller_uuid); g_assert_cmpint(nm_setting_connection_get_multi_connect(s_con), ==, NM_CONNECTION_MULTI_CONNECT_SINGLE); @@ -1447,7 +1447,7 @@ test_team(void) NMSettingIPConfig *s_ip4; NMSettingIPConfig *s_ip6; NMSettingTeam *s_team; - const char *master_uuid; + const char *controller_uuid; connections = _parse_cons(ARGV); g_assert_cmpint(g_hash_table_size(connections), ==, 3); @@ -1458,8 +1458,8 @@ test_team(void) ==, NM_SETTING_TEAM_SETTING_NAME); g_assert_cmpstr(nm_connection_get_id(connection), ==, "team0"); - master_uuid = nm_connection_get_uuid(connection); - g_assert(master_uuid); + controller_uuid = nm_connection_get_uuid(connection); + g_assert(controller_uuid); s_ip4 = nm_connection_get_setting_ip4_config(connection); g_assert(s_ip4); @@ -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_controller(s_con), ==, master_uuid); + g_assert_cmpstr(nm_setting_connection_get_controller(s_con), ==, controller_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_controller(s_con), ==, master_uuid); + g_assert_cmpstr(nm_setting_connection_get_controller(s_con), ==, controller_uuid); g_assert_cmpint(nm_setting_connection_get_multi_connect(s_con), ==, NM_CONNECTION_MULTI_CONNECT_SINGLE); diff --git a/src/nmcli/connections.c b/src/nmcli/connections.c index 89d2378f88..55e99fcfa7 100644 --- a/src/nmcli/connections.c +++ b/src/nmcli/connections.c @@ -1120,7 +1120,7 @@ usage(void) " up [[id | uuid | path] ] [ifname ] [ap ] [passwd-file ]\n\n" " down [id | uuid | path | apath] ...\n\n" - " add COMMON_OPTIONS TYPE_SPECIFIC_OPTIONS SLAVE_OPTIONS IP_OPTIONS [-- " + " add COMMON_OPTIONS TYPE_SPECIFIC_OPTIONS PORT_OPTIONS IP_OPTIONS [-- " "([+|-]. )+]\n\n" " modify [--temporary] [id | uuid | path] ([+|-]. )+\n\n" " clone [--temporary] [id | uuid | path ] \n\n" @@ -1196,130 +1196,131 @@ usage_connection_down(void) static void usage_connection_add(void) { - nmc_printerr(_("Usage: nmcli connection add { ARGUMENTS | help }\n" - "\n" - "ARGUMENTS := COMMON_OPTIONS TYPE_SPECIFIC_OPTIONS SLAVE_OPTIONS IP_OPTIONS [-- " - "([+|-]. )+]\n\n" - " COMMON_OPTIONS:\n" - " type \n" - " [ifname | \"*\"]\n" - " [con-name ]\n" - " [autoconnect yes|no]\n" - " [save yes|no]\n" - " [master ]\n" - " [slave-type ]\n\n" - " TYPE_SPECIFIC_OPTIONS:\n" - " ethernet: [mac ]\n" - " [cloned-mac ]\n" - " [mtu ]\n\n" - " wifi: ssid \n" - " [mac ]\n" - " [cloned-mac ]\n" - " [mtu ]\n" - " [mode infrastructure|ap|adhoc]\n\n" - " wimax: [mac ]\n" - " [nsp ]\n\n" - " pppoe: username \n" - " [password ]\n" - " [service ]\n" - " [mtu ]\n" - " [mac ]\n\n" - " gsm: apn \n" - " [user ]\n" - " [password ]\n\n" - " cdma: [user ]\n" - " [password ]\n\n" - " infiniband: [mac ]\n" - " [mtu ]\n" - " [transport-mode datagram | connected]\n" - " [parent ]\n" - " [p-key ]\n\n" - " bluetooth: [addr ]\n" - " [bt-type panu|nap|dun-gsm|dun-cdma]\n\n" - " vlan: dev \n" - " id \n" - " [flags ]\n" - " [ingress ]\n" - " [egress ]\n" - " [mtu ]\n\n" - " bond: [mode balance-rr (0) | active-backup (1) | balance-xor (2) | " - "broadcast (3) |\n" - " 802.3ad (4) | balance-tlb (5) | balance-alb (6)]\n" - " [primary ]\n" - " [miimon ]\n" - " [downdelay ]\n" - " [updelay ]\n" - " [arp-interval ]\n" - " [arp-ip-target ]\n" - " [lacp-rate slow (0) | fast (1)]\n\n" - " bond-slave: master \n" - " [queue-id <0-65535>]\n\n" - " team: [config |]\n\n" - " team-slave: master \n" - " [config |]\n\n" - " bridge: [stp yes|no]\n" - " [priority ]\n" - " [forward-delay <2-30>]\n" - " [hello-time <1-10>]\n" - " [max-age <6-40>]\n" - " [ageing-time <0-1000000>]\n" - " [multicast-snooping yes|no]\n" - " [mac ]\n\n" - " bridge-slave: master \n" - " [priority <0-63>]\n" - " [path-cost <1-65535>]\n" - " [hairpin yes|no]\n\n" - " vpn: vpn-type " - "vpnc|openvpn|pptp|openconnect|openswan|libreswan|ssh|l2tp|iodine|...\n" - " [user ]\n\n" - " olpc-mesh: ssid \n" - " [channel <1-13>]\n" - " [dhcp-anycast ]\n\n" - " adsl: username \n" - " protocol pppoa|pppoe|ipoatm\n" - " [password ]\n" - " [encapsulation vcmux|llc]\n\n" - " tun: mode tun|tap\n" - " [owner ]\n" - " [group ]\n" - " [pi yes|no]\n" - " [vnet-hdr yes|no]\n" - " [multi-queue yes|no]\n\n" - " ip-tunnel: mode ipip|gre|sit|isatap|vti|ip6ip6|ipip6|ip6gre|vti6\n" - " remote \n" - " [local ]\n" - " [dev ]\n\n" - " macsec: dev \n" - " mode \n" - " [cak ckn ]\n" - " [encrypt yes|no]\n" - " [port 1-65534]\n\n\n" - " macvlan: dev \n" - " mode vepa|bridge|private|passthru|source\n" - " [tap yes|no]\n\n" - " vxlan: id \n" - " [remote ]\n" - " [local ]\n" - " [dev ]\n" - " [source-port-min <0-65535>]\n" - " [source-port-max <0-65535>]\n" - " [destination-port <0-65535>]\n\n" - " wpan: [short-addr <0x0000-0xffff>]\n" - " [pan-id <0x0000-0xffff>]\n" - " [page ]\n" - " [channel ]\n" - " [mac ]\n\n" - " 6lowpan: dev \n" - " dummy:\n\n" - " SLAVE_OPTIONS:\n" - " bridge: [priority <0-63>]\n" - " [path-cost <1-65535>]\n" - " [hairpin yes|no]\n\n" - " team: [config |]\n\n" - " bond: [queue-id <0-65535>]\n\n" - " IP_OPTIONS:\n" - " [ip4 ] [gw4 ]\n" - " [ip6 ] [gw6 ]\n\n")); + nmc_printerr( + _("Usage: nmcli connection add { ARGUMENTS | help }\n" + "\n" + "ARGUMENTS := COMMON_OPTIONS TYPE_SPECIFIC_OPTIONS PORT_OPTIONS IP_OPTIONS [-- " + "([+|-]. )+]\n\n" + " COMMON_OPTIONS:\n" + " type \n" + " [ifname | \"*\"]\n" + " [con-name ]\n" + " [autoconnect yes|no]\n" + " [save yes|no]\n" + " [controller ]\n" + " [port-type ]\n\n" + " TYPE_SPECIFIC_OPTIONS:\n" + " ethernet: [mac ]\n" + " [cloned-mac ]\n" + " [mtu ]\n\n" + " wifi: ssid \n" + " [mac ]\n" + " [cloned-mac ]\n" + " [mtu ]\n" + " [mode infrastructure|ap|adhoc]\n\n" + " wimax: [mac ]\n" + " [nsp ]\n\n" + " pppoe: username \n" + " [password ]\n" + " [service ]\n" + " [mtu ]\n" + " [mac ]\n\n" + " gsm: apn \n" + " [user ]\n" + " [password ]\n\n" + " cdma: [user ]\n" + " [password ]\n\n" + " infiniband: [mac ]\n" + " [mtu ]\n" + " [transport-mode datagram | connected]\n" + " [parent ]\n" + " [p-key ]\n\n" + " bluetooth: [addr ]\n" + " [bt-type panu|nap|dun-gsm|dun-cdma]\n\n" + " vlan: dev \n" + " id \n" + " [flags ]\n" + " [ingress ]\n" + " [egress ]\n" + " [mtu ]\n\n" + " bond: [mode balance-rr (0) | active-backup (1) | balance-xor (2) | " + "broadcast (3) |\n" + " 802.3ad (4) | balance-tlb (5) | balance-alb (6)]\n" + " [primary ]\n" + " [miimon ]\n" + " [downdelay ]\n" + " [updelay ]\n" + " [arp-interval ]\n" + " [arp-ip-target ]\n" + " [lacp-rate slow (0) | fast (1)]\n\n" + " bond-slave: controller \n" + " [queue-id <0-65535>]\n\n" + " team: [config |]\n\n" + " team-slave: controller \n" + " [config |]\n\n" + " bridge: [stp yes|no]\n" + " [priority ]\n" + " [forward-delay <2-30>]\n" + " [hello-time <1-10>]\n" + " [max-age <6-40>]\n" + " [ageing-time <0-1000000>]\n" + " [multicast-snooping yes|no]\n" + " [mac ]\n\n" + " bridge-slave: controller \n" + " [priority <0-63>]\n" + " [path-cost <1-65535>]\n" + " [hairpin yes|no]\n\n" + " vpn: vpn-type " + "vpnc|openvpn|pptp|openconnect|openswan|libreswan|ssh|l2tp|iodine|...\n" + " [user ]\n\n" + " olpc-mesh: ssid \n" + " [channel <1-13>]\n" + " [dhcp-anycast ]\n\n" + " adsl: username \n" + " protocol pppoa|pppoe|ipoatm\n" + " [password ]\n" + " [encapsulation vcmux|llc]\n\n" + " tun: mode tun|tap\n" + " [owner ]\n" + " [group ]\n" + " [pi yes|no]\n" + " [vnet-hdr yes|no]\n" + " [multi-queue yes|no]\n\n" + " ip-tunnel: mode ipip|gre|sit|isatap|vti|ip6ip6|ipip6|ip6gre|vti6\n" + " remote \n" + " [local ]\n" + " [dev ]\n\n" + " macsec: dev \n" + " mode \n" + " [cak ckn ]\n" + " [encrypt yes|no]\n" + " [port 1-65534]\n\n\n" + " macvlan: dev \n" + " mode vepa|bridge|private|passthru|source\n" + " [tap yes|no]\n\n" + " vxlan: id \n" + " [remote ]\n" + " [local ]\n" + " [dev ]\n" + " [source-port-min <0-65535>]\n" + " [source-port-max <0-65535>]\n" + " [destination-port <0-65535>]\n\n" + " wpan: [short-addr <0x0000-0xffff>]\n" + " [pan-id <0x0000-0xffff>]\n" + " [page ]\n" + " [channel ]\n" + " [mac ]\n\n" + " 6lowpan: dev \n" + " dummy:\n\n" + " PORT_OPTIONS:\n" + " bridge: [priority <0-63>]\n" + " [path-cost <1-65535>]\n" + " [hairpin yes|no]\n\n" + " team: [config |]\n\n" + " bond: [queue-id <0-65535>]\n\n" + " IP_OPTIONS:\n" + " [ip4 ] [gw4 ]\n" + " [ip6 ] [gw6 ]\n\n")); } static void @@ -3533,7 +3534,7 @@ get_name_alias_toplevel(const char *name, const char *port_type) if (port_type) { const char *port_name; - if (nm_meta_setting_info_valid_parts_for_slave_type(port_type, &port_name)) + if (nm_meta_setting_info_valid_parts_for_port_type(port_type, &port_name)) return port_name ?: name; return name; } @@ -3881,7 +3882,7 @@ is_setting_mandatory(NMConnection *connection, NMSetting *setting) if (i == 0) item = get_valid_settings_array(c_type); else - item = nm_meta_setting_info_valid_parts_for_slave_type(s_type, NULL); + item = nm_meta_setting_info_valid_parts_for_port_type(s_type, NULL); for (; item && *item; item++) { if (nm_streq(name, (*item)->setting_info->general->setting_name)) return (*item)->mandatory; @@ -3989,7 +3990,8 @@ normalized_controller_for_port(const GPtrArray *connections, } if (!out_controller) { - nmc_print(_("Warning: master='%s' doesn't refer to any existing profile.\n"), controller); + nmc_print(_("Warning: controller='%s' doesn't refer to any existing profile.\n"), + controller); out_controller = controller; if (out_type) *out_type = type; @@ -4463,12 +4465,12 @@ con_settings(NMConnection *connection, g_return_val_if_fail(s_con, FALSE); con_type = nm_setting_connection_get_port_type(s_con); - *port_settings = nm_meta_setting_info_valid_parts_for_slave_type(con_type, NULL); + *port_settings = nm_meta_setting_info_valid_parts_for_port_type(con_type, NULL); if (!*port_settings) { g_set_error(error, NMCLI_ERROR, NMC_RESULT_ERROR_USER_INPUT, - _("Error: invalid slave type; %s."), + _("Error: invalid port type; %s."), con_type); return FALSE; } @@ -4690,7 +4692,7 @@ set_connection_controller(NmCli *nmc, g_set_error_literal(error, NMCLI_ERROR, NMC_RESULT_ERROR_USER_INPUT, - _("Error: master is required")); + _("Error: controller is required")); return FALSE; } @@ -5028,7 +5030,7 @@ complete_property_name(NmCli *nmc, if (s_con) port_type = nm_setting_connection_get_port_type(s_con); valid_settings_main = get_valid_settings_array(connection_type); - valid_settings_port = nm_meta_setting_info_valid_parts_for_slave_type(port_type, NULL); + valid_settings_port = nm_meta_setting_info_valid_parts_for_port_type(port_type, NULL); word_list = get_valid_properties_string(valid_settings_main, valid_settings_port, @@ -6247,7 +6249,7 @@ gen_setting_names(const char *text, int state) return g_strdup(s_name); } - /* Let's give a try to parameters related to slave type */ + /* Let's give a try to parameters related to port type */ list_idx = 0; is_port = 1; } @@ -6256,7 +6258,7 @@ gen_setting_names(const char *text, int state) s_con = nm_connection_get_setting_connection(nmc_tab_completion.connection); if (s_con) s_type = nm_setting_connection_get_port_type(s_con); - valid_settings_arr = nm_meta_setting_info_valid_parts_for_slave_type(s_type, NULL); + valid_settings_arr = nm_meta_setting_info_valid_parts_for_port_type(s_type, NULL); if (list_idx < NM_PTRARRAY_LEN(valid_settings_arr)) { while (valid_settings_arr[list_idx]) { @@ -6313,7 +6315,7 @@ gen_property_names(const char *text, int state) port_type = NM_SETTING_BOND_SETTING_NAME; else port_type = NULL; - valid_settings_port = nm_meta_setting_info_valid_parts_for_slave_type(port_type, NULL); + valid_settings_port = nm_meta_setting_info_valid_parts_for_port_type(port_type, NULL); setting_name = check_valid_name(strv[0], valid_settings_main, valid_settings_port, NULL); if (setting_name) { @@ -6625,7 +6627,7 @@ get_setting_and_property(const char *prompt, s_type = nm_setting_connection_get_port_type(s_con); valid_settings_main = get_valid_settings_array(nmc_tab_completion.con_type); - valid_settings_port = nm_meta_setting_info_valid_parts_for_slave_type(s_type, NULL); + valid_settings_port = nm_meta_setting_info_valid_parts_for_port_type(s_type, NULL); setting_name = check_valid_name(sett, valid_settings_main, valid_settings_port, NULL); setting = nm_meta_setting_info_editor_new_setting( @@ -7996,7 +7998,7 @@ editor_menu_main(NmCli *nmc, NMConnection *connection, const char *connection_ty s_type = nm_setting_connection_get_port_type(s_con); valid_settings_main = get_valid_settings_array(connection_type); - valid_settings_port = nm_meta_setting_info_valid_parts_for_slave_type(s_type, NULL); + valid_settings_port = nm_meta_setting_info_valid_parts_for_port_type(s_type, NULL); valid_settings_str = get_valid_options_string(valid_settings_main, valid_settings_port); nmc_print(_("You may edit the following settings: %s\n"), valid_settings_str); diff --git a/src/nmcli/devices.c b/src/nmcli/devices.c index 48160286af..f6163757a1 100644 --- a/src/nmcli/devices.c +++ b/src/nmcli/devices.c @@ -762,12 +762,12 @@ const NmcMetaGenericInfo *const nmc_fields_dev_wimax_list[] = { #define NMC_FIELDS_DEV_WIMAX_LIST_COMMON "NSP,SIGNAL,TYPE,DEVICE,ACTIVE" #define NMC_FIELDS_DEV_WIMAX_LIST_FOR_DEV_LIST "NAME," NMC_FIELDS_DEV_WIMAX_LIST_COMMON -const NmcMetaGenericInfo *const nmc_fields_dev_show_master_prop[] = { +const NmcMetaGenericInfo *const nmc_fields_dev_show_controller_prop[] = { NMC_META_GENERIC("NAME"), /* 0 */ NMC_META_GENERIC("SLAVES"), /* 1 */ NULL, }; -#define NMC_FIELDS_DEV_SHOW_MASTER_PROP_COMMON "NAME,SLAVES" +#define NMC_FIELDS_DEV_SHOW_CONTROLLER_PROP_COMMON "NAME,SLAVES" const NmcMetaGenericInfo *const nmc_fields_dev_show_team_prop[] = { NMC_META_GENERIC("NAME"), /* 0 */ @@ -802,18 +802,18 @@ const NmcMetaGenericInfo *const nmc_fields_dev_show_sections[] = { NMC_META_GENERIC_WITH_NESTED("WIRED-PROPERTIES", metagen_device_detail_wired_properties), /* 5 */ NMC_META_GENERIC_WITH_NESTED("WIMAX-PROPERTIES", - metagen_device_detail_wimax_properties), /* 6 */ - NMC_META_GENERIC_WITH_NESTED("NSP", nmc_fields_dev_wimax_list + 1), /* 7 */ - NMC_META_GENERIC_WITH_NESTED("IP4", metagen_ip4_config), /* 8 */ - NMC_META_GENERIC_WITH_NESTED("DHCP4", metagen_dhcp_config), /* 9 */ - NMC_META_GENERIC_WITH_NESTED("IP6", metagen_ip6_config), /* 10 */ - NMC_META_GENERIC_WITH_NESTED("DHCP6", metagen_dhcp_config), /* 11 */ - NMC_META_GENERIC_WITH_NESTED("BOND", nmc_fields_dev_show_master_prop + 1), /* 12 */ - NMC_META_GENERIC_WITH_NESTED("TEAM", nmc_fields_dev_show_team_prop + 1), /* 13 */ - NMC_META_GENERIC_WITH_NESTED("BRIDGE", nmc_fields_dev_show_master_prop + 1), /* 14 */ - NMC_META_GENERIC_WITH_NESTED("VLAN", nmc_fields_dev_show_vlan_prop + 1), /* 15 */ - NMC_META_GENERIC_WITH_NESTED("BLUETOOTH", nmc_fields_dev_show_bluetooth + 1), /* 16 */ - NMC_META_GENERIC_WITH_NESTED("CONNECTIONS", metagen_device_detail_connections), /* 17 */ + metagen_device_detail_wimax_properties), /* 6 */ + NMC_META_GENERIC_WITH_NESTED("NSP", nmc_fields_dev_wimax_list + 1), /* 7 */ + NMC_META_GENERIC_WITH_NESTED("IP4", metagen_ip4_config), /* 8 */ + NMC_META_GENERIC_WITH_NESTED("DHCP4", metagen_dhcp_config), /* 9 */ + NMC_META_GENERIC_WITH_NESTED("IP6", metagen_ip6_config), /* 10 */ + NMC_META_GENERIC_WITH_NESTED("DHCP6", metagen_dhcp_config), /* 11 */ + NMC_META_GENERIC_WITH_NESTED("BOND", nmc_fields_dev_show_controller_prop + 1), /* 12 */ + NMC_META_GENERIC_WITH_NESTED("TEAM", nmc_fields_dev_show_team_prop + 1), /* 13 */ + NMC_META_GENERIC_WITH_NESTED("BRIDGE", nmc_fields_dev_show_controller_prop + 1), /* 14 */ + NMC_META_GENERIC_WITH_NESTED("VLAN", nmc_fields_dev_show_vlan_prop + 1), /* 15 */ + NMC_META_GENERIC_WITH_NESTED("BLUETOOTH", nmc_fields_dev_show_bluetooth + 1), /* 16 */ + NMC_META_GENERIC_WITH_NESTED("CONNECTIONS", metagen_device_detail_connections), /* 17 */ NULL, }; #define NMC_FIELDS_DEV_SHOW_SECTIONS_COMMON \ @@ -1511,7 +1511,7 @@ print_bond_bridge_info(NMDevice *device, if (ports_str->len > 0) g_string_truncate(ports_str, ports_str->len - 1); /* Chop off last space */ - tmpl = (const NMMetaAbstractInfo *const *) nmc_fields_dev_show_master_prop; + tmpl = (const NMMetaAbstractInfo *const *) nmc_fields_dev_show_controller_prop; out_indices = parse_output_fields(one_field, tmpl, FALSE, NULL, NULL); arr = nmc_dup_fields_array(tmpl, NMC_OF_FLAG_FIELD_NAMES); g_ptr_array_add(out.output_data, arr); diff --git a/src/nmcli/devices.h b/src/nmcli/devices.h index 7ed75909b3..7e5a88f9e2 100644 --- a/src/nmcli/devices.h +++ b/src/nmcli/devices.h @@ -27,7 +27,7 @@ extern const NmcMetaGenericInfo *const metagen_device_detail_wifi_properties[]; extern const NmcMetaGenericInfo *const metagen_device_detail_wimax_properties[]; extern const NmcMetaGenericInfo *const nmc_fields_dev_wifi_list[]; extern const NmcMetaGenericInfo *const nmc_fields_dev_wimax_list[]; -extern const NmcMetaGenericInfo *const nmc_fields_dev_show_master_prop[]; +extern const NmcMetaGenericInfo *const nmc_fields_dev_show_controller_prop[]; extern const NmcMetaGenericInfo *const nmc_fields_dev_show_team_prop[]; extern const NmcMetaGenericInfo *const nmc_fields_dev_show_vlan_prop[]; extern const NmcMetaGenericInfo *const nmc_fields_dev_show_bluetooth[]; diff --git a/src/nmcli/gen-metadata-nm-settings-nmcli.xml.in b/src/nmcli/gen-metadata-nm-settings-nmcli.xml.in index 63523a5e46..7f5bc2c7a9 100644 --- a/src/nmcli/gen-metadata-nm-settings-nmcli.xml.in +++ b/src/nmcli/gen-metadata-nm-settings-nmcli.xml.in @@ -671,11 +671,11 @@ format="string" /> controller, priv->type_filter, diff --git a/src/nmtui/nmt-wireguard-peer-list.c b/src/nmtui/nmt-wireguard-peer-list.c index 3ac8a88c7f..c6db61a64a 100644 --- a/src/nmtui/nmt-wireguard-peer-list.c +++ b/src/nmtui/nmt-wireguard-peer-list.c @@ -56,7 +56,7 @@ static guint signals[LAST_SIGNAL] = {0}; /** * nmt_wireguard_peer_list_new: - * @master: the master #NMSettingWireGuard whose peers are being listed + * @controller: the controller #NMSettingWireGuard whose peers are being listed * * Creates a new #NmtWireguardPeerList. *