fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-06 13:48:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

hsr: fix initialization of port1 and port2 DBus Object property

Browse source 
This was causing test_nml_dbus_meta() unit test to fail and also it was
affecting the notification when the object changed.

Fixes: 5426bdf4a1 ('HSR: add support to HSR/PRP interface')
(cherry picked from commit 1e70f24378)
(cherry picked from commit 622f188621)
(cherry picked from commit 8bedd0934f)
This commit is contained in:
Fernando Fernandez Mancera 2024-09-23 16:53:32 +02:00 • committed by Íñigo Huguet
parent 81ccac1980
commit ea4a976cd1
2 changed files with 21 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/libnm-client-impl/nm-device-hsr.c
View file

@ -20,10 +20,15 @@ NM_GOBJECT_PROPERTIES_DEFINE_BASE(PROP_PORT1,
PROP_MULTICAST_SPEC, PROP_MULTICAST_SPEC,
PROP_PRP, ); PROP_PRP, );
enum {
PROPERTY_O_IDX_PORT1,
PROPERTY_O_IDX_PORT2,
_PROPERTY_O_IDX_NUM,
};
typedef struct { typedef struct {
char *supervision_address; char *supervision_address;
NMLDBusPropertyO port1; NMLDBusPropertyO property_o[_PROPERTY_O_IDX_NUM];
NMLDBusPropertyO port2;
guint8 multicast_spec; guint8 multicast_spec;
bool prp; bool prp;
} NMDeviceHsrPrivate; } NMDeviceHsrPrivate;
@ -57,7 +62,8 @@ nm_device_hsr_get_port1(NMDeviceHsr *device)
{ {
g_return_val_if_fail(NM_IS_DEVICE_HSR(device), NULL); g_return_val_if_fail(NM_IS_DEVICE_HSR(device), NULL);
return nml_dbus_property_o_get_obj(&NM_DEVICE_HSR_GET_PRIVATE(device)->port1); return nml_dbus_property_o_get_obj(
&NM_DEVICE_HSR_GET_PRIVATE(device)->property_o[PROPERTY_O_IDX_PORT1]);
} }
/** /**
@ -73,7 +79,8 @@ nm_device_hsr_get_port2(NMDeviceHsr *device)
{ {
g_return_val_if_fail(NM_IS_DEVICE_HSR(device), NULL); g_return_val_if_fail(NM_IS_DEVICE_HSR(device), NULL);
return nml_dbus_property_o_get_obj(&NM_DEVICE_HSR_GET_PRIVATE(device)->port2); return nml_dbus_property_o_get_obj(
&NM_DEVICE_HSR_GET_PRIVATE(device)->property_o[PROPERTY_O_IDX_PORT2]);
} }
/** /**
@ -179,12 +186,12 @@ const NMLDBusMetaIface _nml_dbus_meta_iface_nm_device_hsr = NML_DBUS_META_IFACE_
NML_DBUS_META_PROPERTY_INIT_O_PROP("Port1", NML_DBUS_META_PROPERTY_INIT_O_PROP("Port1",
PROP_PORT1, PROP_PORT1,
NMDeviceHsr, NMDeviceHsr,
_priv.port1, _priv.property_o[PROPERTY_O_IDX_PORT1],
nm_device_get_type), nm_device_get_type),
NML_DBUS_META_PROPERTY_INIT_O_PROP("Port2", NML_DBUS_META_PROPERTY_INIT_O_PROP("Port2",
PROP_PORT2, PROP_PORT2,
NMDeviceHsr, NMDeviceHsr,
_priv.port2, _priv.property_o[PROPERTY_O_IDX_PORT2],
nm_device_get_type), nm_device_get_type),
NML_DBUS_META_PROPERTY_INIT_B("Prp", PROP_PRP, NMDeviceHsr, _priv.prp), NML_DBUS_META_PROPERTY_INIT_B("Prp", PROP_PRP, NMDeviceHsr, _priv.prp),
NML_DBUS_META_PROPERTY_INIT_S("SupervisionAddress", NML_DBUS_META_PROPERTY_INIT_S("SupervisionAddress",
@ -203,8 +210,7 @@ nm_device_hsr_class_init(NMDeviceHsrClass *klass)
_NM_OBJECT_CLASS_INIT_PRIV_PTR_DIRECT(nm_object_class, NMDeviceHsr); _NM_OBJECT_CLASS_INIT_PRIV_PTR_DIRECT(nm_object_class, NMDeviceHsr);
_NM_OBJECT_CLASS_INIT_PROPERTY_O_FIELDS_1(nm_object_class, NMDeviceHsrPrivate, port1); _NM_OBJECT_CLASS_INIT_PROPERTY_O_FIELDS_N(nm_object_class, NMDeviceHsrPrivate, property_o);
_NM_OBJECT_CLASS_INIT_PROPERTY_O_FIELDS_1(nm_object_class, NMDeviceHsrPrivate, port2);
/** /**
* NMDeviceHsr:port1: * NMDeviceHsr:port1:

7
src/libnm-client-impl/tests/test-libnm.c
View file

@ -2690,6 +2690,7 @@ test_types(void)
G(nm_device_ethernet_get_type), G(nm_device_ethernet_get_type),
G(nm_device_generic_get_type), G(nm_device_generic_get_type),
G(nm_device_get_type), G(nm_device_get_type),
G(nm_device_hsr_get_type),
G(nm_device_infiniband_get_type), G(nm_device_infiniband_get_type),
G(nm_device_ip_tunnel_get_type), G(nm_device_ip_tunnel_get_type),
G(nm_device_macsec_get_type), G(nm_device_macsec_get_type),
@ -2762,6 +2763,7 @@ test_types(void)
G(nm_setting_generic_get_type), G(nm_setting_generic_get_type),
G(nm_setting_get_type), G(nm_setting_get_type),
G(nm_setting_gsm_get_type), G(nm_setting_gsm_get_type),
G(nm_setting_hsr_get_type),
G(nm_setting_infiniband_get_type), G(nm_setting_infiniband_get_type),
G(nm_setting_ip4_config_get_type), G(nm_setting_ip4_config_get_type),
G(nm_setting_ip6_config_addr_gen_mode_get_type), G(nm_setting_ip6_config_addr_gen_mode_get_type),
@ -3383,6 +3385,11 @@ test_dbus_meta_types(void)
NM_TYPE_DEVICE_GENERIC, NM_TYPE_DEVICE_GENERIC,
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_30, NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_30,
}, },
{
NM_DBUS_INTERFACE_DEVICE_HSR,
NM_TYPE_DEVICE_HSR,
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_30,
},
{ {
NM_DBUS_INTERFACE_DEVICE_INFINIBAND, NM_DBUS_INTERFACE_DEVICE_INFINIBAND,
NM_TYPE_DEVICE_INFINIBAND, NM_TYPE_DEVICE_INFINIBAND,