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

all: merge branch 'cathay4t:bond_port'

Browse source 
https://bugzilla.redhat.com/show_bug.cgi?id=1949127

https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/952
This commit is contained in:
Thomas Haller 2021-08-26 23:06:08 +02:00
commit da59f477c5
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
43 changed files with 1750 additions and 2678 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
Makefile.am
View file

@ -1172,6 +1172,7 @@ src_libnm_core_impl_lib_h_pub_real = \
src/libnm-core-public/nm-setting-8021x.h \
src/libnm-core-public/nm-setting-adsl.h \
src/libnm-core-public/nm-setting-bluetooth.h \
src/libnm-core-public/nm-setting-bond-port.h \
src/libnm-core-public/nm-setting-bond.h \
src/libnm-core-public/nm-setting-bridge-port.h \
src/libnm-core-public/nm-setting-bridge.h \
@ -1252,6 +1253,7 @@ src_libnm_core_impl_lib_c_settings_real = \
src/libnm-core-impl/nm-setting-8021x.c \
src/libnm-core-impl/nm-setting-adsl.c \
src/libnm-core-impl/nm-setting-bluetooth.c \
src/libnm-core-impl/nm-setting-bond-port.c \
src/libnm-core-impl/nm-setting-bond.c \
src/libnm-core-impl/nm-setting-bridge-port.c \
src/libnm-core-impl/nm-setting-bridge.c \
@ -3412,6 +3414,7 @@ EXTRA_DIST += \
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-bridge-component \
@ -5084,12 +5087,14 @@ src_nmtui_nmtui_SOURCES = \
src/nmtui/nmt-mac-entry.h \
src/nmtui/nmt-mtu-entry.c \
src/nmtui/nmt-mtu-entry.h \
src/nmtui/nmt-page-bond-port.c \
src/nmtui/nmt-page-bond-port.h \
src/nmtui/nmt-page-bond.c \
src/nmtui/nmt-page-bond.h \
src/nmtui/nmt-page-bridge.c \
src/nmtui/nmt-page-bridge.h \
src/nmtui/nmt-page-bridge-port.c \
src/nmtui/nmt-page-bridge-port.h \
src/nmtui/nmt-page-bridge.c \
src/nmtui/nmt-page-bridge.h \
src/nmtui/nmt-page-dsl.c \
src/nmtui/nmt-page-dsl.h \
src/nmtui/nmt-page-ethernet.c \
@ -5104,10 +5109,10 @@ src_nmtui_nmtui_SOURCES = \
src/nmtui/nmt-page-ip6.h \
src/nmtui/nmt-page-ppp.c \
src/nmtui/nmt-page-ppp.h \
src/nmtui/nmt-page-team.c \
src/nmtui/nmt-page-team.h \
src/nmtui/nmt-page-team-port.c \
src/nmtui/nmt-page-team-port.h \
src/nmtui/nmt-page-team.c \
src/nmtui/nmt-page-team.h \
src/nmtui/nmt-page-vlan.c \
src/nmtui/nmt-page-vlan.h \
src/nmtui/nmt-page-wifi.c \
@ -5126,12 +5131,12 @@ src_nmtui_nmtui_SOURCES = \
src/nmtui/nmt-route-table.h \
src/nmtui/nmt-slave-list.c \
src/nmtui/nmt-slave-list.h \
src/nmtui/nmt-wireguard-peer-list.c \
src/nmtui/nmt-wireguard-peer-list.h \
src/nmtui/nmt-wireguard-peer-editor.c \
src/nmtui/nmt-wireguard-peer-editor.h \
src/nmtui/nmt-utils.c \
src/nmtui/nmt-utils.h \
src/nmtui/nmt-wireguard-peer-editor.c \
src/nmtui/nmt-wireguard-peer-editor.h \
src/nmtui/nmt-wireguard-peer-list.c \
src/nmtui/nmt-wireguard-peer-list.h \
src/nmtui/nmt-widget-list.c \
src/nmtui/nmt-widget-list.h \
$(NULL)

9
docs/libnm/libnm-docs.xml
View file

@ -315,6 +315,7 @@ print ("NetworkManager version " + client.get_version())]]></programlisting></in
<xi:include href="xml/nm-setting-8021x.xml"/>
<xi:include href="xml/nm-setting-adsl.xml"/>
<xi:include href="xml/nm-setting-bluetooth.xml"/>
<xi:include href="xml/nm-setting-bond-port.xml"/>
<xi:include href="xml/nm-setting-bond.xml"/>
<xi:include href="xml/nm-setting-bridge-port.xml"/>
<xi:include href="xml/nm-setting-bridge.xml"/>
@ -326,20 +327,20 @@ print ("NetworkManager version " + client.get_version())]]></programlisting></in
<xi:include href="xml/nm-setting-gsm.xml"/>
<xi:include href="xml/nm-setting-hostname.xml"/>
<xi:include href="xml/nm-setting-infiniband.xml"/>
<xi:include href="xml/nm-setting-ip4-config.xml"/>
<xi:include href="xml/nm-setting-ip6-config.xml"/>
<xi:include href="xml/nm-setting-ip-config.xml"/>
<xi:include href="xml/nm-setting-ip-tunnel.xml"/>
<xi:include href="xml/nm-setting-ip4-config.xml"/>
<xi:include href="xml/nm-setting-ip6-config.xml"/>
<xi:include href="xml/nm-setting-macsec.xml"/>
<xi:include href="xml/nm-setting-macvlan.xml"/>
<xi:include href="xml/nm-setting-match.xml"/>
<xi:include href="xml/nm-setting-olpc-mesh.xml"/>
<xi:include href="xml/nm-setting-ovs-bridge.xml"/>
<xi:include href="xml/nm-setting-ovs-interface.xml"/>
<xi:include href="xml/nm-setting-ovs-dpdk.xml"/>
<xi:include href="xml/nm-setting-ovs-external-ids.xml"/>
<xi:include href="xml/nm-setting-ovs-interface.xml"/>
<xi:include href="xml/nm-setting-ovs-patch.xml"/>
<xi:include href="xml/nm-setting-ovs-port.xml"/>
<xi:include href="xml/nm-setting-ovs-external-ids.xml"/>
<xi:include href="xml/nm-setting-ppp.xml"/>
<xi:include href="xml/nm-setting-pppoe.xml"/>
<xi:include href="xml/nm-setting-proxy.xml"/>

6
po/POTFILES.in
View file

@ -83,6 +83,7 @@ src/libnm-core-impl/nm-setting-6lowpan.c
src/libnm-core-impl/nm-setting-8021x.c
src/libnm-core-impl/nm-setting-adsl.c
src/libnm-core-impl/nm-setting-bluetooth.c
src/libnm-core-impl/nm-setting-bond-port.c
src/libnm-core-impl/nm-setting-bond.c
src/libnm-core-impl/nm-setting-bridge-port.c
src/libnm-core-impl/nm-setting-bridge.c
@ -159,6 +160,7 @@ src/nmtui/nmt-edit-connection-list.c
src/nmtui/nmt-editor-section.c
src/nmtui/nmt-editor.c
src/nmtui/nmt-mtu-entry.c
src/nmtui/nmt-page-bond-port.c
src/nmtui/nmt-page-bond.c
src/nmtui/nmt-page-bridge-port.c
src/nmtui/nmt-page-bridge.c
@ -179,9 +181,9 @@ src/nmtui/nmt-password-fields.c
src/nmtui/nmt-route-editor.c
src/nmtui/nmt-route-table.c
src/nmtui/nmt-slave-list.c
src/nmtui/nmt-wireguard-peer-list.c
src/nmtui/nmt-wireguard-peer-editor.c
src/nmtui/nmt-widget-list.c
src/nmtui/nmt-wireguard-peer-editor.c
src/nmtui/nmt-wireguard-peer-list.c
src/nmtui/nmtui-connect.c
src/nmtui/nmtui-edit.c
src/nmtui/nmtui-hostname.c

76
src/core/devices/nm-device-bond.c
View file

@ -17,6 +17,7 @@
#include "libnm-core-aux-intern/nm-libnm-core-utils.h"
#include "libnm-core-intern/nm-core-internal.h"
#include "nm-ip4-config.h"
#include "nm-setting-bond-port.h"
#define _NMLOG_DEVICE_TYPE NMDeviceBond
#include "nm-device-logging.h"
@ -215,11 +216,29 @@ update_connection(NMDevice *device, NMConnection *connection)
}
static gboolean
master_update_slave_connection(NMDevice * self,
NMDevice * slave,
NMConnection *connection,
GError ** error)
controller_update_port_connection(NMDevice * self,
NMDevice * port,
NMConnection *connection,
GError ** error)
{
NMSettingBondPort *s_port;
int ifindex_port = nm_device_get_ifindex(port);
uint queue_id = NM_BOND_PORT_QUEUE_ID_DEF;
gs_free char * queue_id_str = NULL;
g_return_val_if_fail(ifindex_port > 0, FALSE);
s_port = _nm_connection_ensure_setting(connection, NM_TYPE_SETTING_BOND_PORT);
queue_id_str =
nm_platform_sysctl_slave_get_option(nm_device_get_platform(self), ifindex_port, "queue_id");
if (queue_id_str) {
queue_id =
_nm_utils_ascii_str_to_int64(queue_id_str, 10, 0, 65535, NM_BOND_PORT_QUEUE_ID_DEF);
g_object_set(s_port, NM_SETTING_BOND_PORT_QUEUE_ID, queue_id, NULL);
} else
_LOGW(LOGD_BOND, "failed to read bond port setting '%s'", NM_SETTING_BOND_PORT_QUEUE_ID);
g_object_set(nm_connection_get_setting_connection(connection),
NM_SETTING_CONNECTION_MASTER,
nm_device_get_iface(self),
@ -384,30 +403,57 @@ act_stage1_prepare(NMDevice *device, NMDeviceStateReason *out_failure_reason)
return ret;
}
static gboolean
enslave_slave(NMDevice *device, NMDevice *slave, NMConnection *connection, gboolean configure)
static void
commit_port_options(NMDevice *bond_device, NMDevice *port, NMSettingBondPort *s_port)
{
NMDeviceBond *self = NM_DEVICE_BOND(device);
char queue_id_str[IFNAMSIZ + NM_STRLEN(":") + 5 + 100];
nm_device_master_check_slave_physical_port(device, slave, LOGD_BOND);
/*
* The queue-id of bond port is read only, we should modify bond interface using:
* echo "eth1:2" > /sys/class/net/bond0/bonding/queue_id
* Kernel allows parital editing, so no need to care about other bond ports.
*/
g_snprintf(queue_id_str,
sizeof(queue_id_str),
"%s:%" G_GUINT32_FORMAT,
nm_device_get_iface(port),
s_port ? nm_setting_bond_port_get_queue_id(s_port) : NM_BOND_PORT_QUEUE_ID_DEF);
nm_platform_sysctl_master_set_option(nm_device_get_platform(bond_device),
nm_device_get_ifindex(bond_device),
"queue_id",
queue_id_str);
}
static gboolean
enslave_slave(NMDevice *device, NMDevice *port, NMConnection *connection, gboolean configure)
{
NMDeviceBond * self = NM_DEVICE_BOND(device);
NMSettingBondPort *s_port;
nm_device_master_check_slave_physical_port(device, port, LOGD_BOND);
if (configure) {
gboolean success;
nm_device_take_down(slave, TRUE);
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(slave));
nm_device_bring_up(slave, TRUE, NULL);
nm_device_get_ip_ifindex(port));
nm_device_bring_up(port, TRUE, NULL);
if (!success) {
_LOGI(LOGD_BOND, "enslaved bond slave %s: failed", nm_device_get_ip_iface(slave));
_LOGI(LOGD_BOND, "assigning bond port %s: failed", nm_device_get_ip_iface(port));
return FALSE;
}
_LOGI(LOGD_BOND, "enslaved bond slave %s", nm_device_get_ip_iface(slave));
s_port = _nm_connection_get_setting(connection, NM_TYPE_SETTING_BOND_PORT);
commit_port_options(device, port, s_port);
_LOGI(LOGD_BOND, "assigned bond port %s", nm_device_get_ip_iface(port));
} else
_LOGI(LOGD_BOND, "bond slave %s was enslaved", nm_device_get_ip_iface(slave));
_LOGI(LOGD_BOND, "bond port %s was assigned", nm_device_get_ip_iface(port));
return TRUE;
}
@ -613,7 +659,7 @@ nm_device_bond_class_init(NMDeviceBondClass *klass)
device_class->complete_connection = complete_connection;
device_class->update_connection = update_connection;
device_class->master_update_slave_connection = master_update_slave_connection;
device_class->master_update_slave_connection = controller_update_port_connection;
device_class->create_and_realize = create_and_realize;
device_class->act_stage1_prepare = act_stage1_prepare;

2
src/core/dhcp/nm-dhcp-dhclient-utils.c
View file

@ -282,7 +282,7 @@ read_interface(const char *line, char *interface, guint size)
if (ptr[0] == '\0' || strlen(ptr) + 1 > size)
return FALSE;
snprintf(interface, size, "%s", ptr);
g_snprintf(interface, size, "%s", ptr);
return TRUE;
}

2
src/core/platform/tests/test-link.c
View file

@ -1494,7 +1494,7 @@ test_software_detect(gconstpointer user_data)
* The fix (17af2bce) is included kernel 4.7, dated 24 July, 2016.
*/
for (i = ifindex_parent + 1; i < ifindex_parent + 100; i++) {
snprintf(buf, sizeof(buf), "/sys/class/macvtap/tap%d", i);
g_snprintf(buf, sizeof(buf), "/sys/class/macvtap/tap%d", i);
if (!g_file_test(buf, G_FILE_TEST_IS_SYMLINK))
break;

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

@ -31,6 +31,7 @@
#include "nm-setting-ethtool.h"
#include "nm-setting-8021x.h"
#include "nm-setting-bond.h"
#include "nm-setting-bond-port.h"
#include "nm-setting-team.h"
#include "nm-setting-team-port.h"
#include "nm-setting-bridge.h"
@ -5493,6 +5494,31 @@ make_bond_setting(shvarFile *ifcfg, const char *file, GError **error)
return (NMSetting *) s_bond;
}
static NMSetting *
make_bond_port_setting(shvarFile *ifcfg)
{
NMSetting * s_port = NULL;
gs_free char *value_to_free = NULL;
const char * value;
guint queue_id;
g_return_val_if_fail(ifcfg != NULL, FALSE);
value = svGetValue(ifcfg, "BOND_PORT_QUEUE_ID", &value_to_free);
if (value) {
s_port = nm_setting_bond_port_new();
queue_id =
_nm_utils_ascii_str_to_uint64(value, 10, 0, G_MAXUINT16, NM_BOND_PORT_QUEUE_ID_DEF);
if (errno != 0) {
PARSE_WARNING("Invalid bond port queue_id value '%s'", value);
return s_port;
}
g_object_set(G_OBJECT(s_port), NM_SETTING_BOND_PORT_QUEUE_ID, queue_id, NULL);
}
return s_port;
}
static NMConnection *
bond_connection_from_ifcfg(const char *file, shvarFile *ifcfg, GError **error)
{
@ -6660,6 +6686,10 @@ connection_from_file_full(const char *filename,
if (setting)
nm_connection_add_setting(connection, setting);
setting = make_bond_port_setting(main_ifcfg);
if (setting)
nm_connection_add_setting(connection, setting);
setting = make_team_port_setting(main_ifcfg);
if (setting)
nm_connection_add_setting(connection, setting);

1
src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.c
View file

@ -827,6 +827,7 @@ const NMSIfcfgKeyTypeInfo nms_ifcfg_well_known_keys[] = {
_KEY_TYPE("BAND", NMS_IFCFG_KEY_TYPE_IS_PLAIN),
_KEY_TYPE("BONDING_MASTER", NMS_IFCFG_KEY_TYPE_IS_PLAIN),
_KEY_TYPE("BONDING_OPTS", NMS_IFCFG_KEY_TYPE_IS_PLAIN),
_KEY_TYPE("BOND_PORT_QUEUE_ID", NMS_IFCFG_KEY_TYPE_IS_PLAIN),
_KEY_TYPE("BOOTPROTO", NMS_IFCFG_KEY_TYPE_IS_PLAIN),
_KEY_TYPE("BRIDGE", NMS_IFCFG_KEY_TYPE_IS_PLAIN),
_KEY_TYPE("BRIDGE_MACADDR", NMS_IFCFG_KEY_TYPE_IS_PLAIN),

2
src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.h
View file

@ -33,7 +33,7 @@ typedef struct {
NMSIfcfgKeyTypeFlags key_flags;
} NMSIfcfgKeyTypeInfo;
extern const NMSIfcfgKeyTypeInfo nms_ifcfg_well_known_keys[251];
extern const NMSIfcfgKeyTypeInfo nms_ifcfg_well_known_keys[252];
const NMSIfcfgKeyTypeInfo *nms_ifcfg_well_known_key_find_info(const char *key, gssize *out_idx);

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

@ -19,6 +19,7 @@
#include "libnm-glib-aux/nm-str-buf.h"
#include "libnm-glib-aux/nm-io-utils.h"
#include "nm-manager.h"
#include "nm-setting-bond-port.h"
#include "nm-setting-connection.h"
#include "nm-setting-wired.h"
#include "nm-setting-wireless.h"
@ -1888,6 +1889,16 @@ write_bridge_port_setting(NMConnection *connection, shvarFile *ifcfg, GError **e
return TRUE;
}
static void
write_bond_port_setting(NMConnection *connection, shvarFile *ifcfg)
{
NMSettingBondPort *s_port;
s_port = _nm_connection_get_setting(connection, NM_TYPE_SETTING_BOND_PORT);
if (s_port)
svSetValueInt64(ifcfg, "BOND_PORT_QUEUE_ID", nm_setting_bond_port_get_queue_id(s_port));
}
static gboolean
write_team_port_setting(NMConnection *connection, shvarFile *ifcfg, GError **error)
{
@ -3370,6 +3381,8 @@ do_write_construct(NMConnection * connection,
if (!write_bridge_port_setting(connection, ifcfg, error))
return FALSE;
write_bond_port_setting(connection, ifcfg);
if (!write_team_port_setting(connection, ifcfg, error))
return FALSE;

9
src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-port Normal file
View file

@ -0,0 +1,9 @@
TYPE=Ethernet
NAME=eth0
UUID=43737e70-7c4f-4b67-9f4f-6d2d4747b1ff
DEVICE=eth0
ONBOOT=yes
LLDP=no
MASTER=bond99
SLAVE=yes
BOND_PORT_QUEUE_ID=1

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

File diff suppressed because it is too large Load diff

2
src/core/supplicant/nm-supplicant-config.c
View file

@ -417,7 +417,7 @@ nm_supplicant_config_add_setting_macsec(NMSupplicantConfig *self,
port = nm_setting_macsec_get_port(setting);
if (port > 0 && port < 65534) {
snprintf(buf, sizeof(buf), "%d", port);
g_snprintf(buf, sizeof(buf), "%d", port);
if (!nm_supplicant_config_add_option(self, "macsec_port", buf, -1, NULL, error))
return FALSE;
}

2
src/libnm-base/nm-base.h
View file

@ -386,4 +386,6 @@ typedef struct {
/****************************************************************************/
#define NM_BOND_PORT_QUEUE_ID_DEF 0
#endif /* __NM_LIBNM_BASE_H__ */

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

@ -1803,4 +1803,7 @@ libnm_1_34_0 {
global:
nm_ip_routing_rule_get_uid_range;
nm_ip_routing_rule_set_uid_range;
nm_setting_bond_port_get_queue_id;
nm_setting_bond_port_get_type;
nm_setting_bond_port_new;
} libnm_1_32_4;

1
src/libnm-client-public/NetworkManager.h
View file

@ -55,6 +55,7 @@
#include "nm-setting-adsl.h"
#include "nm-setting-bluetooth.h"
#include "nm-setting-bond.h"
#include "nm-setting-bond-port.h"
#include "nm-setting-bridge.h"
#include "nm-setting-bridge-port.h"
#include "nm-setting-cdma.h"

1
src/libnm-client-public/nm-autoptr.h
View file

@ -67,6 +67,7 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC(NMSetting8021x, g_object_unref)
G_DEFINE_AUTOPTR_CLEANUP_FUNC(NMSettingAdsl, g_object_unref)
G_DEFINE_AUTOPTR_CLEANUP_FUNC(NMSettingBluetooth, g_object_unref)
G_DEFINE_AUTOPTR_CLEANUP_FUNC(NMSettingBond, g_object_unref)
G_DEFINE_AUTOPTR_CLEANUP_FUNC(NMSettingBondPort, g_object_unref)
G_DEFINE_AUTOPTR_CLEANUP_FUNC(NMSettingBridge, g_object_unref)
G_DEFINE_AUTOPTR_CLEANUP_FUNC(NMSettingBridgePort, g_object_unref)
G_DEFINE_AUTOPTR_CLEANUP_FUNC(NMSettingCdma, g_object_unref)

16
src/libnm-core-aux-intern/nm-libnm-core-utils.c
View file

@ -362,13 +362,19 @@ nm_settings_connection_validate_permission_user(const char *item, gssize len)
gpointer
_nm_connection_ensure_setting(NMConnection *connection, GType gtype)
{
return nm_connection_get_setting(connection, gtype)
?: _nm_connection_new_setting(connection, gtype);
}
gpointer
_nm_connection_new_setting(NMConnection *connection, GType gtype)
{
NMSetting *setting;
setting = nm_connection_get_setting(connection, gtype);
if (!setting) {
setting = g_object_new(gtype, NULL);
nm_connection_add_setting(connection, setting);
}
nm_assert(g_type_is_a(gtype, NM_TYPE_SETTING));
setting = g_object_new(gtype, NULL);
nm_connection_add_setting(connection, setting);
return setting;
}

3
src/libnm-core-aux-intern/nm-libnm-core-utils.h
View file

@ -166,6 +166,9 @@ gboolean nm_utils_validate_dhcp4_vendor_class_id(const char *vci, GError **error
gboolean nm_settings_connection_validate_permission_user(const char *item, gssize len);
/*****************************************************************************/
gpointer _nm_connection_ensure_setting(NMConnection *connection, GType gtype);
gpointer _nm_connection_new_setting(NMConnection *connection, GType gtype);
#endif /* __NM_LIBNM_SHARED_UTILS_H__ */

1
src/libnm-core-impl/meson.build
View file

@ -37,6 +37,7 @@ libnm_core_settings_sources = files(
'nm-setting-adsl.c',
'nm-setting-bluetooth.c',
'nm-setting-bond.c',
'nm-setting-bond-port.c',
'nm-setting-bridge-port.c',
'nm-setting-bridge.c',
'nm-setting-cdma.c',

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

@ -1074,6 +1074,7 @@ _nm_connection_detect_slave_type(NMConnection *connection, NMSetting **out_s_por
const char * controller_type_name;
} infos[] = {
{NM_META_SETTING_TYPE_BRIDGE_PORT, NM_SETTING_BRIDGE_SETTING_NAME},
{NM_META_SETTING_TYPE_BOND_PORT, NM_SETTING_BOND_SETTING_NAME},
{NM_META_SETTING_TYPE_TEAM_PORT, NM_SETTING_TEAM_SETTING_NAME},
{NM_META_SETTING_TYPE_OVS_PORT, NM_SETTING_OVS_BRIDGE_SETTING_NAME},
{NM_META_SETTING_TYPE_OVS_INTERFACE, NM_SETTING_OVS_PORT_SETTING_NAME},
@ -1679,6 +1680,10 @@ _normalize_invalid_slave_port_settings(NMConnection *self)
&& _nm_connection_remove_setting(self, NM_TYPE_SETTING_BRIDGE_PORT))
changed = TRUE;
if (!nm_streq0(slave_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)
&& _nm_connection_remove_setting(self, NM_TYPE_SETTING_TEAM_PORT))
changed = TRUE;

9
src/libnm-core-impl/nm-meta-setting-base-impl.c
View file

@ -16,6 +16,7 @@
#include "nm-setting-adsl.h"
#include "nm-setting-bluetooth.h"
#include "nm-setting-bond.h"
#include "nm-setting-bond-port.h"
#include "nm-setting-bridge-port.h"
#include "nm-setting-bridge.h"
#include "nm-setting-cdma.h"
@ -190,6 +191,13 @@ const NMMetaSettingInfo nm_meta_setting_infos[] = {
.setting_name = NM_SETTING_BOND_SETTING_NAME,
.get_setting_gtype = nm_setting_bond_get_type,
},
[NM_META_SETTING_TYPE_BOND_PORT] =
{
.meta_type = NM_META_SETTING_TYPE_BOND_PORT,
.setting_priority = NM_SETTING_PRIORITY_AUX,
.setting_name = NM_SETTING_BOND_PORT_SETTING_NAME,
.get_setting_gtype = nm_setting_bond_port_get_type,
},
[NM_META_SETTING_TYPE_BRIDGE] =
{
.meta_type = NM_META_SETTING_TYPE_BRIDGE,
@ -568,6 +576,7 @@ const NMMetaSettingType nm_meta_setting_types_by_priority[] = {
NM_META_SETTING_TYPE_SRIOV,
/* NM_SETTING_PRIORITY_AUX */
NM_META_SETTING_TYPE_BOND_PORT,
NM_META_SETTING_TYPE_BRIDGE_PORT,
NM_META_SETTING_TYPE_ETHTOOL,
NM_META_SETTING_TYPE_MATCH,

174
src/libnm-core-impl/nm-setting-bond-port.c Normal file
View file

@ -0,0 +1,174 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
/*
* Copyright (C) 2021 Red Hat, Inc.
*/
#include "libnm-core-impl/nm-default-libnm-core.h"
#include "nm-connection-private.h"
#include "nm-setting-bond-port.h"
#include "nm-setting-bond.h"
#include "nm-setting-connection.h"
#include "nm-utils-private.h"
#include "nm-utils.h"
/**
* SECTION:nm-setting-bond-port
* @short_description: Describes connection properties for bond ports
*
* The #NMSettingBondPort object is a #NMSetting subclass that describes
* optional properties that apply to bond ports.
**/
/*****************************************************************************/
NM_GOBJECT_PROPERTIES_DEFINE(NMSettingBondPort, PROP_QUEUE_ID, );
typedef struct {
guint32 queue_id;
} NMSettingBondPortPrivate;
/**
* NMSettingBondPort:
*
* Bond Port Settings
*/
struct _NMSettingBondPort {
NMSetting parent;
NMSettingBondPortPrivate _priv;
};
struct _NMSettingBondPortClass {
NMSettingClass parent;
};
G_DEFINE_TYPE(NMSettingBondPort, nm_setting_bond_port, NM_TYPE_SETTING)
#define NM_SETTING_BOND_PORT_GET_PRIVATE(self) \
_NM_GET_PRIVATE(self, NMSettingBondPort, NM_IS_SETTING_BOND_PORT, NMSetting)
/*****************************************************************************/
/**
* nm_setting_bond_port_get_queue_id:
* @setting: the #NMSettingBondPort
*
* Returns: the #NMSettingBondPort:queue_id property of the setting
*
* Since: 1.34
**/
guint32
nm_setting_bond_port_get_queue_id(NMSettingBondPort *setting)
{
g_return_val_if_fail(NM_IS_SETTING_BOND_PORT(setting), 0);
return NM_SETTING_BOND_PORT_GET_PRIVATE(setting)->queue_id;
}
/*****************************************************************************/
static gboolean
verify(NMSetting *setting, NMConnection *connection, GError **error)
{
if (connection) {
NMSettingConnection *s_con;
const char * slave_type;
s_con = nm_connection_get_setting_connection(connection);
if (!s_con) {
g_set_error(error,
NM_CONNECTION_ERROR,
NM_CONNECTION_ERROR_MISSING_SETTING,
_("missing setting"));
g_prefix_error(error, "%s: ", NM_SETTING_CONNECTION_SETTING_NAME);
return FALSE;
}
slave_type = nm_setting_connection_get_slave_type(s_con);
if (!nm_streq0(slave_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'"),
NM_SETTING_BOND_PORT_SETTING_NAME,
NM_SETTING_BOND_SETTING_NAME);
g_prefix_error(error,
"%s.%s: ",
NM_SETTING_CONNECTION_SETTING_NAME,
NM_SETTING_CONNECTION_SLAVE_TYPE);
return FALSE;
}
}
return TRUE;
}
/*****************************************************************************/
static void
nm_setting_bond_port_init(NMSettingBondPort *setting)
{}
/**
* nm_setting_bond_port_new:
*
* Creates a new #NMSettingBondPort object with default values.
*
* Returns: (transfer full): the new empty #NMSettingBondPort object
*
* Since: 1.34
**/
NMSetting *
nm_setting_bond_port_new(void)
{
return g_object_new(NM_TYPE_SETTING_BOND_PORT, NULL);
}
static void
nm_setting_bond_port_class_init(NMSettingBondPortClass *klass)
{
GObjectClass * object_class = G_OBJECT_CLASS(klass);
NMSettingClass *setting_class = NM_SETTING_CLASS(klass);
GArray * properties_override = _nm_sett_info_property_override_create_array();
object_class->get_property = _nm_setting_property_get_property_direct;
object_class->set_property = _nm_setting_property_set_property_direct;
setting_class->verify = verify;
setting_class->finalize_direct = TRUE;
/**
* NMSettingBondPort:queue-id:
*
* The queue ID of this bond port. The maximum value of queue ID is
* the number of TX queues currently active in device.
*
* Since: 1.34
**/
/* ---ifcfg-rh---
* property: queue-id
* variable: BONDING_OPTS: queue-id=
* values: 0 - 65535
* default: 0
* description: Queue ID.
* ---end---
*/
_nm_setting_property_define_direct_uint32(properties_override,
obj_properties,
NM_SETTING_BOND_PORT_QUEUE_ID,
PROP_QUEUE_ID,
0,
G_MAXUINT16,
NM_BOND_PORT_QUEUE_ID_DEF,
NM_SETTING_PARAM_INFERRABLE,
NMSettingBondPort,
_priv.queue_id);
g_object_class_install_properties(object_class, _PROPERTY_ENUMS_LAST, obj_properties);
_nm_setting_class_commit(setting_class,
NM_META_SETTING_TYPE_BOND_PORT,
NULL,
properties_override,
0);
}

1
src/libnm-core-impl/nm-utils.c
View file

@ -29,6 +29,7 @@
#include "nm-setting-private.h"
#include "nm-crypto.h"
#include "nm-setting-bond.h"
#include "nm-setting-bond-port.h"
#include "nm-setting-bridge.h"
#include "nm-setting-bridge-port.h"
#include "nm-setting-infiniband.h"

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

@ -121,7 +121,7 @@ test_nm_meta_setting_types_by_priority(void)
G_STATIC_ASSERT_EXPR(_NM_META_SETTING_TYPE_NUM
== G_N_ELEMENTS(nm_meta_setting_types_by_priority));
G_STATIC_ASSERT_EXPR(_NM_META_SETTING_TYPE_NUM == 51);
G_STATIC_ASSERT_EXPR(_NM_META_SETTING_TYPE_NUM == 52);
arr = g_ptr_array_new_with_free_func(g_object_unref);

1
src/libnm-core-intern/nm-core-internal.h
View file

@ -29,6 +29,7 @@
#include "nm-setting-adsl.h"
#include "nm-setting-bluetooth.h"
#include "nm-setting-bond.h"
#include "nm-setting-bond-port.h"
#include "nm-setting-bridge-port.h"
#include "nm-setting-bridge.h"
#include "nm-setting-cdma.h"

1
src/libnm-core-intern/nm-meta-setting-base-impl.h
View file

@ -110,6 +110,7 @@ typedef enum _nm_packed {
NM_META_SETTING_TYPE_ADSL,
NM_META_SETTING_TYPE_BLUETOOTH,
NM_META_SETTING_TYPE_BOND,
NM_META_SETTING_TYPE_BOND_PORT,
NM_META_SETTING_TYPE_BRIDGE,
NM_META_SETTING_TYPE_BRIDGE_PORT,
NM_META_SETTING_TYPE_CDMA,

1
src/libnm-core-public/meson.build
View file

@ -13,6 +13,7 @@ libnm_core_headers = files(
'nm-setting-adsl.h',
'nm-setting-bluetooth.h',
'nm-setting-bond.h',
'nm-setting-bond-port.h',
'nm-setting-bridge-port.h',
'nm-setting-bridge.h',
'nm-setting-cdma.h',

1
src/libnm-core-public/nm-core-types.h
View file

@ -19,6 +19,7 @@ typedef struct _NMSetting8021x NMSetting8021x;
typedef struct _NMSettingAdsl NMSettingAdsl;
typedef struct _NMSettingBluetooth NMSettingBluetooth;
typedef struct _NMSettingBond NMSettingBond;
typedef struct _NMSettingBondPort NMSettingBondPort;
typedef struct _NMSettingBridge NMSettingBridge;
typedef struct _NMSettingBridgePort NMSettingBridgePort;
typedef struct _NMSettingCdma NMSettingCdma;

46
src/libnm-core-public/nm-setting-bond-port.h Normal file
View file

@ -0,0 +1,46 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
/*
* Copyright (C) 2012 Red Hat, Inc.
*/
#ifndef __NM_SETTING_BOND_PORT_H__
#define __NM_SETTING_BOND_PORT_H__
#if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
#error "Only <NetworkManager.h> can be included directly."
#endif
#include "nm-setting.h"
#include "nm-setting-bond.h"
G_BEGIN_DECLS
#define NM_TYPE_SETTING_BOND_PORT (nm_setting_bond_port_get_type())
#define NM_SETTING_BOND_PORT(obj) \
(G_TYPE_CHECK_INSTANCE_CAST((obj), NM_TYPE_SETTING_BOND_PORT, NMSettingBondPort))
#define NM_SETTING_BOND_PORT_CLASS(klass) \
(G_TYPE_CHECK_CLASS_CAST((klass), NM_TYPE_SETTING_BOND_PORT, NMSettingBondPortClass))
#define NM_IS_SETTING_BOND_PORT(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), NM_TYPE_SETTING_BOND_PORT))
#define NM_IS_SETTING_BOND_PORT_CLASS(klass) \
(G_TYPE_CHECK_CLASS_TYPE((klass), NM_TYPE_SETTING_BOND_PORT))
#define NM_SETTING_BOND_PORT_GET_CLASS(obj) \
(G_TYPE_INSTANCE_GET_CLASS((obj), NM_TYPE_SETTING_BOND_PORT, NMSettingBondPortClass))
#define NM_SETTING_BOND_PORT_SETTING_NAME "bond-port"
#define NM_SETTING_BOND_PORT_QUEUE_ID "queue-id"
typedef struct _NMSettingBondPortClass NMSettingBondPortClass;
NM_AVAILABLE_IN_1_34
GType nm_setting_bond_port_get_type(void);
NM_AVAILABLE_IN_1_34
NMSetting *nm_setting_bond_port_new(void);
NM_AVAILABLE_IN_1_34
guint32 nm_setting_bond_port_get_queue_id(NMSettingBondPort *setting);
G_END_DECLS
#endif /* __NM_SETTING_BOND_PORT_H__ */

38
src/libnm-glib-aux/nm-test-utils.h
View file

@ -1982,6 +1982,28 @@ nmtst_assert_route_attribute_boolean(NMIPRoute *route, const char *name, gboolea
#if (defined(__NM_SIMPLE_CONNECTION_H__) && defined(__NM_SETTING_CONNECTION_H__)) \
|| (defined(NM_CONNECTION_H))
#define nmtst_connection_assert_setting(connection, gtype) \
({ \
const GType _gtype = (gtype); \
gpointer _ptr; \
\
_ptr = nm_connection_get_setting((connection), (_gtype)); \
g_assert(NM_IS_SETTING(_ptr)); \
g_assert(G_OBJECT_TYPE(_ptr) == _gtype); \
_ptr; \
})
#define nmtst_connection_assert_no_setting(connection, gtype) \
G_STMT_START \
{ \
const GType _gtype = (gtype); \
gpointer _ptr; \
\
_ptr = nm_connection_get_setting((connection), (_gtype)); \
g_assert(!_ptr); \
} \
G_STMT_END
static inline NMConnection *
nmtst_clone_connection(NMConnection *connection)
{
@ -2854,4 +2876,20 @@ nmtst_ip_address_new(int addr_family, const char *str)
/*****************************************************************************/
#define nmtst_gbytes_from_arr(...) \
({ \
const guint8 _arr[] = {__VA_ARGS__}; \
\
g_bytes_new(_arr, sizeof(_arr)); \
})
#define nmtst_gbytes_from_str(str) \
({ \
const char *const _str = (str); \
\
g_bytes_new(_str, strlen(_str)); \
})
/*****************************************************************************/
#endif /* __NM_TEST_UTILS_H__ */

2
src/libnm-platform/nm-platform.c
View file

@ -2563,6 +2563,8 @@ slave_category(NMPlatform *self, int slave)
switch (nm_platform_link_get_type(self, master)) {
case NM_LINK_TYPE_BRIDGE:
return "brport";
case NM_LINK_TYPE_BOND:
return "bonding_slave";
default:
return NULL;
}

9
src/libnmc-setting/nm-meta-setting-base-impl.c
View file

@ -16,6 +16,7 @@
#include "nm-setting-adsl.h"
#include "nm-setting-bluetooth.h"
#include "nm-setting-bond.h"
#include "nm-setting-bond-port.h"
#include "nm-setting-bridge-port.h"
#include "nm-setting-bridge.h"
#include "nm-setting-cdma.h"
@ -190,6 +191,13 @@ const NMMetaSettingInfo nm_meta_setting_infos[] = {
.setting_name = NM_SETTING_BOND_SETTING_NAME,
.get_setting_gtype = nm_setting_bond_get_type,
},
[NM_META_SETTING_TYPE_BOND_PORT] =
{
.meta_type = NM_META_SETTING_TYPE_BOND_PORT,
.setting_priority = NM_SETTING_PRIORITY_AUX,
.setting_name = NM_SETTING_BOND_PORT_SETTING_NAME,
.get_setting_gtype = nm_setting_bond_port_get_type,
},
[NM_META_SETTING_TYPE_BRIDGE] =
{
.meta_type = NM_META_SETTING_TYPE_BRIDGE,
@ -568,6 +576,7 @@ const NMMetaSettingType nm_meta_setting_types_by_priority[] = {
NM_META_SETTING_TYPE_SRIOV,
/* NM_SETTING_PRIORITY_AUX */
NM_META_SETTING_TYPE_BOND_PORT,
NM_META_SETTING_TYPE_BRIDGE_PORT,
NM_META_SETTING_TYPE_ETHTOOL,
NM_META_SETTING_TYPE_MATCH,

1
src/libnmc-setting/nm-meta-setting-base-impl.h
View file

@ -110,6 +110,7 @@ typedef enum _nm_packed {
NM_META_SETTING_TYPE_ADSL,
NM_META_SETTING_TYPE_BLUETOOTH,
NM_META_SETTING_TYPE_BOND,
NM_META_SETTING_TYPE_BOND_PORT,
NM_META_SETTING_TYPE_BRIDGE,
NM_META_SETTING_TYPE_BRIDGE_PORT,
NM_META_SETTING_TYPE_CDMA,

21
src/libnmc-setting/nm-meta-setting-desc.c
View file

@ -5048,6 +5048,18 @@ static const NMMetaPropertyInfo *const property_infos_BOND[] = {
NULL
};
#undef _CURRENT_NM_META_SETTING_TYPE
#define _CURRENT_NM_META_SETTING_TYPE NM_META_SETTING_TYPE_BOND_PORT
static const NMMetaPropertyInfo *const property_infos_BOND_PORT[] = {
PROPERTY_INFO_WITH_DESC (NM_SETTING_BOND_PORT_QUEUE_ID,
.is_cli_option = TRUE,
.property_alias = "queue-id",
.prompt = N_("Queue ID [0]"),
.property_type = &_pt_gobject_int,
),
NULL
};
#undef _CURRENT_NM_META_SETTING_TYPE
#define _CURRENT_NM_META_SETTING_TYPE NM_META_SETTING_TYPE_BRIDGE
static const NMMetaPropertyInfo *const property_infos_BRIDGE[] = {
@ -8113,6 +8125,7 @@ _setting_init_fcn_wireless (ARGS_SETTING_INIT_FCN)
#define SETTING_PRETTY_NAME_ADSL N_("ADSL connection")
#define SETTING_PRETTY_NAME_BLUETOOTH N_("bluetooth connection")
#define SETTING_PRETTY_NAME_BOND N_("Bond device")
#define SETTING_PRETTY_NAME_BOND_PORT N_("Bond port")
#define SETTING_PRETTY_NAME_BRIDGE N_("Bridge device")
#define SETTING_PRETTY_NAME_BRIDGE_PORT N_("Bridge port")
#define SETTING_PRETTY_NAME_CDMA N_("CDMA mobile broadband connection")
@ -8217,6 +8230,7 @@ const NMMetaSettingInfoEditor nm_meta_setting_infos_editor[] = {
NM_META_SETTING_VALID_PART_ITEM (ETHTOOL, FALSE),
),
),
SETTING_INFO (BOND_PORT),
SETTING_INFO (BRIDGE,
.valid_parts = NM_META_SETTING_VALID_PARTS (
NM_META_SETTING_VALID_PART_ITEM (CONNECTION, TRUE),
@ -8497,6 +8511,11 @@ static const NMMetaSettingValidPartItem *const valid_settings_noslave[] = {
NULL,
};
static const NMMetaSettingValidPartItem *const valid_settings_slave_bond[] = {
NM_META_SETTING_VALID_PART_ITEM(BOND_PORT, TRUE),
NULL,
};
static const NMMetaSettingValidPartItem *const valid_settings_slave_bridge[] = {
NM_META_SETTING_VALID_PART_ITEM(BRIDGE_PORT, TRUE),
NULL,
@ -8526,7 +8545,7 @@ nm_meta_setting_info_valid_parts_for_slave_type(const char *slave_type, const ch
}
if (nm_streq(slave_type, NM_SETTING_BOND_SETTING_NAME)) {
NM_SET_OUT(out_slave_name, "bond-slave");
return NM_PTRARRAY_EMPTY(const NMMetaSettingValidPartItem *);
return valid_settings_slave_bond;
}
if (nm_streq(slave_type, NM_SETTING_BRIDGE_SETTING_NAME)) {
NM_SET_OUT(out_slave_name, "bridge-slave");

1
src/libnmc-setting/settings-docs.h.in
View file

@ -114,6 +114,7 @@
#define DESCRIBE_DOC_NM_SETTING_BLUETOOTH_BDADDR N_("The Bluetooth address of the device.")
#define DESCRIBE_DOC_NM_SETTING_BLUETOOTH_TYPE N_("Either \"dun\" for Dial-Up Networking connections or \"panu\" for Personal Area Networking connections to devices supporting the NAP profile.")
#define DESCRIBE_DOC_NM_SETTING_BOND_OPTIONS N_("Dictionary of key/value pairs of bonding options. Both keys and values must be strings. Option names must contain only alphanumeric characters (ie, [a-zA-Z0-9]).")
#define DESCRIBE_DOC_NM_SETTING_BOND_PORT_QUEUE_ID N_("The queue ID of this bond port. The maximum value of queue ID is the number of TX queues currently active in device.")
#define DESCRIBE_DOC_NM_SETTING_BRIDGE_AGEING_TIME N_("The Ethernet MAC address aging time, in seconds.")
#define DESCRIBE_DOC_NM_SETTING_BRIDGE_FORWARD_DELAY N_("The Spanning Tree Protocol (STP) forwarding delay, in seconds.")
#define DESCRIBE_DOC_NM_SETTING_BRIDGE_GROUP_ADDRESS N_("If specified, The MAC address of the multicast group this bridge uses for STP. The address must be a link-local address in standard Ethernet MAC address format, ie an address of the form 01:80:C2:00:00:0X, with X in [0, 4..F]. If not specified the default value is 01:80:C2:00:00:00.")

45
src/nmcli/connections.c
View file

@ -874,18 +874,19 @@ const NmcMetaGenericInfo
"," NM_SETTING_CDMA_SETTING_NAME "," NM_SETTING_BLUETOOTH_SETTING_NAME \
"," NM_SETTING_OLPC_MESH_SETTING_NAME "," NM_SETTING_VPN_SETTING_NAME \
"," NM_SETTING_INFINIBAND_SETTING_NAME "," NM_SETTING_BOND_SETTING_NAME \
"," NM_SETTING_VLAN_SETTING_NAME "," NM_SETTING_BRIDGE_SETTING_NAME \
"," NM_SETTING_BRIDGE_PORT_SETTING_NAME "," NM_SETTING_TEAM_SETTING_NAME \
"," NM_SETTING_TEAM_PORT_SETTING_NAME "," NM_SETTING_OVS_BRIDGE_SETTING_NAME \
"," NM_SETTING_OVS_INTERFACE_SETTING_NAME "," NM_SETTING_OVS_PATCH_SETTING_NAME \
"," NM_SETTING_OVS_PORT_SETTING_NAME "," NM_SETTING_DCB_SETTING_NAME \
"," NM_SETTING_TUN_SETTING_NAME "," NM_SETTING_IP_TUNNEL_SETTING_NAME \
"," NM_SETTING_MACSEC_SETTING_NAME "," NM_SETTING_MACVLAN_SETTING_NAME \
"," NM_SETTING_VXLAN_SETTING_NAME "," NM_SETTING_VRF_SETTING_NAME \
"," NM_SETTING_WPAN_SETTING_NAME "," NM_SETTING_6LOWPAN_SETTING_NAME \
"," NM_SETTING_WIREGUARD_SETTING_NAME "," NM_SETTING_PROXY_SETTING_NAME \
"," NM_SETTING_TC_CONFIG_SETTING_NAME "," NM_SETTING_SRIOV_SETTING_NAME \
"," NM_SETTING_ETHTOOL_SETTING_NAME "," NM_SETTING_OVS_DPDK_SETTING_NAME \
"," NM_SETTING_BOND_PORT_SETTING_NAME "," NM_SETTING_VLAN_SETTING_NAME \
"," NM_SETTING_BRIDGE_SETTING_NAME "," NM_SETTING_BRIDGE_PORT_SETTING_NAME \
"," NM_SETTING_TEAM_SETTING_NAME "," NM_SETTING_TEAM_PORT_SETTING_NAME \
"," NM_SETTING_OVS_BRIDGE_SETTING_NAME "," NM_SETTING_OVS_INTERFACE_SETTING_NAME \
"," NM_SETTING_OVS_PATCH_SETTING_NAME "," NM_SETTING_OVS_PORT_SETTING_NAME \
"," NM_SETTING_DCB_SETTING_NAME "," NM_SETTING_TUN_SETTING_NAME \
"," NM_SETTING_IP_TUNNEL_SETTING_NAME "," NM_SETTING_MACSEC_SETTING_NAME \
"," NM_SETTING_MACVLAN_SETTING_NAME "," NM_SETTING_VXLAN_SETTING_NAME \
"," NM_SETTING_VRF_SETTING_NAME "," NM_SETTING_WPAN_SETTING_NAME \
"," NM_SETTING_6LOWPAN_SETTING_NAME "," NM_SETTING_WIREGUARD_SETTING_NAME \
"," NM_SETTING_PROXY_SETTING_NAME "," NM_SETTING_TC_CONFIG_SETTING_NAME \
"," NM_SETTING_SRIOV_SETTING_NAME "," NM_SETTING_ETHTOOL_SETTING_NAME \
"," NM_SETTING_OVS_DPDK_SETTING_NAME \
"," NM_SETTING_HOSTNAME_SETTING_NAME /* NM_SETTING_DUMMY_SETTING_NAME NM_SETTING_WIMAX_SETTING_NAME */
const NmcMetaGenericInfo *const nmc_fields_con_active_details_groups[] = {
@ -1062,7 +1063,8 @@ usage_connection_add(void)
" [arp-interval <num>]\n"
" [arp-ip-target <num>]\n"
" [lacp-rate slow (0) | fast (1)]\n\n"
" bond-slave: master <master (ifname, or connection UUID or name)>\n\n"
" bond-slave: master <master (ifname, or connection UUID or name)>\n"
" [queue-id <0-65535>]\n\n"
" team: [config <file>|<raw JSON data>]\n\n"
" team-slave: master <master (ifname, or connection UUID or name)>\n"
" [config <file>|<raw JSON data>]\n\n"
@ -1125,6 +1127,7 @@ usage_connection_add(void)
" [path-cost <1-65535>]\n"
" [hairpin yes|no]\n\n"
" team: [config <file>|<raw JSON data>]\n\n"
" bond: [queue-id <0-65535>]\n\n"
" IP_OPTIONS:\n"
" [ip4 <IPv4 address>] [gw4 <IPv4 gateway>]\n"
" [ip6 <IPv6 address>] [gw6 <IPv6 gateway>]\n\n"));
@ -3791,13 +3794,13 @@ prompt_yes_no(gboolean default_yes, char *delim)
if (!delim)
delim = "";
snprintf(prompt,
sizeof(prompt),
"(%s/%s) [%s]%s ",
WORD_YES,
WORD_NO,
default_yes ? WORD_YES : WORD_NO,
delim);
g_snprintf(prompt,
sizeof(prompt),
"(%s/%s) [%s]%s ",
WORD_YES,
WORD_NO,
default_yes ? WORD_YES : WORD_NO,
delim);
return prompt;
}
@ -6007,6 +6010,8 @@ gen_property_names(const char *text, int state)
slv_type = NM_SETTING_TEAM_SETTING_NAME;
else if (nm_streq0(strv[0], NM_SETTING_BRIDGE_PORT_SETTING_NAME))
slv_type = NM_SETTING_BRIDGE_SETTING_NAME;
else if (nm_streq0(strv[0], NM_SETTING_BOND_PORT_SETTING_NAME))
slv_type = NM_SETTING_BOND_SETTING_NAME;
else
slv_type = NULL;
valid_settings_slave = nm_meta_setting_info_valid_parts_for_slave_type(slv_type, NULL);

5
src/nmcli/generate-docs-nm-settings-nmcli.xml.in
View file

@ -267,6 +267,11 @@
<property name="options"
description="Dictionary of key/value pairs of bonding options. Both keys and values must be strings. Option names must contain only alphanumeric characters (ie, [a-zA-Z0-9])." />
</setting>
<setting name="bond-port" >
<property name="queue-id"
alias="queue-id"
description="The queue ID of this bond port. The maximum value of queue ID is the number of TX queues currently active in device." />
</setting>
<setting name="bridge" >
<property name="mac-address"
alias="mac"

1
src/nmtui/meson.build
View file

@ -18,6 +18,7 @@ executable(
'nmt-mac-entry.c',
'nmt-mtu-entry.c',
'nmt-page-bond.c',
'nmt-page-bond-port.c',
'nmt-page-bridge.c',
'nmt-page-bridge-port.c',
'nmt-page-dsl.c',

3
src/nmtui/nmt-editor.c
View file

@ -26,6 +26,7 @@
#include "nmt-mtu-entry.h"
#include "nmt-page-bond.h"
#include "nmt-page-bond-port.h"
#include "nmt-page-bridge.h"
#include "nmt-page-bridge-port.h"
#include "nmt-page-dsl.h"
@ -387,6 +388,8 @@ nmt_editor_constructed(GObject *object)
add_sections_for_page(editor, grid, nmt_page_bridge_port_new(priv->edit_connection));
else if (!strcmp(slave_type, NM_SETTING_TEAM_SETTING_NAME))
add_sections_for_page(editor, grid, nmt_page_team_port_new(priv->edit_connection));
else if (nm_streq(slave_type, NM_SETTING_BOND_SETTING_NAME))
add_sections_for_page(editor, grid, nmt_page_bond_port_new(priv->edit_connection));
} else {
NmtNewtWidget *section;

2
src/nmtui/nmt-editor.h
View file

@ -1,4 +1,4 @@
/* SPDX-License-Identifier: GPL-2.0-or-later */
/* SPDX-License-Identifier: LGPL-2.1-or-later */
/*
* Copyright (C) 2013 Red Hat, Inc.
*/

64
src/nmtui/nmt-page-bond-port.c Normal file
View file

@ -0,0 +1,64 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
/*
* Copyright (C) 2021 Red Hat, Inc.
*/
/**
* SECTION:nmt-page-bond-port
* @short_description: The editor page for Bond ports
*/
#include "libnm-client-aux-extern/nm-default-client.h"
#include "nmt-page-bond-port.h"
#include "libnm-core-aux-intern/nm-libnm-core-utils.h"
G_DEFINE_TYPE(NmtPageBondPort, nmt_page_bond_port, NMT_TYPE_EDITOR_PAGE)
static void
nmt_page_bond_port_init(NmtPageBondPort *bond)
{}
NmtEditorPage *
nmt_page_bond_port_new(NMConnection *conn)
{
return g_object_new(NMT_TYPE_PAGE_BOND_PORT, "connection", conn, NULL);
}
static void
nmt_page_bond_port_constructed(GObject *object)
{
NmtPageBondPort * bond = NMT_PAGE_BOND_PORT(object);
NmtEditorSection * section;
NmtEditorGrid * grid;
NMSettingBondPort *s_port;
NmtNewtWidget * widget;
NMConnection * conn;
conn = nmt_editor_page_get_connection(NMT_EDITOR_PAGE(bond));
s_port = _nm_connection_ensure_setting(conn, NM_TYPE_SETTING_BOND_PORT);
section = nmt_editor_section_new(_("BOND PORT"), NULL, TRUE);
grid = nmt_editor_section_get_body(section);
widget = nmt_newt_entry_numeric_new(10, 0, 63);
g_object_bind_property(s_port,
NM_SETTING_BOND_PORT_QUEUE_ID,
widget,
"text",
G_BINDING_BIDIRECTIONAL | G_BINDING_SYNC_CREATE);
nmt_editor_grid_append(grid, _("Queue ID"), widget, NULL);
nmt_editor_page_add_section(NMT_EDITOR_PAGE(bond), section);
G_OBJECT_CLASS(nmt_page_bond_port_parent_class)->constructed(object);
}
static void
nmt_page_bond_port_class_init(NmtPageBondPortClass *bond_class)
{
GObjectClass *object_class = G_OBJECT_CLASS(bond_class);
object_class->constructed = nmt_page_bond_port_constructed;
}

36
src/nmtui/nmt-page-bond-port.h Normal file
View file

@ -0,0 +1,36 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
/*
* Copyright (C) 2021 Red Hat, Inc.
*/
#ifndef NMT_PAGE_BOND_PORT_H
#define NMT_PAGE_BOND_PORT_H
#include "nmt-editor-page-device.h"
#define NMT_TYPE_PAGE_BOND_PORT (nmt_page_bond_port_get_type())
#define NMT_PAGE_BOND_PORT(obj) \
(G_TYPE_CHECK_INSTANCE_CAST((obj), NMT_TYPE_PAGE_BOND_PORT, NmtPageBondPort))
#define NMT_PAGE_BOND_PORT_CLASS(klass) \
(G_TYPE_CHECK_CLASS_CAST((klass), NMT_TYPE_PAGE_BOND_PORT, NmtPageBondPortClass))
#define NMT_IS_PAGE_BOND_PORT(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), NMT_TYPE_PAGE_BOND_PORT))
#define NMT_IS_PAGE_BOND_PORT_CLASS(klass) \
(G_TYPE_CHECK_CLASS_TYPE((klass), NMT_TYPE_PAGE_BOND_PORT))
#define NMT_PAGE_BOND_PORT_GET_CLASS(obj) \
(G_TYPE_INSTANCE_GET_CLASS((obj), NMT_TYPE_PAGE_BOND_PORT, NmtPageBondPortClass))
typedef struct {
NmtEditorPage parent;
} NmtPageBondPort;
typedef struct {
NmtEditorPageClass parent;
} NmtPageBondPortClass;
GType nmt_page_bond_port_get_type(void);
NmtEditorPage *nmt_page_bond_port_new(NMConnection *conn);
#endif /* NMT_PAGE_BOND_PORT_H */