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

34
src/libnm-core-impl/nm-setting-8021x.c
View File

@@ -176,8 +176,8 @@ typedef struct {
NMSettingSecretFlags pin_flags; NMSettingSecretFlags pin_flags;
NMSettingSecretFlags private_key_password_flags; NMSettingSecretFlags private_key_password_flags;
NMSettingSecretFlags phase2_private_key_password_flags; NMSettingSecretFlags phase2_private_key_password_flags;
bool optional : 1; bool optional;
bool system_ca_certs : 1; bool system_ca_certs;
} NMSetting8021xPrivate; } NMSetting8021xPrivate;
/** /**
@@ -4588,13 +4588,14 @@ nm_setting_802_1x_class_init(NMSetting8021xClass *klass)
* description: a boolean value. * description: a boolean value.
* ---end--- * ---end---
*/ */
_nm_setting_property_define_boolean(properties_override, _nm_setting_property_define_direct_boolean(properties_override,
obj_properties, obj_properties,
NM_SETTING_802_1X_SYSTEM_CA_CERTS, NM_SETTING_802_1X_SYSTEM_CA_CERTS,
PROP_SYSTEM_CA_CERTS, PROP_SYSTEM_CA_CERTS,
FALSE, FALSE,
NM_SETTING_PARAM_NONE, NM_SETTING_PARAM_NONE,
nm_setting_802_1x_get_system_ca_certs); NMSetting8021xPrivate,
system_ca_certs);
/** /**
* NMSetting8021x:auth-timeout: * NMSetting8021x:auth-timeout:
@@ -4638,13 +4639,14 @@ nm_setting_802_1x_class_init(NMSetting8021xClass *klass)
* description: whether the 802.1X authentication is optional * description: whether the 802.1X authentication is optional
* ---end--- * ---end---
*/ */
_nm_setting_property_define_boolean(properties_override, _nm_setting_property_define_direct_boolean(properties_override,
obj_properties, obj_properties,
NM_SETTING_802_1X_OPTIONAL, NM_SETTING_802_1X_OPTIONAL,
PROP_OPTIONAL, PROP_OPTIONAL,
FALSE, FALSE,
NM_SETTING_PARAM_NONE, NM_SETTING_PARAM_NONE,
nm_setting_802_1x_get_optional); NMSetting8021xPrivate,
optional);
g_object_class_install_properties(object_class, _PROPERTY_ENUMS_LAST, obj_properties); g_object_class_install_properties(object_class, _PROPERTY_ENUMS_LAST, obj_properties);

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

@@ -36,7 +36,7 @@ typedef struct {
GPtrArray *vlans; GPtrArray *vlans;
guint16 priority; guint16 priority;
guint16 path_cost; guint16 path_cost;
bool hairpin_mode : 1; bool hairpin_mode;
} NMSettingBridgePortPrivate; } NMSettingBridgePortPrivate;
/** /**
@@ -564,13 +564,14 @@ nm_setting_bridge_port_class_init(NMSettingBridgePortClass *klass)
* description: Hairpin mode of the bridge port. * description: Hairpin mode of the bridge port.
* ---end--- * ---end---
*/ */
_nm_setting_property_define_boolean(properties_override, _nm_setting_property_define_direct_boolean(properties_override,
obj_properties, obj_properties,
NM_SETTING_BRIDGE_PORT_HAIRPIN_MODE, NM_SETTING_BRIDGE_PORT_HAIRPIN_MODE,
PROP_HAIRPIN_MODE, PROP_HAIRPIN_MODE,
FALSE, FALSE,
NM_SETTING_PARAM_INFERRABLE, NM_SETTING_PARAM_INFERRABLE,
nm_setting_bridge_port_get_hairpin_mode); NMSettingBridgePortPrivate,
hairpin_mode);
/** /**
* NMSettingBridgePort:vlans: (type GPtrArray(NMBridgeVlan)) * NMSettingBridgePort:vlans: (type GPtrArray(NMBridgeVlan))

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

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

17
src/libnm-core-impl/nm-setting-connection.c
View File

@@ -94,7 +94,7 @@ typedef struct {
NMMetered metered; NMMetered metered;
NMSettingConnectionLldp lldp; NMSettingConnectionLldp lldp;
bool autoconnect; bool autoconnect;
bool read_only : 1; bool read_only;
} NMSettingConnectionPrivate; } NMSettingConnectionPrivate;
/** /**
@@ -2200,13 +2200,14 @@ nm_setting_connection_class_init(NMSettingConnectionClass *klass)
* service's D-Bus interface with the right privileges, or %TRUE if the * service's D-Bus interface with the right privileges, or %TRUE if the
* connection is read-only and cannot be modified. * connection is read-only and cannot be modified.
**/ **/
_nm_setting_property_define_boolean(properties_override, _nm_setting_property_define_direct_boolean(properties_override,
obj_properties, obj_properties,
NM_SETTING_CONNECTION_READ_ONLY, NM_SETTING_CONNECTION_READ_ONLY,
PROP_READ_ONLY, PROP_READ_ONLY,
FALSE, FALSE,
NM_SETTING_PARAM_FUZZY_IGNORE, NM_SETTING_PARAM_FUZZY_IGNORE,
nm_setting_connection_get_read_only); NMSettingConnectionPrivate,
read_only);
/** /**
* NMSettingConnection:zone: * NMSettingConnection:zone:

34
src/libnm-core-impl/nm-setting-gsm.c
View File

@@ -51,8 +51,8 @@ typedef struct {
NMSettingSecretFlags password_flags; NMSettingSecretFlags password_flags;
NMSettingSecretFlags pin_flags; NMSettingSecretFlags pin_flags;
guint32 mtu; guint32 mtu;
bool auto_config : 1; bool auto_config;
bool home_only : 1; bool home_only;
} NMSettingGsmPrivate; } NMSettingGsmPrivate;
/** /**
@@ -667,13 +667,14 @@ nm_setting_gsm_class_init(NMSettingGsmClass *klass)
* *
* Since: 1.22 * Since: 1.22
**/ **/
_nm_setting_property_define_boolean(properties_override, _nm_setting_property_define_direct_boolean(properties_override,
obj_properties, obj_properties,
NM_SETTING_GSM_AUTO_CONFIG, NM_SETTING_GSM_AUTO_CONFIG,
PROP_AUTO_CONFIG, PROP_AUTO_CONFIG,
FALSE, FALSE,
NM_SETTING_PARAM_NONE, NM_SETTING_PARAM_NONE,
nm_setting_gsm_get_auto_config); NMSettingGsmPrivate,
auto_config);
/** /**
* NMSettingGsm:number: * NMSettingGsm:number:
@@ -794,13 +795,14 @@ nm_setting_gsm_class_init(NMSettingGsmClass *klass)
* When %TRUE, only connections to the home network will be allowed. * When %TRUE, only connections to the home network will be allowed.
* Connections to roaming networks will not be made. * Connections to roaming networks will not be made.
**/ **/
_nm_setting_property_define_boolean(properties_override, _nm_setting_property_define_direct_boolean(properties_override,
obj_properties, obj_properties,
NM_SETTING_GSM_HOME_ONLY, NM_SETTING_GSM_HOME_ONLY,
PROP_HOME_ONLY, PROP_HOME_ONLY,
FALSE, FALSE,
NM_SETTING_PARAM_NONE, NM_SETTING_PARAM_NONE,
nm_setting_gsm_get_home_only); NMSettingGsmPrivate,
home_only);
/** /**
* NMSettingGsm:device-id: * NMSettingGsm:device-id:

54
src/libnm-core-impl/nm-setting-ip-config.c
View File

@@ -5816,35 +5816,39 @@ _nm_sett_info_property_override_create_array_ip_config(void)
.to_dbus_fcn = _routing_rules_dbus_only_synth, .to_dbus_fcn = _routing_rules_dbus_only_synth,
.from_dbus_fcn = _routing_rules_dbus_only_set, )); .from_dbus_fcn = _routing_rules_dbus_only_set, ));
_nm_properties_override_gobj(properties_override, _nm_properties_override_gobj(
obj_properties[PROP_IGNORE_AUTO_ROUTES], properties_override,
&nm_sett_info_propert_type_boolean, obj_properties[PROP_IGNORE_AUTO_ROUTES],
.to_dbus_data.get_boolean = (gboolean(*)( &nm_sett_info_propert_type_direct_boolean,
NMSetting *)) nm_setting_ip_config_get_ignore_auto_routes); .direct_offset =
NM_STRUCT_OFFSET_ENSURE_TYPE(bool, NMSettingIPConfigPrivate, ignore_auto_routes));
_nm_properties_override_gobj(properties_override, _nm_properties_override_gobj(
obj_properties[PROP_IGNORE_AUTO_DNS], properties_override,
&nm_sett_info_propert_type_boolean, obj_properties[PROP_IGNORE_AUTO_DNS],
.to_dbus_data.get_boolean = (gboolean(*)( &nm_sett_info_propert_type_direct_boolean,
NMSetting *)) nm_setting_ip_config_get_ignore_auto_dns); .direct_offset =
NM_STRUCT_OFFSET_ENSURE_TYPE(bool, NMSettingIPConfigPrivate, ignore_auto_dns));
_nm_properties_override_gobj(properties_override, _nm_properties_override_gobj(
obj_properties[PROP_DHCP_SEND_HOSTNAME], properties_override,
&nm_sett_info_propert_type_boolean, obj_properties[PROP_DHCP_SEND_HOSTNAME],
.to_dbus_data.get_boolean = (gboolean(*)( &nm_sett_info_propert_type_direct_boolean,
NMSetting *)) nm_setting_ip_config_get_dhcp_send_hostname); .direct_offset =
NM_STRUCT_OFFSET_ENSURE_TYPE(bool, NMSettingIPConfigPrivate, dhcp_send_hostname));
_nm_properties_override_gobj(properties_override, _nm_properties_override_gobj(
obj_properties[PROP_NEVER_DEFAULT], properties_override,
&nm_sett_info_propert_type_boolean, obj_properties[PROP_NEVER_DEFAULT],
.to_dbus_data.get_boolean = (gboolean(*)( &nm_sett_info_propert_type_direct_boolean,
NMSetting *)) nm_setting_ip_config_get_never_default); .direct_offset =
NM_STRUCT_OFFSET_ENSURE_TYPE(bool, NMSettingIPConfigPrivate, never_default));
_nm_properties_override_gobj(properties_override, _nm_properties_override_gobj(
obj_properties[PROP_MAY_FAIL], properties_override,
&nm_sett_info_propert_type_boolean, obj_properties[PROP_MAY_FAIL],
.to_dbus_data.get_boolean = &nm_sett_info_propert_type_direct_boolean,
(gboolean(*)(NMSetting *)) nm_setting_ip_config_get_may_fail); .direct_offset = NM_STRUCT_OFFSET_ENSURE_TYPE(bool, NMSettingIPConfigPrivate, may_fail));
return properties_override; return properties_override;
} }

17
src/libnm-core-impl/nm-setting-ip-tunnel.c
View File

@@ -44,7 +44,7 @@ typedef struct {
NMIPTunnelMode mode; NMIPTunnelMode mode;
guint32 mtu; guint32 mtu;
guint32 flags; guint32 flags;
bool path_mtu_discovery : 1; bool path_mtu_discovery;
} NMSettingIPTunnelPrivate; } NMSettingIPTunnelPrivate;
/** /**
@@ -770,13 +770,14 @@ nm_setting_ip_tunnel_class_init(NMSettingIPTunnelClass *klass)
* *
* Since: 1.2 * Since: 1.2
**/ **/
_nm_setting_property_define_boolean(properties_override, _nm_setting_property_define_direct_boolean(properties_override,
obj_properties, obj_properties,
NM_SETTING_IP_TUNNEL_PATH_MTU_DISCOVERY, NM_SETTING_IP_TUNNEL_PATH_MTU_DISCOVERY,
PROP_PATH_MTU_DISCOVERY, PROP_PATH_MTU_DISCOVERY,
TRUE, TRUE,
NM_SETTING_PARAM_INFERRABLE, NM_SETTING_PARAM_INFERRABLE,
nm_setting_ip_tunnel_get_path_mtu_discovery); NMSettingIPTunnelPrivate,
path_mtu_discovery);
/** /**
* NMSettingIPTunnel:input-key: * NMSettingIPTunnel:input-key:

34
src/libnm-core-impl/nm-setting-macsec.c
View File

@@ -45,8 +45,8 @@ typedef struct {
NMSettingMacsecMode mode; NMSettingMacsecMode mode;
NMSettingSecretFlags mka_cak_flags; NMSettingSecretFlags mka_cak_flags;
NMSettingMacsecValidation validation; NMSettingMacsecValidation validation;
bool encrypt : 1; bool encrypt;
bool send_sci : 1; bool send_sci;
} NMSettingMacsecPrivate; } NMSettingMacsecPrivate;
/** /**
@@ -583,13 +583,14 @@ nm_setting_macsec_class_init(NMSettingMacsecClass *klass)
* *
* Since: 1.6 * Since: 1.6
**/ **/
_nm_setting_property_define_boolean(properties_override, _nm_setting_property_define_direct_boolean(properties_override,
obj_properties, obj_properties,
NM_SETTING_MACSEC_ENCRYPT, NM_SETTING_MACSEC_ENCRYPT,
PROP_ENCRYPT, PROP_ENCRYPT,
TRUE, TRUE,
NM_SETTING_PARAM_NONE, NM_SETTING_PARAM_NONE,
nm_setting_macsec_get_encrypt); NMSettingMacsecPrivate,
encrypt);
/** /**
* NMSettingMacsec:mka-cak: * NMSettingMacsec:mka-cak:
@@ -676,13 +677,14 @@ nm_setting_macsec_class_init(NMSettingMacsecClass *klass)
* *
* Since: 1.12 * Since: 1.12
**/ **/
_nm_setting_property_define_boolean(properties_override, _nm_setting_property_define_direct_boolean(properties_override,
obj_properties, obj_properties,
NM_SETTING_MACSEC_SEND_SCI, NM_SETTING_MACSEC_SEND_SCI,
PROP_SEND_SCI, PROP_SEND_SCI,
TRUE, TRUE,
NM_SETTING_PARAM_NONE, NM_SETTING_PARAM_NONE,
nm_setting_macsec_get_send_sci); NMSettingMacsecPrivate,
send_sci);
g_object_class_install_properties(object_class, _PROPERTY_ENUMS_LAST, obj_properties); g_object_class_install_properties(object_class, _PROPERTY_ENUMS_LAST, obj_properties);

34
src/libnm-core-impl/nm-setting-macvlan.c
View File

@@ -30,8 +30,8 @@ NM_GOBJECT_PROPERTIES_DEFINE_BASE(PROP_PARENT, PROP_MODE, PROP_PROMISCUOUS, PROP
typedef struct { typedef struct {
char * parent; char * parent;
NMSettingMacvlanMode mode; NMSettingMacvlanMode mode;
bool promiscuous : 1; bool promiscuous;
bool tap : 1; bool tap;
} NMSettingMacvlanPrivate; } NMSettingMacvlanPrivate;
/** /**
@@ -322,13 +322,14 @@ nm_setting_macvlan_class_init(NMSettingMacvlanClass *klass)
* *
* Since: 1.2 * Since: 1.2
**/ **/
_nm_setting_property_define_boolean(properties_override, _nm_setting_property_define_direct_boolean(properties_override,
obj_properties, obj_properties,
NM_SETTING_MACVLAN_PROMISCUOUS, NM_SETTING_MACVLAN_PROMISCUOUS,
PROP_PROMISCUOUS, PROP_PROMISCUOUS,
TRUE, TRUE,
NM_SETTING_PARAM_INFERRABLE, NM_SETTING_PARAM_INFERRABLE,
nm_setting_macvlan_get_promiscuous); NMSettingMacvlanPrivate,
promiscuous);
/** /**
* NMSettingMacvlan:tap: * NMSettingMacvlan:tap:
@@ -337,13 +338,14 @@ nm_setting_macvlan_class_init(NMSettingMacvlanClass *klass)
* *
* Since: 1.2 * Since: 1.2
**/ **/
_nm_setting_property_define_boolean(properties_override, _nm_setting_property_define_direct_boolean(properties_override,
obj_properties, obj_properties,
NM_SETTING_MACVLAN_TAP, NM_SETTING_MACVLAN_TAP,
PROP_TAP, PROP_TAP,
FALSE, FALSE,
NM_SETTING_PARAM_INFERRABLE, NM_SETTING_PARAM_INFERRABLE,
nm_setting_macvlan_get_tap); NMSettingMacvlanPrivate,
tap);
g_object_class_install_properties(object_class, _PROPERTY_ENUMS_LAST, obj_properties); g_object_class_install_properties(object_class, _PROPERTY_ENUMS_LAST, obj_properties);

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

@@ -37,9 +37,9 @@ struct _NMSettingOvsBridge {
char *fail_mode; char *fail_mode;
char *datapath_type; char *datapath_type;
bool mcast_snooping_enable : 1; bool mcast_snooping_enable;
bool rstp_enable : 1; bool rstp_enable;
bool stp_enable : 1; bool stp_enable;
}; };
struct _NMSettingOvsBridgeClass { struct _NMSettingOvsBridgeClass {
@@ -320,13 +320,14 @@ nm_setting_ovs_bridge_class_init(NMSettingOvsBridgeClass *klass)
* *
* Since: 1.10 * Since: 1.10
**/ **/
_nm_setting_property_define_boolean(properties_override, _nm_setting_property_define_direct_boolean(properties_override,
obj_properties, obj_properties,
NM_SETTING_OVS_BRIDGE_MCAST_SNOOPING_ENABLE, NM_SETTING_OVS_BRIDGE_MCAST_SNOOPING_ENABLE,
PROP_MCAST_SNOOPING_ENABLE, PROP_MCAST_SNOOPING_ENABLE,
FALSE, FALSE,
NM_SETTING_PARAM_NONE, NM_SETTING_PARAM_NONE,
nm_setting_ovs_bridge_get_mcast_snooping_enable); NMSettingOvsBridge,
mcast_snooping_enable);
/** /**
* NMSettingOvsBridge:rstp-enable: * NMSettingOvsBridge:rstp-enable:
@@ -335,13 +336,14 @@ nm_setting_ovs_bridge_class_init(NMSettingOvsBridgeClass *klass)
* *
* Since: 1.10 * Since: 1.10
**/ **/
_nm_setting_property_define_boolean(properties_override, _nm_setting_property_define_direct_boolean(properties_override,
obj_properties, obj_properties,
NM_SETTING_OVS_BRIDGE_RSTP_ENABLE, NM_SETTING_OVS_BRIDGE_RSTP_ENABLE,
PROP_RSTP_ENABLE, PROP_RSTP_ENABLE,
FALSE, FALSE,
NM_SETTING_PARAM_NONE, NM_SETTING_PARAM_NONE,
nm_setting_ovs_bridge_get_rstp_enable); NMSettingOvsBridge,
rstp_enable);
/** /**
* NMSettingOvsBridge:stp-enable: * NMSettingOvsBridge:stp-enable:
@@ -350,13 +352,14 @@ nm_setting_ovs_bridge_class_init(NMSettingOvsBridgeClass *klass)
* *
* Since: 1.10 * Since: 1.10
**/ **/
_nm_setting_property_define_boolean(properties_override, _nm_setting_property_define_direct_boolean(properties_override,
obj_properties, obj_properties,
NM_SETTING_OVS_BRIDGE_STP_ENABLE, NM_SETTING_OVS_BRIDGE_STP_ENABLE,
PROP_STP_ENABLE, PROP_STP_ENABLE,
FALSE, FALSE,
NM_SETTING_PARAM_NONE, NM_SETTING_PARAM_NONE,
nm_setting_ovs_bridge_get_stp_enable); NMSettingOvsBridge,
stp_enable);
/** /**
* NMSettingOvsBridge:datapath-type: * NMSettingOvsBridge:datapath-type:

221
src/libnm-core-impl/nm-setting-ppp.c
View File

@@ -47,19 +47,19 @@ typedef struct {
guint32 mtu; guint32 mtu;
guint32 lcp_echo_failure; guint32 lcp_echo_failure;
guint32 lcp_echo_interval; guint32 lcp_echo_interval;
bool noauth : 1; bool noauth;
bool refuse_eap : 1; bool refuse_eap;
bool refuse_pap : 1; bool refuse_pap;
bool refuse_chap : 1; bool refuse_chap;
bool refuse_mschap : 1; bool refuse_mschap;
bool refuse_mschapv2 : 1; bool refuse_mschapv2;
bool nobsdcomp : 1; bool nobsdcomp;
bool nodeflate : 1; bool nodeflate;
bool no_vj_comp : 1; bool no_vj_comp;
bool require_mppe : 1; bool require_mppe;
bool require_mppe_128 : 1; bool require_mppe_128;
bool mppe_stateful : 1; bool mppe_stateful;
bool crtscts : 1; bool crtscts;
} NMSettingPppPrivate; } NMSettingPppPrivate;
/** /**
@@ -552,117 +552,126 @@ nm_setting_ppp_class_init(NMSettingPppClass *klass)
* authenticate itself to the client. If %FALSE, require authentication * authenticate itself to the client. If %FALSE, require authentication
* from the remote side. In almost all cases, this should be %TRUE. * from the remote side. In almost all cases, this should be %TRUE.
**/ **/
_nm_setting_property_define_boolean(properties_override, _nm_setting_property_define_direct_boolean(properties_override,
obj_properties, obj_properties,
NM_SETTING_PPP_NOAUTH, NM_SETTING_PPP_NOAUTH,
PROP_NOAUTH, PROP_NOAUTH,
TRUE, TRUE,
NM_SETTING_PARAM_NONE, NM_SETTING_PARAM_NONE,
nm_setting_ppp_get_noauth); NMSettingPppPrivate,
noauth);
/** /**
* NMSettingPpp:refuse-eap: * NMSettingPpp:refuse-eap:
* *
* If %TRUE, the EAP authentication method will not be used. * If %TRUE, the EAP authentication method will not be used.
**/ **/
_nm_setting_property_define_boolean(properties_override, _nm_setting_property_define_direct_boolean(properties_override,
obj_properties, obj_properties,
NM_SETTING_PPP_REFUSE_EAP, NM_SETTING_PPP_REFUSE_EAP,
PROP_REFUSE_EAP, PROP_REFUSE_EAP,
FALSE, FALSE,
NM_SETTING_PARAM_NONE, NM_SETTING_PARAM_NONE,
nm_setting_ppp_get_refuse_eap); NMSettingPppPrivate,
refuse_eap);
/** /**
* NMSettingPpp:refuse-pap: * NMSettingPpp:refuse-pap:
* *
* If %TRUE, the PAP authentication method will not be used. * If %TRUE, the PAP authentication method will not be used.
**/ **/
_nm_setting_property_define_boolean(properties_override, _nm_setting_property_define_direct_boolean(properties_override,
obj_properties, obj_properties,
NM_SETTING_PPP_REFUSE_PAP, NM_SETTING_PPP_REFUSE_PAP,
PROP_REFUSE_PAP, PROP_REFUSE_PAP,
FALSE, FALSE,
NM_SETTING_PARAM_NONE, NM_SETTING_PARAM_NONE,
nm_setting_ppp_get_refuse_pap); NMSettingPppPrivate,
refuse_pap);
/** /**
* NMSettingPpp:refuse-chap: * NMSettingPpp:refuse-chap:
* *
* If %TRUE, the CHAP authentication method will not be used. * If %TRUE, the CHAP authentication method will not be used.
**/ **/
_nm_setting_property_define_boolean(properties_override, _nm_setting_property_define_direct_boolean(properties_override,
obj_properties, obj_properties,
NM_SETTING_PPP_REFUSE_CHAP, NM_SETTING_PPP_REFUSE_CHAP,
PROP_REFUSE_CHAP, PROP_REFUSE_CHAP,
FALSE, FALSE,
NM_SETTING_PARAM_NONE, NM_SETTING_PARAM_NONE,
nm_setting_ppp_get_refuse_chap); NMSettingPppPrivate,
refuse_chap);
/** /**
* NMSettingPpp:refuse-mschap: * NMSettingPpp:refuse-mschap:
* *
* If %TRUE, the MSCHAP authentication method will not be used. * If %TRUE, the MSCHAP authentication method will not be used.
**/ **/
_nm_setting_property_define_boolean(properties_override, _nm_setting_property_define_direct_boolean(properties_override,
obj_properties, obj_properties,
NM_SETTING_PPP_REFUSE_MSCHAP, NM_SETTING_PPP_REFUSE_MSCHAP,
PROP_REFUSE_MSCHAP, PROP_REFUSE_MSCHAP,
FALSE, FALSE,
NM_SETTING_PARAM_NONE, NM_SETTING_PARAM_NONE,
nm_setting_ppp_get_refuse_mschap); NMSettingPppPrivate,
refuse_mschap);
/** /**
* NMSettingPpp:refuse-mschapv2: * NMSettingPpp:refuse-mschapv2:
* *
* If %TRUE, the MSCHAPv2 authentication method will not be used. * If %TRUE, the MSCHAPv2 authentication method will not be used.
**/ **/
_nm_setting_property_define_boolean(properties_override, _nm_setting_property_define_direct_boolean(properties_override,
obj_properties, obj_properties,
NM_SETTING_PPP_REFUSE_MSCHAPV2, NM_SETTING_PPP_REFUSE_MSCHAPV2,
PROP_REFUSE_MSCHAPV2, PROP_REFUSE_MSCHAPV2,
FALSE, FALSE,
NM_SETTING_PARAM_NONE, NM_SETTING_PARAM_NONE,
nm_setting_ppp_get_refuse_mschapv2); NMSettingPppPrivate,
refuse_mschapv2);
/** /**
* NMSettingPpp:nobsdcomp: * NMSettingPpp:nobsdcomp:
* *
* If %TRUE, BSD compression will not be requested. * If %TRUE, BSD compression will not be requested.
**/ **/
_nm_setting_property_define_boolean(properties_override, _nm_setting_property_define_direct_boolean(properties_override,
obj_properties, obj_properties,
NM_SETTING_PPP_NOBSDCOMP, NM_SETTING_PPP_NOBSDCOMP,
PROP_NOBSDCOMP, PROP_NOBSDCOMP,
FALSE, FALSE,
NM_SETTING_PARAM_FUZZY_IGNORE, NM_SETTING_PARAM_FUZZY_IGNORE,
nm_setting_ppp_get_nobsdcomp); NMSettingPppPrivate,
nobsdcomp);
/** /**
* NMSettingPpp:nodeflate: * NMSettingPpp:nodeflate:
* *
* If %TRUE, "deflate" compression will not be requested. * If %TRUE, "deflate" compression will not be requested.
**/ **/
_nm_setting_property_define_boolean(properties_override, _nm_setting_property_define_direct_boolean(properties_override,
obj_properties, obj_properties,
NM_SETTING_PPP_NODEFLATE, NM_SETTING_PPP_NODEFLATE,
PROP_NODEFLATE, PROP_NODEFLATE,
FALSE, FALSE,
NM_SETTING_PARAM_FUZZY_IGNORE, NM_SETTING_PARAM_FUZZY_IGNORE,
nm_setting_ppp_get_nodeflate); NMSettingPppPrivate,
nodeflate);
/** /**
* NMSettingPpp:no-vj-comp: * NMSettingPpp:no-vj-comp:
* *
* If %TRUE, Van Jacobsen TCP header compression will not be requested. * If %TRUE, Van Jacobsen TCP header compression will not be requested.
**/ **/
_nm_setting_property_define_boolean(properties_override, _nm_setting_property_define_direct_boolean(properties_override,
obj_properties, obj_properties,
NM_SETTING_PPP_NO_VJ_COMP, NM_SETTING_PPP_NO_VJ_COMP,
PROP_NO_VJ_COMP, PROP_NO_VJ_COMP,
FALSE, FALSE,
NM_SETTING_PARAM_FUZZY_IGNORE, NM_SETTING_PARAM_FUZZY_IGNORE,
nm_setting_ppp_get_no_vj_comp); NMSettingPppPrivate,
no_vj_comp);
/** /**
* NMSettingPpp:require-mppe: * NMSettingPpp:require-mppe:
@@ -672,13 +681,14 @@ nm_setting_ppp_class_init(NMSettingPppClass *klass)
* session will fail. Note that MPPE is not used on mobile broadband * session will fail. Note that MPPE is not used on mobile broadband
* connections. * connections.
**/ **/
_nm_setting_property_define_boolean(properties_override, _nm_setting_property_define_direct_boolean(properties_override,
obj_properties, obj_properties,
NM_SETTING_PPP_REQUIRE_MPPE, NM_SETTING_PPP_REQUIRE_MPPE,
PROP_REQUIRE_MPPE, PROP_REQUIRE_MPPE,
FALSE, FALSE,
NM_SETTING_PARAM_NONE, NM_SETTING_PARAM_NONE,
nm_setting_ppp_get_require_mppe); NMSettingPppPrivate,
require_mppe);
/** /**
* NMSettingPpp:require-mppe-128: * NMSettingPpp:require-mppe-128:
@@ -687,13 +697,14 @@ nm_setting_ppp_class_init(NMSettingPppClass *klass)
* required for the PPP session, and the "require-mppe" property must also * required for the PPP session, and the "require-mppe" property must also
* be set to %TRUE. If 128-bit MPPE is not available the session will fail. * be set to %TRUE. If 128-bit MPPE is not available the session will fail.
**/ **/
_nm_setting_property_define_boolean(properties_override, _nm_setting_property_define_direct_boolean(properties_override,
obj_properties, obj_properties,
NM_SETTING_PPP_REQUIRE_MPPE_128, NM_SETTING_PPP_REQUIRE_MPPE_128,
PROP_REQUIRE_MPPE_128, PROP_REQUIRE_MPPE_128,
FALSE, FALSE,
NM_SETTING_PARAM_NONE, NM_SETTING_PARAM_NONE,
nm_setting_ppp_get_require_mppe_128); NMSettingPppPrivate,
require_mppe_128);
/** /**
* NMSettingPpp:mppe-stateful: * NMSettingPpp:mppe-stateful:
@@ -701,13 +712,14 @@ nm_setting_ppp_class_init(NMSettingPppClass *klass)
* If %TRUE, stateful MPPE is used. See pppd documentation for more * If %TRUE, stateful MPPE is used. See pppd documentation for more
* information on stateful MPPE. * information on stateful MPPE.
**/ **/
_nm_setting_property_define_boolean(properties_override, _nm_setting_property_define_direct_boolean(properties_override,
obj_properties, obj_properties,
NM_SETTING_PPP_MPPE_STATEFUL, NM_SETTING_PPP_MPPE_STATEFUL,
PROP_MPPE_STATEFUL, PROP_MPPE_STATEFUL,
FALSE, FALSE,
NM_SETTING_PARAM_NONE, NM_SETTING_PARAM_NONE,
nm_setting_ppp_get_mppe_stateful); NMSettingPppPrivate,
mppe_stateful);
/** /**
* NMSettingPpp:crtscts: * NMSettingPpp:crtscts:
@@ -716,13 +728,14 @@ nm_setting_ppp_class_init(NMSettingPppClass *klass)
* flow control with RTS and CTS signals. This value should normally be set * flow control with RTS and CTS signals. This value should normally be set
* to %FALSE. * to %FALSE.
**/ **/
_nm_setting_property_define_boolean(properties_override, _nm_setting_property_define_direct_boolean(properties_override,
obj_properties, obj_properties,
NM_SETTING_PPP_CRTSCTS, NM_SETTING_PPP_CRTSCTS,
PROP_CRTSCTS, PROP_CRTSCTS,
FALSE, FALSE,
NM_SETTING_PARAM_NONE, NM_SETTING_PARAM_NONE,
nm_setting_ppp_get_crtscts); NMSettingPppPrivate,
crtscts);
/** /**
* NMSettingPpp:baud: * NMSettingPpp:baud:

82
src/libnm-core-impl/nm-setting-private.h
View File

@@ -160,11 +160,11 @@ typedef struct {
int dhcp_timeout; int dhcp_timeout;
int required_timeout; int required_timeout;
guint32 route_table; guint32 route_table;
bool ignore_auto_routes : 1; bool ignore_auto_routes;
bool ignore_auto_dns : 1; bool ignore_auto_dns;
bool dhcp_send_hostname : 1; bool dhcp_send_hostname;
bool never_default : 1; bool never_default;
bool may_fail : 1; bool may_fail;
} NMSettingIPConfigPrivate; } NMSettingIPConfigPrivate;
void _nm_setting_ip_config_private_init(gpointer self, NMSettingIPConfigPrivate *priv); void _nm_setting_ip_config_private_init(gpointer self, NMSettingIPConfigPrivate *priv);
@@ -288,7 +288,6 @@ extern const NMSettInfoPropertType nm_sett_info_propert_type_plain_u;
extern const NMSettInfoPropertType nm_sett_info_propert_type_direct_boolean; extern const NMSettInfoPropertType nm_sett_info_propert_type_direct_boolean;
extern const NMSettInfoPropertType nm_sett_info_propert_type_boolean;
extern const NMSettInfoPropertType nm_sett_info_propert_type_string; extern const NMSettInfoPropertType nm_sett_info_propert_type_string;
NMSettingVerifyResult NMSettingVerifyResult
@@ -317,14 +316,6 @@ GVariant *_nm_setting_property_to_dbus_fcn_direct(const NMSettInfoSetting *
NMConnectionSerializationFlags flags, NMConnectionSerializationFlags flags,
const NMConnectionSerializationOptions *options); const NMConnectionSerializationOptions *options);
GVariant *
_nm_setting_property_to_dbus_fcn_get_boolean(const NMSettInfoSetting * sett_info,
guint property_idx,
NMConnection * connection,
NMSetting * setting,
NMConnectionSerializationFlags flags,
const NMConnectionSerializationOptions *options);
GVariant * GVariant *
_nm_setting_property_to_dbus_fcn_get_string(const NMSettInfoSetting * sett_info, _nm_setting_property_to_dbus_fcn_get_string(const NMSettInfoSetting * sett_info,
guint property_idx, guint property_idx,
@@ -487,69 +478,6 @@ _nm_properties_override(GArray *properties_override, const NMSettInfoProperty *p
/*****************************************************************************/ /*****************************************************************************/
#define _nm_setting_property_define_boolean_full(properties_override, \
obj_properties, \
prop_name, \
prop_id, \
default_value, \
param_flags, \
property_type, \
get_fcn, \
...) \
G_STMT_START \
{ \
const gboolean _default_value = (default_value); \
GParamSpec * _param_spec; \
const NMSettInfoPropertType *const _property_type = (property_type); \
\
G_STATIC_ASSERT( \
!NM_FLAGS_ANY((param_flags), \
~(NM_SETTING_PARAM_FUZZY_IGNORE | NM_SETTING_PARAM_INFERRABLE \
| NM_SETTING_PARAM_REAPPLY_IMMEDIATELY))); \
\
nm_assert(_property_type); \
nm_assert(_property_type->to_dbus_fcn == _nm_setting_property_to_dbus_fcn_get_boolean); \
\
nm_assert(NM_IN_SET(_default_value, 0, 1)); \
\
_param_spec = \
g_param_spec_boolean("" prop_name "", \
"", \
"", \
_default_value, \
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | (param_flags)); \
\
(obj_properties)[(prop_id)] = _param_spec; \
\
_nm_properties_override_gobj((properties_override), \
_param_spec, \
_property_type, \
.to_dbus_data.get_boolean = \
(gboolean(*)(NMSetting *)) (get_fcn), \
__VA_ARGS__); \
} \
G_STMT_END
#define _nm_setting_property_define_boolean(properties_override, \
obj_properties, \
prop_name, \
prop_id, \
default_value, \
param_flags, \
get_fcn, \
...) \
_nm_setting_property_define_boolean_full((properties_override), \
(obj_properties), \
prop_name, \
(prop_id), \
(default_value), \
(param_flags), \
&nm_sett_info_propert_type_boolean, \
(get_fcn), \
__VA_ARGS__)
/*****************************************************************************/
#define _nm_setting_property_define_string_full(properties_override, \ #define _nm_setting_property_define_string_full(properties_override, \
obj_properties, \ obj_properties, \
prop_name, \ prop_name, \

17
src/libnm-core-impl/nm-setting-proxy.c
View File

@@ -32,7 +32,7 @@ typedef struct {
char *pac_url; char *pac_url;
char *pac_script; char *pac_script;
int method; int method;
bool browser_only : 1; bool browser_only;
} NMSettingProxyPrivate; } NMSettingProxyPrivate;
/** /**
@@ -345,13 +345,14 @@ nm_setting_proxy_class_init(NMSettingProxyClass *klass)
* description: Whether the proxy configuration is for browser only. * description: Whether the proxy configuration is for browser only.
* ---end--- * ---end---
*/ */
_nm_setting_property_define_boolean(properties_override, _nm_setting_property_define_direct_boolean(properties_override,
obj_properties, obj_properties,
NM_SETTING_PROXY_BROWSER_ONLY, NM_SETTING_PROXY_BROWSER_ONLY,
PROP_BROWSER_ONLY, PROP_BROWSER_ONLY,
FALSE, FALSE,
NM_SETTING_PARAM_NONE, NM_SETTING_PARAM_NONE,
nm_setting_proxy_get_browser_only); NMSettingProxyPrivate,
browser_only);
/** /**
* NMSettingProxy:pac-url: * NMSettingProxy:pac-url:

51
src/libnm-core-impl/nm-setting-tun.c
View File

@@ -35,9 +35,9 @@ typedef struct {
char * owner; char * owner;
char * group; char * group;
NMSettingTunMode mode; NMSettingTunMode mode;
bool pi : 1; bool pi;
bool vnet_hdr : 1; bool vnet_hdr;
bool multi_queue : 1; bool multi_queue;
} NMSettingTunPrivate; } NMSettingTunPrivate;
/** /**
@@ -369,13 +369,14 @@ nm_setting_tun_class_init(NMSettingTunClass *klass)
* *
* Since: 1.2 * Since: 1.2
*/ */
_nm_setting_property_define_boolean(properties_override, _nm_setting_property_define_direct_boolean(properties_override,
obj_properties, obj_properties,
NM_SETTING_TUN_PI, NM_SETTING_TUN_PI,
PROP_PI, PROP_PI,
FALSE, FALSE,
NM_SETTING_PARAM_INFERRABLE, NM_SETTING_PARAM_INFERRABLE,
nm_setting_tun_get_pi); NMSettingTunPrivate,
pi);
/** /**
* NMSettingTun:vnet-hdr: * NMSettingTun:vnet-hdr:
@@ -385,13 +386,14 @@ nm_setting_tun_class_init(NMSettingTunClass *klass)
* *
* Since: 1.2 * Since: 1.2
*/ */
_nm_setting_property_define_boolean(properties_override, _nm_setting_property_define_direct_boolean(properties_override,
obj_properties, obj_properties,
NM_SETTING_TUN_VNET_HDR, NM_SETTING_TUN_VNET_HDR,
PROP_VNET_HDR, PROP_VNET_HDR,
FALSE, FALSE,
NM_SETTING_PARAM_INFERRABLE, NM_SETTING_PARAM_INFERRABLE,
nm_setting_tun_get_vnet_hdr); NMSettingTunPrivate,
vnet_hdr);
/** /**
* NMSettingTun:multi-queue: * NMSettingTun:multi-queue:
@@ -403,13 +405,14 @@ nm_setting_tun_class_init(NMSettingTunClass *klass)
* *
* Since: 1.2 * Since: 1.2
*/ */
_nm_setting_property_define_boolean(properties_override, _nm_setting_property_define_direct_boolean(properties_override,
obj_properties, obj_properties,
NM_SETTING_TUN_MULTI_QUEUE, NM_SETTING_TUN_MULTI_QUEUE,
PROP_MULTI_QUEUE, PROP_MULTI_QUEUE,
FALSE, FALSE,
NM_SETTING_PARAM_INFERRABLE, NM_SETTING_PARAM_INFERRABLE,
nm_setting_tun_get_multi_queue); NMSettingTunPrivate,
multi_queue);
g_object_class_install_properties(object_class, _PROPERTY_ENUMS_LAST, obj_properties); g_object_class_install_properties(object_class, _PROPERTY_ENUMS_LAST, obj_properties);

26
src/libnm-core-impl/nm-setting-vpn.c
View File

@@ -47,11 +47,6 @@ typedef struct {
*/ */
char *user_name; char *user_name;
/* Whether the VPN stays up across link changes, until the user
* explicitly disconnects it.
*/
gboolean persistent;
/* The hash table is created at setting object /* The hash table is created at setting object
* init time and should not be replaced. It is * init time and should not be replaced. It is
* a char * -> char * mapping, and both the key * a char * -> char * mapping, and both the key
@@ -72,6 +67,12 @@ typedef struct {
/* Timeout for the VPN service to establish the connection */ /* Timeout for the VPN service to establish the connection */
guint32 timeout; guint32 timeout;
/* Whether the VPN stays up across link changes, until the user
* explicitly disconnects it.
*/
bool persistent;
} NMSettingVpnPrivate; } NMSettingVpnPrivate;
/** /**
@@ -1172,13 +1173,14 @@ nm_setting_vpn_class_init(NMSettingVpnClass *klass)
* the VPN will attempt to stay connected across link changes and outages, * the VPN will attempt to stay connected across link changes and outages,
* until explicitly disconnected. * until explicitly disconnected.
**/ **/
_nm_setting_property_define_boolean(properties_override, _nm_setting_property_define_direct_boolean(properties_override,
obj_properties, obj_properties,
NM_SETTING_VPN_PERSISTENT, NM_SETTING_VPN_PERSISTENT,
PROP_PERSISTENT, PROP_PERSISTENT,
FALSE, FALSE,
NM_SETTING_PARAM_NONE, NM_SETTING_PARAM_NONE,
nm_setting_vpn_get_persistent); NMSettingVpnPrivate,
persistent);
/** /**
* NMSettingVpn:data: (type GHashTable(utf8,utf8)): * NMSettingVpn:data: (type GHashTable(utf8,utf8)):

86
src/libnm-core-impl/nm-setting-vxlan.c
View File

@@ -53,11 +53,11 @@ typedef struct {
guint ttl; guint ttl;
guint ageing; guint ageing;
guint limit; guint limit;
bool learning : 1; bool proxy;
bool proxy : 1; bool learning;
bool rsc : 1; bool rsc;
bool l2_miss : 1; bool l2_miss;
bool l3_miss : 1; bool l3_miss;
} NMSettingVxlanPrivate; } NMSettingVxlanPrivate;
/** /**
@@ -595,6 +595,7 @@ nm_setting_vxlan_class_init(NMSettingVxlanClass *klass)
"", "",
NULL, NULL,
G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS); G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS);
/** /**
* NMSettingVxlan:id: * NMSettingVxlan:id:
* *
@@ -765,13 +766,14 @@ nm_setting_vxlan_class_init(NMSettingVxlanClass *klass)
* *
* Since: 1.2 * Since: 1.2
**/ **/
_nm_setting_property_define_boolean(properties_override, _nm_setting_property_define_direct_boolean(properties_override,
obj_properties, obj_properties,
NM_SETTING_VXLAN_PROXY, NM_SETTING_VXLAN_PROXY,
PROP_PROXY, PROP_PROXY,
FALSE, FALSE,
NM_SETTING_PARAM_INFERRABLE, NM_SETTING_PARAM_INFERRABLE,
nm_setting_vxlan_get_proxy); NMSettingVxlanPrivate,
proxy);
/** /**
* NMSettingVxlan:learning: * NMSettingVxlan:learning:
@@ -781,13 +783,14 @@ nm_setting_vxlan_class_init(NMSettingVxlanClass *klass)
* *
* Since: 1.2 * Since: 1.2
**/ **/
_nm_setting_property_define_boolean(properties_override, _nm_setting_property_define_direct_boolean(properties_override,
obj_properties, obj_properties,
NM_SETTING_VXLAN_LEARNING, NM_SETTING_VXLAN_LEARNING,
PROP_LEARNING, PROP_LEARNING,
TRUE, TRUE,
NM_SETTING_PARAM_INFERRABLE, NM_SETTING_PARAM_INFERRABLE,
nm_setting_vxlan_get_learning); NMSettingVxlanPrivate,
learning);
/** /**
* NMSettingVxlan:rsc: * NMSettingVxlan:rsc:
@@ -796,13 +799,14 @@ nm_setting_vxlan_class_init(NMSettingVxlanClass *klass)
* *
* Since: 1.2 * Since: 1.2
**/ **/
_nm_setting_property_define_boolean(properties_override, _nm_setting_property_define_direct_boolean(properties_override,
obj_properties, obj_properties,
NM_SETTING_VXLAN_RSC, NM_SETTING_VXLAN_RSC,
PROP_RSC, PROP_RSC,
FALSE, FALSE,
NM_SETTING_PARAM_INFERRABLE, NM_SETTING_PARAM_INFERRABLE,
nm_setting_vxlan_get_rsc); NMSettingVxlanPrivate,
rsc);
/** /**
* NMSettingVxlan:l2-miss: * NMSettingVxlan:l2-miss:
@@ -811,13 +815,14 @@ nm_setting_vxlan_class_init(NMSettingVxlanClass *klass)
* *
* Since: 1.2 * Since: 1.2
**/ **/
_nm_setting_property_define_boolean(properties_override, _nm_setting_property_define_direct_boolean(properties_override,
obj_properties, obj_properties,
NM_SETTING_VXLAN_L2_MISS, NM_SETTING_VXLAN_L2_MISS,
PROP_L2_MISS, PROP_L2_MISS,
FALSE, FALSE,
NM_SETTING_PARAM_INFERRABLE, NM_SETTING_PARAM_INFERRABLE,
nm_setting_vxlan_get_l2_miss); NMSettingVxlanPrivate,
l2_miss);
/** /**
* NMSettingVxlan:l3-miss: * NMSettingVxlan:l3-miss:
@@ -826,13 +831,14 @@ nm_setting_vxlan_class_init(NMSettingVxlanClass *klass)
* *
* Since: 1.2 * Since: 1.2
**/ **/
_nm_setting_property_define_boolean(properties_override, _nm_setting_property_define_direct_boolean(properties_override,
obj_properties, obj_properties,
NM_SETTING_VXLAN_L3_MISS, NM_SETTING_VXLAN_L3_MISS,
PROP_L3_MISS, PROP_L3_MISS,
FALSE, FALSE,
NM_SETTING_PARAM_INFERRABLE, NM_SETTING_PARAM_INFERRABLE,
nm_setting_vxlan_get_l3_miss); NMSettingVxlanPrivate,
l3_miss);
g_object_class_install_properties(object_class, _PROPERTY_ENUMS_LAST, obj_properties); g_object_class_install_properties(object_class, _PROPERTY_ENUMS_LAST, obj_properties);

19
src/libnm-core-impl/nm-setting-wired.c
View File

@@ -66,7 +66,7 @@ typedef struct {
NMTernary accept_all_mac_addresses; NMTernary accept_all_mac_addresses;
guint32 speed; guint32 speed;
guint32 mtu; guint32 mtu;
bool auto_negotiate : 1; bool auto_negotiate;
} NMSettingWiredPrivate; } NMSettingWiredPrivate;
/** /**
@@ -1380,14 +1380,15 @@ nm_setting_wired_class_init(NMSettingWiredClass *klass)
* "speed" and "duplex" parameters (skips link configuration). * "speed" and "duplex" parameters (skips link configuration).
* ---end--- * ---end---
*/ */
_nm_setting_property_define_boolean(properties_override, _nm_setting_property_define_direct_boolean(properties_override,
obj_properties, obj_properties,
NM_SETTING_WIRED_AUTO_NEGOTIATE, NM_SETTING_WIRED_AUTO_NEGOTIATE,
PROP_AUTO_NEGOTIATE, PROP_AUTO_NEGOTIATE,
FALSE, FALSE,
NM_SETTING_PARAM_NONE, NM_SETTING_PARAM_NONE,
nm_setting_wired_get_auto_negotiate, NMSettingWiredPrivate,
.to_dbus_data.including_default = TRUE); auto_negotiate,
.to_dbus_data.including_default = TRUE);
/** /**
* NMSettingWired:mac-address: * NMSettingWired:mac-address:

17
src/libnm-core-impl/nm-setting-wireguard.c
View File

@@ -902,8 +902,8 @@ typedef struct {
guint32 fwmark; guint32 fwmark;
guint32 mtu; guint32 mtu;
guint16 listen_port; guint16 listen_port;
bool peer_routes;
bool private_key_valid : 1; bool private_key_valid : 1;
bool peer_routes : 1;
} NMSettingWireGuardPrivate; } NMSettingWireGuardPrivate;
/** /**
@@ -2514,13 +2514,14 @@ nm_setting_wireguard_class_init(NMSettingWireGuardClass *klass)
* *
* Since: 1.16 * Since: 1.16
**/ **/
_nm_setting_property_define_boolean(properties_override, _nm_setting_property_define_direct_boolean(properties_override,
obj_properties, obj_properties,
NM_SETTING_WIREGUARD_PEER_ROUTES, NM_SETTING_WIREGUARD_PEER_ROUTES,
PROP_PEER_ROUTES, PROP_PEER_ROUTES,
TRUE, TRUE,
NM_SETTING_PARAM_INFERRABLE, NM_SETTING_PARAM_INFERRABLE,
nm_setting_wireguard_get_peer_routes); NMSettingWireGuardPrivate,
peer_routes);
/** /**
* NMSettingWireGuard:mtu: * NMSettingWireGuard:mtu:

17
src/libnm-core-impl/nm-setting-wireless.c
View File

@@ -63,7 +63,7 @@ typedef struct {
guint32 mtu; guint32 mtu;
guint32 powersave; guint32 powersave;
guint32 wowl; guint32 wowl;
bool hidden : 1; bool hidden;
} NMSettingWirelessPrivate; } NMSettingWirelessPrivate;
/** /**
@@ -1833,13 +1833,14 @@ nm_setting_wireless_class_init(NMSettingWirelessClass *klass)
* description: Whether the network hides the SSID. * description: Whether the network hides the SSID.
* ---end--- * ---end---
*/ */
_nm_setting_property_define_boolean(properties_override, _nm_setting_property_define_direct_boolean(properties_override,
obj_properties, obj_properties,
NM_SETTING_WIRELESS_HIDDEN, NM_SETTING_WIRELESS_HIDDEN,
PROP_HIDDEN, PROP_HIDDEN,
FALSE, FALSE,
NM_SETTING_PARAM_NONE, NM_SETTING_PARAM_NONE,
nm_setting_wireless_get_hidden); NMSettingWirelessPrivate,
hidden);
/** /**
* NMSettingWireless:powersave: * NMSettingWireless:powersave:

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

@@ -570,24 +570,6 @@ _nm_setting_property_to_dbus_fcn_direct(const NMSettInfoSetting *
} }
} }
GVariant *
_nm_setting_property_to_dbus_fcn_get_boolean(const NMSettInfoSetting * sett_info,
guint property_idx,
NMConnection * connection,
NMSetting * setting,
NMConnectionSerializationFlags flags,
const NMConnectionSerializationOptions *options)
{
const NMSettInfoProperty *property_info = &sett_info->property_infos[property_idx];
gboolean val;
val = !!property_info->to_dbus_data.get_boolean(setting);
if (!property_info->to_dbus_data.including_default
&& val == NM_G_PARAM_SPEC_GET_DEFAULT_BOOLEAN(property_info->param_spec))
return NULL;
return g_variant_ref(nm_g_variant_singleton_b(val));
}
GVariant * GVariant *
_nm_setting_property_to_dbus_fcn_get_string(const NMSettInfoSetting * sett_info, _nm_setting_property_to_dbus_fcn_get_string(const NMSettInfoSetting * sett_info,
guint property_idx, guint property_idx,
@@ -2446,10 +2428,6 @@ const NMSettInfoPropertType nm_sett_info_propert_type_direct_boolean =
.direct_type = NM_VALUE_TYPE_BOOL, .direct_type = NM_VALUE_TYPE_BOOL,
.to_dbus_fcn = _nm_setting_property_to_dbus_fcn_direct); .to_dbus_fcn = _nm_setting_property_to_dbus_fcn_direct);
const NMSettInfoPropertType nm_sett_info_propert_type_boolean = NM_SETT_INFO_PROPERT_TYPE_DBUS_INIT(
G_VARIANT_TYPE_BOOLEAN,
.to_dbus_fcn = _nm_setting_property_to_dbus_fcn_get_boolean);
const NMSettInfoPropertType nm_sett_info_propert_type_string = const NMSettInfoPropertType nm_sett_info_propert_type_string =
NM_SETT_INFO_PROPERT_TYPE_DBUS_INIT(G_VARIANT_TYPE_STRING, NM_SETT_INFO_PROPERT_TYPE_DBUS_INIT(G_VARIANT_TYPE_STRING,
.to_dbus_fcn = _nm_setting_property_to_dbus_fcn_get_string); .to_dbus_fcn = _nm_setting_property_to_dbus_fcn_get_string);

6
src/libnm-core-impl/tests/test-setting.c
View File

@@ -4481,12 +4481,6 @@ check_done:;
!= NM_SETTING_PROPERTY_TO_DBUS_FCN_GPROP_TYPE_DEFAULT) != NM_SETTING_PROPERTY_TO_DBUS_FCN_GPROP_TYPE_DEFAULT)
g_assert(!sip->to_dbus_data.gprop_to_dbus_fcn); g_assert(!sip->to_dbus_data.gprop_to_dbus_fcn);
can_set_including_default = TRUE; can_set_including_default = TRUE;
} else if (sip->property_type->to_dbus_fcn
== _nm_setting_property_to_dbus_fcn_get_boolean) {
g_assert(sip->param_spec);
g_assert(sip->param_spec->value_type == G_TYPE_BOOLEAN);
g_assert(sip->to_dbus_data.get_boolean);
can_set_including_default = TRUE;
} else if (sip->property_type->to_dbus_fcn } else if (sip->property_type->to_dbus_fcn
== _nm_setting_property_to_dbus_fcn_get_string) { == _nm_setting_property_to_dbus_fcn_get_string) {
g_assert(sip->param_spec); g_assert(sip->param_spec);

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

@@ -725,7 +725,6 @@ struct _NMSettInfoProperty {
union { union {
gpointer none; gpointer none;
NMSettInfoPropGPropToDBusFcn gprop_to_dbus_fcn; NMSettInfoPropGPropToDBusFcn gprop_to_dbus_fcn;
gboolean (*get_boolean)(NMSetting *);
const char *(*get_string)(NMSetting *); const char *(*get_string)(NMSetting *);
}; };