colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libnm: use _nm_setting_property_define_direct_boolean()

Browse Source 
There is a new way how to implement default boolean properties.
Use it.
This commit is contained in:
Thomas Haller
2021-06-28 17:28:21 +02:00
parent 03dc5ad391
commit 233776c2c7
22 changed files with 455 additions and 504 deletions
Download Patch File Download Diff File Expand all files Collapse all files

102
src/libnm-core-impl/nm-setting-bridge.c
View File

@@ -77,12 +77,12 @@ typedef struct {
guint16 max_age;
guint16 vlan_default_pvid;
guint16 group_forward_mask;
bool multicast_snooping : 1;
bool vlan_filtering : 1;
bool stp : 1;
bool vlan_stats_enabled : 1;
bool multicast_query_use_ifaddr : 1;
bool multicast_querier : 1;
bool stp;
bool multicast_snooping;
bool vlan_filtering;
bool vlan_stats_enabled;
bool multicast_query_use_ifaddr;
bool multicast_querier;
} NMSettingBridgePrivate;
/**
@@ -1672,13 +1672,14 @@ nm_setting_bridge_class_init(NMSettingBridgeClass *klass)
* description: Span tree protocol participation.
* ---end---
*/
_nm_setting_property_define_boolean(properties_override,
obj_properties,
NM_SETTING_BRIDGE_STP,
PROP_STP,
NM_BRIDGE_STP_DEF,
NM_SETTING_PARAM_INFERRABLE,
nm_setting_bridge_get_stp);
_nm_setting_property_define_direct_boolean(properties_override,
obj_properties,
NM_SETTING_BRIDGE_STP,
PROP_STP,
NM_BRIDGE_STP_DEF,
NM_SETTING_PARAM_INFERRABLE,
NMSettingBridgePrivate,
stp);
/**
* NMSettingBridge:priority:
@@ -1831,13 +1832,14 @@ nm_setting_bridge_class_init(NMSettingBridgeClass *klass)
* description: IGMP snooping support.
* ---end---
*/
_nm_setting_property_define_boolean(properties_override,
obj_properties,
NM_SETTING_BRIDGE_MULTICAST_SNOOPING,
PROP_MULTICAST_SNOOPING,
NM_BRIDGE_MULTICAST_SNOOPING_DEF,
NM_SETTING_PARAM_INFERRABLE,
nm_setting_bridge_get_multicast_snooping);
_nm_setting_property_define_direct_boolean(properties_override,
obj_properties,
NM_SETTING_BRIDGE_MULTICAST_SNOOPING,
PROP_MULTICAST_SNOOPING,
NM_BRIDGE_MULTICAST_SNOOPING_DEF,
NM_SETTING_PARAM_INFERRABLE,
NMSettingBridgePrivate,
multicast_snooping);
/**
* NMSettingBridge:vlan-filtering:
@@ -1854,13 +1856,14 @@ nm_setting_bridge_class_init(NMSettingBridgeClass *klass)
* description: VLAN filtering support.
* ---end---
*/
_nm_setting_property_define_boolean(properties_override,
obj_properties,
NM_SETTING_BRIDGE_VLAN_FILTERING,
PROP_VLAN_FILTERING,
FALSE,
NM_SETTING_PARAM_INFERRABLE,
nm_setting_bridge_get_vlan_filtering);
_nm_setting_property_define_direct_boolean(properties_override,
obj_properties,
NM_SETTING_BRIDGE_VLAN_FILTERING,
PROP_VLAN_FILTERING,
FALSE,
NM_SETTING_PARAM_INFERRABLE,
NMSettingBridgePrivate,
vlan_filtering);
/**
* NMSettingBridge:vlan-default-pvid:
@@ -2001,13 +2004,14 @@ nm_setting_bridge_class_init(NMSettingBridgeClass *klass)
*
* Since: 1.24
*/
_nm_setting_property_define_boolean(properties_override,
obj_properties,
NM_SETTING_BRIDGE_VLAN_STATS_ENABLED,
PROP_VLAN_STATS_ENABLED,
NM_BRIDGE_VLAN_STATS_ENABLED_DEF,
NM_SETTING_PARAM_INFERRABLE,
nm_setting_bridge_get_vlan_stats_enabled);
_nm_setting_property_define_direct_boolean(properties_override,
obj_properties,
NM_SETTING_BRIDGE_VLAN_STATS_ENABLED,
PROP_VLAN_STATS_ENABLED,
NM_BRIDGE_VLAN_STATS_ENABLED_DEF,
NM_SETTING_PARAM_INFERRABLE,
NMSettingBridgePrivate,
vlan_stats_enabled);
/**
* NMSettingBridge:multicast-router:
@@ -2052,13 +2056,14 @@ nm_setting_bridge_class_init(NMSettingBridgeClass *klass)
*
* Since: 1.24
*/
_nm_setting_property_define_boolean(properties_override,
obj_properties,
NM_SETTING_BRIDGE_MULTICAST_QUERY_USE_IFADDR,
PROP_MULTICAST_QUERY_USE_IFADDR,
NM_BRIDGE_MULTICAST_QUERY_USE_IFADDR_DEF,
NM_SETTING_PARAM_INFERRABLE,
nm_setting_bridge_get_multicast_query_use_ifaddr);
_nm_setting_property_define_direct_boolean(properties_override,
obj_properties,
NM_SETTING_BRIDGE_MULTICAST_QUERY_USE_IFADDR,
PROP_MULTICAST_QUERY_USE_IFADDR,
NM_BRIDGE_MULTICAST_QUERY_USE_IFADDR_DEF,
NM_SETTING_PARAM_INFERRABLE,
NMSettingBridgePrivate,
multicast_query_use_ifaddr);
/**
* NMSettingBridge:multicast-querier:
@@ -2075,13 +2080,14 @@ nm_setting_bridge_class_init(NMSettingBridgeClass *klass)
*
* Since: 1.24
*/
_nm_setting_property_define_boolean(properties_override,
obj_properties,
NM_SETTING_BRIDGE_MULTICAST_QUERIER,
PROP_MULTICAST_QUERIER,
NM_BRIDGE_MULTICAST_QUERIER_DEF,
NM_SETTING_PARAM_INFERRABLE,
nm_setting_bridge_get_multicast_querier);
_nm_setting_property_define_direct_boolean(properties_override,
obj_properties,
NM_SETTING_BRIDGE_MULTICAST_QUERIER,
PROP_MULTICAST_QUERIER,
NM_BRIDGE_MULTICAST_QUERIER_DEF,
NM_SETTING_PARAM_INFERRABLE,
NMSettingBridgePrivate,
multicast_querier);
/**
* NMSettingBridge:multicast-hash-max: