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

libnm-core: cleanup NMSetting's class initialization

Browse Source 
Unify the coding style for class-init functions in libnm-core.

Also make use of obj_properties, NM_GOBJECT_PROPERTIES_DEFINE(), and
_notify().
This commit is contained in:
Thomas Haller
2019-01-11 08:28:26 +01:00
parent 450a471dfe
commit a3d6976efc
39 changed files with 2064 additions and 2411 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
libnm-core/nm-connection.c
View File

@@ -3006,8 +3006,6 @@ nm_connection_get_private (NMConnection *connection)
static void static void
nm_connection_default_init (NMConnectionInterface *iface) nm_connection_default_init (NMConnectionInterface *iface)
{ {
/* Signals */
/** /**
* NMConnection::secrets-updated: * NMConnection::secrets-updated:
* @connection: the object on which the signal is emitted * @connection: the object on which the signal is emitted
@@ -3018,14 +3016,14 @@ nm_connection_default_init (NMConnectionInterface *iface)
* have been changed. * have been changed.
*/ */
signals[SECRETS_UPDATED] = signals[SECRETS_UPDATED] =
g_signal_new (NM_CONNECTION_SECRETS_UPDATED, g_signal_new (NM_CONNECTION_SECRETS_UPDATED,
NM_TYPE_CONNECTION, NM_TYPE_CONNECTION,
G_SIGNAL_RUN_FIRST, G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (NMConnectionInterface, secrets_updated), G_STRUCT_OFFSET (NMConnectionInterface, secrets_updated),
NULL, NULL, NULL, NULL,
g_cclosure_marshal_VOID__STRING, g_cclosure_marshal_VOID__STRING,
G_TYPE_NONE, 1, G_TYPE_NONE, 1,
G_TYPE_STRING); G_TYPE_STRING);
/** /**
* NMConnection::secrets-cleared: * NMConnection::secrets-cleared:
@@ -3035,13 +3033,13 @@ nm_connection_default_init (NMConnectionInterface *iface)
* are cleared. * are cleared.
*/ */
signals[SECRETS_CLEARED] = signals[SECRETS_CLEARED] =
g_signal_new (NM_CONNECTION_SECRETS_CLEARED, g_signal_new (NM_CONNECTION_SECRETS_CLEARED,
NM_TYPE_CONNECTION, NM_TYPE_CONNECTION,
G_SIGNAL_RUN_FIRST, G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (NMConnectionInterface, secrets_cleared), G_STRUCT_OFFSET (NMConnectionInterface, secrets_cleared),
NULL, NULL, NULL, NULL,
g_cclosure_marshal_VOID__VOID, g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE, 0); G_TYPE_NONE, 0);
/** /**
* NMConnection::changed: * NMConnection::changed:
@@ -3052,11 +3050,11 @@ nm_connection_default_init (NMConnectionInterface *iface)
* or when settings are added or removed. * or when settings are added or removed.
*/ */
signals[CHANGED] = signals[CHANGED] =
g_signal_new (NM_CONNECTION_CHANGED, g_signal_new (NM_CONNECTION_CHANGED,
NM_TYPE_CONNECTION, NM_TYPE_CONNECTION,
G_SIGNAL_RUN_FIRST, G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (NMConnectionInterface, changed), G_STRUCT_OFFSET (NMConnectionInterface, changed),
NULL, NULL, NULL, NULL,
g_cclosure_marshal_VOID__VOID, g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE, 0); G_TYPE_NONE, 0);
} }

90
libnm-core/nm-setting-adsl.c
View File

@@ -51,8 +51,7 @@ typedef struct {
guint32 vci; guint32 vci;
} NMSettingAdslPrivate; } NMSettingAdslPrivate;
enum { NM_GOBJECT_PROPERTIES_DEFINE_BASE (
PROP_0,
PROP_USERNAME, PROP_USERNAME,
PROP_PASSWORD, PROP_PASSWORD,
PROP_PASSWORD_FLAGS, PROP_PASSWORD_FLAGS,
@@ -60,9 +59,7 @@ enum {
PROP_ENCAPSULATION, PROP_ENCAPSULATION,
PROP_VPI, PROP_VPI,
PROP_VCI, PROP_VCI,
);
LAST_PROP
};
/** /**
* nm_setting_adsl_new: * nm_setting_adsl_new:
@@ -364,86 +361,81 @@ nm_setting_adsl_class_init (NMSettingAdslClass *klass)
* *
* Username used to authenticate with the ADSL service. * Username used to authenticate with the ADSL service.
**/ **/
g_object_class_install_property obj_properties[PROP_USERNAME] =
(object_class, PROP_USERNAME, g_param_spec_string (NM_SETTING_ADSL_USERNAME, "", "",
g_param_spec_string (NM_SETTING_ADSL_USERNAME, "", "", NULL,
NULL, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingAdsl:password: * NMSettingAdsl:password:
* *
* Password used to authenticate with the ADSL service. * Password used to authenticate with the ADSL service.
**/ **/
g_object_class_install_property obj_properties[PROP_PASSWORD] =
(object_class, PROP_PASSWORD, g_param_spec_string (NM_SETTING_ADSL_PASSWORD, "", "",
g_param_spec_string (NM_SETTING_ADSL_PASSWORD, "", "", NULL,
NULL, G_PARAM_READWRITE |
G_PARAM_READWRITE | NM_SETTING_PARAM_SECRET |
NM_SETTING_PARAM_SECRET | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingAdsl:password-flags: * NMSettingAdsl:password-flags:
* *
* Flags indicating how to handle the #NMSettingAdsl:password property. * Flags indicating how to handle the #NMSettingAdsl:password property.
**/ **/
g_object_class_install_property obj_properties[PROP_PASSWORD_FLAGS] =
(object_class, PROP_PASSWORD_FLAGS, g_param_spec_flags (NM_SETTING_ADSL_PASSWORD_FLAGS, "", "",
g_param_spec_flags (NM_SETTING_ADSL_PASSWORD_FLAGS, "", "", NM_TYPE_SETTING_SECRET_FLAGS,
NM_TYPE_SETTING_SECRET_FLAGS, NM_SETTING_SECRET_FLAG_NONE,
NM_SETTING_SECRET_FLAG_NONE, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingAdsl:protocol: * NMSettingAdsl:protocol:
* *
* ADSL connection protocol. Can be "pppoa", "pppoe" or "ipoatm". * ADSL connection protocol. Can be "pppoa", "pppoe" or "ipoatm".
**/ **/
g_object_class_install_property obj_properties[PROP_PROTOCOL] =
(object_class, PROP_PROTOCOL, g_param_spec_string (NM_SETTING_ADSL_PROTOCOL, "", "",
g_param_spec_string (NM_SETTING_ADSL_PROTOCOL, "", "", NULL,
NULL, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingAdsl:encapsulation: * NMSettingAdsl:encapsulation:
* *
* Encapsulation of ADSL connection. Can be "vcmux" or "llc". * Encapsulation of ADSL connection. Can be "vcmux" or "llc".
**/ **/
g_object_class_install_property obj_properties[PROP_ENCAPSULATION] =
(object_class, PROP_ENCAPSULATION, g_param_spec_string (NM_SETTING_ADSL_ENCAPSULATION, "", "",
g_param_spec_string (NM_SETTING_ADSL_ENCAPSULATION, "", "", NULL,
NULL, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingAdsl:vpi: * NMSettingAdsl:vpi:
* *
* VPI of ADSL connection * VPI of ADSL connection
**/ **/
g_object_class_install_property obj_properties[PROP_VPI] =
(object_class, PROP_VPI, g_param_spec_uint (NM_SETTING_ADSL_VPI, "", "",
g_param_spec_uint (NM_SETTING_ADSL_VPI, "", "", 0, 65536, 0,
0, 65536, 0, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingAdsl:vci: * NMSettingAdsl:vci:
* *
* VCI of ADSL connection * VCI of ADSL connection
**/ **/
g_object_class_install_property obj_properties[PROP_VCI] =
(object_class, PROP_VCI, g_param_spec_uint (NM_SETTING_ADSL_VCI, "", "",
g_param_spec_uint (NM_SETTING_ADSL_VCI, "", "", 0, 65536, 0,
0, 65536, 0, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
g_object_class_install_properties (object_class, _PROPERTY_ENUMS_LAST, obj_properties);
_nm_setting_class_commit (setting_class, NM_META_SETTING_TYPE_ADSL); _nm_setting_class_commit (setting_class, NM_META_SETTING_TYPE_ADSL);
} }

38
libnm-core/nm-setting-bluetooth.c
View File

@@ -52,13 +52,10 @@ typedef struct {
char *type; char *type;
} NMSettingBluetoothPrivate; } NMSettingBluetoothPrivate;
enum { NM_GOBJECT_PROPERTIES_DEFINE_BASE (
PROP_0,
PROP_BDADDR, PROP_BDADDR,
PROP_TYPE, PROP_TYPE,
);
LAST_PROP
};
/** /**
* nm_setting_bluetooth_new: * nm_setting_bluetooth_new:
@@ -300,17 +297,15 @@ nm_setting_bluetooth_class_init (NMSettingBluetoothClass *klass)
* *
* The Bluetooth address of the device. * The Bluetooth address of the device.
**/ **/
g_object_class_install_property obj_properties[PROP_BDADDR] =
(object_class, PROP_BDADDR, g_param_spec_string (NM_SETTING_BLUETOOTH_BDADDR, "", "",
g_param_spec_string (NM_SETTING_BLUETOOTH_BDADDR, "", "", NULL,
NULL, G_PARAM_READWRITE |
G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE |
NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
_properties_override_add_transform (properties_override, _properties_override_add_transform (properties_override,
g_object_class_find_property (G_OBJECT_CLASS (setting_class), obj_properties[PROP_BDADDR],
NM_SETTING_BLUETOOTH_BDADDR),
G_VARIANT_TYPE_BYTESTRING, G_VARIANT_TYPE_BYTESTRING,
_nm_utils_hwaddr_to_dbus, _nm_utils_hwaddr_to_dbus,
_nm_utils_hwaddr_from_dbus); _nm_utils_hwaddr_from_dbus);
@@ -321,13 +316,14 @@ nm_setting_bluetooth_class_init (NMSettingBluetoothClass *klass)
* Either "dun" for Dial-Up Networking connections or "panu" for Personal * Either "dun" for Dial-Up Networking connections or "panu" for Personal
* Area Networking connections to devices supporting the NAP profile. * Area Networking connections to devices supporting the NAP profile.
**/ **/
g_object_class_install_property obj_properties[PROP_TYPE] =
(object_class, PROP_TYPE, g_param_spec_string (NM_SETTING_BLUETOOTH_TYPE, "", "",
g_param_spec_string (NM_SETTING_BLUETOOTH_TYPE, "", "", NULL,
NULL, G_PARAM_READWRITE |
G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE |
NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
g_object_class_install_properties (object_class, _PROPERTY_ENUMS_LAST, obj_properties);
_nm_setting_class_commit_full (setting_class, NM_META_SETTING_TYPE_BLUETOOTH, _nm_setting_class_commit_full (setting_class, NM_META_SETTING_TYPE_BLUETOOTH,
NULL, properties_override); NULL, properties_override);

28
libnm-core/nm-setting-bond.c
View File

@@ -46,11 +46,9 @@
/*****************************************************************************/ /*****************************************************************************/
enum { NM_GOBJECT_PROPERTIES_DEFINE (NMSettingBond,
PROP_0,
PROP_OPTIONS, PROP_OPTIONS,
LAST_PROP );
};
typedef struct { typedef struct {
GHashTable *options; GHashTable *options;
@@ -365,7 +363,7 @@ nm_setting_bond_add_option (NMSettingBond *setting,
g_hash_table_remove (priv->options, NM_SETTING_BOND_OPTION_UPDELAY); g_hash_table_remove (priv->options, NM_SETTING_BOND_OPTION_UPDELAY);
} }
g_object_notify (G_OBJECT (setting), NM_SETTING_BOND_OPTIONS); _notify (setting, PROP_OPTIONS);
return TRUE; return TRUE;
} }
@@ -398,7 +396,7 @@ nm_setting_bond_remove_option (NMSettingBond *setting,
nm_clear_g_free (&priv->options_idx_cache); nm_clear_g_free (&priv->options_idx_cache);
found = g_hash_table_remove (priv->options, name); found = g_hash_table_remove (priv->options, name);
if (found) if (found)
g_object_notify (G_OBJECT (setting), NM_SETTING_BOND_OPTIONS); _notify (setting, PROP_OPTIONS);
return found; return found;
} }
@@ -983,17 +981,15 @@ nm_setting_bond_class_init (NMSettingBondClass *klass)
* example: BONDING_OPTS="miimon=100 mode=broadcast" * example: BONDING_OPTS="miimon=100 mode=broadcast"
* ---end--- * ---end---
*/ */
g_object_class_install_property obj_properties[PROP_OPTIONS] =
(object_class, PROP_OPTIONS, g_param_spec_boxed (NM_SETTING_BOND_OPTIONS, "", "",
g_param_spec_boxed (NM_SETTING_BOND_OPTIONS, "", "", G_TYPE_HASH_TABLE,
G_TYPE_HASH_TABLE, G_PARAM_READWRITE |
G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE |
NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
_properties_override_add_transform (properties_override, _properties_override_add_transform (properties_override,
g_object_class_find_property (G_OBJECT_CLASS (setting_class), obj_properties[PROP_OPTIONS],
NM_SETTING_BOND_OPTIONS),
G_VARIANT_TYPE ("a{ss}"), G_VARIANT_TYPE ("a{ss}"),
_nm_utils_strdict_to_dbus, _nm_utils_strdict_to_dbus,
_nm_utils_strdict_from_dbus); _nm_utils_strdict_from_dbus);
@@ -1012,6 +1008,8 @@ nm_setting_bond_class_init (NMSettingBondClass *klass)
_nm_setting_get_deprecated_virtual_interface_name, _nm_setting_get_deprecated_virtual_interface_name,
NULL); NULL);
g_object_class_install_properties (object_class, _PROPERTY_ENUMS_LAST, obj_properties);
_nm_setting_class_commit_full (setting_class, NM_META_SETTING_TYPE_BOND, _nm_setting_class_commit_full (setting_class, NM_META_SETTING_TYPE_BOND,
NULL, properties_override); NULL, properties_override);
} }

49
libnm-core/nm-setting-bridge-port.c
View File

@@ -50,13 +50,11 @@ typedef struct {
gboolean hairpin_mode; gboolean hairpin_mode;
} NMSettingBridgePortPrivate; } NMSettingBridgePortPrivate;
enum { NM_GOBJECT_PROPERTIES_DEFINE_BASE (
PROP_0,
PROP_PRIORITY, PROP_PRIORITY,
PROP_PATH_COST, PROP_PATH_COST,
PROP_HAIRPIN_MODE, PROP_HAIRPIN_MODE,
LAST_PROP );
};
/*****************************************************************************/ /*****************************************************************************/
@@ -229,14 +227,13 @@ nm_setting_bridge_port_class_init (NMSettingBridgePortClass *klass)
* description: STP priority. * description: STP priority.
* ---end--- * ---end---
*/ */
g_object_class_install_property obj_properties[PROP_PRIORITY] =
(object_class, PROP_PRIORITY, g_param_spec_uint (NM_SETTING_BRIDGE_PORT_PRIORITY, "", "",
g_param_spec_uint (NM_SETTING_BRIDGE_PORT_PRIORITY, "", "", 0, NM_BR_PORT_MAX_PRIORITY, NM_BR_PORT_DEF_PRIORITY,
0, NM_BR_PORT_MAX_PRIORITY, NM_BR_PORT_DEF_PRIORITY, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
G_PARAM_CONSTRUCT | NM_SETTING_PARAM_INFERRABLE |
NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingBridgePort:path-cost: * NMSettingBridgePort:path-cost:
@@ -252,13 +249,12 @@ nm_setting_bridge_port_class_init (NMSettingBridgePortClass *klass)
* description: STP cost. * description: STP cost.
* ---end--- * ---end---
*/ */
g_object_class_install_property obj_properties[PROP_PATH_COST] =
(object_class, PROP_PATH_COST, g_param_spec_uint (NM_SETTING_BRIDGE_PORT_PATH_COST, "", "",
g_param_spec_uint (NM_SETTING_BRIDGE_PORT_PATH_COST, "", "", 0, NM_BR_PORT_MAX_PATH_COST, 100,
0, NM_BR_PORT_MAX_PATH_COST, 100, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingBridgePort:hairpin-mode: * NMSettingBridgePort:hairpin-mode:
@@ -273,13 +269,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---
*/ */
g_object_class_install_property obj_properties[PROP_HAIRPIN_MODE] =
(object_class, PROP_HAIRPIN_MODE, g_param_spec_boolean (NM_SETTING_BRIDGE_PORT_HAIRPIN_MODE, "", "",
g_param_spec_boolean (NM_SETTING_BRIDGE_PORT_HAIRPIN_MODE, "", "", FALSE,
FALSE, G_PARAM_READWRITE |
G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE |
NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
g_object_class_install_properties (object_class, _PROPERTY_ENUMS_LAST, obj_properties);
_nm_setting_class_commit (setting_class, NM_META_SETTING_TYPE_BRIDGE_PORT); _nm_setting_class_commit (setting_class, NM_META_SETTING_TYPE_BRIDGE_PORT);
} }

144
libnm-core/nm-setting-bridge.c
View File

@@ -54,8 +54,7 @@ typedef struct {
gboolean multicast_snooping; gboolean multicast_snooping;
} NMSettingBridgePrivate; } NMSettingBridgePrivate;
enum { NM_GOBJECT_PROPERTIES_DEFINE_BASE (
PROP_0,
PROP_MAC_ADDRESS, PROP_MAC_ADDRESS,
PROP_STP, PROP_STP,
PROP_PRIORITY, PROP_PRIORITY,
@@ -65,8 +64,7 @@ enum {
PROP_AGEING_TIME, PROP_AGEING_TIME,
PROP_GROUP_FORWARD_MASK, PROP_GROUP_FORWARD_MASK,
PROP_MULTICAST_SNOOPING, PROP_MULTICAST_SNOOPING,
LAST_PROP );
};
/** /**
* nm_setting_bridge_new: * nm_setting_bridge_new:
@@ -435,17 +433,15 @@ nm_setting_bridge_class_init (NMSettingBridgeClass *klass)
* BRIDGE_MACADDR for bridges is an NM extension. * BRIDGE_MACADDR for bridges is an NM extension.
* ---end--- * ---end---
*/ */
g_object_class_install_property obj_properties[PROP_MAC_ADDRESS] =
(object_class, PROP_MAC_ADDRESS, g_param_spec_string (NM_SETTING_BRIDGE_MAC_ADDRESS, "", "",
g_param_spec_string (NM_SETTING_BRIDGE_MAC_ADDRESS, "", "", NULL,
NULL, G_PARAM_READWRITE |
G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE |
NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
_properties_override_add_transform (properties_override, _properties_override_add_transform (properties_override,
g_object_class_find_property (G_OBJECT_CLASS (setting_class), obj_properties[PROP_MAC_ADDRESS],
NM_SETTING_BRIDGE_MAC_ADDRESS),
G_VARIANT_TYPE_BYTESTRING, G_VARIANT_TYPE_BYTESTRING,
_nm_utils_hwaddr_to_dbus, _nm_utils_hwaddr_to_dbus,
_nm_utils_hwaddr_from_dbus); _nm_utils_hwaddr_from_dbus);
@@ -462,14 +458,13 @@ nm_setting_bridge_class_init (NMSettingBridgeClass *klass)
* description: Span tree protocol participation. * description: Span tree protocol participation.
* ---end--- * ---end---
*/ */
g_object_class_install_property obj_properties[PROP_STP] =
(object_class, PROP_STP, g_param_spec_boolean (NM_SETTING_BRIDGE_STP, "", "",
g_param_spec_boolean (NM_SETTING_BRIDGE_STP, "", "", TRUE,
TRUE, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
G_PARAM_CONSTRUCT | NM_SETTING_PARAM_INFERRABLE |
NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingBridge:priority: * NMSettingBridge:priority:
@@ -486,14 +481,13 @@ nm_setting_bridge_class_init (NMSettingBridgeClass *klass)
* description: STP priority. * description: STP priority.
* ---end--- * ---end---
*/ */
g_object_class_install_property obj_properties[PROP_PRIORITY] =
(object_class, PROP_PRIORITY, g_param_spec_uint (NM_SETTING_BRIDGE_PRIORITY, "", "",
g_param_spec_uint (NM_SETTING_BRIDGE_PRIORITY, "", "", 0, G_MAXUINT16, 0x8000,
0, G_MAXUINT16, 0x8000, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
G_PARAM_CONSTRUCT | NM_SETTING_PARAM_INFERRABLE |
NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingBridge:forward-delay: * NMSettingBridge:forward-delay:
@@ -508,14 +502,13 @@ nm_setting_bridge_class_init (NMSettingBridgeClass *klass)
* description: STP forwarding delay. * description: STP forwarding delay.
* ---end--- * ---end---
*/ */
g_object_class_install_property obj_properties[PROP_FORWARD_DELAY] =
(object_class, PROP_FORWARD_DELAY, g_param_spec_uint (NM_SETTING_BRIDGE_FORWARD_DELAY, "", "",
g_param_spec_uint (NM_SETTING_BRIDGE_FORWARD_DELAY, "", "", 0, NM_BR_MAX_FORWARD_DELAY, 15,
0, NM_BR_MAX_FORWARD_DELAY, 15, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
G_PARAM_CONSTRUCT | NM_SETTING_PARAM_INFERRABLE |
NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingBridge:hello-time: * NMSettingBridge:hello-time:
@@ -530,14 +523,13 @@ nm_setting_bridge_class_init (NMSettingBridgeClass *klass)
* description: STP hello time. * description: STP hello time.
* ---end--- * ---end---
*/ */
g_object_class_install_property obj_properties[PROP_HELLO_TIME] =
(object_class, PROP_HELLO_TIME, g_param_spec_uint (NM_SETTING_BRIDGE_HELLO_TIME, "", "",
g_param_spec_uint (NM_SETTING_BRIDGE_HELLO_TIME, "", "", 0, NM_BR_MAX_HELLO_TIME, 2,
0, NM_BR_MAX_HELLO_TIME, 2, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
G_PARAM_CONSTRUCT | NM_SETTING_PARAM_INFERRABLE |
NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingBridge:max-age: * NMSettingBridge:max-age:
@@ -552,14 +544,13 @@ nm_setting_bridge_class_init (NMSettingBridgeClass *klass)
* description: STP maximum message age. * description: STP maximum message age.
* ---end--- * ---end---
*/ */
g_object_class_install_property obj_properties[PROP_MAX_AGE] =
(object_class, PROP_MAX_AGE, g_param_spec_uint (NM_SETTING_BRIDGE_MAX_AGE, "", "",
g_param_spec_uint (NM_SETTING_BRIDGE_MAX_AGE, "", "", 0, NM_BR_MAX_MAX_AGE, 20,
0, NM_BR_MAX_MAX_AGE, 20, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
G_PARAM_CONSTRUCT | NM_SETTING_PARAM_INFERRABLE |
NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingBridge:ageing-time: * NMSettingBridge:ageing-time:
@@ -574,14 +565,13 @@ nm_setting_bridge_class_init (NMSettingBridgeClass *klass)
* description: Ethernet MAC ageing time. * description: Ethernet MAC ageing time.
* ---end--- * ---end---
*/ */
g_object_class_install_property obj_properties[PROP_AGEING_TIME] =
(object_class, PROP_AGEING_TIME, g_param_spec_uint (NM_SETTING_BRIDGE_AGEING_TIME, "", "",
g_param_spec_uint (NM_SETTING_BRIDGE_AGEING_TIME, "", "", NM_BR_MIN_AGEING_TIME, NM_BR_MAX_AGEING_TIME, 300,
NM_BR_MIN_AGEING_TIME, NM_BR_MAX_AGEING_TIME, 300, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
G_PARAM_CONSTRUCT | NM_SETTING_PARAM_INFERRABLE |
NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingBridge:group-forward-mask: * NMSettingBridge:group-forward-mask:
@@ -595,14 +585,13 @@ nm_setting_bridge_class_init (NMSettingBridgeClass *klass)
* *
* Since: 1.10 * Since: 1.10
**/ **/
g_object_class_install_property obj_properties[PROP_GROUP_FORWARD_MASK] =
(object_class, PROP_GROUP_FORWARD_MASK, g_param_spec_uint (NM_SETTING_BRIDGE_GROUP_FORWARD_MASK, "", "",
g_param_spec_uint (NM_SETTING_BRIDGE_GROUP_FORWARD_MASK, "", "", 0, 0xFFFF, 0,
0, 0xFFFF, 0, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
G_PARAM_CONSTRUCT | NM_SETTING_PARAM_INFERRABLE |
NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingBridge:multicast-snooping: * NMSettingBridge:multicast-snooping:
@@ -622,14 +611,13 @@ nm_setting_bridge_class_init (NMSettingBridgeClass *klass)
* description: IGMP snooping support. * description: IGMP snooping support.
* ---end--- * ---end---
*/ */
g_object_class_install_property obj_properties[PROP_MULTICAST_SNOOPING] =
(object_class, PROP_MULTICAST_SNOOPING, g_param_spec_boolean (NM_SETTING_BRIDGE_MULTICAST_SNOOPING, "", "",
g_param_spec_boolean (NM_SETTING_BRIDGE_MULTICAST_SNOOPING, "", "", TRUE,
TRUE, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
G_PARAM_CONSTRUCT | NM_SETTING_PARAM_INFERRABLE |
NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/* ---dbus--- /* ---dbus---
* property: interface-name * property: interface-name
@@ -645,6 +633,8 @@ nm_setting_bridge_class_init (NMSettingBridgeClass *klass)
_nm_setting_get_deprecated_virtual_interface_name, _nm_setting_get_deprecated_virtual_interface_name,
NULL); NULL);
g_object_class_install_properties (object_class, _PROPERTY_ENUMS_LAST, obj_properties);
_nm_setting_class_commit_full (setting_class, NM_META_SETTING_TYPE_BRIDGE, _nm_setting_class_commit_full (setting_class, NM_META_SETTING_TYPE_BRIDGE,
NULL, properties_override); NULL, properties_override);
} }

72
libnm-core/nm-setting-cdma.c
View File

@@ -49,16 +49,13 @@ typedef struct {
guint32 mtu; guint32 mtu;
} NMSettingCdmaPrivate; } NMSettingCdmaPrivate;
enum { NM_GOBJECT_PROPERTIES_DEFINE_BASE (
PROP_0,
PROP_NUMBER, PROP_NUMBER,
PROP_USERNAME, PROP_USERNAME,
PROP_PASSWORD, PROP_PASSWORD,
PROP_PASSWORD_FLAGS, PROP_PASSWORD_FLAGS,
PROP_MTU, PROP_MTU,
);
LAST_PROP
};
/** /**
* nm_setting_cdma_new: * nm_setting_cdma_new:
@@ -305,12 +302,11 @@ nm_setting_cdma_class_init (NMSettingCdmaClass *klass)
* broadband network, if any. If not specified, the default number (#777) * broadband network, if any. If not specified, the default number (#777)
* is used when required. * is used when required.
**/ **/
g_object_class_install_property obj_properties[PROP_NUMBER] =
(object_class, PROP_NUMBER, g_param_spec_string (NM_SETTING_CDMA_NUMBER, "", "",
g_param_spec_string (NM_SETTING_CDMA_NUMBER, "", "", NULL,
NULL, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingCdma:username: * NMSettingCdma:username:
@@ -319,12 +315,11 @@ nm_setting_cdma_class_init (NMSettingCdmaClass *klass)
* providers do not require a username, or accept any username. But if a * providers do not require a username, or accept any username. But if a
* username is required, it is specified here. * username is required, it is specified here.
**/ **/
g_object_class_install_property obj_properties[PROP_USERNAME] =
(object_class, PROP_USERNAME, g_param_spec_string (NM_SETTING_CDMA_USERNAME, "", "",
g_param_spec_string (NM_SETTING_CDMA_USERNAME, "", "", NULL,
NULL, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingCdma:password: * NMSettingCdma:password:
@@ -333,26 +328,24 @@ nm_setting_cdma_class_init (NMSettingCdmaClass *klass)
* providers do not require a password, or accept any password. But if a * providers do not require a password, or accept any password. But if a
* password is required, it is specified here. * password is required, it is specified here.
**/ **/
g_object_class_install_property obj_properties[PROP_PASSWORD] =
(object_class, PROP_PASSWORD, g_param_spec_string (NM_SETTING_CDMA_PASSWORD, "", "",
g_param_spec_string (NM_SETTING_CDMA_PASSWORD, "", "", NULL,
NULL, G_PARAM_READWRITE |
G_PARAM_READWRITE | NM_SETTING_PARAM_SECRET |
NM_SETTING_PARAM_SECRET | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingCdma:password-flags: * NMSettingCdma:password-flags:
* *
* Flags indicating how to handle the #NMSettingCdma:password property. * Flags indicating how to handle the #NMSettingCdma:password property.
**/ **/
g_object_class_install_property obj_properties[PROP_PASSWORD_FLAGS] =
(object_class, PROP_PASSWORD_FLAGS, g_param_spec_flags (NM_SETTING_CDMA_PASSWORD_FLAGS, "", "",
g_param_spec_flags (NM_SETTING_CDMA_PASSWORD_FLAGS, "", "", NM_TYPE_SETTING_SECRET_FLAGS,
NM_TYPE_SETTING_SECRET_FLAGS, NM_SETTING_SECRET_FLAG_NONE,
NM_SETTING_SECRET_FLAG_NONE, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingCdma:mtu: * NMSettingCdma:mtu:
@@ -362,14 +355,15 @@ nm_setting_cdma_class_init (NMSettingCdmaClass *klass)
* *
* Since: 1.8 * Since: 1.8
**/ **/
g_object_class_install_property obj_properties[PROP_MTU] =
(object_class, PROP_MTU, g_param_spec_uint (NM_SETTING_CDMA_MTU, "", "",
g_param_spec_uint (NM_SETTING_CDMA_MTU, "", "", 0, G_MAXUINT32, 0,
0, G_MAXUINT32, 0, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
G_PARAM_CONSTRUCT | NM_SETTING_PARAM_FUZZY_IGNORE |
NM_SETTING_PARAM_FUZZY_IGNORE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
g_object_class_install_properties (object_class, _PROPERTY_ENUMS_LAST, obj_properties);
_nm_setting_class_commit (setting_class, NM_META_SETTING_TYPE_CDMA); _nm_setting_class_commit (setting_class, NM_META_SETTING_TYPE_CDMA);
} }

321
libnm-core/nm-setting-connection.c
View File

@@ -84,8 +84,7 @@ typedef struct {
int llmnr; int llmnr;
} NMSettingConnectionPrivate; } NMSettingConnectionPrivate;
enum { NM_GOBJECT_PROPERTIES_DEFINE (NMSettingConnection,
PROP_0,
PROP_ID, PROP_ID,
PROP_UUID, PROP_UUID,
PROP_INTERFACE_NAME, PROP_INTERFACE_NAME,
@@ -109,9 +108,7 @@ enum {
PROP_LLMNR, PROP_LLMNR,
PROP_STABLE_ID, PROP_STABLE_ID,
PROP_AUTH_RETRIES, PROP_AUTH_RETRIES,
);
LAST_PROP
};
/*****************************************************************************/ /*****************************************************************************/
@@ -431,7 +428,7 @@ nm_setting_connection_add_permission (NMSettingConnection *setting,
p = permission_new (pitem); p = permission_new (pitem);
g_return_val_if_fail (p != NULL, FALSE); g_return_val_if_fail (p != NULL, FALSE);
priv->permissions = g_slist_append (priv->permissions, p); priv->permissions = g_slist_append (priv->permissions, p);
g_object_notify (G_OBJECT (setting), NM_SETTING_CONNECTION_PERMISSIONS); _notify (setting, PROP_PERMISSIONS);
return TRUE; return TRUE;
} }
@@ -458,7 +455,7 @@ nm_setting_connection_remove_permission (NMSettingConnection *setting,
permission_free ((Permission *) iter->data); permission_free ((Permission *) iter->data);
priv->permissions = g_slist_delete_link (priv->permissions, iter); priv->permissions = g_slist_delete_link (priv->permissions, iter);
g_object_notify (G_OBJECT (setting), NM_SETTING_CONNECTION_PERMISSIONS); _notify (setting, PROP_PERMISSIONS);
} }
/** /**
@@ -498,7 +495,7 @@ nm_setting_connection_remove_permission_by_value (NMSettingConnection *setting,
if (strcmp (pitem, p->item) == 0) { if (strcmp (pitem, p->item) == 0) {
permission_free ((Permission *) iter->data); permission_free ((Permission *) iter->data);
priv->permissions = g_slist_delete_link (priv->permissions, iter); priv->permissions = g_slist_delete_link (priv->permissions, iter);
g_object_notify (G_OBJECT (setting), NM_SETTING_CONNECTION_PERMISSIONS); _notify (setting, PROP_PERMISSIONS);
return TRUE; return TRUE;
} }
} }
@@ -771,7 +768,7 @@ nm_setting_connection_add_secondary (NMSettingConnection *setting,
} }
priv->secondaries = g_slist_append (priv->secondaries, g_strdup (sec_uuid)); priv->secondaries = g_slist_append (priv->secondaries, g_strdup (sec_uuid));
g_object_notify (G_OBJECT (setting), NM_SETTING_CONNECTION_SECONDARIES); _notify (setting, PROP_SECONDARIES);
return TRUE; return TRUE;
} }
@@ -796,7 +793,7 @@ nm_setting_connection_remove_secondary (NMSettingConnection *setting, guint32 id
g_free (elt->data); g_free (elt->data);
priv->secondaries = g_slist_delete_link (priv->secondaries, elt); priv->secondaries = g_slist_delete_link (priv->secondaries, elt);
g_object_notify (G_OBJECT (setting), NM_SETTING_CONNECTION_SECONDARIES); _notify (setting, PROP_SECONDARIES);
} }
/** /**
@@ -823,7 +820,7 @@ nm_setting_connection_remove_secondary_by_value (NMSettingConnection *setting,
for (iter = priv->secondaries; iter; iter = g_slist_next (iter)) { for (iter = priv->secondaries; iter; iter = g_slist_next (iter)) {
if (!strcmp (sec_uuid, (char *) iter->data)) { if (!strcmp (sec_uuid, (char *) iter->data)) {
priv->secondaries = g_slist_delete_link (priv->secondaries, iter); priv->secondaries = g_slist_delete_link (priv->secondaries, iter);
g_object_notify (G_OBJECT (setting), NM_SETTING_CONNECTION_SECONDARIES); _notify (setting, PROP_SECONDARIES);
return TRUE; return TRUE;
} }
} }
@@ -1568,13 +1565,12 @@ nm_setting_connection_class_init (NMSettingConnectionClass *klass)
* description: User friendly name for the connection profile. * description: User friendly name for the connection profile.
* ---end--- * ---end---
*/ */
g_object_class_install_property obj_properties[PROP_ID] =
(object_class, PROP_ID, g_param_spec_string (NM_SETTING_CONNECTION_ID, "", "",
g_param_spec_string (NM_SETTING_CONNECTION_ID, "", "", NULL,
NULL, G_PARAM_READWRITE |
G_PARAM_READWRITE | NM_SETTING_PARAM_FUZZY_IGNORE |
NM_SETTING_PARAM_FUZZY_IGNORE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingConnection:uuid: * NMSettingConnection:uuid:
@@ -1599,13 +1595,12 @@ nm_setting_connection_class_init (NMSettingConnectionClass *klass)
* creates the UUID itself (by hashing the filename). * creates the UUID itself (by hashing the filename).
* ---end--- * ---end---
*/ */
g_object_class_install_property obj_properties[PROP_UUID] =
(object_class, PROP_UUID, g_param_spec_string (NM_SETTING_CONNECTION_UUID, "", "",
g_param_spec_string (NM_SETTING_CONNECTION_UUID, "", "", NULL,
NULL, G_PARAM_READWRITE |
G_PARAM_READWRITE | NM_SETTING_PARAM_FUZZY_IGNORE |
NM_SETTING_PARAM_FUZZY_IGNORE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingConnection:stable-id: * NMSettingConnection:stable-id:
@@ -1653,13 +1648,12 @@ nm_setting_connection_class_init (NMSettingConnectionClass *klass)
* description: Token to generate stable IDs. * description: Token to generate stable IDs.
* ---end--- * ---end---
*/ */
g_object_class_install_property obj_properties[PROP_STABLE_ID] =
(object_class, PROP_STABLE_ID, g_param_spec_string (NM_SETTING_CONNECTION_STABLE_ID, "", "",
g_param_spec_string (NM_SETTING_CONNECTION_STABLE_ID, "", "", NULL,
NULL, G_PARAM_READWRITE |
G_PARAM_READWRITE | NM_SETTING_PARAM_FUZZY_IGNORE |
NM_SETTING_PARAM_FUZZY_IGNORE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingConnection:interface-name: * NMSettingConnection:interface-name:
@@ -1684,17 +1678,15 @@ nm_setting_connection_class_init (NMSettingConnectionClass *klass)
* can be required for some connection types. * can be required for some connection types.
* ---end--- * ---end---
*/ */
g_object_class_install_property obj_properties[PROP_INTERFACE_NAME] =
(object_class, PROP_INTERFACE_NAME, g_param_spec_string (NM_SETTING_CONNECTION_INTERFACE_NAME, "", "",
g_param_spec_string (NM_SETTING_CONNECTION_INTERFACE_NAME, "", "", NULL,
NULL, G_PARAM_READWRITE |
G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE |
NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
_properties_override_add_override (properties_override, _properties_override_add_override (properties_override,
g_object_class_find_property (G_OBJECT_CLASS (setting_class), obj_properties[PROP_INTERFACE_NAME],
NM_SETTING_CONNECTION_INTERFACE_NAME),
G_VARIANT_TYPE_STRING, G_VARIANT_TYPE_STRING,
NULL, NULL,
nm_setting_connection_set_interface_name, nm_setting_connection_set_interface_name,
@@ -1718,13 +1710,12 @@ nm_setting_connection_class_init (NMSettingConnectionClass *klass)
* example: TYPE=Ethernet; TYPE=Bond; TYPE=Bridge; DEVICETYPE=TeamPort * example: TYPE=Ethernet; TYPE=Bond; TYPE=Bridge; DEVICETYPE=TeamPort
* ---end--- * ---end---
*/ */
g_object_class_install_property obj_properties[PROP_TYPE] =
(object_class, PROP_TYPE, g_param_spec_string (NM_SETTING_CONNECTION_TYPE, "", "",
g_param_spec_string (NM_SETTING_CONNECTION_TYPE, "", "", NULL,
NULL, G_PARAM_READWRITE |
G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE |
NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingConnection:permissions: * NMSettingConnection:permissions:
@@ -1751,12 +1742,11 @@ nm_setting_connection_class_init (NMSettingConnectionClass *klass)
* example: USERS="joe bob" * example: USERS="joe bob"
* ---end--- * ---end---
*/ */
g_object_class_install_property obj_properties[PROP_PERMISSIONS] =
(object_class, PROP_PERMISSIONS, g_param_spec_boxed (NM_SETTING_CONNECTION_PERMISSIONS, "", "",
g_param_spec_boxed (NM_SETTING_CONNECTION_PERMISSIONS, "", "", G_TYPE_STRV,
G_TYPE_STRV, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingConnection:autoconnect: * NMSettingConnection:autoconnect:
@@ -1777,14 +1767,13 @@ nm_setting_connection_class_init (NMSettingConnectionClass *klass)
* description: Whether the connection should be autoconnected (not only while booting). * description: Whether the connection should be autoconnected (not only while booting).
* ---end--- * ---end---
*/ */
g_object_class_install_property obj_properties[PROP_AUTOCONNECT] =
(object_class, PROP_AUTOCONNECT, g_param_spec_boolean (NM_SETTING_CONNECTION_AUTOCONNECT, "", "",
g_param_spec_boolean (NM_SETTING_CONNECTION_AUTOCONNECT, "", "", TRUE,
TRUE, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
G_PARAM_CONSTRUCT | NM_SETTING_PARAM_FUZZY_IGNORE |
NM_SETTING_PARAM_FUZZY_IGNORE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingConnection:autoconnect-priority: * NMSettingConnection:autoconnect-priority:
@@ -1803,8 +1792,7 @@ nm_setting_connection_class_init (NMSettingConnectionClass *klass)
* example: AUTOCONNECT_PRIORITY=20 * example: AUTOCONNECT_PRIORITY=20
* ---end--- * ---end---
*/ */
g_object_class_install_property obj_properties[PROP_AUTOCONNECT_PRIORITY] =
(object_class, PROP_AUTOCONNECT_PRIORITY,
g_param_spec_int (NM_SETTING_CONNECTION_AUTOCONNECT_PRIORITY, "", "", g_param_spec_int (NM_SETTING_CONNECTION_AUTOCONNECT_PRIORITY, "", "",
NM_SETTING_CONNECTION_AUTOCONNECT_PRIORITY_MIN, NM_SETTING_CONNECTION_AUTOCONNECT_PRIORITY_MIN,
NM_SETTING_CONNECTION_AUTOCONNECT_PRIORITY_MAX, NM_SETTING_CONNECTION_AUTOCONNECT_PRIORITY_MAX,
@@ -1812,7 +1800,7 @@ nm_setting_connection_class_init (NMSettingConnectionClass *klass)
G_PARAM_READWRITE | G_PARAM_READWRITE |
G_PARAM_CONSTRUCT | G_PARAM_CONSTRUCT |
NM_SETTING_PARAM_FUZZY_IGNORE | NM_SETTING_PARAM_FUZZY_IGNORE |
G_PARAM_STATIC_STRINGS)); G_PARAM_STATIC_STRINGS);
/** /**
* NMSettingConnection:autoconnect-retries: * NMSettingConnection:autoconnect-retries:
@@ -1832,14 +1820,13 @@ nm_setting_connection_class_init (NMSettingConnectionClass *klass)
* example: AUTOCONNECT_RETRIES=1 * example: AUTOCONNECT_RETRIES=1
* ---end--- * ---end---
*/ */
g_object_class_install_property obj_properties[PROP_AUTOCONNECT_RETRIES] =
(object_class, PROP_AUTOCONNECT_RETRIES,
g_param_spec_int (NM_SETTING_CONNECTION_AUTOCONNECT_RETRIES, "", "", g_param_spec_int (NM_SETTING_CONNECTION_AUTOCONNECT_RETRIES, "", "",
-1, G_MAXINT32, -1, -1, G_MAXINT32, -1,
G_PARAM_READWRITE | G_PARAM_READWRITE |
G_PARAM_CONSTRUCT | G_PARAM_CONSTRUCT |
NM_SETTING_PARAM_FUZZY_IGNORE | NM_SETTING_PARAM_FUZZY_IGNORE |
G_PARAM_STATIC_STRINGS)); G_PARAM_STATIC_STRINGS);
/** /**
* NMSettingConnection:multi-connect: * NMSettingConnection:multi-connect:
@@ -1857,13 +1844,12 @@ nm_setting_connection_class_init (NMSettingConnectionClass *klass)
* example: ZONE=3 * example: ZONE=3
* ---end--- * ---end---
*/ */
g_object_class_install_property obj_properties[PROP_MULTI_CONNECT] =
(object_class, PROP_MULTI_CONNECT,
g_param_spec_int (NM_SETTING_CONNECTION_MULTI_CONNECT, "", "", g_param_spec_int (NM_SETTING_CONNECTION_MULTI_CONNECT, "", "",
G_MININT32, G_MAXINT32, NM_CONNECTION_MULTI_CONNECT_DEFAULT, G_MININT32, G_MAXINT32, NM_CONNECTION_MULTI_CONNECT_DEFAULT,
G_PARAM_READWRITE | G_PARAM_READWRITE |
NM_SETTING_PARAM_FUZZY_IGNORE | NM_SETTING_PARAM_FUZZY_IGNORE |
G_PARAM_STATIC_STRINGS)); G_PARAM_STATIC_STRINGS);
/** /**
* NMSettingConnection:timestamp: * NMSettingConnection:timestamp:
@@ -1876,14 +1862,13 @@ nm_setting_connection_class_init (NMSettingConnectionClass *klass)
* timestamp. The property is only meant for reading (changes to this * timestamp. The property is only meant for reading (changes to this
* property will not be preserved). * property will not be preserved).
**/ **/
g_object_class_install_property obj_properties[PROP_TIMESTAMP] =
(object_class, PROP_TIMESTAMP, g_param_spec_uint64 (NM_SETTING_CONNECTION_TIMESTAMP, "", "",
g_param_spec_uint64 (NM_SETTING_CONNECTION_TIMESTAMP, "", "", 0, G_MAXUINT64, 0,
0, G_MAXUINT64, 0, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
G_PARAM_CONSTRUCT | NM_SETTING_PARAM_FUZZY_IGNORE |
NM_SETTING_PARAM_FUZZY_IGNORE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingConnection:read-only: * NMSettingConnection:read-only:
@@ -1892,14 +1877,13 @@ 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.
**/ **/
g_object_class_install_property obj_properties[PROP_READ_ONLY] =
(object_class, PROP_READ_ONLY, g_param_spec_boolean (NM_SETTING_CONNECTION_READ_ONLY, "", "",
g_param_spec_boolean (NM_SETTING_CONNECTION_READ_ONLY, "", "", FALSE,
FALSE, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
G_PARAM_CONSTRUCT | NM_SETTING_PARAM_FUZZY_IGNORE |
NM_SETTING_PARAM_FUZZY_IGNORE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingConnection:zone: * NMSettingConnection:zone:
@@ -1920,15 +1904,14 @@ nm_setting_connection_class_init (NMSettingConnectionClass *klass)
* example: ZONE=Work * example: ZONE=Work
* ---end--- * ---end---
*/ */
g_object_class_install_property obj_properties[PROP_ZONE] =
(object_class, PROP_ZONE, g_param_spec_string (NM_SETTING_CONNECTION_ZONE, "", "",
g_param_spec_string (NM_SETTING_CONNECTION_ZONE, "", "", NULL,
NULL, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
G_PARAM_CONSTRUCT | NM_SETTING_PARAM_FUZZY_IGNORE |
NM_SETTING_PARAM_FUZZY_IGNORE | NM_SETTING_PARAM_REAPPLY_IMMEDIATELY |
NM_SETTING_PARAM_REAPPLY_IMMEDIATELY | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingConnection:master: * NMSettingConnection:master:
@@ -1944,14 +1927,13 @@ nm_setting_connection_class_init (NMSettingConnectionClass *klass)
* for compatibility with legacy tooling. * for compatibility with legacy tooling.
* ---end--- * ---end---
*/ */
g_object_class_install_property obj_properties[PROP_MASTER] =
(object_class, PROP_MASTER, g_param_spec_string (NM_SETTING_CONNECTION_MASTER, "", "",
g_param_spec_string (NM_SETTING_CONNECTION_MASTER, "", "", NULL,
NULL, G_PARAM_READWRITE |
G_PARAM_READWRITE | NM_SETTING_PARAM_FUZZY_IGNORE |
NM_SETTING_PARAM_FUZZY_IGNORE | NM_SETTING_PARAM_INFERRABLE |
NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingConnection:slave-type: * NMSettingConnection:slave-type:
@@ -1970,14 +1952,13 @@ nm_setting_connection_class_init (NMSettingConnectionClass *klass)
* and BRIDGE_UUID for bridging. * and BRIDGE_UUID for bridging.
* ---end--- * ---end---
*/ */
g_object_class_install_property obj_properties[PROP_SLAVE_TYPE] =
(object_class, PROP_SLAVE_TYPE, g_param_spec_string (NM_SETTING_CONNECTION_SLAVE_TYPE, "", "",
g_param_spec_string (NM_SETTING_CONNECTION_SLAVE_TYPE, "", "", NULL,
NULL, G_PARAM_READWRITE |
G_PARAM_READWRITE | NM_SETTING_PARAM_FUZZY_IGNORE |
NM_SETTING_PARAM_FUZZY_IGNORE | NM_SETTING_PARAM_INFERRABLE |
NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingConnection:autoconnect-slaves: * NMSettingConnection:autoconnect-slaves:
@@ -2002,15 +1983,14 @@ nm_setting_connection_class_init (NMSettingConnectionClass *klass)
* when this connection is activated. * when this connection is activated.
* ---end--- * ---end---
*/ */
g_object_class_install_property obj_properties[PROP_AUTOCONNECT_SLAVES] =
(object_class, PROP_AUTOCONNECT_SLAVES, g_param_spec_enum (NM_SETTING_CONNECTION_AUTOCONNECT_SLAVES, "", "",
g_param_spec_enum (NM_SETTING_CONNECTION_AUTOCONNECT_SLAVES, "", "", NM_TYPE_SETTING_CONNECTION_AUTOCONNECT_SLAVES,
NM_TYPE_SETTING_CONNECTION_AUTOCONNECT_SLAVES, NM_SETTING_CONNECTION_AUTOCONNECT_SLAVES_DEFAULT,
NM_SETTING_CONNECTION_AUTOCONNECT_SLAVES_DEFAULT, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
G_PARAM_CONSTRUCT | NM_SETTING_PARAM_FUZZY_IGNORE |
NM_SETTING_PARAM_FUZZY_IGNORE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingConnection:secondaries: * NMSettingConnection:secondaries:
@@ -2026,13 +2006,12 @@ nm_setting_connection_class_init (NMSettingConnectionClass *klass)
* together with this connection. * together with this connection.
* ---end--- * ---end---
*/ */
g_object_class_install_property obj_properties[PROP_SECONDARIES] =
(object_class, PROP_SECONDARIES, g_param_spec_boxed (NM_SETTING_CONNECTION_SECONDARIES, "", "",
g_param_spec_boxed (NM_SETTING_CONNECTION_SECONDARIES, "", "", G_TYPE_STRV,
G_TYPE_STRV, G_PARAM_READWRITE |
G_PARAM_READWRITE | NM_SETTING_PARAM_FUZZY_IGNORE |
NM_SETTING_PARAM_FUZZY_IGNORE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingConnection:gateway-ping-timeout: * NMSettingConnection:gateway-ping-timeout:
@@ -2049,13 +2028,12 @@ nm_setting_connection_class_init (NMSettingConnectionClass *klass)
* example: GATEWAY_PING_TIMEOUT=5 * example: GATEWAY_PING_TIMEOUT=5
* ---end--- * ---end---
*/ */
g_object_class_install_property obj_properties[PROP_GATEWAY_PING_TIMEOUT] =
(object_class, PROP_GATEWAY_PING_TIMEOUT, g_param_spec_uint (NM_SETTING_CONNECTION_GATEWAY_PING_TIMEOUT, "", "",
g_param_spec_uint (NM_SETTING_CONNECTION_GATEWAY_PING_TIMEOUT, "", "", 0, 600, 0,
0, 600, 0, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingConnection:metered: * NMSettingConnection:metered:
@@ -2075,14 +2053,13 @@ nm_setting_connection_class_init (NMSettingConnectionClass *klass)
* example: CONNECTION_METERED=yes * example: CONNECTION_METERED=yes
* ---end--- * ---end---
*/ */
g_object_class_install_property obj_properties[PROP_METERED] =
(object_class, PROP_METERED, g_param_spec_enum (NM_SETTING_CONNECTION_METERED, "", "",
g_param_spec_enum (NM_SETTING_CONNECTION_METERED, "", "", NM_TYPE_METERED,
NM_TYPE_METERED, NM_METERED_UNKNOWN,
NM_METERED_UNKNOWN, G_PARAM_READWRITE |
G_PARAM_READWRITE | NM_SETTING_PARAM_REAPPLY_IMMEDIATELY |
NM_SETTING_PARAM_REAPPLY_IMMEDIATELY | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingConnection:lldp: * NMSettingConnection:lldp:
@@ -2100,14 +2077,13 @@ nm_setting_connection_class_init (NMSettingConnectionClass *klass)
* example: LLDP=no * example: LLDP=no
* ---end--- * ---end---
*/ */
g_object_class_install_property obj_properties[PROP_LLDP] =
(object_class, PROP_LLDP, g_param_spec_int (NM_SETTING_CONNECTION_LLDP, "", "",
g_param_spec_int (NM_SETTING_CONNECTION_LLDP, "", "", G_MININT32, G_MAXINT32, NM_SETTING_CONNECTION_LLDP_DEFAULT,
G_MININT32, G_MAXINT32, NM_SETTING_CONNECTION_LLDP_DEFAULT, NM_SETTING_PARAM_FUZZY_IGNORE |
NM_SETTING_PARAM_FUZZY_IGNORE | G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingConnection:auth-retries: * NMSettingConnection:auth-retries:
@@ -2127,14 +2103,13 @@ nm_setting_connection_class_init (NMSettingConnectionClass *klass)
* description: Number of retries for authentication. * description: Number of retries for authentication.
* ---end--- * ---end---
*/ */
g_object_class_install_property obj_properties[PROP_AUTH_RETRIES] =
(object_class, PROP_AUTH_RETRIES, g_param_spec_int (NM_SETTING_CONNECTION_AUTH_RETRIES, "", "",
g_param_spec_int (NM_SETTING_CONNECTION_AUTH_RETRIES, "", "", -1, G_MAXINT32, -1,
-1, G_MAXINT32, -1, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
G_PARAM_CONSTRUCT | NM_SETTING_PARAM_FUZZY_IGNORE |
NM_SETTING_PARAM_FUZZY_IGNORE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingConnection:mdns: * NMSettingConnection:mdns:
@@ -2159,13 +2134,12 @@ nm_setting_connection_class_init (NMSettingConnectionClass *klass)
* example: MDNS=yes * example: MDNS=yes
* ---end--- * ---end---
*/ */
g_object_class_install_property obj_properties[PROP_MDNS] =
(object_class, PROP_MDNS, g_param_spec_int (NM_SETTING_CONNECTION_MDNS, "", "",
g_param_spec_int (NM_SETTING_CONNECTION_MDNS, "", "", G_MININT32, G_MAXINT32,
G_MININT32, G_MAXINT32, NM_SETTING_CONNECTION_MDNS_DEFAULT,
NM_SETTING_CONNECTION_MDNS_DEFAULT, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingConnection:llmnr: * NMSettingConnection:llmnr:
@@ -2193,13 +2167,14 @@ nm_setting_connection_class_init (NMSettingConnectionClass *klass)
* example: LLMNR=yes * example: LLMNR=yes
* ---end--- * ---end---
*/ */
g_object_class_install_property obj_properties[PROP_LLMNR] =
(object_class, PROP_LLMNR, g_param_spec_int (NM_SETTING_CONNECTION_LLMNR, "", "",
g_param_spec_int (NM_SETTING_CONNECTION_LLMNR, "", "", G_MININT32, G_MAXINT32,
G_MININT32, G_MAXINT32, NM_SETTING_CONNECTION_LLMNR_DEFAULT,
NM_SETTING_CONNECTION_LLMNR_DEFAULT, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
g_object_class_install_properties (object_class, _PROPERTY_ENUMS_LAST, obj_properties);
_nm_setting_class_commit_full (setting_class, NM_META_SETTING_TYPE_CONNECTION, _nm_setting_class_commit_full (setting_class, NM_META_SETTING_TYPE_CONNECTION,
NULL, properties_override); NULL, properties_override);

265
libnm-core/nm-setting-dcb.c
View File

@@ -68,8 +68,8 @@ typedef struct {
guint priority_traffic_class[8]; guint priority_traffic_class[8];
} NMSettingDcbPrivate; } NMSettingDcbPrivate;
enum { NM_GOBJECT_PROPERTIES_DEFINE (NMSettingDcb,
PROP_0,
PROP_APP_FCOE_FLAGS, PROP_APP_FCOE_FLAGS,
PROP_APP_FCOE_PRIORITY, PROP_APP_FCOE_PRIORITY,
PROP_APP_FCOE_MODE, PROP_APP_FCOE_MODE,
@@ -81,17 +81,15 @@ enum {
PROP_APP_FIP_PRIORITY, PROP_APP_FIP_PRIORITY,
PROP_PFC_FLAGS, PROP_PFC_FLAGS,
PROP_PFC, PROP_PRIORITY_FLOW_CONTROL,
PROP_PRIORITY_GROUP_FLAGS, PROP_PRIORITY_GROUP_FLAGS,
PROP_PRIORITY_GROUP_ID, PROP_PRIORITY_GROUP_ID,
PROP_PRIORITY_GROUP_BANDWIDTH, PROP_PRIORITY_GROUP_BANDWIDTH,
PROP_PRIORITY_BANDWIDTH, PROP_PRIORITY_BANDWIDTH,
PROP_PRIORITY_STRICT, PROP_PRIORITY_STRICT_BANDWIDTH,
PROP_PRIORITY_TRAFFIC_CLASS, PROP_PRIORITY_TRAFFIC_CLASS,
);
LAST_PROP
};
/** /**
* nm_setting_dcb_new: * nm_setting_dcb_new:
@@ -258,7 +256,7 @@ nm_setting_dcb_set_priority_flow_control (NMSettingDcb *setting,
priv = NM_SETTING_DCB_GET_PRIVATE (setting); priv = NM_SETTING_DCB_GET_PRIVATE (setting);
if (priv->pfc[user_priority] != uint_enabled) { if (priv->pfc[user_priority] != uint_enabled) {
priv->pfc[user_priority] = uint_enabled; priv->pfc[user_priority] = uint_enabled;
g_object_notify (G_OBJECT (setting), NM_SETTING_DCB_PRIORITY_FLOW_CONTROL); _notify (setting, PROP_PRIORITY_FLOW_CONTROL);
} }
} }
@@ -318,7 +316,7 @@ nm_setting_dcb_set_priority_group_id (NMSettingDcb *setting,
priv = NM_SETTING_DCB_GET_PRIVATE (setting); priv = NM_SETTING_DCB_GET_PRIVATE (setting);
if (priv->priority_group_id[user_priority] != group_id) { if (priv->priority_group_id[user_priority] != group_id) {
priv->priority_group_id[user_priority] = group_id; priv->priority_group_id[user_priority] = group_id;
g_object_notify (G_OBJECT (setting), NM_SETTING_DCB_PRIORITY_GROUP_ID); _notify (setting, PROP_PRIORITY_GROUP_ID);
} }
} }
@@ -363,7 +361,7 @@ nm_setting_dcb_set_priority_group_bandwidth (NMSettingDcb *setting,
priv = NM_SETTING_DCB_GET_PRIVATE (setting); priv = NM_SETTING_DCB_GET_PRIVATE (setting);
if (priv->priority_group_bandwidth[group_id] != bandwidth_percent) { if (priv->priority_group_bandwidth[group_id] != bandwidth_percent) {
priv->priority_group_bandwidth[group_id] = bandwidth_percent; priv->priority_group_bandwidth[group_id] = bandwidth_percent;
g_object_notify (G_OBJECT (setting), NM_SETTING_DCB_PRIORITY_GROUP_BANDWIDTH); _notify (setting, PROP_PRIORITY_GROUP_BANDWIDTH);
} }
} }
@@ -409,7 +407,7 @@ nm_setting_dcb_set_priority_bandwidth (NMSettingDcb *setting,
priv = NM_SETTING_DCB_GET_PRIVATE (setting); priv = NM_SETTING_DCB_GET_PRIVATE (setting);
if (priv->priority_bandwidth[user_priority] != bandwidth_percent) { if (priv->priority_bandwidth[user_priority] != bandwidth_percent) {
priv->priority_bandwidth[user_priority] = bandwidth_percent; priv->priority_bandwidth[user_priority] = bandwidth_percent;
g_object_notify (G_OBJECT (setting), NM_SETTING_DCB_PRIORITY_BANDWIDTH); _notify (setting, PROP_PRIORITY_BANDWIDTH);
} }
} }
@@ -455,7 +453,7 @@ nm_setting_dcb_set_priority_strict_bandwidth (NMSettingDcb *setting,
priv = NM_SETTING_DCB_GET_PRIVATE (setting); priv = NM_SETTING_DCB_GET_PRIVATE (setting);
if (priv->priority_strict[user_priority] != uint_strict) { if (priv->priority_strict[user_priority] != uint_strict) {
priv->priority_strict[user_priority] = uint_strict; priv->priority_strict[user_priority] = uint_strict;
g_object_notify (G_OBJECT (setting), NM_SETTING_DCB_PRIORITY_STRICT_BANDWIDTH); _notify (setting, PROP_PRIORITY_STRICT_BANDWIDTH);
} }
} }
@@ -500,7 +498,7 @@ nm_setting_dcb_set_priority_traffic_class (NMSettingDcb *setting,
priv = NM_SETTING_DCB_GET_PRIVATE (setting); priv = NM_SETTING_DCB_GET_PRIVATE (setting);
if (priv->priority_traffic_class[user_priority] != traffic_class) { if (priv->priority_traffic_class[user_priority] != traffic_class) {
priv->priority_traffic_class[user_priority] = traffic_class; priv->priority_traffic_class[user_priority] = traffic_class;
g_object_notify (G_OBJECT (setting), NM_SETTING_DCB_PRIORITY_TRAFFIC_CLASS); _notify (setting, PROP_PRIORITY_TRAFFIC_CLASS);
} }
} }
@@ -808,7 +806,7 @@ set_property (GObject *object, guint prop_id,
case PROP_PFC_FLAGS: case PROP_PFC_FLAGS:
priv->pfc_flags = g_value_get_flags (value); priv->pfc_flags = g_value_get_flags (value);
break; break;
case PROP_PFC: case PROP_PRIORITY_FLOW_CONTROL:
SET_ARRAY_FROM_GVALUE (value, priv->pfc); SET_ARRAY_FROM_GVALUE (value, priv->pfc);
break; break;
case PROP_PRIORITY_GROUP_FLAGS: case PROP_PRIORITY_GROUP_FLAGS:
@@ -823,7 +821,7 @@ set_property (GObject *object, guint prop_id,
case PROP_PRIORITY_BANDWIDTH: case PROP_PRIORITY_BANDWIDTH:
SET_ARRAY_FROM_GVALUE (value, priv->priority_bandwidth); SET_ARRAY_FROM_GVALUE (value, priv->priority_bandwidth);
break; break;
case PROP_PRIORITY_STRICT: case PROP_PRIORITY_STRICT_BANDWIDTH:
SET_ARRAY_FROM_GVALUE (value, priv->priority_strict); SET_ARRAY_FROM_GVALUE (value, priv->priority_strict);
break; break;
case PROP_PRIORITY_TRAFFIC_CLASS: case PROP_PRIORITY_TRAFFIC_CLASS:
@@ -867,7 +865,7 @@ get_property (GObject *object, guint prop_id,
case PROP_PFC_FLAGS: case PROP_PFC_FLAGS:
g_value_set_flags (value, priv->pfc_flags); g_value_set_flags (value, priv->pfc_flags);
break; break;
case PROP_PFC: case PROP_PRIORITY_FLOW_CONTROL:
SET_GVALUE_FROM_ARRAY (value, priv->pfc); SET_GVALUE_FROM_ARRAY (value, priv->pfc);
break; break;
case PROP_PRIORITY_GROUP_FLAGS: case PROP_PRIORITY_GROUP_FLAGS:
@@ -882,7 +880,7 @@ get_property (GObject *object, guint prop_id,
case PROP_PRIORITY_BANDWIDTH: case PROP_PRIORITY_BANDWIDTH:
SET_GVALUE_FROM_ARRAY (value, priv->priority_bandwidth); SET_GVALUE_FROM_ARRAY (value, priv->priority_bandwidth);
break; break;
case PROP_PRIORITY_STRICT: case PROP_PRIORITY_STRICT_BANDWIDTH:
SET_GVALUE_FROM_ARRAY (value, priv->priority_strict); SET_GVALUE_FROM_ARRAY (value, priv->priority_strict);
break; break;
case PROP_PRIORITY_TRAFFIC_CLASS: case PROP_PRIORITY_TRAFFIC_CLASS:
@@ -934,13 +932,12 @@ nm_setting_dcb_class_init (NMSettingDcbClass *klass)
* example: DCB_APP_FCOE_ENABLE=yes DCB_APP_FCOE_ADVERTISE=yes * example: DCB_APP_FCOE_ENABLE=yes DCB_APP_FCOE_ADVERTISE=yes
* ---end--- * ---end---
*/ */
g_object_class_install_property obj_properties[PROP_APP_FCOE_FLAGS] =
(object_class, PROP_APP_FCOE_FLAGS, g_param_spec_flags (NM_SETTING_DCB_APP_FCOE_FLAGS, "", "",
g_param_spec_flags (NM_SETTING_DCB_APP_FCOE_FLAGS, "", "", NM_TYPE_SETTING_DCB_FLAGS,
NM_TYPE_SETTING_DCB_FLAGS, NM_SETTING_DCB_FLAG_NONE,
NM_SETTING_DCB_FLAG_NONE, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingDcb:app-fcoe-priority: * NMSettingDcb:app-fcoe-priority:
@@ -956,13 +953,12 @@ nm_setting_dcb_class_init (NMSettingDcbClass *klass)
* description: Priority of FCoE frames. * description: Priority of FCoE frames.
* ---end--- * ---end---
*/ */
g_object_class_install_property obj_properties[PROP_APP_FCOE_PRIORITY] =
(object_class, PROP_APP_FCOE_PRIORITY, g_param_spec_int (NM_SETTING_DCB_APP_FCOE_PRIORITY, "", "",
g_param_spec_int (NM_SETTING_DCB_APP_FCOE_PRIORITY, "", "", -1, 7, -1,
-1, 7, -1, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingDcb:app-fcoe-mode: * NMSettingDcb:app-fcoe-mode:
@@ -978,13 +974,12 @@ nm_setting_dcb_class_init (NMSettingDcbClass *klass)
* description: FCoE controller mode. * description: FCoE controller mode.
* ---end--- * ---end---
*/ */
g_object_class_install_property obj_properties[PROP_APP_FCOE_MODE] =
(object_class, PROP_APP_FCOE_MODE, g_param_spec_string (NM_SETTING_DCB_APP_FCOE_MODE, "", "",
g_param_spec_string (NM_SETTING_DCB_APP_FCOE_MODE, "", "", NM_SETTING_DCB_FCOE_MODE_FABRIC,
NM_SETTING_DCB_FCOE_MODE_FABRIC, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingDcb:app-iscsi-flags: * NMSettingDcb:app-iscsi-flags:
@@ -1000,13 +995,12 @@ nm_setting_dcb_class_init (NMSettingDcbClass *klass)
* description: iSCSI flags. * description: iSCSI flags.
* ---end--- * ---end---
*/ */
g_object_class_install_property obj_properties[PROP_APP_ISCSI_FLAGS] =
(object_class, PROP_APP_ISCSI_FLAGS, g_param_spec_flags (NM_SETTING_DCB_APP_ISCSI_FLAGS, "", "",
g_param_spec_flags (NM_SETTING_DCB_APP_ISCSI_FLAGS, "", "", NM_TYPE_SETTING_DCB_FLAGS,
NM_TYPE_SETTING_DCB_FLAGS, NM_SETTING_DCB_FLAG_NONE,
NM_SETTING_DCB_FLAG_NONE, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingDcb:app-iscsi-priority: * NMSettingDcb:app-iscsi-priority:
@@ -1022,13 +1016,12 @@ nm_setting_dcb_class_init (NMSettingDcbClass *klass)
* description: Priority of iSCSI frames. * description: Priority of iSCSI frames.
* ---end--- * ---end---
*/ */
g_object_class_install_property obj_properties[PROP_APP_ISCSI_PRIORITY] =
(object_class, PROP_APP_ISCSI_PRIORITY, g_param_spec_int (NM_SETTING_DCB_APP_ISCSI_PRIORITY, "", "",
g_param_spec_int (NM_SETTING_DCB_APP_ISCSI_PRIORITY, "", "", -1, 7, -1,
-1, 7, -1, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingDcb:app-fip-flags: * NMSettingDcb:app-fip-flags:
@@ -1044,13 +1037,12 @@ nm_setting_dcb_class_init (NMSettingDcbClass *klass)
* description: FIP flags. * description: FIP flags.
* ---end--- * ---end---
*/ */
g_object_class_install_property obj_properties[PROP_APP_FIP_FLAGS] =
(object_class, PROP_APP_FIP_FLAGS, g_param_spec_flags (NM_SETTING_DCB_APP_FIP_FLAGS, "", "",
g_param_spec_flags (NM_SETTING_DCB_APP_FIP_FLAGS, "", "", NM_TYPE_SETTING_DCB_FLAGS,
NM_TYPE_SETTING_DCB_FLAGS, NM_SETTING_DCB_FLAG_NONE,
NM_SETTING_DCB_FLAG_NONE, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingDcb:app-fip-priority: * NMSettingDcb:app-fip-priority:
@@ -1066,13 +1058,12 @@ nm_setting_dcb_class_init (NMSettingDcbClass *klass)
* description: Priority of FIP frames. * description: Priority of FIP frames.
* ---end--- * ---end---
*/ */
g_object_class_install_property obj_properties[PROP_APP_FIP_PRIORITY] =
(object_class, PROP_APP_FIP_PRIORITY, g_param_spec_int (NM_SETTING_DCB_APP_FIP_PRIORITY, "", "",
g_param_spec_int (NM_SETTING_DCB_APP_FIP_PRIORITY, "", "", -1, 7, -1,
-1, 7, -1, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingDcb:priority-flow-control-flags: * NMSettingDcb:priority-flow-control-flags:
@@ -1088,13 +1079,12 @@ nm_setting_dcb_class_init (NMSettingDcbClass *klass)
* description: Priority flow control flags. * description: Priority flow control flags.
* ---end--- * ---end---
*/ */
g_object_class_install_property obj_properties[PROP_PFC_FLAGS] =
(object_class, PROP_PFC_FLAGS, g_param_spec_flags (NM_SETTING_DCB_PRIORITY_FLOW_CONTROL_FLAGS, "", "",
g_param_spec_flags (NM_SETTING_DCB_PRIORITY_FLOW_CONTROL_FLAGS, "", "", NM_TYPE_SETTING_DCB_FLAGS,
NM_TYPE_SETTING_DCB_FLAGS, NM_SETTING_DCB_FLAG_NONE,
NM_SETTING_DCB_FLAG_NONE, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingDcb:priority-flow-control: (type GArray(gboolean)) * NMSettingDcb:priority-flow-control: (type GArray(gboolean))
@@ -1111,19 +1101,17 @@ nm_setting_dcb_class_init (NMSettingDcbClass *klass)
* example: DCB_PFC_UP=01101110 * example: DCB_PFC_UP=01101110
* ---end--- * ---end---
*/ */
g_object_class_install_property obj_properties[PROP_PRIORITY_FLOW_CONTROL] =
(object_class, PROP_PFC, g_param_spec_boxed (NM_SETTING_DCB_PRIORITY_FLOW_CONTROL, "", "",
g_param_spec_boxed (NM_SETTING_DCB_PRIORITY_FLOW_CONTROL, "", "", G_TYPE_ARRAY,
G_TYPE_ARRAY, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
_properties_override_add_transform (properties_override, _properties_override_add_transform (properties_override,
g_object_class_find_property (G_OBJECT_CLASS (setting_class), obj_properties[PROP_PRIORITY_FLOW_CONTROL],
NM_SETTING_DCB_PRIORITY_FLOW_CONTROL), G_VARIANT_TYPE ("au"),
G_VARIANT_TYPE ("au"), _nm_setting_dcb_uint_array_to_dbus,
_nm_setting_dcb_uint_array_to_dbus, _nm_setting_dcb_uint_array_from_dbus);
_nm_setting_dcb_uint_array_from_dbus);
/** /**
* NMSettingDcb:priority-group-flags: * NMSettingDcb:priority-group-flags:
@@ -1139,13 +1127,12 @@ nm_setting_dcb_class_init (NMSettingDcbClass *klass)
* description: Priority groups flags. * description: Priority groups flags.
* ---end--- * ---end---
*/ */
g_object_class_install_property obj_properties[PROP_PRIORITY_GROUP_FLAGS] =
(object_class, PROP_PRIORITY_GROUP_FLAGS, g_param_spec_flags (NM_SETTING_DCB_PRIORITY_GROUP_FLAGS, "", "",
g_param_spec_flags (NM_SETTING_DCB_PRIORITY_GROUP_FLAGS, "", "", NM_TYPE_SETTING_DCB_FLAGS,
NM_TYPE_SETTING_DCB_FLAGS, NM_SETTING_DCB_FLAG_NONE,
NM_SETTING_DCB_FLAG_NONE, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingDcb:priority-group-id: (type GArray(guint)) * NMSettingDcb:priority-group-id: (type GArray(guint))
@@ -1162,19 +1149,17 @@ nm_setting_dcb_class_init (NMSettingDcbClass *klass)
* example: DCB_PG_ID=1205f173 * example: DCB_PG_ID=1205f173
* ---end--- * ---end---
*/ */
g_object_class_install_property obj_properties[PROP_PRIORITY_GROUP_ID] =
(object_class, PROP_PRIORITY_GROUP_ID, g_param_spec_boxed (NM_SETTING_DCB_PRIORITY_GROUP_ID, "", "",
g_param_spec_boxed (NM_SETTING_DCB_PRIORITY_GROUP_ID, "", "", G_TYPE_ARRAY,
G_TYPE_ARRAY, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
_properties_override_add_transform (properties_override, _properties_override_add_transform (properties_override,
g_object_class_find_property (G_OBJECT_CLASS (setting_class), obj_properties[PROP_PRIORITY_GROUP_ID],
NM_SETTING_DCB_PRIORITY_GROUP_ID), G_VARIANT_TYPE ("au"),
G_VARIANT_TYPE ("au"), _nm_setting_dcb_uint_array_to_dbus,
_nm_setting_dcb_uint_array_to_dbus, _nm_setting_dcb_uint_array_from_dbus);
_nm_setting_dcb_uint_array_from_dbus);
/** /**
* NMSettingDcb:priority-group-bandwidth: (type GArray(guint)) * NMSettingDcb:priority-group-bandwidth: (type GArray(guint))
@@ -1191,19 +1176,17 @@ nm_setting_dcb_class_init (NMSettingDcbClass *klass)
* example: DCB_PG_PCT=10,5,10,15,10,10,10,30 * example: DCB_PG_PCT=10,5,10,15,10,10,10,30
* ---end--- * ---end---
*/ */
g_object_class_install_property obj_properties[PROP_PRIORITY_GROUP_BANDWIDTH] =
(object_class, PROP_PRIORITY_GROUP_BANDWIDTH, g_param_spec_boxed (NM_SETTING_DCB_PRIORITY_GROUP_BANDWIDTH, "", "",
g_param_spec_boxed (NM_SETTING_DCB_PRIORITY_GROUP_BANDWIDTH, "", "", G_TYPE_ARRAY,
G_TYPE_ARRAY, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
_properties_override_add_transform (properties_override, _properties_override_add_transform (properties_override,
g_object_class_find_property (G_OBJECT_CLASS (setting_class), obj_properties[PROP_PRIORITY_GROUP_BANDWIDTH],
NM_SETTING_DCB_PRIORITY_GROUP_BANDWIDTH), G_VARIANT_TYPE ("au"),
G_VARIANT_TYPE ("au"), _nm_setting_dcb_uint_array_to_dbus,
_nm_setting_dcb_uint_array_to_dbus, _nm_setting_dcb_uint_array_from_dbus);
_nm_setting_dcb_uint_array_from_dbus);
/** /**
* NMSettingDcb:priority-bandwidth: (type GArray(guint)) * NMSettingDcb:priority-bandwidth: (type GArray(guint))
@@ -1222,19 +1205,17 @@ nm_setting_dcb_class_init (NMSettingDcbClass *klass)
* example: DCB_PG_UPPCT=7,13,10,10,15,15,10,20 * example: DCB_PG_UPPCT=7,13,10,10,15,15,10,20
* ---end--- * ---end---
*/ */
g_object_class_install_property obj_properties[PROP_PRIORITY_BANDWIDTH] =
(object_class, PROP_PRIORITY_BANDWIDTH, g_param_spec_boxed (NM_SETTING_DCB_PRIORITY_BANDWIDTH, "", "",
g_param_spec_boxed (NM_SETTING_DCB_PRIORITY_BANDWIDTH, "", "", G_TYPE_ARRAY,
G_TYPE_ARRAY, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
_properties_override_add_transform (properties_override, _properties_override_add_transform (properties_override,
g_object_class_find_property (G_OBJECT_CLASS (setting_class), obj_properties[PROP_PRIORITY_BANDWIDTH],
NM_SETTING_DCB_PRIORITY_BANDWIDTH), G_VARIANT_TYPE ("au"),
G_VARIANT_TYPE ("au"), _nm_setting_dcb_uint_array_to_dbus,
_nm_setting_dcb_uint_array_to_dbus, _nm_setting_dcb_uint_array_from_dbus);
_nm_setting_dcb_uint_array_from_dbus);
/** /**
* NMSettingDcb:priority-strict-bandwidth: (type GArray(gboolean)) * NMSettingDcb:priority-strict-bandwidth: (type GArray(gboolean))
@@ -1251,19 +1232,17 @@ nm_setting_dcb_class_init (NMSettingDcbClass *klass)
* example: DCB_PG_STRICT=01101110 * example: DCB_PG_STRICT=01101110
* ---end--- * ---end---
*/ */
g_object_class_install_property obj_properties[PROP_PRIORITY_STRICT_BANDWIDTH] =
(object_class, PROP_PRIORITY_STRICT, g_param_spec_boxed (NM_SETTING_DCB_PRIORITY_STRICT_BANDWIDTH, "", "",
g_param_spec_boxed (NM_SETTING_DCB_PRIORITY_STRICT_BANDWIDTH, "", "", G_TYPE_ARRAY,
G_TYPE_ARRAY, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
_properties_override_add_transform (properties_override, _properties_override_add_transform (properties_override,
g_object_class_find_property (G_OBJECT_CLASS (setting_class), obj_properties[PROP_PRIORITY_STRICT_BANDWIDTH],
NM_SETTING_DCB_PRIORITY_STRICT_BANDWIDTH), G_VARIANT_TYPE ("au"),
G_VARIANT_TYPE ("au"), _nm_setting_dcb_uint_array_to_dbus,
_nm_setting_dcb_uint_array_to_dbus, _nm_setting_dcb_uint_array_from_dbus);
_nm_setting_dcb_uint_array_from_dbus);
/** /**
* NMSettingDcb:priority-traffic-class: (type GArray(guint)) * NMSettingDcb:priority-traffic-class: (type GArray(guint))
@@ -1279,20 +1258,20 @@ nm_setting_dcb_class_init (NMSettingDcbClass *klass)
* example: DCB_PG_UP2TC=01623701 * example: DCB_PG_UP2TC=01623701
* ---end--- * ---end---
*/ */
g_object_class_install_property obj_properties[PROP_PRIORITY_TRAFFIC_CLASS] =
(object_class, PROP_PRIORITY_TRAFFIC_CLASS, g_param_spec_boxed (NM_SETTING_DCB_PRIORITY_TRAFFIC_CLASS, "", "",
g_param_spec_boxed (NM_SETTING_DCB_PRIORITY_TRAFFIC_CLASS, "", "", G_TYPE_ARRAY,
G_TYPE_ARRAY, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
_properties_override_add_transform (properties_override, _properties_override_add_transform (properties_override,
g_object_class_find_property (G_OBJECT_CLASS (setting_class), obj_properties[PROP_PRIORITY_TRAFFIC_CLASS],
NM_SETTING_DCB_PRIORITY_TRAFFIC_CLASS),
G_VARIANT_TYPE ("au"), G_VARIANT_TYPE ("au"),
_nm_setting_dcb_uint_array_to_dbus, _nm_setting_dcb_uint_array_to_dbus,
_nm_setting_dcb_uint_array_from_dbus); _nm_setting_dcb_uint_array_from_dbus);
g_object_class_install_properties (object_class, _PROPERTY_ENUMS_LAST, obj_properties);
_nm_setting_class_commit_full (setting_class, NM_META_SETTING_TYPE_DCB, _nm_setting_class_commit_full (setting_class, NM_META_SETTING_TYPE_DCB,
NULL, properties_override); NULL, properties_override);
} }

164
libnm-core/nm-setting-gsm.c
View File

@@ -63,8 +63,7 @@ typedef struct {
guint32 mtu; guint32 mtu;
} NMSettingGsmPrivate; } NMSettingGsmPrivate;
enum { NM_GOBJECT_PROPERTIES_DEFINE_BASE (
PROP_0,
PROP_NUMBER, PROP_NUMBER,
PROP_USERNAME, PROP_USERNAME,
PROP_PASSWORD, PROP_PASSWORD,
@@ -78,9 +77,7 @@ enum {
PROP_SIM_ID, PROP_SIM_ID,
PROP_SIM_OPERATOR_ID, PROP_SIM_OPERATOR_ID,
PROP_MTU, PROP_MTU,
);
LAST_PROP
};
/** /**
* nm_setting_gsm_new: * nm_setting_gsm_new:
@@ -628,12 +625,11 @@ nm_setting_gsm_class_init (NMSettingGsmClass *klass)
* *
* Deprecated: 1.16: user-provided values for this setting are no longer used. * Deprecated: 1.16: user-provided values for this setting are no longer used.
**/ **/
g_object_class_install_property obj_properties[PROP_NUMBER] =
(object_class, PROP_NUMBER, g_param_spec_string (NM_SETTING_GSM_NUMBER, "", "",
g_param_spec_string (NM_SETTING_GSM_NUMBER, "", "", NULL,
NULL, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingGsm:username: * NMSettingGsm:username:
@@ -642,12 +638,11 @@ nm_setting_gsm_class_init (NMSettingGsmClass *klass)
* providers do not require a username, or accept any username. But if a * providers do not require a username, or accept any username. But if a
* username is required, it is specified here. * username is required, it is specified here.
**/ **/
g_object_class_install_property obj_properties[PROP_USERNAME] =
(object_class, PROP_USERNAME, g_param_spec_string (NM_SETTING_GSM_USERNAME, "", "",
g_param_spec_string (NM_SETTING_GSM_USERNAME, "", "", NULL,
NULL, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingGsm:password: * NMSettingGsm:password:
@@ -656,26 +651,24 @@ nm_setting_gsm_class_init (NMSettingGsmClass *klass)
* providers do not require a password, or accept any password. But if a * providers do not require a password, or accept any password. But if a
* password is required, it is specified here. * password is required, it is specified here.
**/ **/
g_object_class_install_property obj_properties[PROP_PASSWORD] =
(object_class, PROP_PASSWORD, g_param_spec_string (NM_SETTING_GSM_PASSWORD, "", "",
g_param_spec_string (NM_SETTING_GSM_PASSWORD, "", "", NULL,
NULL, G_PARAM_READWRITE |
G_PARAM_READWRITE | NM_SETTING_PARAM_SECRET |
NM_SETTING_PARAM_SECRET | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingGsm:password-flags: * NMSettingGsm:password-flags:
* *
* Flags indicating how to handle the #NMSettingGsm:password property. * Flags indicating how to handle the #NMSettingGsm:password property.
**/ **/
g_object_class_install_property obj_properties[PROP_PASSWORD_FLAGS] =
(object_class, PROP_PASSWORD_FLAGS, g_param_spec_flags (NM_SETTING_GSM_PASSWORD_FLAGS, "", "",
g_param_spec_flags (NM_SETTING_GSM_PASSWORD_FLAGS, "", "", NM_TYPE_SETTING_SECRET_FLAGS,
NM_TYPE_SETTING_SECRET_FLAGS, NM_SETTING_SECRET_FLAG_NONE,
NM_SETTING_SECRET_FLAG_NONE, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingGsm:apn: * NMSettingGsm:apn:
@@ -688,12 +681,11 @@ nm_setting_gsm_class_init (NMSettingGsmClass *klass)
* The APN may only be composed of the characters a-z, 0-9, ., and - per GSM * The APN may only be composed of the characters a-z, 0-9, ., and - per GSM
* 03.60 Section 14.9. * 03.60 Section 14.9.
**/ **/
g_object_class_install_property obj_properties[PROP_APN] =
(object_class, PROP_APN, g_param_spec_string (NM_SETTING_GSM_APN, "", "",
g_param_spec_string (NM_SETTING_GSM_APN, "", "", NULL,
NULL, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingGsm:network-id: * NMSettingGsm:network-id:
@@ -704,12 +696,11 @@ nm_setting_gsm_class_init (NMSettingGsmClass *klass)
* This can be used to ensure that the device does not roam when direct * This can be used to ensure that the device does not roam when direct
* roaming control of the device is not otherwise possible. * roaming control of the device is not otherwise possible.
**/ **/
g_object_class_install_property obj_properties[PROP_NETWORK_ID] =
(object_class, PROP_NETWORK_ID, g_param_spec_string (NM_SETTING_GSM_NETWORK_ID, "", "",
g_param_spec_string (NM_SETTING_GSM_NETWORK_ID, "", "", NULL,
NULL, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingGsm:pin: * NMSettingGsm:pin:
@@ -718,26 +709,24 @@ nm_setting_gsm_class_init (NMSettingGsmClass *klass)
* operations are requested. Specify the PIN here to allow operation of the * operations are requested. Specify the PIN here to allow operation of the
* device. * device.
**/ **/
g_object_class_install_property obj_properties[PROP_PIN] =
(object_class, PROP_PIN, g_param_spec_string (NM_SETTING_GSM_PIN, "", "",
g_param_spec_string (NM_SETTING_GSM_PIN, "", "", NULL,
NULL, G_PARAM_READWRITE |
G_PARAM_READWRITE | NM_SETTING_PARAM_SECRET |
NM_SETTING_PARAM_SECRET | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingGsm:pin-flags: * NMSettingGsm:pin-flags:
* *
* Flags indicating how to handle the #NMSettingGsm:pin property. * Flags indicating how to handle the #NMSettingGsm:pin property.
**/ **/
g_object_class_install_property obj_properties[PROP_PIN_FLAGS] =
(object_class, PROP_PIN_FLAGS, g_param_spec_flags (NM_SETTING_GSM_PIN_FLAGS, "", "",
g_param_spec_flags (NM_SETTING_GSM_PIN_FLAGS, "", "", NM_TYPE_SETTING_SECRET_FLAGS,
NM_TYPE_SETTING_SECRET_FLAGS, NM_SETTING_SECRET_FLAG_NONE,
NM_SETTING_SECRET_FLAG_NONE, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingGsm:home-only: * NMSettingGsm:home-only:
@@ -745,12 +734,11 @@ 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.
**/ **/
g_object_class_install_property obj_properties[PROP_HOME_ONLY] =
(object_class, PROP_HOME_ONLY, g_param_spec_boolean (NM_SETTING_GSM_HOME_ONLY, "", "",
g_param_spec_boolean (NM_SETTING_GSM_HOME_ONLY, "", "", FALSE,
FALSE, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingGsm:device-id: * NMSettingGsm:device-id:
@@ -761,12 +749,11 @@ nm_setting_gsm_class_init (NMSettingGsmClass *klass)
* *
* Since: 1.2 * Since: 1.2
**/ **/
g_object_class_install_property obj_properties[PROP_DEVICE_ID] =
(object_class, PROP_DEVICE_ID, g_param_spec_string (NM_SETTING_GSM_DEVICE_ID, "", "",
g_param_spec_string (NM_SETTING_GSM_DEVICE_ID, "", "", NULL,
NULL, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingGsm:sim-id: * NMSettingGsm:sim-id:
@@ -778,12 +765,11 @@ nm_setting_gsm_class_init (NMSettingGsmClass *klass)
* *
* Since: 1.2 * Since: 1.2
**/ **/
g_object_class_install_property obj_properties[PROP_SIM_ID] =
(object_class, PROP_SIM_ID, g_param_spec_string (NM_SETTING_GSM_SIM_ID, "", "",
g_param_spec_string (NM_SETTING_GSM_SIM_ID, "", "", NULL,
NULL, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingGsm:sim-operator-id: * NMSettingGsm:sim-operator-id:
@@ -796,12 +782,11 @@ nm_setting_gsm_class_init (NMSettingGsmClass *klass)
* *
* Since: 1.2 * Since: 1.2
**/ **/
g_object_class_install_property obj_properties[PROP_SIM_OPERATOR_ID] =
(object_class, PROP_SIM_OPERATOR_ID, g_param_spec_string (NM_SETTING_GSM_SIM_OPERATOR_ID, "", "",
g_param_spec_string (NM_SETTING_GSM_SIM_OPERATOR_ID, "", "", NULL,
NULL, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingGsm:mtu: * NMSettingGsm:mtu:
@@ -811,14 +796,13 @@ nm_setting_gsm_class_init (NMSettingGsmClass *klass)
* *
* Since: 1.8 * Since: 1.8
**/ **/
g_object_class_install_property obj_properties[PROP_MTU] =
(object_class, PROP_MTU, g_param_spec_uint (NM_SETTING_GSM_MTU, "", "",
g_param_spec_uint (NM_SETTING_GSM_MTU, "", "", 0, G_MAXUINT32, 0,
0, G_MAXUINT32, 0, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
G_PARAM_CONSTRUCT | NM_SETTING_PARAM_FUZZY_IGNORE |
NM_SETTING_PARAM_FUZZY_IGNORE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/* Ignore incoming deprecated properties */ /* Ignore incoming deprecated properties */
_properties_override_add_dbus_only (properties_override, _properties_override_add_dbus_only (properties_override,
@@ -833,6 +817,8 @@ nm_setting_gsm_class_init (NMSettingGsmClass *klass)
NULL, NULL,
NULL); NULL);
g_object_class_install_properties (object_class, _PROPERTY_ENUMS_LAST, obj_properties);
_nm_setting_class_commit_full (setting_class, NM_META_SETTING_TYPE_GSM, _nm_setting_class_commit_full (setting_class, NM_META_SETTING_TYPE_GSM,
NULL, properties_override); NULL, properties_override);
} }

85
libnm-core/nm-setting-infiniband.c
View File

@@ -49,16 +49,13 @@ typedef struct {
char *parent, *virtual_iface_name; char *parent, *virtual_iface_name;
} NMSettingInfinibandPrivate; } NMSettingInfinibandPrivate;
enum { NM_GOBJECT_PROPERTIES_DEFINE_BASE (
PROP_0,
PROP_MAC_ADDRESS, PROP_MAC_ADDRESS,
PROP_MTU, PROP_MTU,
PROP_TRANSPORT_MODE, PROP_TRANSPORT_MODE,
PROP_P_KEY, PROP_P_KEY,
PROP_PARENT, PROP_PARENT,
);
LAST_PROP
};
/** /**
* nm_setting_infiniband_new: * nm_setting_infiniband_new:
@@ -415,17 +412,15 @@ nm_setting_infiniband_class_init (NMSettingInfinibandClass *klass)
* example: HWADDR=01:02:03:04:05:06:07:08:09:0A:01:02:03:04:05:06:07:08:09:11 * example: HWADDR=01:02:03:04:05:06:07:08:09:0A:01:02:03:04:05:06:07:08:09:11
* ---end--- * ---end---
*/ */
g_object_class_install_property obj_properties[PROP_MAC_ADDRESS] =
(object_class, PROP_MAC_ADDRESS, g_param_spec_string (NM_SETTING_INFINIBAND_MAC_ADDRESS, "", "",
g_param_spec_string (NM_SETTING_INFINIBAND_MAC_ADDRESS, "", "", NULL,
NULL, G_PARAM_READWRITE |
G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE |
NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
_properties_override_add_transform (properties_override, _properties_override_add_transform (properties_override,
g_object_class_find_property (G_OBJECT_CLASS (setting_class), obj_properties[PROP_MAC_ADDRESS],
NM_SETTING_INFINIBAND_MAC_ADDRESS),
G_VARIANT_TYPE_BYTESTRING, G_VARIANT_TYPE_BYTESTRING,
_nm_utils_hwaddr_to_dbus, _nm_utils_hwaddr_to_dbus,
_nm_utils_hwaddr_from_dbus); _nm_utils_hwaddr_from_dbus);
@@ -442,14 +437,13 @@ nm_setting_infiniband_class_init (NMSettingInfinibandClass *klass)
* description: MTU of the interface. * description: MTU of the interface.
* ---end--- * ---end---
*/ */
g_object_class_install_property obj_properties[PROP_MTU] =
(object_class, PROP_MTU, g_param_spec_uint (NM_SETTING_INFINIBAND_MTU, "", "",
g_param_spec_uint (NM_SETTING_INFINIBAND_MTU, "", "", 0, G_MAXUINT32, 0,
0, G_MAXUINT32, 0, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
G_PARAM_CONSTRUCT | NM_SETTING_PARAM_FUZZY_IGNORE |
NM_SETTING_PARAM_FUZZY_IGNORE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingInfiniband:transport-mode: * NMSettingInfiniband:transport-mode:
@@ -465,14 +459,13 @@ nm_setting_infiniband_class_init (NMSettingInfinibandClass *klass)
* "datagram" mode * "datagram" mode
* ---end--- * ---end---
*/ */
g_object_class_install_property obj_properties[PROP_TRANSPORT_MODE] =
(object_class, PROP_TRANSPORT_MODE, g_param_spec_string (NM_SETTING_INFINIBAND_TRANSPORT_MODE, "", "",
g_param_spec_string (NM_SETTING_INFINIBAND_TRANSPORT_MODE, "", "", NULL,
NULL, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
G_PARAM_CONSTRUCT | NM_SETTING_PARAM_INFERRABLE |
NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingInfiniband:p-key: * NMSettingInfiniband:p-key:
@@ -492,14 +485,13 @@ nm_setting_infiniband_class_init (NMSettingInfinibandClass *klass)
* example: PKEY=yes PKEY_ID=2 PHYSDEV=mlx4_ib0 DEVICE=mlx4_ib0.8002 * example: PKEY=yes PKEY_ID=2 PHYSDEV=mlx4_ib0 DEVICE=mlx4_ib0.8002
* ---end--- * ---end---
*/ */
g_object_class_install_property obj_properties[PROP_P_KEY] =
(object_class, PROP_P_KEY, g_param_spec_int (NM_SETTING_INFINIBAND_P_KEY, "", "",
g_param_spec_int (NM_SETTING_INFINIBAND_P_KEY, "", "", -1, 0xFFFF, -1,
-1, 0xFFFF, -1, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
G_PARAM_CONSTRUCT | NM_SETTING_PARAM_INFERRABLE |
NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingInfiniband:parent: * NMSettingInfiniband:parent:
@@ -517,14 +509,15 @@ nm_setting_infiniband_class_init (NMSettingInfinibandClass *klass)
* example: PHYSDEV=ib0 * example: PHYSDEV=ib0
* ---end--- * ---end---
*/ */
g_object_class_install_property obj_properties[PROP_PARENT] =
(object_class, PROP_PARENT, g_param_spec_string (NM_SETTING_INFINIBAND_PARENT, "", "",
g_param_spec_string (NM_SETTING_INFINIBAND_PARENT, "", "", NULL,
NULL, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
G_PARAM_CONSTRUCT | NM_SETTING_PARAM_INFERRABLE |
NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
g_object_class_install_properties (object_class, _PROPERTY_ENUMS_LAST, obj_properties);
_nm_setting_class_commit_full (setting_class, NM_META_SETTING_TYPE_INFINIBAND, _nm_setting_class_commit_full (setting_class, NM_META_SETTING_TYPE_INFINIBAND,
NULL, properties_override); NULL, properties_override);

278
libnm-core/nm-setting-ip-config.c
View File

@@ -1407,8 +1407,7 @@ typedef struct {
int dhcp_timeout; int dhcp_timeout;
} NMSettingIPConfigPrivate; } NMSettingIPConfigPrivate;
enum { NM_GOBJECT_PROPERTIES_DEFINE (NMSettingIPConfig,
PROP_0,
PROP_METHOD, PROP_METHOD,
PROP_DNS, PROP_DNS,
PROP_DNS_SEARCH, PROP_DNS_SEARCH,
@@ -1427,9 +1426,7 @@ enum {
PROP_MAY_FAIL, PROP_MAY_FAIL,
PROP_DAD_TIMEOUT, PROP_DAD_TIMEOUT,
PROP_DHCP_TIMEOUT, PROP_DHCP_TIMEOUT,
);
LAST_PROP
};
#define NM_SETTING_IP_CONFIG_GET_FAMILY(setting) (NM_IS_SETTING_IP4_CONFIG (setting) ? AF_INET : AF_INET6) #define NM_SETTING_IP_CONFIG_GET_FAMILY(setting) (NM_IS_SETTING_IP4_CONFIG (setting) ? AF_INET : AF_INET6)
@@ -1515,7 +1512,7 @@ nm_setting_ip_config_add_dns (NMSettingIPConfig *setting, const char *dns)
} }
g_ptr_array_add (priv->dns, dns_canonical); g_ptr_array_add (priv->dns, dns_canonical);
g_object_notify (G_OBJECT (setting), NM_SETTING_IP_CONFIG_DNS); _notify (setting, PROP_DNS);
return TRUE; return TRUE;
} }
@@ -1537,7 +1534,7 @@ nm_setting_ip_config_remove_dns (NMSettingIPConfig *setting, int idx)
g_return_if_fail (idx >= 0 && idx < priv->dns->len); g_return_if_fail (idx >= 0 && idx < priv->dns->len);
g_ptr_array_remove_index (priv->dns, idx); g_ptr_array_remove_index (priv->dns, idx);
g_object_notify (G_OBJECT (setting), NM_SETTING_IP_CONFIG_DNS); _notify (setting, PROP_DNS);
} }
/** /**
@@ -1566,7 +1563,7 @@ nm_setting_ip_config_remove_dns_by_value (NMSettingIPConfig *setting, const char
for (i = 0; i < priv->dns->len; i++) { for (i = 0; i < priv->dns->len; i++) {
if (!strcmp (dns_canonical, priv->dns->pdata[i])) { if (!strcmp (dns_canonical, priv->dns->pdata[i])) {
g_ptr_array_remove_index (priv->dns, i); g_ptr_array_remove_index (priv->dns, i);
g_object_notify (G_OBJECT (setting), NM_SETTING_IP_CONFIG_DNS); _notify (setting, PROP_DNS);
g_free (dns_canonical); g_free (dns_canonical);
return TRUE; return TRUE;
} }
@@ -1592,7 +1589,7 @@ nm_setting_ip_config_clear_dns (NMSettingIPConfig *setting)
if (priv->dns->len != 0) { if (priv->dns->len != 0) {
g_ptr_array_set_size (priv->dns, 0); g_ptr_array_set_size (priv->dns, 0);
g_object_notify (G_OBJECT (setting), NM_SETTING_IP_CONFIG_DNS); _notify (setting, PROP_DNS);
} }
} }
@@ -1658,7 +1655,7 @@ nm_setting_ip_config_add_dns_search (NMSettingIPConfig *setting,
} }
g_ptr_array_add (priv->dns_search, g_strdup (dns_search)); g_ptr_array_add (priv->dns_search, g_strdup (dns_search));
g_object_notify (G_OBJECT (setting), NM_SETTING_IP_CONFIG_DNS_SEARCH); _notify (setting, PROP_DNS_SEARCH);
return TRUE; return TRUE;
} }
@@ -1680,7 +1677,7 @@ nm_setting_ip_config_remove_dns_search (NMSettingIPConfig *setting, int idx)
g_return_if_fail (idx >= 0 && idx < priv->dns_search->len); g_return_if_fail (idx >= 0 && idx < priv->dns_search->len);
g_ptr_array_remove_index (priv->dns_search, idx); g_ptr_array_remove_index (priv->dns_search, idx);
g_object_notify (G_OBJECT (setting), NM_SETTING_IP_CONFIG_DNS_SEARCH); _notify (setting, PROP_DNS_SEARCH);
} }
/** /**
@@ -1707,7 +1704,7 @@ nm_setting_ip_config_remove_dns_search_by_value (NMSettingIPConfig *setting,
for (i = 0; i < priv->dns_search->len; i++) { for (i = 0; i < priv->dns_search->len; i++) {
if (!strcmp (dns_search, priv->dns_search->pdata[i])) { if (!strcmp (dns_search, priv->dns_search->pdata[i])) {
g_ptr_array_remove_index (priv->dns_search, i); g_ptr_array_remove_index (priv->dns_search, i);
g_object_notify (G_OBJECT (setting), NM_SETTING_IP_CONFIG_DNS_SEARCH); _notify (setting, PROP_DNS_SEARCH);
return TRUE; return TRUE;
} }
} }
@@ -1731,7 +1728,7 @@ nm_setting_ip_config_clear_dns_searches (NMSettingIPConfig *setting)
if (priv->dns_search->len != 0) { if (priv->dns_search->len != 0) {
g_ptr_array_set_size (priv->dns_search, 0); g_ptr_array_set_size (priv->dns_search, 0);
g_object_notify (G_OBJECT (setting), NM_SETTING_IP_CONFIG_DNS_SEARCH); _notify (setting, PROP_DNS_SEARCH);
} }
} }
@@ -1863,7 +1860,7 @@ nm_setting_ip_config_add_dns_option (NMSettingIPConfig *setting,
} }
g_ptr_array_add (priv->dns_options, g_strdup (dns_option)); g_ptr_array_add (priv->dns_options, g_strdup (dns_option));
g_object_notify (G_OBJECT (setting), NM_SETTING_IP_CONFIG_DNS_OPTIONS); _notify (setting, PROP_DNS_OPTIONS);
return TRUE; return TRUE;
} }
@@ -1888,7 +1885,7 @@ nm_setting_ip_config_remove_dns_option (NMSettingIPConfig *setting, int idx)
g_return_if_fail (idx >= 0 && idx < priv->dns_options->len); g_return_if_fail (idx >= 0 && idx < priv->dns_options->len);
g_ptr_array_remove_index (priv->dns_options, idx); g_ptr_array_remove_index (priv->dns_options, idx);
g_object_notify (G_OBJECT (setting), NM_SETTING_IP_CONFIG_DNS_OPTIONS); _notify (setting, PROP_DNS_OPTIONS);
} }
/** /**
@@ -1920,7 +1917,7 @@ nm_setting_ip_config_remove_dns_option_by_value (NMSettingIPConfig *setting,
i = _nm_utils_dns_option_find_idx (priv->dns_options, dns_option); i = _nm_utils_dns_option_find_idx (priv->dns_options, dns_option);
if (i >= 0) { if (i >= 0) {
g_ptr_array_remove_index (priv->dns_options, i); g_ptr_array_remove_index (priv->dns_options, i);
g_object_notify (G_OBJECT (setting), NM_SETTING_IP_CONFIG_DNS_OPTIONS); _notify (setting, PROP_DNS_OPTIONS);
return TRUE; return TRUE;
} }
@@ -1959,7 +1956,7 @@ nm_setting_ip_config_clear_dns_options (NMSettingIPConfig *setting, gboolean is_
g_ptr_array_set_size (priv->dns_options, 0); g_ptr_array_set_size (priv->dns_options, 0);
} }
} }
g_object_notify (G_OBJECT (setting), NM_SETTING_IP_CONFIG_DNS_OPTIONS); _notify (setting, PROP_DNS_OPTIONS);
} }
/** /**
@@ -2042,7 +2039,7 @@ nm_setting_ip_config_add_address (NMSettingIPConfig *setting,
g_ptr_array_add (priv->addresses, nm_ip_address_dup (address)); g_ptr_array_add (priv->addresses, nm_ip_address_dup (address));
g_object_notify (G_OBJECT (setting), NM_SETTING_IP_CONFIG_ADDRESSES); _notify (setting, PROP_ADDRESSES);
return TRUE; return TRUE;
} }
@@ -2065,7 +2062,7 @@ nm_setting_ip_config_remove_address (NMSettingIPConfig *setting, int idx)
g_ptr_array_remove_index (priv->addresses, idx); g_ptr_array_remove_index (priv->addresses, idx);
g_object_notify (G_OBJECT (setting), NM_SETTING_IP_CONFIG_ADDRESSES); _notify (setting, PROP_ADDRESSES);
} }
/** /**
@@ -2091,7 +2088,7 @@ nm_setting_ip_config_remove_address_by_value (NMSettingIPConfig *setting,
for (i = 0; i < priv->addresses->len; i++) { for (i = 0; i < priv->addresses->len; i++) {
if (nm_ip_address_equal (priv->addresses->pdata[i], address)) { if (nm_ip_address_equal (priv->addresses->pdata[i], address)) {
g_ptr_array_remove_index (priv->addresses, i); g_ptr_array_remove_index (priv->addresses, i);
g_object_notify (G_OBJECT (setting), NM_SETTING_IP_CONFIG_ADDRESSES); _notify (setting, PROP_ADDRESSES);
return TRUE; return TRUE;
} }
} }
@@ -2113,7 +2110,7 @@ nm_setting_ip_config_clear_addresses (NMSettingIPConfig *setting)
if (priv->addresses->len != 0) { if (priv->addresses->len != 0) {
g_ptr_array_set_size (priv->addresses, 0); g_ptr_array_set_size (priv->addresses, 0);
g_object_notify (G_OBJECT (setting), NM_SETTING_IP_CONFIG_ADDRESSES); _notify (setting, PROP_ADDRESSES);
} }
} }
@@ -2200,7 +2197,7 @@ nm_setting_ip_config_add_route (NMSettingIPConfig *setting,
} }
g_ptr_array_add (priv->routes, nm_ip_route_dup (route)); g_ptr_array_add (priv->routes, nm_ip_route_dup (route));
g_object_notify (G_OBJECT (setting), NM_SETTING_IP_CONFIG_ROUTES); _notify (setting, PROP_ROUTES);
return TRUE; return TRUE;
} }
@@ -2222,7 +2219,7 @@ nm_setting_ip_config_remove_route (NMSettingIPConfig *setting, int idx)
g_return_if_fail (idx >= 0 && idx < priv->routes->len); g_return_if_fail (idx >= 0 && idx < priv->routes->len);
g_ptr_array_remove_index (priv->routes, idx); g_ptr_array_remove_index (priv->routes, idx);
g_object_notify (G_OBJECT (setting), NM_SETTING_IP_CONFIG_ROUTES); _notify (setting, PROP_ROUTES);
} }
/** /**
@@ -2250,7 +2247,7 @@ nm_setting_ip_config_remove_route_by_value (NMSettingIPConfig *setting,
for (i = 0; i < priv->routes->len; i++) { for (i = 0; i < priv->routes->len; i++) {
if (nm_ip_route_equal_full (priv->routes->pdata[i], route, NM_IP_ROUTE_EQUAL_CMP_FLAGS_WITH_ATTRS)) { if (nm_ip_route_equal_full (priv->routes->pdata[i], route, NM_IP_ROUTE_EQUAL_CMP_FLAGS_WITH_ATTRS)) {
g_ptr_array_remove_index (priv->routes, i); g_ptr_array_remove_index (priv->routes, i);
g_object_notify (G_OBJECT (setting), NM_SETTING_IP_CONFIG_ROUTES); _notify (setting, PROP_ROUTES);
return TRUE; return TRUE;
} }
} }
@@ -2272,7 +2269,7 @@ nm_setting_ip_config_clear_routes (NMSettingIPConfig *setting)
if (priv->routes->len != 0) { if (priv->routes->len != 0) {
g_ptr_array_set_size (priv->routes, 0); g_ptr_array_set_size (priv->routes, 0);
g_object_notify (G_OBJECT (setting), NM_SETTING_IP_CONFIG_ROUTES); _notify (setting, PROP_ROUTES);
} }
} }
@@ -2891,8 +2888,7 @@ _nm_sett_info_property_override_create_array_ip_config (void)
GArray *properties_override = _nm_sett_info_property_override_create_array (); GArray *properties_override = _nm_sett_info_property_override_create_array ();
_properties_override_add_override (properties_override, _properties_override_add_override (properties_override,
g_object_class_find_property (G_OBJECT_CLASS (setting_class), obj_properties[PROP_GATEWAY],
NM_SETTING_IP_CONFIG_GATEWAY),
G_VARIANT_TYPE_STRING, G_VARIANT_TYPE_STRING,
NULL, NULL,
ip_gateway_set, ip_gateway_set,
@@ -2939,25 +2935,23 @@ nm_setting_ip_config_class_init (NMSettingIPConfigClass *klass)
* shared method must be configured on the interface which shares the internet * shared method must be configured on the interface which shares the internet
* to a subnet, not on the uplink which is shared. * to a subnet, not on the uplink which is shared.
**/ **/
g_object_class_install_property obj_properties[PROP_METHOD] =
(object_class, PROP_METHOD, g_param_spec_string (NM_SETTING_IP_CONFIG_METHOD, "", "",
g_param_spec_string (NM_SETTING_IP_CONFIG_METHOD, "", "", NULL,
NULL, G_PARAM_READWRITE |
G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE |
NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingIPConfig:dns: * NMSettingIPConfig:dns:
* *
* Array of IP addresses of DNS servers. * Array of IP addresses of DNS servers.
**/ **/
g_object_class_install_property obj_properties[PROP_DNS] =
(object_class, PROP_DNS, g_param_spec_boxed (NM_SETTING_IP_CONFIG_DNS, "", "",
g_param_spec_boxed (NM_SETTING_IP_CONFIG_DNS, "", "", G_TYPE_STRV,
G_TYPE_STRV, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingIPConfig:dns-search: * NMSettingIPConfig:dns-search:
@@ -2967,12 +2961,11 @@ nm_setting_ip_config_class_init (NMSettingIPConfigClass *klass)
* interface over which a query must be forwarded; they are not used * interface over which a query must be forwarded; they are not used
* to complete unqualified host names. * to complete unqualified host names.
**/ **/
g_object_class_install_property obj_properties[PROP_DNS_SEARCH] =
(object_class, PROP_DNS_SEARCH, g_param_spec_boxed (NM_SETTING_IP_CONFIG_DNS_SEARCH, "", "",
g_param_spec_boxed (NM_SETTING_IP_CONFIG_DNS_SEARCH, "", "", G_TYPE_STRV,
G_TYPE_STRV, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingIPConfig:dns-options: * NMSettingIPConfig:dns-options:
@@ -2985,12 +2978,11 @@ nm_setting_ip_config_class_init (NMSettingIPConfigClass *klass)
* *
* Since: 1.2 * Since: 1.2
**/ **/
g_object_class_install_property obj_properties[PROP_DNS_OPTIONS] =
(object_class, PROP_DNS_OPTIONS, g_param_spec_boxed (NM_SETTING_IP_CONFIG_DNS_OPTIONS, "", "",
g_param_spec_boxed (NM_SETTING_IP_CONFIG_DNS_OPTIONS, "", "", G_TYPE_STRV,
G_TYPE_STRV, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingIPConfig:dns-priority: * NMSettingIPConfig:dns-priority:
@@ -3027,31 +3019,29 @@ nm_setting_ip_config_class_init (NMSettingIPConfigClass *klass)
* *
* Since: 1.4 * Since: 1.4
**/ **/
g_object_class_install_property obj_properties[PROP_DNS_PRIORITY] =
(object_class, PROP_DNS_PRIORITY,
g_param_spec_int (NM_SETTING_IP_CONFIG_DNS_PRIORITY, "", "", g_param_spec_int (NM_SETTING_IP_CONFIG_DNS_PRIORITY, "", "",
G_MININT32, G_MAXINT32, 0, G_MININT32, G_MAXINT32, 0,
G_PARAM_READWRITE | G_PARAM_READWRITE |
G_PARAM_CONSTRUCT | G_PARAM_CONSTRUCT |
G_PARAM_STATIC_STRINGS)); G_PARAM_STATIC_STRINGS);
/** /**
* NMSettingIPConfig:addresses: (type GPtrArray(NMIPAddress)) * NMSettingIPConfig:addresses: (type GPtrArray(NMIPAddress))
* *
* Array of IP addresses. * Array of IP addresses.
**/ **/
g_object_class_install_property obj_properties[PROP_ADDRESSES] =
(object_class, PROP_ADDRESSES, g_param_spec_boxed (NM_SETTING_IP_CONFIG_ADDRESSES, "", "",
g_param_spec_boxed (NM_SETTING_IP_CONFIG_ADDRESSES, "", "", G_TYPE_PTR_ARRAY,
G_TYPE_PTR_ARRAY, G_PARAM_READWRITE |
G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE |
NM_SETTING_PARAM_INFERRABLE | /* "addresses" is a legacy D-Bus property, because the
/* "addresses" is a legacy D-Bus property, because the * "addresses" GObject property normally gets set from
* "addresses" GObject property normally gets set from * the "address-data" D-Bus property...
* the "address-data" D-Bus property... */
*/ NM_SETTING_PARAM_LEGACY |
NM_SETTING_PARAM_LEGACY | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingIPConfig:gateway: * NMSettingIPConfig:gateway:
@@ -3059,28 +3049,26 @@ nm_setting_ip_config_class_init (NMSettingIPConfigClass *klass)
* The gateway associated with this configuration. This is only meaningful * The gateway associated with this configuration. This is only meaningful
* if #NMSettingIPConfig:addresses is also set. * if #NMSettingIPConfig:addresses is also set.
**/ **/
g_object_class_install_property obj_properties[PROP_GATEWAY] =
(object_class, PROP_GATEWAY, g_param_spec_string (NM_SETTING_IP_CONFIG_GATEWAY, "", "",
g_param_spec_string (NM_SETTING_IP_CONFIG_GATEWAY, "", "", NULL,
NULL, G_PARAM_READWRITE |
G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE |
NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingIPConfig:routes: (type GPtrArray(NMIPRoute)) * NMSettingIPConfig:routes: (type GPtrArray(NMIPRoute))
* *
* Array of IP routes. * Array of IP routes.
**/ **/
g_object_class_install_property obj_properties[PROP_ROUTES] =
(object_class, PROP_ROUTES, g_param_spec_boxed (NM_SETTING_IP_CONFIG_ROUTES, "", "",
g_param_spec_boxed (NM_SETTING_IP_CONFIG_ROUTES, "", "", G_TYPE_PTR_ARRAY,
G_TYPE_PTR_ARRAY, G_PARAM_READWRITE |
G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE |
NM_SETTING_PARAM_INFERRABLE | /* See :addresses above Re: LEGACY */
/* See :addresses above Re: LEGACY */ NM_SETTING_PARAM_LEGACY |
NM_SETTING_PARAM_LEGACY | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingIPConfig:route-metric: * NMSettingIPConfig:route-metric:
@@ -3096,13 +3084,12 @@ nm_setting_ip_config_class_init (NMSettingIPConfigClass *klass)
* mean setting it to 1024. * mean setting it to 1024.
* For IPv4, zero is a regular value for the metric. * For IPv4, zero is a regular value for the metric.
**/ **/
g_object_class_install_property obj_properties[PROP_ROUTE_METRIC] =
(object_class, PROP_ROUTE_METRIC,
g_param_spec_int64 (NM_SETTING_IP_CONFIG_ROUTE_METRIC, "", "", g_param_spec_int64 (NM_SETTING_IP_CONFIG_ROUTE_METRIC, "", "",
-1, G_MAXUINT32, -1, -1, G_MAXUINT32, -1,
G_PARAM_READWRITE | G_PARAM_READWRITE |
G_PARAM_CONSTRUCT | G_PARAM_CONSTRUCT |
G_PARAM_STATIC_STRINGS)); G_PARAM_STATIC_STRINGS);
/** /**
* NMSettingIPConfig:route-table: * NMSettingIPConfig:route-table:
@@ -3125,13 +3112,12 @@ nm_setting_ip_config_class_init (NMSettingIPConfigClass *klass)
* *
* Since: 1.10 * Since: 1.10
**/ **/
g_object_class_install_property obj_properties[PROP_ROUTE_TABLE] =
(object_class, PROP_ROUTE_TABLE, g_param_spec_uint (NM_SETTING_IP_CONFIG_ROUTE_TABLE, "", "",
g_param_spec_uint (NM_SETTING_IP_CONFIG_ROUTE_TABLE, "", "", 0, G_MAXUINT32, 0,
0, G_MAXUINT32, 0, G_PARAM_READWRITE |
G_PARAM_READWRITE | NM_SETTING_PARAM_FUZZY_IGNORE |
NM_SETTING_PARAM_FUZZY_IGNORE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingIPConfig:ignore-auto-routes: * NMSettingIPConfig:ignore-auto-routes:
* *
@@ -3139,13 +3125,12 @@ nm_setting_ip_config_class_init (NMSettingIPConfigClass *klass)
* %TRUE, automatically configured routes are ignored and only routes * %TRUE, automatically configured routes are ignored and only routes
* specified in the #NMSettingIPConfig:routes property, if any, are used. * specified in the #NMSettingIPConfig:routes property, if any, are used.
**/ **/
g_object_class_install_property obj_properties[PROP_IGNORE_AUTO_ROUTES] =
(object_class, PROP_IGNORE_AUTO_ROUTES, g_param_spec_boolean (NM_SETTING_IP_CONFIG_IGNORE_AUTO_ROUTES, "", "",
g_param_spec_boolean (NM_SETTING_IP_CONFIG_IGNORE_AUTO_ROUTES, "", "", FALSE,
FALSE, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingIPConfig:ignore-auto-dns: * NMSettingIPConfig:ignore-auto-dns:
@@ -3156,13 +3141,12 @@ nm_setting_ip_config_class_init (NMSettingIPConfigClass *klass)
* #NMSettingIPConfig:dns and #NMSettingIPConfig:dns-search properties, if * #NMSettingIPConfig:dns and #NMSettingIPConfig:dns-search properties, if
* any, are used. * any, are used.
**/ **/
g_object_class_install_property obj_properties[PROP_IGNORE_AUTO_DNS] =
(object_class, PROP_IGNORE_AUTO_DNS, g_param_spec_boolean (NM_SETTING_IP_CONFIG_IGNORE_AUTO_DNS, "", "",
g_param_spec_boolean (NM_SETTING_IP_CONFIG_IGNORE_AUTO_DNS, "", "", FALSE,
FALSE, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingIPConfig:dhcp-hostname: * NMSettingIPConfig:dhcp-hostname:
@@ -3172,12 +3156,11 @@ nm_setting_ip_config_class_init (NMSettingIPConfigClass *klass)
* This property and #NMSettingIP4Config:dhcp-fqdn are mutually exclusive and * This property and #NMSettingIP4Config:dhcp-fqdn are mutually exclusive and
* cannot be set at the same time. * cannot be set at the same time.
**/ **/
g_object_class_install_property obj_properties[PROP_DHCP_HOSTNAME] =
(object_class, PROP_DHCP_HOSTNAME, g_param_spec_string (NM_SETTING_IP_CONFIG_DHCP_HOSTNAME, "", "",
g_param_spec_string (NM_SETTING_IP_CONFIG_DHCP_HOSTNAME, "", "", NULL,
NULL, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingIPConfig:dhcp-send-hostname: * NMSettingIPConfig:dhcp-send-hostname:
@@ -3188,13 +3171,12 @@ nm_setting_ip_config_class_init (NMSettingIPConfigClass *klass)
* #NMSettingIPConfig:dhcp-hostname property is %NULL and this property is * #NMSettingIPConfig:dhcp-hostname property is %NULL and this property is
* %TRUE, the current persistent hostname of the computer is sent. * %TRUE, the current persistent hostname of the computer is sent.
**/ **/
g_object_class_install_property obj_properties[PROP_DHCP_SEND_HOSTNAME] =
(object_class, PROP_DHCP_SEND_HOSTNAME, g_param_spec_boolean (NM_SETTING_IP_CONFIG_DHCP_SEND_HOSTNAME, "", "",
g_param_spec_boolean (NM_SETTING_IP_CONFIG_DHCP_SEND_HOSTNAME, "", "", TRUE,
TRUE, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingIPConfig:never-default: * NMSettingIPConfig:never-default:
@@ -3203,13 +3185,12 @@ nm_setting_ip_config_class_init (NMSettingIPConfigClass *klass)
* IP type, meaning it will never be assigned the default route by * IP type, meaning it will never be assigned the default route by
* NetworkManager. * NetworkManager.
**/ **/
g_object_class_install_property obj_properties[PROP_NEVER_DEFAULT] =
(object_class, PROP_NEVER_DEFAULT, g_param_spec_boolean (NM_SETTING_IP_CONFIG_NEVER_DEFAULT, "", "",
g_param_spec_boolean (NM_SETTING_IP_CONFIG_NEVER_DEFAULT, "", "", FALSE,
FALSE, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingIPConfig:may-fail: * NMSettingIPConfig:may-fail:
@@ -3222,13 +3203,12 @@ nm_setting_ip_config_class_init (NMSettingIPConfigClass *klass)
* to succeed if IPv4 configuration fails but IPv6 configuration completes * to succeed if IPv4 configuration fails but IPv6 configuration completes
* successfully. * successfully.
**/ **/
g_object_class_install_property obj_properties[PROP_MAY_FAIL] =
(object_class, PROP_MAY_FAIL, g_param_spec_boolean (NM_SETTING_IP_CONFIG_MAY_FAIL, "", "",
g_param_spec_boolean (NM_SETTING_IP_CONFIG_MAY_FAIL, "", "", TRUE,
TRUE, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingIPConfig:dad-timeout: * NMSettingIPConfig:dad-timeout:
@@ -3244,25 +3224,25 @@ nm_setting_ip_config_class_init (NMSettingIPConfigClass *klass)
* *
* Since: 1.2 * Since: 1.2
**/ **/
g_object_class_install_property obj_properties[PROP_DAD_TIMEOUT] =
(object_class, PROP_DAD_TIMEOUT, g_param_spec_int (NM_SETTING_IP_CONFIG_DAD_TIMEOUT, "", "",
g_param_spec_int (NM_SETTING_IP_CONFIG_DAD_TIMEOUT, "", "", -1, NM_SETTING_IP_CONFIG_DAD_TIMEOUT_MAX, -1,
-1, NM_SETTING_IP_CONFIG_DAD_TIMEOUT_MAX, -1, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
G_PARAM_CONSTRUCT | NM_SETTING_PARAM_FUZZY_IGNORE |
NM_SETTING_PARAM_FUZZY_IGNORE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingIPConfig:dhcp-timeout: * NMSettingIPConfig:dhcp-timeout:
* *
* A timeout for a DHCP transaction in seconds. * A timeout for a DHCP transaction in seconds.
**/ **/
g_object_class_install_property obj_properties[PROP_DHCP_TIMEOUT] =
(object_class, PROP_DHCP_TIMEOUT, g_param_spec_int (NM_SETTING_IP_CONFIG_DHCP_TIMEOUT, "", "",
g_param_spec_int (NM_SETTING_IP_CONFIG_DHCP_TIMEOUT, "", "", 0, G_MAXINT32, 0,
0, G_MAXINT32, 0, G_PARAM_READWRITE |
G_PARAM_READWRITE | NM_SETTING_PARAM_FUZZY_IGNORE |
NM_SETTING_PARAM_FUZZY_IGNORE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
g_object_class_install_properties (object_class, _PROPERTY_ENUMS_LAST, obj_properties);
} }

190
libnm-core/nm-setting-ip-tunnel.c
View File

@@ -50,8 +50,7 @@ typedef struct {
guint32 flags; guint32 flags;
} NMSettingIPTunnelPrivate; } NMSettingIPTunnelPrivate;
enum { NM_GOBJECT_PROPERTIES_DEFINE_BASE (
PROP_0,
PROP_PARENT, PROP_PARENT,
PROP_MODE, PROP_MODE,
PROP_LOCAL, PROP_LOCAL,
@@ -65,9 +64,7 @@ enum {
PROP_FLOW_LABEL, PROP_FLOW_LABEL,
PROP_MTU, PROP_MTU,
PROP_FLAGS, PROP_FLAGS,
);
LAST_PROP
};
/** /**
* nm_setting_ip_tunnel_get_parent: * nm_setting_ip_tunnel_get_parent:
@@ -643,13 +640,12 @@ nm_setting_ip_tunnel_class_init (NMSettingIPTunnelClass *klass)
* *
* Since: 1.2 * Since: 1.2
**/ **/
g_object_class_install_property obj_properties[PROP_PARENT] =
(object_class, PROP_PARENT, g_param_spec_string (NM_SETTING_IP_TUNNEL_PARENT, "", "",
g_param_spec_string (NM_SETTING_IP_TUNNEL_PARENT, "", "", NULL,
NULL, G_PARAM_READWRITE |
G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE |
NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingIPTunnel:mode: * NMSettingIPTunnel:mode:
@@ -659,13 +655,12 @@ nm_setting_ip_tunnel_class_init (NMSettingIPTunnelClass *klass)
* *
* Since: 1.2 * Since: 1.2
**/ **/
g_object_class_install_property obj_properties[PROP_MODE] =
(object_class, PROP_MODE, g_param_spec_uint (NM_SETTING_IP_TUNNEL_MODE, "", "",
g_param_spec_uint (NM_SETTING_IP_TUNNEL_MODE, "", "", 0, G_MAXUINT, 0,
0, G_MAXUINT, 0, G_PARAM_READWRITE |
G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE |
NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingIPTunnel:local: * NMSettingIPTunnel:local:
@@ -675,13 +670,12 @@ nm_setting_ip_tunnel_class_init (NMSettingIPTunnelClass *klass)
* *
* Since: 1.2 * Since: 1.2
**/ **/
g_object_class_install_property obj_properties[PROP_LOCAL] =
(object_class, PROP_LOCAL, g_param_spec_string (NM_SETTING_IP_TUNNEL_LOCAL, "", "",
g_param_spec_string (NM_SETTING_IP_TUNNEL_LOCAL, "", "", NULL,
NULL, G_PARAM_READWRITE |
G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE |
NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingIPTunnel:remote: * NMSettingIPTunnel:remote:
@@ -691,13 +685,12 @@ nm_setting_ip_tunnel_class_init (NMSettingIPTunnelClass *klass)
* *
* Since: 1.2 * Since: 1.2
**/ **/
g_object_class_install_property obj_properties[PROP_REMOTE] =
(object_class, PROP_REMOTE, g_param_spec_string (NM_SETTING_IP_TUNNEL_REMOTE, "", "",
g_param_spec_string (NM_SETTING_IP_TUNNEL_REMOTE, "", "", NULL,
NULL, G_PARAM_READWRITE |
G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE |
NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingIPTunnel:ttl * NMSettingIPTunnel:ttl
@@ -707,14 +700,13 @@ nm_setting_ip_tunnel_class_init (NMSettingIPTunnelClass *klass)
* *
* Since: 1.2 * Since: 1.2
**/ **/
g_object_class_install_property obj_properties[PROP_TTL] =
(object_class, PROP_TTL, g_param_spec_uint (NM_SETTING_IP_TUNNEL_TTL, "", "",
g_param_spec_uint (NM_SETTING_IP_TUNNEL_TTL, "", "", 0, 255, 0,
0, 255, 0, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
G_PARAM_CONSTRUCT | NM_SETTING_PARAM_INFERRABLE |
NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingIPTunnel:tos * NMSettingIPTunnel:tos
@@ -724,14 +716,13 @@ nm_setting_ip_tunnel_class_init (NMSettingIPTunnelClass *klass)
* *
* Since: 1.2 * Since: 1.2
**/ **/
g_object_class_install_property obj_properties[PROP_TOS] =
(object_class, PROP_TOS, g_param_spec_uint (NM_SETTING_IP_TUNNEL_TOS, "", "",
g_param_spec_uint (NM_SETTING_IP_TUNNEL_TOS, "", "", 0, 255, 0,
0, 255, 0, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
G_PARAM_CONSTRUCT | NM_SETTING_PARAM_INFERRABLE |
NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingIPTunnel:path-mtu-discovery * NMSettingIPTunnel:path-mtu-discovery
@@ -740,14 +731,13 @@ nm_setting_ip_tunnel_class_init (NMSettingIPTunnelClass *klass)
* *
* Since: 1.2 * Since: 1.2
**/ **/
g_object_class_install_property obj_properties[PROP_PATH_MTU_DISCOVERY] =
(object_class, PROP_PATH_MTU_DISCOVERY, g_param_spec_boolean (NM_SETTING_IP_TUNNEL_PATH_MTU_DISCOVERY, "", "",
g_param_spec_boolean (NM_SETTING_IP_TUNNEL_PATH_MTU_DISCOVERY, "", "", TRUE,
TRUE, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
G_PARAM_CONSTRUCT | NM_SETTING_PARAM_INFERRABLE |
NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingIPTunnel:input-key: * NMSettingIPTunnel:input-key:
@@ -757,13 +747,12 @@ nm_setting_ip_tunnel_class_init (NMSettingIPTunnelClass *klass)
* *
* Since: 1.2 * Since: 1.2
**/ **/
g_object_class_install_property obj_properties[PROP_INPUT_KEY] =
(object_class, PROP_INPUT_KEY, g_param_spec_string (NM_SETTING_IP_TUNNEL_INPUT_KEY, "", "",
g_param_spec_string (NM_SETTING_IP_TUNNEL_INPUT_KEY, "", "", NULL,
NULL, G_PARAM_READWRITE |
G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE |
NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingIPTunnel:output-key: * NMSettingIPTunnel:output-key:
@@ -773,13 +762,12 @@ nm_setting_ip_tunnel_class_init (NMSettingIPTunnelClass *klass)
* *
* Since: 1.2 * Since: 1.2
**/ **/
g_object_class_install_property obj_properties[PROP_OUTPUT_KEY] =
(object_class, PROP_OUTPUT_KEY, g_param_spec_string (NM_SETTING_IP_TUNNEL_OUTPUT_KEY, "", "",
g_param_spec_string (NM_SETTING_IP_TUNNEL_OUTPUT_KEY, "", "", NULL,
NULL, G_PARAM_READWRITE |
G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE |
NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingIPTunnel:encapsulation-limit: * NMSettingIPTunnel:encapsulation-limit:
@@ -789,14 +777,13 @@ nm_setting_ip_tunnel_class_init (NMSettingIPTunnelClass *klass)
* *
* Since: 1.2 * Since: 1.2
**/ **/
g_object_class_install_property obj_properties[PROP_ENCAPSULATION_LIMIT] =
(object_class, PROP_ENCAPSULATION_LIMIT, g_param_spec_uint (NM_SETTING_IP_TUNNEL_ENCAPSULATION_LIMIT, "", "",
g_param_spec_uint (NM_SETTING_IP_TUNNEL_ENCAPSULATION_LIMIT, "", "", 0, 255, 0,
0, 255, 0, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
G_PARAM_CONSTRUCT | NM_SETTING_PARAM_INFERRABLE |
NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingIPTunnel:flow-label: * NMSettingIPTunnel:flow-label:
@@ -806,14 +793,13 @@ nm_setting_ip_tunnel_class_init (NMSettingIPTunnelClass *klass)
* *
* Since: 1.2 * Since: 1.2
**/ **/
g_object_class_install_property obj_properties[PROP_FLOW_LABEL] =
(object_class, PROP_FLOW_LABEL, g_param_spec_uint (NM_SETTING_IP_TUNNEL_FLOW_LABEL, "", "",
g_param_spec_uint (NM_SETTING_IP_TUNNEL_FLOW_LABEL, "", "", 0, (1 << 20) - 1, 0,
0, (1 << 20) - 1, 0, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
G_PARAM_CONSTRUCT | NM_SETTING_PARAM_INFERRABLE |
NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingIPTunnel:mtu: * NMSettingIPTunnel:mtu:
@@ -823,14 +809,13 @@ nm_setting_ip_tunnel_class_init (NMSettingIPTunnelClass *klass)
* *
* Since: 1.2 * Since: 1.2
**/ **/
g_object_class_install_property obj_properties[PROP_MTU] =
(object_class, PROP_MTU, g_param_spec_uint (NM_SETTING_IP_TUNNEL_MTU, "", "",
g_param_spec_uint (NM_SETTING_IP_TUNNEL_MTU, "", "", 0, G_MAXUINT, 0,
0, G_MAXUINT, 0, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
G_PARAM_CONSTRUCT | NM_SETTING_PARAM_FUZZY_IGNORE |
NM_SETTING_PARAM_FUZZY_IGNORE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingIPTunnel:flags: * NMSettingIPTunnel:flags:
@@ -843,13 +828,14 @@ nm_setting_ip_tunnel_class_init (NMSettingIPTunnelClass *klass)
* *
* Since: 1.12 * Since: 1.12
**/ **/
g_object_class_install_property obj_properties[PROP_FLAGS] =
(object_class, PROP_FLAGS, g_param_spec_uint (NM_SETTING_IP_TUNNEL_FLAGS, "", "",
g_param_spec_uint (NM_SETTING_IP_TUNNEL_FLAGS, "", "", 0, G_MAXUINT32, 0,
0, G_MAXUINT32, 0, G_PARAM_READWRITE |
G_PARAM_READWRITE | NM_SETTING_PARAM_FUZZY_IGNORE |
NM_SETTING_PARAM_FUZZY_IGNORE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
g_object_class_install_properties (object_class, _PROPERTY_ENUMS_LAST, obj_properties);
_nm_setting_class_commit (setting_class, NM_META_SETTING_TYPE_IP_TUNNEL); _nm_setting_class_commit (setting_class, NM_META_SETTING_TYPE_IP_TUNNEL);
} }

31
libnm-core/nm-setting-ip4-config.c
View File

@@ -59,13 +59,10 @@ typedef struct {
char *dhcp_fqdn; char *dhcp_fqdn;
} NMSettingIP4ConfigPrivate; } NMSettingIP4ConfigPrivate;
enum { NM_GOBJECT_PROPERTIES_DEFINE_BASE (
PROP_0,
PROP_DHCP_CLIENT_ID, PROP_DHCP_CLIENT_ID,
PROP_DHCP_FQDN, PROP_DHCP_FQDN,
);
LAST_PROP
};
/** /**
* nm_setting_ip4_config_new: * nm_setting_ip4_config_new:
@@ -747,12 +744,11 @@ nm_setting_ip4_config_class_init (NMSettingIP4ConfigClass *klass)
* example: DHCP_CLIENT_ID=ax-srv-1; DHCP_CLIENT_ID=01:44:44:44:44:44:44 * example: DHCP_CLIENT_ID=ax-srv-1; DHCP_CLIENT_ID=01:44:44:44:44:44:44
* ---end--- * ---end---
*/ */
g_object_class_install_property obj_properties[PROP_DHCP_CLIENT_ID] =
(object_class, PROP_DHCP_CLIENT_ID, g_param_spec_string (NM_SETTING_IP4_CONFIG_DHCP_CLIENT_ID, "", "",
g_param_spec_string (NM_SETTING_IP4_CONFIG_DHCP_CLIENT_ID, "", "", NULL,
NULL, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/* ---ifcfg-rh--- /* ---ifcfg-rh---
* property: dad-timeout * property: dad-timeout
@@ -791,12 +787,11 @@ nm_setting_ip4_config_class_init (NMSettingIP4ConfigClass *klass)
* example: DHCP_FQDN=foo.bar.com * example: DHCP_FQDN=foo.bar.com
* ---end--- * ---end---
*/ */
g_object_class_install_property obj_properties[PROP_DHCP_FQDN] =
(object_class, PROP_DHCP_FQDN, g_param_spec_string (NM_SETTING_IP4_CONFIG_DHCP_FQDN, "", "",
g_param_spec_string (NM_SETTING_IP4_CONFIG_DHCP_FQDN, "", "", NULL,
NULL, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/* IP4-specific property overrides */ /* IP4-specific property overrides */
@@ -902,6 +897,8 @@ nm_setting_ip4_config_class_init (NMSettingIP4ConfigClass *klass)
ip4_route_data_get, ip4_route_data_get,
ip4_route_data_set); ip4_route_data_set);
g_object_class_install_properties (object_class, _PROPERTY_ENUMS_LAST, obj_properties);
_nm_setting_class_commit_full (setting_class, NM_META_SETTING_TYPE_IP4_CONFIG, _nm_setting_class_commit_full (setting_class, NM_META_SETTING_TYPE_IP4_CONFIG,
NULL, properties_override); NULL, properties_override);
} }

63
libnm-core/nm-setting-ip6-config.c
View File

@@ -63,15 +63,12 @@ typedef struct {
char *dhcp_duid; char *dhcp_duid;
} NMSettingIP6ConfigPrivate; } NMSettingIP6ConfigPrivate;
enum { NM_GOBJECT_PROPERTIES_DEFINE_BASE (
PROP_0,
PROP_IP6_PRIVACY, PROP_IP6_PRIVACY,
PROP_ADDR_GEN_MODE, PROP_ADDR_GEN_MODE,
PROP_TOKEN, PROP_TOKEN,
PROP_DHCP_DUID, PROP_DHCP_DUID,
);
LAST_PROP
};
/** /**
* nm_setting_ip6_config_new: * nm_setting_ip6_config_new:
@@ -749,14 +746,13 @@ nm_setting_ip6_config_class_init (NMSettingIP6ConfigClass *klass)
* example: IPV6_PRIVACY=rfc3041 IPV6_PRIVACY_PREFER_PUBLIC_IP=yes * example: IPV6_PRIVACY=rfc3041 IPV6_PRIVACY_PREFER_PUBLIC_IP=yes
* ---end--- * ---end---
*/ */
g_object_class_install_property obj_properties[PROP_IP6_PRIVACY] =
(object_class, PROP_IP6_PRIVACY, g_param_spec_enum (NM_SETTING_IP6_CONFIG_IP6_PRIVACY, "", "",
g_param_spec_enum (NM_SETTING_IP6_CONFIG_IP6_PRIVACY, "", "", NM_TYPE_SETTING_IP6_CONFIG_PRIVACY,
NM_TYPE_SETTING_IP6_CONFIG_PRIVACY, NM_SETTING_IP6_CONFIG_PRIVACY_UNKNOWN,
NM_SETTING_IP6_CONFIG_PRIVACY_UNKNOWN, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingIP6Config:addr-gen-mode: * NMSettingIP6Config:addr-gen-mode:
@@ -799,14 +795,13 @@ nm_setting_ip6_config_class_init (NMSettingIP6ConfigClass *klass)
* example: IPV6_ADDR_GEN_MODE=stable-privacy * example: IPV6_ADDR_GEN_MODE=stable-privacy
* ---end--- * ---end---
*/ */
g_object_class_install_property obj_properties[PROP_ADDR_GEN_MODE] =
(object_class, PROP_ADDR_GEN_MODE, g_param_spec_int (NM_SETTING_IP6_CONFIG_ADDR_GEN_MODE, "", "",
g_param_spec_int (NM_SETTING_IP6_CONFIG_ADDR_GEN_MODE, "", "", G_MININT, G_MAXINT,
G_MININT, G_MAXINT, NM_SETTING_IP6_CONFIG_ADDR_GEN_MODE_STABLE_PRIVACY,
NM_SETTING_IP6_CONFIG_ADDR_GEN_MODE_STABLE_PRIVACY, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingIP6Config:token: * NMSettingIP6Config:token:
@@ -823,13 +818,12 @@ nm_setting_ip6_config_class_init (NMSettingIP6ConfigClass *klass)
* example: IPV6_TOKEN=::53 * example: IPV6_TOKEN=::53
* ---end--- * ---end---
*/ */
g_object_class_install_property obj_properties[PROP_TOKEN] =
(object_class, PROP_TOKEN, g_param_spec_string (NM_SETTING_IP6_CONFIG_TOKEN, "", "",
g_param_spec_string (NM_SETTING_IP6_CONFIG_TOKEN, "", "", NULL,
NULL, G_PARAM_READWRITE |
G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE |
NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingIP6Config:dhcp-duid: * NMSettingIP6Config:dhcp-duid:
@@ -876,12 +870,11 @@ nm_setting_ip6_config_class_init (NMSettingIP6ConfigClass *klass)
* example: DHCPV6_DUID=LL; DHCPV6_DUID=0301deadbeef0001; DHCPV6_DUID=03:01:de:ad:be:ef:00:01 * example: DHCPV6_DUID=LL; DHCPV6_DUID=0301deadbeef0001; DHCPV6_DUID=03:01:de:ad:be:ef:00:01
* ---end--- * ---end---
*/ */
g_object_class_install_property obj_properties[PROP_DHCP_DUID] =
(object_class, PROP_DHCP_DUID, g_param_spec_string (NM_SETTING_IP6_CONFIG_DHCP_DUID, "", "",
g_param_spec_string (NM_SETTING_IP6_CONFIG_DHCP_DUID, "", "", NULL,
NULL, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/* IP6-specific property overrides */ /* IP6-specific property overrides */
@@ -976,6 +969,8 @@ nm_setting_ip6_config_class_init (NMSettingIP6ConfigClass *klass)
ip6_route_data_get, ip6_route_data_get,
ip6_route_data_set); ip6_route_data_set);
g_object_class_install_properties (object_class, _PROPERTY_ENUMS_LAST, obj_properties);
_nm_setting_class_commit_full (setting_class, NM_META_SETTING_TYPE_IP6_CONFIG, _nm_setting_class_commit_full (setting_class, NM_META_SETTING_TYPE_IP6_CONFIG,
NULL, properties_override); NULL, properties_override);
} }

68
libnm-core/nm-setting-macvlan.c
View File

@@ -50,14 +50,12 @@ typedef struct {
gboolean tap; gboolean tap;
} NMSettingMacvlanPrivate; } NMSettingMacvlanPrivate;
enum { NM_GOBJECT_PROPERTIES_DEFINE_BASE (
PROP_0,
PROP_PARENT, PROP_PARENT,
PROP_MODE, PROP_MODE,
PROP_PROMISCUOUS, PROP_PROMISCUOUS,
PROP_TAP, PROP_TAP,
LAST_PROP );
};
/** /**
* nm_setting_macvlan_new: * nm_setting_macvlan_new:
@@ -281,14 +279,13 @@ nm_setting_macvlan_class_init (NMSettingMacvlanClass *klass)
* *
* Since: 1.2 * Since: 1.2
**/ **/
g_object_class_install_property obj_properties[PROP_PARENT] =
(object_class, PROP_PARENT, g_param_spec_string (NM_SETTING_MACVLAN_PARENT, "", "",
g_param_spec_string (NM_SETTING_MACVLAN_PARENT, "", "", NULL,
NULL, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
G_PARAM_CONSTRUCT | NM_SETTING_PARAM_INFERRABLE |
NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingMacvlan:mode: * NMSettingMacvlan:mode:
@@ -298,14 +295,13 @@ nm_setting_macvlan_class_init (NMSettingMacvlanClass *klass)
* *
* Since: 1.2 * Since: 1.2
**/ **/
g_object_class_install_property obj_properties[PROP_MODE] =
(object_class, PROP_MODE, g_param_spec_uint (NM_SETTING_MACVLAN_MODE, "", "",
g_param_spec_uint (NM_SETTING_MACVLAN_MODE, "", "", 0, G_MAXUINT, 0,
0, G_MAXUINT, 0, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
G_PARAM_CONSTRUCT | NM_SETTING_PARAM_INFERRABLE |
NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingMacvlan:promiscuous: * NMSettingMacvlan:promiscuous:
@@ -314,14 +310,13 @@ nm_setting_macvlan_class_init (NMSettingMacvlanClass *klass)
* *
* Since: 1.2 * Since: 1.2
**/ **/
g_object_class_install_property obj_properties[PROP_PROMISCUOUS] =
(object_class, PROP_PROMISCUOUS, g_param_spec_boolean (NM_SETTING_MACVLAN_PROMISCUOUS, "", "",
g_param_spec_boolean (NM_SETTING_MACVLAN_PROMISCUOUS, "", "", TRUE,
TRUE, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
G_PARAM_CONSTRUCT | NM_SETTING_PARAM_INFERRABLE |
NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingMacvlan:tap: * NMSettingMacvlan:tap:
@@ -330,14 +325,15 @@ nm_setting_macvlan_class_init (NMSettingMacvlanClass *klass)
* *
* Since: 1.2 * Since: 1.2
**/ **/
g_object_class_install_property obj_properties[PROP_TAP] =
(object_class, PROP_TAP, g_param_spec_boolean (NM_SETTING_MACVLAN_TAP, "", "",
g_param_spec_boolean (NM_SETTING_MACVLAN_TAP, "", "", FALSE,
FALSE, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
G_PARAM_CONSTRUCT | NM_SETTING_PARAM_INFERRABLE |
NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
g_object_class_install_properties (object_class, _PROPERTY_ENUMS_LAST, obj_properties);
_nm_setting_class_commit (setting_class, NM_META_SETTING_TYPE_MACVLAN); _nm_setting_class_commit (setting_class, NM_META_SETTING_TYPE_MACVLAN);
} }

51
libnm-core/nm-setting-olpc-mesh.c
View File

@@ -49,14 +49,11 @@ typedef struct {
char *dhcp_anycast_addr; char *dhcp_anycast_addr;
} NMSettingOlpcMeshPrivate; } NMSettingOlpcMeshPrivate;
enum { NM_GOBJECT_PROPERTIES_DEFINE_BASE (
PROP_0,
PROP_SSID, PROP_SSID,
PROP_CHANNEL, PROP_CHANNEL,
PROP_DHCP_ANYCAST_ADDRESS, PROP_DHCP_ANYCAST_ADDRESS,
);
LAST_PROP
};
/** /**
* nm_setting_olpc_mesh_new: * nm_setting_olpc_mesh_new:
@@ -231,27 +228,25 @@ nm_setting_olpc_mesh_class_init (NMSettingOlpcMeshClass *klass)
* *
* SSID of the mesh network to join. * SSID of the mesh network to join.
**/ **/
g_object_class_install_property obj_properties[PROP_SSID] =
(object_class, PROP_SSID, g_param_spec_boxed (NM_SETTING_OLPC_MESH_SSID, "", "",
g_param_spec_boxed (NM_SETTING_OLPC_MESH_SSID, "", "", G_TYPE_BYTES,
G_TYPE_BYTES, G_PARAM_READWRITE |
G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE |
NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingOlpcMesh:channel: * NMSettingOlpcMesh:channel:
* *
* Channel on which the mesh network to join is located. * Channel on which the mesh network to join is located.
**/ **/
g_object_class_install_property obj_properties[PROP_CHANNEL] =
(object_class, PROP_CHANNEL, g_param_spec_uint (NM_SETTING_OLPC_MESH_CHANNEL, "", "",
g_param_spec_uint (NM_SETTING_OLPC_MESH_CHANNEL, "", "", 0, G_MAXUINT32, 0,
0, G_MAXUINT32, 0, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
G_PARAM_CONSTRUCT | NM_SETTING_PARAM_INFERRABLE |
NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingOlpcMesh:dhcp-anycast-address: * NMSettingOlpcMesh:dhcp-anycast-address:
@@ -260,20 +255,20 @@ nm_setting_olpc_mesh_class_init (NMSettingOlpcMeshClass *klass)
* The specific anycast address used determines which DHCP server class * The specific anycast address used determines which DHCP server class
* answers the request. * answers the request.
**/ **/
g_object_class_install_property obj_properties[PROP_DHCP_ANYCAST_ADDRESS] =
(object_class, PROP_DHCP_ANYCAST_ADDRESS, g_param_spec_string (NM_SETTING_OLPC_MESH_DHCP_ANYCAST_ADDRESS, "", "",
g_param_spec_string (NM_SETTING_OLPC_MESH_DHCP_ANYCAST_ADDRESS, "", "", NULL,
NULL, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
_properties_override_add_transform (properties_override, _properties_override_add_transform (properties_override,
g_object_class_find_property (G_OBJECT_CLASS (setting_class), obj_properties[PROP_DHCP_ANYCAST_ADDRESS],
NM_SETTING_OLPC_MESH_DHCP_ANYCAST_ADDRESS),
G_VARIANT_TYPE_BYTESTRING, G_VARIANT_TYPE_BYTESTRING,
_nm_utils_hwaddr_to_dbus, _nm_utils_hwaddr_to_dbus,
_nm_utils_hwaddr_from_dbus); _nm_utils_hwaddr_from_dbus);
g_object_class_install_properties (object_class, _PROPERTY_ENUMS_LAST, obj_properties);
_nm_setting_class_commit_full (setting_class, NM_META_SETTING_TYPE_OLPC_MESH, _nm_setting_class_commit_full (setting_class, NM_META_SETTING_TYPE_OLPC_MESH,
NULL, properties_override); NULL, properties_override);
} }

62
libnm-core/nm-setting-ovs-bridge.c
View File

@@ -34,14 +34,12 @@
* necessary for Open vSwitch bridges. * necessary for Open vSwitch bridges.
**/ **/
enum { NM_GOBJECT_PROPERTIES_DEFINE_BASE (
PROP_0,
PROP_FAIL_MODE, PROP_FAIL_MODE,
PROP_MCAST_SNOOPING_ENABLE, PROP_MCAST_SNOOPING_ENABLE,
PROP_RSTP_ENABLE, PROP_RSTP_ENABLE,
PROP_STP_ENABLE, PROP_STP_ENABLE,
LAST_PROP );
};
/** /**
* NMSettingOvsBridge: * NMSettingOvsBridge:
@@ -280,14 +278,13 @@ nm_setting_ovs_bridge_class_init (NMSettingOvsBridgeClass *klass)
* *
* Since: 1.10 * Since: 1.10
**/ **/
g_object_class_install_property obj_properties[PROP_FAIL_MODE] =
(object_class, PROP_FAIL_MODE, g_param_spec_string (NM_SETTING_OVS_BRIDGE_FAIL_MODE, "", "",
g_param_spec_string (NM_SETTING_OVS_BRIDGE_FAIL_MODE, "", "", NULL,
NULL, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
G_PARAM_CONSTRUCT | NM_SETTING_PARAM_INFERRABLE |
NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingOvsBridge:mcast-snooping-enable: * NMSettingOvsBridge:mcast-snooping-enable:
@@ -296,13 +293,12 @@ nm_setting_ovs_bridge_class_init (NMSettingOvsBridgeClass *klass)
* *
* Since: 1.10 * Since: 1.10
**/ **/
g_object_class_install_property obj_properties[PROP_MCAST_SNOOPING_ENABLE] =
(object_class, PROP_MCAST_SNOOPING_ENABLE, g_param_spec_boolean (NM_SETTING_OVS_BRIDGE_MCAST_SNOOPING_ENABLE, "", "",
g_param_spec_boolean (NM_SETTING_OVS_BRIDGE_MCAST_SNOOPING_ENABLE, "", "", FALSE,
FALSE, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingOvsBridge:rstp-enable: * NMSettingOvsBridge:rstp-enable:
@@ -311,13 +307,12 @@ nm_setting_ovs_bridge_class_init (NMSettingOvsBridgeClass *klass)
* *
* Since: 1.10 * Since: 1.10
**/ **/
g_object_class_install_property obj_properties[PROP_RSTP_ENABLE] =
(object_class, PROP_RSTP_ENABLE, g_param_spec_boolean (NM_SETTING_OVS_BRIDGE_RSTP_ENABLE, "", "",
g_param_spec_boolean (NM_SETTING_OVS_BRIDGE_RSTP_ENABLE, "", "", FALSE,
FALSE, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingOvsBridge:stp-enable: * NMSettingOvsBridge:stp-enable:
@@ -326,13 +321,14 @@ nm_setting_ovs_bridge_class_init (NMSettingOvsBridgeClass *klass)
* *
* Since: 1.10 * Since: 1.10
**/ **/
g_object_class_install_property obj_properties[PROP_STP_ENABLE] =
(object_class, PROP_STP_ENABLE, g_param_spec_boolean (NM_SETTING_OVS_BRIDGE_STP_ENABLE, "", "",
g_param_spec_boolean (NM_SETTING_OVS_BRIDGE_STP_ENABLE, "", "", FALSE,
FALSE, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
g_object_class_install_properties (object_class, _PROPERTY_ENUMS_LAST, obj_properties);
_nm_setting_class_commit (setting_class, NM_META_SETTING_TYPE_OVS_BRIDGE); _nm_setting_class_commit (setting_class, NM_META_SETTING_TYPE_OVS_BRIDGE);
} }

23
libnm-core/nm-setting-ovs-interface.c
View File

@@ -33,11 +33,9 @@
* necessary for Open vSwitch interfaces. * necessary for Open vSwitch interfaces.
**/ **/
enum { NM_GOBJECT_PROPERTIES_DEFINE_BASE (
PROP_0,
PROP_TYPE, PROP_TYPE,
LAST_PROP );
};
/** /**
* NMSettingOvsInterface: * NMSettingOvsInterface:
@@ -379,14 +377,15 @@ nm_setting_ovs_interface_class_init (NMSettingOvsInterfaceClass *klass)
* *
* Since: 1.10 * Since: 1.10
**/ **/
g_object_class_install_property obj_properties[PROP_TYPE] =
(object_class, PROP_TYPE, g_param_spec_string (NM_SETTING_OVS_INTERFACE_TYPE, "", "",
g_param_spec_string (NM_SETTING_OVS_INTERFACE_TYPE, "", "", NULL,
NULL, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
G_PARAM_CONSTRUCT | NM_SETTING_PARAM_INFERRABLE |
NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
g_object_class_install_properties (object_class, _PROPERTY_ENUMS_LAST, obj_properties);
_nm_setting_class_commit (setting_class, NM_META_SETTING_TYPE_OVS_INTERFACE); _nm_setting_class_commit (setting_class, NM_META_SETTING_TYPE_OVS_INTERFACE);
} }

23
libnm-core/nm-setting-ovs-patch.c
View File

@@ -34,11 +34,9 @@
* necessary for Open vSwitch interfaces of type "patch". * necessary for Open vSwitch interfaces of type "patch".
**/ **/
enum { NM_GOBJECT_PROPERTIES_DEFINE_BASE (
PROP_0,
PROP_PEER, PROP_PEER,
LAST_PROP );
};
/** /**
* NMSettingOvsPatch: * NMSettingOvsPatch:
@@ -199,14 +197,15 @@ nm_setting_ovs_patch_class_init (NMSettingOvsPatchClass *klass)
* *
* Since: 1.10 * Since: 1.10
**/ **/
g_object_class_install_property obj_properties[PROP_PEER] =
(object_class, PROP_PEER, g_param_spec_string (NM_SETTING_OVS_PATCH_PEER, "", "",
g_param_spec_string (NM_SETTING_OVS_PATCH_PEER, "", "", NULL,
NULL, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
G_PARAM_CONSTRUCT | NM_SETTING_PARAM_INFERRABLE |
NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
g_object_class_install_properties (object_class, _PROPERTY_ENUMS_LAST, obj_properties);
_nm_setting_class_commit (setting_class, NM_META_SETTING_TYPE_OVS_PATCH); _nm_setting_class_commit (setting_class, NM_META_SETTING_TYPE_OVS_PATCH);
} }

102
libnm-core/nm-setting-ovs-port.c
View File

@@ -34,16 +34,16 @@
* necessary for Open vSwitch ports. * necessary for Open vSwitch ports.
**/ **/
enum { /*****************************************************************************/
PROP_0,
NM_GOBJECT_PROPERTIES_DEFINE_BASE (
PROP_VLAN_MODE, PROP_VLAN_MODE,
PROP_TAG, PROP_TAG,
PROP_LACP, PROP_LACP,
PROP_BOND_MODE, PROP_BOND_MODE,
PROP_BOND_UPDELAY, PROP_BOND_UPDELAY,
PROP_BOND_DOWNDELAY, PROP_BOND_DOWNDELAY,
LAST_PROP );
};
/** /**
* NMSettingOvsPort: * NMSettingOvsPort:
@@ -364,8 +364,8 @@ nm_setting_ovs_port_class_init (NMSettingOvsPortClass *klass)
GObjectClass *object_class = G_OBJECT_CLASS (klass); GObjectClass *object_class = G_OBJECT_CLASS (klass);
NMSettingClass *setting_class = NM_SETTING_CLASS (klass); NMSettingClass *setting_class = NM_SETTING_CLASS (klass);
object_class->set_property = set_property;
object_class->get_property = get_property; object_class->get_property = get_property;
object_class->set_property = set_property;
object_class->finalize = finalize; object_class->finalize = finalize;
setting_class->verify = verify; setting_class->verify = verify;
@@ -378,14 +378,13 @@ nm_setting_ovs_port_class_init (NMSettingOvsPortClass *klass)
* *
* Since: 1.10 * Since: 1.10
**/ **/
g_object_class_install_property obj_properties[PROP_VLAN_MODE] =
(object_class, PROP_VLAN_MODE, g_param_spec_string (NM_SETTING_OVS_PORT_VLAN_MODE, "", "",
g_param_spec_string (NM_SETTING_OVS_PORT_VLAN_MODE, "", "", NULL,
NULL, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
G_PARAM_CONSTRUCT | NM_SETTING_PARAM_INFERRABLE |
NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingOvsPort:tag: * NMSettingOvsPort:tag:
@@ -394,14 +393,13 @@ nm_setting_ovs_port_class_init (NMSettingOvsPortClass *klass)
* *
* Since: 1.10 * Since: 1.10
**/ **/
g_object_class_install_property obj_properties[PROP_TAG] =
(object_class, PROP_TAG, g_param_spec_uint (NM_SETTING_OVS_PORT_TAG, "", "",
g_param_spec_uint (NM_SETTING_OVS_PORT_TAG, "", "", 0, 4095, 0,
0, 4095, 0, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
G_PARAM_CONSTRUCT | NM_SETTING_PARAM_INFERRABLE |
NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingOvsPort:lacp: * NMSettingOvsPort:lacp:
@@ -410,14 +408,13 @@ nm_setting_ovs_port_class_init (NMSettingOvsPortClass *klass)
* *
* Since: 1.10 * Since: 1.10
**/ **/
g_object_class_install_property obj_properties[PROP_LACP] =
(object_class, PROP_LACP, g_param_spec_string (NM_SETTING_OVS_PORT_LACP, "", "",
g_param_spec_string (NM_SETTING_OVS_PORT_LACP, "", "", NULL,
NULL, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
G_PARAM_CONSTRUCT | NM_SETTING_PARAM_INFERRABLE |
NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingOvsPort:bond-mode: * NMSettingOvsPort:bond-mode:
@@ -426,14 +423,13 @@ nm_setting_ovs_port_class_init (NMSettingOvsPortClass *klass)
* *
* Since: 1.10 * Since: 1.10
**/ **/
g_object_class_install_property obj_properties[PROP_BOND_MODE] =
(object_class, PROP_BOND_MODE, g_param_spec_string (NM_SETTING_OVS_PORT_BOND_MODE, "", "",
g_param_spec_string (NM_SETTING_OVS_PORT_BOND_MODE, "", "", NULL,
NULL, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
G_PARAM_CONSTRUCT | NM_SETTING_PARAM_INFERRABLE |
NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingOvsPort:bond-updelay: * NMSettingOvsPort:bond-updelay:
@@ -442,14 +438,13 @@ nm_setting_ovs_port_class_init (NMSettingOvsPortClass *klass)
* *
* Since: 1.10 * Since: 1.10
**/ **/
g_object_class_install_property obj_properties[PROP_BOND_UPDELAY] =
(object_class, PROP_BOND_UPDELAY, g_param_spec_uint (NM_SETTING_OVS_PORT_BOND_UPDELAY, "", "",
g_param_spec_uint (NM_SETTING_OVS_PORT_BOND_UPDELAY, "", "", 0, G_MAXUINT, 0,
0, G_MAXUINT, 0, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
G_PARAM_CONSTRUCT | NM_SETTING_PARAM_INFERRABLE |
NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingOvsPort:bond-downdelay: * NMSettingOvsPort:bond-downdelay:
@@ -458,14 +453,15 @@ nm_setting_ovs_port_class_init (NMSettingOvsPortClass *klass)
* *
* Since: 1.10 * Since: 1.10
**/ **/
g_object_class_install_property obj_properties[PROP_BOND_DOWNDELAY] =
(object_class, PROP_BOND_DOWNDELAY, g_param_spec_uint (NM_SETTING_OVS_PORT_BOND_DOWNDELAY, "", "",
g_param_spec_uint (NM_SETTING_OVS_PORT_BOND_DOWNDELAY, "", "", 0, G_MAXUINT, 0,
0, G_MAXUINT, 0, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
G_PARAM_CONSTRUCT | NM_SETTING_PARAM_INFERRABLE |
NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
g_object_class_install_properties (object_class, _PROPERTY_ENUMS_LAST, obj_properties);
_nm_setting_class_commit (setting_class, NM_META_SETTING_TYPE_OVS_PORT); _nm_setting_class_commit (setting_class, NM_META_SETTING_TYPE_OVS_PORT);
} }

255
libnm-core/nm-setting-ppp.c
View File

@@ -60,8 +60,7 @@ typedef struct {
guint32 lcp_echo_interval; guint32 lcp_echo_interval;
} NMSettingPppPrivate; } NMSettingPppPrivate;
enum { NM_GOBJECT_PROPERTIES_DEFINE_BASE (
PROP_0,
PROP_NOAUTH, PROP_NOAUTH,
PROP_REFUSE_EAP, PROP_REFUSE_EAP,
PROP_REFUSE_PAP, PROP_REFUSE_PAP,
@@ -80,9 +79,7 @@ enum {
PROP_MTU, PROP_MTU,
PROP_LCP_ECHO_FAILURE, PROP_LCP_ECHO_FAILURE,
PROP_LCP_ECHO_INTERVAL, PROP_LCP_ECHO_INTERVAL,
);
LAST_PROP
};
/** /**
* nm_setting_ppp_new: * nm_setting_ppp_new:
@@ -542,120 +539,111 @@ 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.
**/ **/
g_object_class_install_property obj_properties[PROP_NOAUTH] =
(object_class, PROP_NOAUTH, g_param_spec_boolean (NM_SETTING_PPP_NOAUTH, "", "",
g_param_spec_boolean (NM_SETTING_PPP_NOAUTH, "", "", TRUE,
TRUE, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* 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.
**/ **/
g_object_class_install_property obj_properties[PROP_REFUSE_EAP] =
(object_class, PROP_REFUSE_EAP, g_param_spec_boolean (NM_SETTING_PPP_REFUSE_EAP, "", "",
g_param_spec_boolean (NM_SETTING_PPP_REFUSE_EAP, "", "", FALSE,
FALSE, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* 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.
**/ **/
g_object_class_install_property obj_properties[PROP_REFUSE_PAP] =
(object_class, PROP_REFUSE_PAP, g_param_spec_boolean (NM_SETTING_PPP_REFUSE_PAP, "", "",
g_param_spec_boolean (NM_SETTING_PPP_REFUSE_PAP, "", "", FALSE,
FALSE, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* 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.
**/ **/
g_object_class_install_property obj_properties[PROP_REFUSE_CHAP] =
(object_class, PROP_REFUSE_CHAP, g_param_spec_boolean (NM_SETTING_PPP_REFUSE_CHAP, "", "",
g_param_spec_boolean (NM_SETTING_PPP_REFUSE_CHAP, "", "", FALSE,
FALSE, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* 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.
**/ **/
g_object_class_install_property obj_properties[PROP_REFUSE_MSCHAP] =
(object_class, PROP_REFUSE_MSCHAP, g_param_spec_boolean (NM_SETTING_PPP_REFUSE_MSCHAP, "", "",
g_param_spec_boolean (NM_SETTING_PPP_REFUSE_MSCHAP, "", "", FALSE,
FALSE, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* 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.
**/ **/
g_object_class_install_property obj_properties[PROP_REFUSE_MSCHAPV2] =
(object_class, PROP_REFUSE_MSCHAPV2, g_param_spec_boolean (NM_SETTING_PPP_REFUSE_MSCHAPV2, "", "",
g_param_spec_boolean (NM_SETTING_PPP_REFUSE_MSCHAPV2, "", "", FALSE,
FALSE, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingPpp:nobsdcomp: * NMSettingPpp:nobsdcomp:
* *
* If %TRUE, BSD compression will not be requested. * If %TRUE, BSD compression will not be requested.
**/ **/
g_object_class_install_property obj_properties[PROP_NOBSDCOMP] =
(object_class, PROP_NOBSDCOMP, g_param_spec_boolean (NM_SETTING_PPP_NOBSDCOMP, "", "",
g_param_spec_boolean (NM_SETTING_PPP_NOBSDCOMP, "", "", FALSE,
FALSE, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
G_PARAM_CONSTRUCT | NM_SETTING_PARAM_FUZZY_IGNORE |
NM_SETTING_PARAM_FUZZY_IGNORE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingPpp:nodeflate: * NMSettingPpp:nodeflate:
* *
* If %TRUE, "deflate" compression will not be requested. * If %TRUE, "deflate" compression will not be requested.
**/ **/
g_object_class_install_property obj_properties[PROP_NODEFLATE] =
(object_class, PROP_NODEFLATE, g_param_spec_boolean (NM_SETTING_PPP_NODEFLATE, "", "",
g_param_spec_boolean (NM_SETTING_PPP_NODEFLATE, "", "", FALSE,
FALSE, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
G_PARAM_CONSTRUCT | NM_SETTING_PARAM_FUZZY_IGNORE |
NM_SETTING_PARAM_FUZZY_IGNORE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* 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.
**/ **/
g_object_class_install_property obj_properties[PROP_NO_VJ_COMP] =
(object_class, PROP_NO_VJ_COMP, g_param_spec_boolean (NM_SETTING_PPP_NO_VJ_COMP, "", "",
g_param_spec_boolean (NM_SETTING_PPP_NO_VJ_COMP, "", "", FALSE,
FALSE, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
G_PARAM_CONSTRUCT | NM_SETTING_PARAM_FUZZY_IGNORE |
NM_SETTING_PARAM_FUZZY_IGNORE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingPpp:require-mppe: * NMSettingPpp:require-mppe:
@@ -665,13 +653,12 @@ 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.
**/ **/
g_object_class_install_property obj_properties[PROP_REQUIRE_MPPE] =
(object_class, PROP_REQUIRE_MPPE, g_param_spec_boolean (NM_SETTING_PPP_REQUIRE_MPPE, "", "",
g_param_spec_boolean (NM_SETTING_PPP_REQUIRE_MPPE, "", "", FALSE,
FALSE, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingPpp:require-mppe-128: * NMSettingPpp:require-mppe-128:
@@ -680,12 +667,11 @@ 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.
**/ **/
g_object_class_install_property obj_properties[PROP_REQUIRE_MPPE_128] =
(object_class, PROP_REQUIRE_MPPE_128, g_param_spec_boolean (NM_SETTING_PPP_REQUIRE_MPPE_128, "", "",
g_param_spec_boolean (NM_SETTING_PPP_REQUIRE_MPPE_128, "", "", FALSE,
FALSE, G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
G_PARAM_READWRITE | G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingPpp:mppe-stateful: * NMSettingPpp:mppe-stateful:
@@ -693,13 +679,12 @@ 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.
**/ **/
g_object_class_install_property obj_properties[PROP_MPPE_STATEFUL] =
(object_class, PROP_MPPE_STATEFUL, g_param_spec_boolean (NM_SETTING_PPP_MPPE_STATEFUL, "", "",
g_param_spec_boolean (NM_SETTING_PPP_MPPE_STATEFUL, "", "", FALSE,
FALSE, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingPpp:crtscts: * NMSettingPpp:crtscts:
@@ -708,13 +693,12 @@ 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.
**/ **/
g_object_class_install_property obj_properties[PROP_CRTSCTS] =
(object_class, PROP_CRTSCTS, g_param_spec_boolean (NM_SETTING_PPP_CRTSCTS, "", "",
g_param_spec_boolean (NM_SETTING_PPP_CRTSCTS, "", "", FALSE,
FALSE, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingPpp:baud: * NMSettingPpp:baud:
@@ -723,14 +707,13 @@ nm_setting_ppp_class_init (NMSettingPppClass *klass)
* baudrate. This value should normally be left as 0 to automatically * baudrate. This value should normally be left as 0 to automatically
* choose the speed. * choose the speed.
**/ **/
g_object_class_install_property obj_properties[PROP_BAUD] =
(object_class, PROP_BAUD, g_param_spec_uint (NM_SETTING_PPP_BAUD, "", "",
g_param_spec_uint (NM_SETTING_PPP_BAUD, "", "", 0, G_MAXUINT32, 0,
0, G_MAXUINT32, 0, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
G_PARAM_CONSTRUCT | NM_SETTING_PARAM_FUZZY_IGNORE |
NM_SETTING_PARAM_FUZZY_IGNORE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingPpp:mru: * NMSettingPpp:mru:
@@ -739,13 +722,12 @@ nm_setting_ppp_class_init (NMSettingPppClass *klass)
* larger than the specified size. If non-zero, the MRU should be between * larger than the specified size. If non-zero, the MRU should be between
* 128 and 16384. * 128 and 16384.
*/ */
g_object_class_install_property obj_properties[PROP_MRU] =
(object_class, PROP_MRU, g_param_spec_uint (NM_SETTING_PPP_MRU, "", "",
g_param_spec_uint (NM_SETTING_PPP_MRU, "", "", 0, 16384, 0,
0, 16384, 0, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingPpp:mtu: * NMSettingPpp:mtu:
@@ -753,14 +735,13 @@ nm_setting_ppp_class_init (NMSettingPppClass *klass)
* If non-zero, instruct pppd to send packets no larger than the specified * If non-zero, instruct pppd to send packets no larger than the specified
* size. * size.
**/ **/
g_object_class_install_property obj_properties[PROP_MTU] =
(object_class, PROP_MTU, g_param_spec_uint (NM_SETTING_PPP_MTU, "", "",
g_param_spec_uint (NM_SETTING_PPP_MTU, "", "", 0, G_MAXUINT32, 0,
0, G_MAXUINT32, 0, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
G_PARAM_CONSTRUCT | NM_SETTING_PARAM_FUZZY_IGNORE |
NM_SETTING_PARAM_FUZZY_IGNORE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingPpp:lcp-echo-failure: * NMSettingPpp:lcp-echo-failure:
@@ -770,14 +751,13 @@ nm_setting_ppp_class_init (NMSettingPppClass *klass)
* peer. The "lcp-echo-interval" property must also be set to a non-zero * peer. The "lcp-echo-interval" property must also be set to a non-zero
* value if this property is used. * value if this property is used.
**/ **/
g_object_class_install_property obj_properties[PROP_LCP_ECHO_FAILURE] =
(object_class, PROP_LCP_ECHO_FAILURE, g_param_spec_uint (NM_SETTING_PPP_LCP_ECHO_FAILURE, "", "",
g_param_spec_uint (NM_SETTING_PPP_LCP_ECHO_FAILURE, "", "", 0, G_MAXUINT32, 0,
0, G_MAXUINT32, 0, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
G_PARAM_CONSTRUCT | NM_SETTING_PARAM_FUZZY_IGNORE |
NM_SETTING_PARAM_FUZZY_IGNORE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingPpp:lcp-echo-interval: * NMSettingPpp:lcp-echo-interval:
@@ -787,14 +767,15 @@ nm_setting_ppp_class_init (NMSettingPppClass *klass)
* peers will respond to echo requests and some will not, and it is not * peers will respond to echo requests and some will not, and it is not
* possible to autodetect this. * possible to autodetect this.
**/ **/
g_object_class_install_property obj_properties[PROP_LCP_ECHO_INTERVAL] =
(object_class, PROP_LCP_ECHO_INTERVAL, g_param_spec_uint (NM_SETTING_PPP_LCP_ECHO_INTERVAL, "", "",
g_param_spec_uint (NM_SETTING_PPP_LCP_ECHO_INTERVAL, "", "", 0, G_MAXUINT32, 0,
0, G_MAXUINT32, 0, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
G_PARAM_CONSTRUCT | NM_SETTING_PARAM_FUZZY_IGNORE |
NM_SETTING_PARAM_FUZZY_IGNORE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
g_object_class_install_properties (object_class, _PROPERTY_ENUMS_LAST, obj_properties);
_nm_setting_class_commit (setting_class, NM_META_SETTING_TYPE_PPP); _nm_setting_class_commit (setting_class, NM_META_SETTING_TYPE_PPP);
} }

72
libnm-core/nm-setting-pppoe.c
View File

@@ -50,16 +50,13 @@ typedef struct {
NMSettingSecretFlags password_flags; NMSettingSecretFlags password_flags;
} NMSettingPppoePrivate; } NMSettingPppoePrivate;
enum { NM_GOBJECT_PROPERTIES_DEFINE_BASE (
PROP_0,
PROP_PARENT, PROP_PARENT,
PROP_SERVICE, PROP_SERVICE,
PROP_USERNAME, PROP_USERNAME,
PROP_PASSWORD, PROP_PASSWORD,
PROP_PASSWORD_FLAGS, PROP_PASSWORD_FLAGS,
);
LAST_PROP
};
/** /**
* nm_setting_pppoe_new: * nm_setting_pppoe_new:
@@ -310,14 +307,13 @@ nm_setting_pppoe_class_init (NMSettingPppoeClass *klass)
* *
* Since: 1.10 * Since: 1.10
**/ **/
g_object_class_install_property obj_properties[PROP_PARENT] =
(object_class, PROP_PARENT, g_param_spec_string (NM_SETTING_PPPOE_PARENT, "", "",
g_param_spec_string (NM_SETTING_PPPOE_PARENT, "", "", NULL,
NULL, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
G_PARAM_CONSTRUCT | NM_SETTING_PARAM_INFERRABLE |
NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingPppoe:service: * NMSettingPppoe:service:
@@ -327,50 +323,48 @@ nm_setting_pppoe_class_init (NMSettingPppoeClass *klass)
* this should be left blank. It is only required if there are multiple * this should be left blank. It is only required if there are multiple
* access concentrators or a specific service is known to be required. * access concentrators or a specific service is known to be required.
**/ **/
g_object_class_install_property obj_properties[PROP_SERVICE] =
(object_class, PROP_SERVICE, g_param_spec_string (NM_SETTING_PPPOE_SERVICE, "", "",
g_param_spec_string (NM_SETTING_PPPOE_SERVICE, "", "", NULL,
NULL, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingPppoe:username: * NMSettingPppoe:username:
* *
* Username used to authenticate with the PPPoE service. * Username used to authenticate with the PPPoE service.
**/ **/
g_object_class_install_property obj_properties[PROP_USERNAME] =
(object_class, PROP_USERNAME, g_param_spec_string (NM_SETTING_PPPOE_USERNAME, "", "",
g_param_spec_string (NM_SETTING_PPPOE_USERNAME, "", "", NULL,
NULL, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingPppoe:password: * NMSettingPppoe:password:
* *
* Password used to authenticate with the PPPoE service. * Password used to authenticate with the PPPoE service.
**/ **/
g_object_class_install_property obj_properties[PROP_PASSWORD] =
(object_class, PROP_PASSWORD, g_param_spec_string (NM_SETTING_PPPOE_PASSWORD, "", "",
g_param_spec_string (NM_SETTING_PPPOE_PASSWORD, "", "", NULL,
NULL, G_PARAM_READWRITE |
G_PARAM_READWRITE | NM_SETTING_PARAM_SECRET |
NM_SETTING_PARAM_SECRET | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingPppoe:password-flags: * NMSettingPppoe:password-flags:
* *
* Flags indicating how to handle the #NMSettingPppoe:password property. * Flags indicating how to handle the #NMSettingPppoe:password property.
**/ **/
g_object_class_install_property obj_properties[PROP_PASSWORD_FLAGS] =
(object_class, PROP_PASSWORD_FLAGS, g_param_spec_flags (NM_SETTING_PPPOE_PASSWORD_FLAGS, "", "",
g_param_spec_flags (NM_SETTING_PPPOE_PASSWORD_FLAGS, "", "", NM_TYPE_SETTING_SECRET_FLAGS,
NM_TYPE_SETTING_SECRET_FLAGS, NM_SETTING_SECRET_FLAG_NONE,
NM_SETTING_SECRET_FLAG_NONE, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
g_object_class_install_properties (object_class, _PROPERTY_ENUMS_LAST, obj_properties);
_nm_setting_class_commit (setting_class, NM_META_SETTING_TYPE_PPPOE); _nm_setting_class_commit (setting_class, NM_META_SETTING_TYPE_PPPOE);
} }

55
libnm-core/nm-setting-proxy.c
View File

@@ -50,15 +50,12 @@ typedef struct {
char *pac_script; char *pac_script;
} NMSettingProxyPrivate; } NMSettingProxyPrivate;
enum { NM_GOBJECT_PROPERTIES_DEFINE_BASE (
PROP_0,
PROP_METHOD, PROP_METHOD,
PROP_BROWSER_ONLY, PROP_BROWSER_ONLY,
PROP_PAC_URL, PROP_PAC_URL,
PROP_PAC_SCRIPT, PROP_PAC_SCRIPT,
);
LAST_PROP
};
/** /**
* nm_setting_proxy_new: * nm_setting_proxy_new:
@@ -312,13 +309,12 @@ nm_setting_proxy_class_init (NMSettingProxyClass *klass)
* values: none, auto * values: none, auto
* ---end--- * ---end---
*/ */
g_object_class_install_property obj_properties[PROP_METHOD] =
(object_class, PROP_METHOD, g_param_spec_int (NM_SETTING_PROXY_METHOD, "", "",
g_param_spec_int (NM_SETTING_PROXY_METHOD, "", "", G_MININT32, G_MAXINT32, NM_SETTING_PROXY_METHOD_NONE,
G_MININT32, G_MAXINT32, NM_SETTING_PROXY_METHOD_NONE, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingProxy:browser-only: * NMSettingProxy:browser-only:
@@ -334,12 +330,11 @@ 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---
*/ */
g_object_class_install_property obj_properties[PROP_BROWSER_ONLY] =
(object_class, PROP_BROWSER_ONLY, g_param_spec_boolean (NM_SETTING_PROXY_BROWSER_ONLY, "", "",
g_param_spec_boolean (NM_SETTING_PROXY_BROWSER_ONLY, "", "", FALSE,
FALSE, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingProxy:pac-url: * NMSettingProxy:pac-url:
@@ -355,12 +350,11 @@ nm_setting_proxy_class_init (NMSettingProxyClass *klass)
* example: PAC_URL=http://wpad.mycompany.com/wpad.dat * example: PAC_URL=http://wpad.mycompany.com/wpad.dat
* ---end--- * ---end---
*/ */
g_object_class_install_property obj_properties[PROP_PAC_URL] =
(object_class, PROP_PAC_URL, g_param_spec_string (NM_SETTING_PROXY_PAC_URL, "", "",
g_param_spec_string (NM_SETTING_PROXY_PAC_URL, "", "", NULL,
NULL, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingProxy:pac-script: * NMSettingProxy:pac-script:
@@ -376,12 +370,13 @@ nm_setting_proxy_class_init (NMSettingProxyClass *klass)
* example: PAC_SCRIPT=/home/joe/proxy.pac * example: PAC_SCRIPT=/home/joe/proxy.pac
* ---end--- * ---end---
*/ */
g_object_class_install_property obj_properties[PROP_PAC_SCRIPT] =
(object_class, PROP_PAC_SCRIPT, g_param_spec_string (NM_SETTING_PROXY_PAC_SCRIPT, "", "",
g_param_spec_string (NM_SETTING_PROXY_PAC_SCRIPT, "", "", NULL,
NULL, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
g_object_class_install_properties (object_class, _PROPERTY_ENUMS_LAST, obj_properties);
_nm_setting_class_commit (setting_class, NM_META_SETTING_TYPE_PROXY); _nm_setting_class_commit (setting_class, NM_META_SETTING_TYPE_PROXY);
} }

79
libnm-core/nm-setting-serial.c
View File

@@ -49,16 +49,13 @@ typedef struct {
guint64 send_delay; guint64 send_delay;
} NMSettingSerialPrivate; } NMSettingSerialPrivate;
enum { NM_GOBJECT_PROPERTIES_DEFINE_BASE (
PROP_0,
PROP_BAUD, PROP_BAUD,
PROP_BITS, PROP_BITS,
PROP_PARITY, PROP_PARITY,
PROP_STOPBITS, PROP_STOPBITS,
PROP_SEND_DELAY, PROP_SEND_DELAY,
);
LAST_PROP
};
/** /**
* nm_setting_serial_new: * nm_setting_serial_new:
@@ -254,26 +251,24 @@ nm_setting_serial_class_init (NMSettingSerialClass *klass)
* value usually has no effect for mobile broadband modems as they generally * value usually has no effect for mobile broadband modems as they generally
* ignore speed settings and use the highest available speed. * ignore speed settings and use the highest available speed.
**/ **/
g_object_class_install_property obj_properties[PROP_BAUD] =
(object_class, PROP_BAUD, g_param_spec_uint (NM_SETTING_SERIAL_BAUD, "", "",
g_param_spec_uint (NM_SETTING_SERIAL_BAUD, "", "", 0, G_MAXUINT, 57600,
0, G_MAXUINT, 57600, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingSerial:bits: * NMSettingSerial:bits:
* *
* Byte-width of the serial communication. The 8 in "8n1" for example. * Byte-width of the serial communication. The 8 in "8n1" for example.
**/ **/
g_object_class_install_property obj_properties[PROP_BITS] =
(object_class, PROP_BITS, g_param_spec_uint (NM_SETTING_SERIAL_BITS, "", "",
g_param_spec_uint (NM_SETTING_SERIAL_BITS, "", "", 5, 8, 8,
5, 8, 8, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingSerial:parity: * NMSettingSerial:parity:
@@ -295,18 +290,16 @@ nm_setting_serial_class_init (NMSettingSerialClass *klass)
* 111 (ASCII 'o') for odd, 110 (ASCII 'n') for none. * 111 (ASCII 'o') for odd, 110 (ASCII 'n') for none.
* ---end--- * ---end---
*/ */
g_object_class_install_property obj_properties[PROP_PARITY] =
(object_class, PROP_PARITY, g_param_spec_enum (NM_SETTING_SERIAL_PARITY, "", "",
g_param_spec_enum (NM_SETTING_SERIAL_PARITY, "", "", NM_TYPE_SETTING_SERIAL_PARITY,
NM_TYPE_SETTING_SERIAL_PARITY, NM_SETTING_SERIAL_PARITY_NONE,
NM_SETTING_SERIAL_PARITY_NONE, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
_properties_override_add_transform (properties_override, _properties_override_add_transform (properties_override,
g_object_class_find_property (G_OBJECT_CLASS (setting_class), obj_properties[PROP_PARITY],
NM_SETTING_SERIAL_PARITY),
G_VARIANT_TYPE_BYTE, G_VARIANT_TYPE_BYTE,
parity_to_dbus, parity_to_dbus,
parity_from_dbus); parity_from_dbus);
@@ -317,26 +310,26 @@ nm_setting_serial_class_init (NMSettingSerialClass *klass)
* Number of stop bits for communication on the serial port. Either 1 or 2. * Number of stop bits for communication on the serial port. Either 1 or 2.
* The 1 in "8n1" for example. * The 1 in "8n1" for example.
**/ **/
g_object_class_install_property obj_properties[PROP_STOPBITS] =
(object_class, PROP_STOPBITS, g_param_spec_uint (NM_SETTING_SERIAL_STOPBITS, "", "",
g_param_spec_uint (NM_SETTING_SERIAL_STOPBITS, "", "", 1, 2, 1,
1, 2, 1, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingSerial:send-delay: * NMSettingSerial:send-delay:
* *
* Time to delay between each byte sent to the modem, in microseconds. * Time to delay between each byte sent to the modem, in microseconds.
**/ **/
g_object_class_install_property obj_properties[PROP_SEND_DELAY] =
(object_class, PROP_SEND_DELAY, g_param_spec_uint64 (NM_SETTING_SERIAL_SEND_DELAY, "", "",
g_param_spec_uint64 (NM_SETTING_SERIAL_SEND_DELAY, "", "", 0, G_MAXUINT64, 0,
0, G_MAXUINT64, 0, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
g_object_class_install_properties (object_class, _PROPERTY_ENUMS_LAST, obj_properties);
_nm_setting_class_commit_full (setting_class, NM_META_SETTING_TYPE_SERIAL, _nm_setting_class_commit_full (setting_class, NM_META_SETTING_TYPE_SERIAL,
NULL, properties_override); NULL, properties_override);

65
libnm-core/nm-setting-sriov.c
View File

@@ -44,14 +44,11 @@ struct _NMSettingSriovClass {
G_DEFINE_TYPE (NMSettingSriov, nm_setting_sriov, NM_TYPE_SETTING) G_DEFINE_TYPE (NMSettingSriov, nm_setting_sriov, NM_TYPE_SETTING)
enum { NM_GOBJECT_PROPERTIES_DEFINE (NMSettingSriov,
PROP_0,
PROP_TOTAL_VFS, PROP_TOTAL_VFS,
PROP_VFS, PROP_VFS,
PROP_AUTOPROBE_DRIVERS, PROP_AUTOPROBE_DRIVERS,
);
LAST_PROP
};
/*****************************************************************************/ /*****************************************************************************/
@@ -790,7 +787,7 @@ nm_setting_sriov_add_vf (NMSettingSriov *setting, NMSriovVF *vf)
g_return_if_fail (vf->refcount > 0); g_return_if_fail (vf->refcount > 0);
g_ptr_array_add (setting->vfs, nm_sriov_vf_dup (vf)); g_ptr_array_add (setting->vfs, nm_sriov_vf_dup (vf));
g_object_notify (G_OBJECT (setting), NM_SETTING_SRIOV_VFS); _notify (setting, PROP_VFS);
} }
/** /**
@@ -809,7 +806,7 @@ nm_setting_sriov_remove_vf (NMSettingSriov *setting, guint idx)
g_return_if_fail (idx < setting->vfs->len); g_return_if_fail (idx < setting->vfs->len);
g_ptr_array_remove_index (setting->vfs, idx); g_ptr_array_remove_index (setting->vfs, idx);
g_object_notify (G_OBJECT (setting), NM_SETTING_SRIOV_VFS); _notify (setting, PROP_VFS);
} }
/** /**
@@ -834,7 +831,7 @@ nm_setting_sriov_remove_vf_by_index (NMSettingSriov *setting,
for (i = 0; i < setting->vfs->len; i++) { for (i = 0; i < setting->vfs->len; i++) {
if (nm_sriov_vf_get_index (setting->vfs->pdata[i]) == index) { if (nm_sriov_vf_get_index (setting->vfs->pdata[i]) == index) {
g_ptr_array_remove_index (setting->vfs, i); g_ptr_array_remove_index (setting->vfs, i);
g_object_notify (G_OBJECT (setting), NM_SETTING_SRIOV_VFS); _notify (setting, PROP_VFS);
return TRUE; return TRUE;
} }
} }
@@ -856,7 +853,7 @@ nm_setting_sriov_clear_vfs (NMSettingSriov *setting)
if (setting->vfs->len != 0) { if (setting->vfs->len != 0) {
g_ptr_array_set_size (setting->vfs, 0); g_ptr_array_set_size (setting->vfs, 0);
g_object_notify (G_OBJECT (setting), NM_SETTING_SRIOV_VFS); _notify (setting, PROP_VFS);
} }
} }
@@ -1270,14 +1267,13 @@ nm_setting_sriov_class_init (NMSettingSriovClass *klass)
* example: SRIOV_TOTAL_VFS=16 * example: SRIOV_TOTAL_VFS=16
* ---end--- * ---end---
*/ */
g_object_class_install_property obj_properties[PROP_TOTAL_VFS] =
(object_class, PROP_TOTAL_VFS, g_param_spec_uint (NM_SETTING_SRIOV_TOTAL_VFS, "", "",
g_param_spec_uint (NM_SETTING_SRIOV_TOTAL_VFS, "", "", 0, G_MAXUINT32, 0,
0, G_MAXUINT32, 0, NM_SETTING_PARAM_FUZZY_IGNORE |
NM_SETTING_PARAM_FUZZY_IGNORE | G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingSriov:vfs: (type GPtrArray(NMSriovVF)) * NMSettingSriov:vfs: (type GPtrArray(NMSriovVF))
@@ -1318,17 +1314,15 @@ nm_setting_sriov_class_init (NMSettingSriovClass *klass)
* example: SRIOV_VF10="mac=00:11:22:33:44:55", ... * example: SRIOV_VF10="mac=00:11:22:33:44:55", ...
* ---end--- * ---end---
*/ */
g_object_class_install_property obj_properties[PROP_VFS] =
(object_class, PROP_VFS, g_param_spec_boxed (NM_SETTING_SRIOV_VFS, "", "",
g_param_spec_boxed (NM_SETTING_SRIOV_VFS, "", "", G_TYPE_PTR_ARRAY,
G_TYPE_PTR_ARRAY, G_PARAM_READWRITE |
G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE |
NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
_properties_override_add_override (properties_override, _properties_override_add_override (properties_override,
g_object_class_find_property (G_OBJECT_CLASS (setting_class), obj_properties[PROP_VFS],
NM_SETTING_SRIOV_VFS),
G_VARIANT_TYPE ("aa{sv}"), G_VARIANT_TYPE ("aa{sv}"),
vfs_to_dbus, vfs_to_dbus,
vfs_from_dbus, vfs_from_dbus,
@@ -1360,15 +1354,16 @@ nm_setting_sriov_class_init (NMSettingSriovClass *klass)
* example: SRIOV_AUTOPROBE_DRIVERS=0,1 * example: SRIOV_AUTOPROBE_DRIVERS=0,1
* ---end--- * ---end---
*/ */
g_object_class_install_property obj_properties[PROP_AUTOPROBE_DRIVERS] =
(object_class, PROP_AUTOPROBE_DRIVERS, g_param_spec_enum (NM_SETTING_SRIOV_AUTOPROBE_DRIVERS, "", "",
g_param_spec_enum (NM_SETTING_SRIOV_AUTOPROBE_DRIVERS, "", "", nm_ternary_get_type (),
nm_ternary_get_type (), NM_TERNARY_DEFAULT,
NM_TERNARY_DEFAULT, NM_SETTING_PARAM_FUZZY_IGNORE |
NM_SETTING_PARAM_FUZZY_IGNORE | G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
g_object_class_install_properties (object_class, _PROPERTY_ENUMS_LAST, obj_properties);
_nm_setting_class_commit_full (setting_class, NM_META_SETTING_TYPE_SRIOV, _nm_setting_class_commit_full (setting_class, NM_META_SETTING_TYPE_SRIOV,
NULL, properties_override); NULL, properties_override);

57
libnm-core/nm-setting-tc-config.c
View File

@@ -809,13 +809,10 @@ nm_tc_tfilter_set_action (NMTCTfilter *tfilter, NMTCAction *action)
/*****************************************************************************/ /*****************************************************************************/
enum { NM_GOBJECT_PROPERTIES_DEFINE (NMSettingTCConfig,
PROP_0,
PROP_QDISCS, PROP_QDISCS,
PROP_TFILTERS, PROP_TFILTERS,
);
LAST_PROP
};
/** /**
* NMSettingTCConfig: * NMSettingTCConfig:
@@ -914,7 +911,7 @@ nm_setting_tc_config_add_qdisc (NMSettingTCConfig *self,
} }
g_ptr_array_add (self->qdiscs, nm_tc_qdisc_dup (qdisc)); g_ptr_array_add (self->qdiscs, nm_tc_qdisc_dup (qdisc));
g_object_notify (G_OBJECT (self), NM_SETTING_TC_CONFIG_QDISCS); _notify (self, PROP_QDISCS);
return TRUE; return TRUE;
} }
@@ -935,7 +932,7 @@ nm_setting_tc_config_remove_qdisc (NMSettingTCConfig *self, guint idx)
g_return_if_fail (idx < self->qdiscs->len); g_return_if_fail (idx < self->qdiscs->len);
g_ptr_array_remove_index (self->qdiscs, idx); g_ptr_array_remove_index (self->qdiscs, idx);
g_object_notify (G_OBJECT (self), NM_SETTING_TC_CONFIG_QDISCS); _notify (self, PROP_QDISCS);
} }
/** /**
@@ -961,7 +958,7 @@ nm_setting_tc_config_remove_qdisc_by_value (NMSettingTCConfig *self,
for (i = 0; i < self->qdiscs->len; i++) { for (i = 0; i < self->qdiscs->len; i++) {
if (nm_tc_qdisc_equal (self->qdiscs->pdata[i], qdisc)) { if (nm_tc_qdisc_equal (self->qdiscs->pdata[i], qdisc)) {
g_ptr_array_remove_index (self->qdiscs, i); g_ptr_array_remove_index (self->qdiscs, i);
g_object_notify (G_OBJECT (self), NM_SETTING_TC_CONFIG_QDISCS); _notify (self, PROP_QDISCS);
return TRUE; return TRUE;
} }
} }
@@ -983,7 +980,7 @@ nm_setting_tc_config_clear_qdiscs (NMSettingTCConfig *self)
if (self->qdiscs->len != 0) { if (self->qdiscs->len != 0) {
g_ptr_array_set_size (self->qdiscs, 0); g_ptr_array_set_size (self->qdiscs, 0);
g_object_notify (G_OBJECT (self), NM_SETTING_TC_CONFIG_QDISCS); _notify (self, PROP_QDISCS);
} }
} }
@@ -1051,7 +1048,7 @@ nm_setting_tc_config_add_tfilter (NMSettingTCConfig *self,
} }
g_ptr_array_add (self->tfilters, nm_tc_tfilter_dup (tfilter)); g_ptr_array_add (self->tfilters, nm_tc_tfilter_dup (tfilter));
g_object_notify (G_OBJECT (self), NM_SETTING_TC_CONFIG_TFILTERS); _notify (self, PROP_TFILTERS);
return TRUE; return TRUE;
} }
@@ -1071,7 +1068,7 @@ nm_setting_tc_config_remove_tfilter (NMSettingTCConfig *self, guint idx)
g_return_if_fail (idx < self->tfilters->len); g_return_if_fail (idx < self->tfilters->len);
g_ptr_array_remove_index (self->tfilters, idx); g_ptr_array_remove_index (self->tfilters, idx);
g_object_notify (G_OBJECT (self), NM_SETTING_TC_CONFIG_TFILTERS); _notify (self, PROP_TFILTERS);
} }
/** /**
@@ -1097,7 +1094,7 @@ nm_setting_tc_config_remove_tfilter_by_value (NMSettingTCConfig *self,
for (i = 0; i < self->tfilters->len; i++) { for (i = 0; i < self->tfilters->len; i++) {
if (nm_tc_tfilter_equal (self->tfilters->pdata[i], tfilter)) { if (nm_tc_tfilter_equal (self->tfilters->pdata[i], tfilter)) {
g_ptr_array_remove_index (self->tfilters, i); g_ptr_array_remove_index (self->tfilters, i);
g_object_notify (G_OBJECT (self), NM_SETTING_TC_CONFIG_TFILTERS); _notify (self, PROP_TFILTERS);
return TRUE; return TRUE;
} }
} }
@@ -1119,7 +1116,7 @@ nm_setting_tc_config_clear_tfilters (NMSettingTCConfig *self)
if (self->tfilters->len != 0) { if (self->tfilters->len != 0) {
g_ptr_array_set_size (self->tfilters, 0); g_ptr_array_set_size (self->tfilters, 0);
g_object_notify (G_OBJECT (self), NM_SETTING_TC_CONFIG_TFILTERS); _notify (self, PROP_TFILTERS);
} }
} }
@@ -1619,17 +1616,15 @@ nm_setting_tc_config_class_init (NMSettingTCConfigClass *klass)
* example: QDISC1=ingress, QDISC2="root handle 1234: fq_codel" * example: QDISC1=ingress, QDISC2="root handle 1234: fq_codel"
* ---end--- * ---end---
*/ */
g_object_class_install_property obj_properties[PROP_QDISCS] =
(object_class, PROP_QDISCS, g_param_spec_boxed (NM_SETTING_TC_CONFIG_QDISCS, "", "",
g_param_spec_boxed (NM_SETTING_TC_CONFIG_QDISCS, "", "", G_TYPE_PTR_ARRAY,
G_TYPE_PTR_ARRAY, G_PARAM_READWRITE |
G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE |
NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
_properties_override_add_override (properties_override, _properties_override_add_override (properties_override,
g_object_class_find_property (G_OBJECT_CLASS (setting_class), obj_properties[PROP_QDISCS],
NM_SETTING_TC_CONFIG_QDISCS),
G_VARIANT_TYPE ("aa{sv}"), G_VARIANT_TYPE ("aa{sv}"),
tc_qdiscs_get, tc_qdiscs_get,
tc_qdiscs_set, tc_qdiscs_set,
@@ -1647,22 +1642,22 @@ nm_setting_tc_config_class_init (NMSettingTCConfigClass *klass)
* example: FILTER1="parent ffff: matchall action simple sdata Input", ... * example: FILTER1="parent ffff: matchall action simple sdata Input", ...
* ---end--- * ---end---
*/ */
g_object_class_install_property obj_properties[PROP_TFILTERS] =
(object_class, PROP_TFILTERS, g_param_spec_boxed (NM_SETTING_TC_CONFIG_TFILTERS, "", "",
g_param_spec_boxed (NM_SETTING_TC_CONFIG_TFILTERS, "", "", G_TYPE_PTR_ARRAY,
G_TYPE_PTR_ARRAY, G_PARAM_READWRITE |
G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE |
NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
_properties_override_add_override (properties_override, _properties_override_add_override (properties_override,
g_object_class_find_property (G_OBJECT_CLASS (setting_class), obj_properties[PROP_TFILTERS],
NM_SETTING_TC_CONFIG_TFILTERS),
G_VARIANT_TYPE ("aa{sv}"), G_VARIANT_TYPE ("aa{sv}"),
tc_tfilters_get, tc_tfilters_get,
tc_tfilters_set, tc_tfilters_set,
NULL); NULL);
g_object_class_install_properties (object_class, _PROPERTY_ENUMS_LAST, obj_properties);
_nm_setting_class_commit_full (setting_class, NM_META_SETTING_TYPE_TC_CONFIG, _nm_setting_class_commit_full (setting_class, NM_META_SETTING_TYPE_TC_CONFIG,
NULL, properties_override); NULL, properties_override);
} }

101
libnm-core/nm-setting-team-port.c
View File

@@ -54,8 +54,7 @@ typedef struct {
} NMSettingTeamPortPrivate; } NMSettingTeamPortPrivate;
/* Keep aligned with _prop_to_keys[] */ /* Keep aligned with _prop_to_keys[] */
enum { NM_GOBJECT_PROPERTIES_DEFINE (NMSettingTeamPort,
PROP_0,
PROP_CONFIG, PROP_CONFIG,
PROP_QUEUE_ID, PROP_QUEUE_ID,
PROP_PRIO, PROP_PRIO,
@@ -63,12 +62,10 @@ enum {
PROP_LACP_PRIO, PROP_LACP_PRIO,
PROP_LACP_KEY, PROP_LACP_KEY,
PROP_LINK_WATCHERS, PROP_LINK_WATCHERS,
LAST_PROP );
};
/* Keep aligned with team-port properties enum */ /* Keep aligned with team-port properties enum */
static const _NMUtilsTeamPropertyKeys _prop_to_keys[LAST_PROP] = { static const _NMUtilsTeamPropertyKeys _prop_to_keys[_PROPERTY_ENUMS_LAST] = {
[PROP_0] = { NULL, NULL, NULL, 0 },
[PROP_CONFIG] = { NULL, NULL, NULL, 0 }, [PROP_CONFIG] = { NULL, NULL, NULL, 0 },
[PROP_QUEUE_ID] = { "queue_id", NULL, NULL, NM_SETTING_TEAM_PORT_QUEUE_ID_DEFAULT }, [PROP_QUEUE_ID] = { "queue_id", NULL, NULL, NM_SETTING_TEAM_PORT_QUEUE_ID_DEFAULT },
[PROP_PRIO] = { "prio", NULL, NULL, 0 }, [PROP_PRIO] = { "prio", NULL, NULL, 0 },
@@ -251,7 +248,7 @@ nm_setting_team_port_add_link_watcher (NMSettingTeamPort *setting,
} }
g_ptr_array_add (priv->link_watchers, nm_team_link_watcher_dup (link_watcher)); g_ptr_array_add (priv->link_watchers, nm_team_link_watcher_dup (link_watcher));
g_object_notify (G_OBJECT (setting), NM_SETTING_TEAM_PORT_LINK_WATCHERS); _notify (setting, PROP_LINK_WATCHERS);
return TRUE; return TRUE;
} }
@@ -273,7 +270,7 @@ nm_setting_team_port_remove_link_watcher (NMSettingTeamPort *setting, guint idx)
g_return_if_fail (idx < priv->link_watchers->len); g_return_if_fail (idx < priv->link_watchers->len);
g_ptr_array_remove_index (priv->link_watchers, idx); g_ptr_array_remove_index (priv->link_watchers, idx);
g_object_notify (G_OBJECT (setting), NM_SETTING_TEAM_PORT_LINK_WATCHERS); _notify (setting, PROP_LINK_WATCHERS);
} }
/** /**
@@ -299,7 +296,7 @@ nm_setting_team_port_remove_link_watcher_by_value (NMSettingTeamPort *setting,
for (i = 0; i < priv->link_watchers->len; i++) { for (i = 0; i < priv->link_watchers->len; i++) {
if (nm_team_link_watcher_equal (priv->link_watchers->pdata[i], link_watcher)) { if (nm_team_link_watcher_equal (priv->link_watchers->pdata[i], link_watcher)) {
g_ptr_array_remove_index (priv->link_watchers, i); g_ptr_array_remove_index (priv->link_watchers, i);
g_object_notify (G_OBJECT (setting), NM_SETTING_TEAM_PORT_LINK_WATCHERS); _notify (setting, PROP_LINK_WATCHERS);
return TRUE; return TRUE;
} }
} }
@@ -323,7 +320,7 @@ nm_setting_team_port_clear_link_watchers (NMSettingTeamPort *setting)
if (priv->link_watchers->len != 0) { if (priv->link_watchers->len != 0) {
g_ptr_array_set_size (priv->link_watchers, 0); g_ptr_array_set_size (priv->link_watchers, 0);
g_object_notify (G_OBJECT (setting), NM_SETTING_TEAM_PORT_LINK_WATCHERS); _notify (setting, PROP_LINK_WATCHERS);
} }
} }
@@ -634,13 +631,12 @@ nm_setting_team_port_class_init (NMSettingTeamPortClass *klass)
* description: Team port configuration in JSON. See man teamd.conf for details. * description: Team port configuration in JSON. See man teamd.conf for details.
* ---end--- * ---end---
*/ */
g_object_class_install_property obj_properties[PROP_CONFIG] =
(object_class, PROP_CONFIG, g_param_spec_string (NM_SETTING_TEAM_PORT_CONFIG, "", "",
g_param_spec_string (NM_SETTING_TEAM_PORT_CONFIG, "", "", NULL,
NULL, G_PARAM_READWRITE |
G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE |
NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingTeamPort:queue-id: * NMSettingTeamPort:queue-id:
@@ -650,12 +646,11 @@ nm_setting_team_port_class_init (NMSettingTeamPortClass *klass)
* *
* Since: 1.12 * Since: 1.12
**/ **/
g_object_class_install_property obj_properties[PROP_QUEUE_ID] =
(object_class, PROP_QUEUE_ID, g_param_spec_int (NM_SETTING_TEAM_PORT_QUEUE_ID, "", "",
g_param_spec_int (NM_SETTING_TEAM_PORT_QUEUE_ID, "", "", G_MININT32, G_MAXINT32, 0,
G_MININT32, G_MAXINT32, 0, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingTeamPort:prio: * NMSettingTeamPort:prio:
@@ -664,12 +659,11 @@ nm_setting_team_port_class_init (NMSettingTeamPortClass *klass)
* *
* Since: 1.12 * Since: 1.12
**/ **/
g_object_class_install_property obj_properties[PROP_PRIO] =
(object_class, PROP_PRIO, g_param_spec_int (NM_SETTING_TEAM_PORT_PRIO, "", "",
g_param_spec_int (NM_SETTING_TEAM_PORT_PRIO, "", "", G_MININT32, G_MAXINT32, 0,
G_MININT32, G_MAXINT32, 0, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingTeamPort:sticky: * NMSettingTeamPort:sticky:
@@ -678,12 +672,11 @@ nm_setting_team_port_class_init (NMSettingTeamPortClass *klass)
* *
* Since: 1.12 * Since: 1.12
**/ **/
g_object_class_install_property obj_properties[PROP_STICKY] =
(object_class, PROP_STICKY, g_param_spec_boolean (NM_SETTING_TEAM_PORT_STICKY, "", "",
g_param_spec_boolean (NM_SETTING_TEAM_PORT_STICKY, "", "", FALSE,
FALSE, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingTeamPort:lacp-prio: * NMSettingTeamPort:lacp-prio:
@@ -692,12 +685,11 @@ nm_setting_team_port_class_init (NMSettingTeamPortClass *klass)
* *
* Since: 1.12 * Since: 1.12
**/ **/
g_object_class_install_property obj_properties[PROP_LACP_PRIO] =
(object_class, PROP_LACP_PRIO, g_param_spec_int (NM_SETTING_TEAM_PORT_LACP_PRIO, "", "",
g_param_spec_int (NM_SETTING_TEAM_PORT_LACP_PRIO, "", "", G_MININT32, G_MAXINT32, 0,
G_MININT32, G_MAXINT32, 0, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingTeamPort:lacp-key: * NMSettingTeamPort:lacp-key:
@@ -706,12 +698,11 @@ nm_setting_team_port_class_init (NMSettingTeamPortClass *klass)
* *
* Since: 1.12 * Since: 1.12
**/ **/
g_object_class_install_property obj_properties[PROP_LACP_KEY] =
(object_class, PROP_LACP_KEY, g_param_spec_int (NM_SETTING_TEAM_PORT_LACP_KEY, "", "",
g_param_spec_int (NM_SETTING_TEAM_PORT_LACP_KEY, "", "", G_MININT32, G_MAXINT32, 0,
G_MININT32, G_MAXINT32, 0, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingTeamPort:link-watchers: (type GPtrArray(NMTeamLinkWatcher)) * NMSettingTeamPort:link-watchers: (type GPtrArray(NMTeamLinkWatcher))
@@ -727,20 +718,20 @@ nm_setting_team_port_class_init (NMSettingTeamPortClass *klass)
* *
* Since: 1.12 * Since: 1.12
**/ **/
g_object_class_install_property obj_properties[PROP_LINK_WATCHERS] =
(object_class, PROP_LINK_WATCHERS, g_param_spec_boxed (NM_SETTING_TEAM_PORT_LINK_WATCHERS, "", "",
g_param_spec_boxed (NM_SETTING_TEAM_PORT_LINK_WATCHERS, "", "", G_TYPE_PTR_ARRAY,
G_TYPE_PTR_ARRAY, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
_properties_override_add_transform (properties_override, _properties_override_add_transform (properties_override,
g_object_class_find_property (G_OBJECT_CLASS (setting_class), obj_properties[PROP_LINK_WATCHERS],
NM_SETTING_TEAM_PORT_LINK_WATCHERS),
G_VARIANT_TYPE ("aa{sv}"), G_VARIANT_TYPE ("aa{sv}"),
team_link_watchers_to_dbus, team_link_watchers_to_dbus,
team_link_watchers_from_dbus); team_link_watchers_from_dbus);
g_object_class_install_properties (object_class, _PROPERTY_ENUMS_LAST, obj_properties);
_nm_setting_class_commit_full (setting_class, NM_META_SETTING_TYPE_TEAM_PORT, _nm_setting_class_commit_full (setting_class, NM_META_SETTING_TYPE_TEAM_PORT,
NULL, properties_override); NULL, properties_override);
} }

206
libnm-core/nm-setting-team.c
View File

@@ -648,8 +648,7 @@ typedef struct {
} NMSettingTeamPrivate; } NMSettingTeamPrivate;
/* Keep aligned with _prop_to_keys[] */ /* Keep aligned with _prop_to_keys[] */
enum { NM_GOBJECT_PROPERTIES_DEFINE (NMSettingTeam,
PROP_0,
PROP_CONFIG, PROP_CONFIG,
PROP_NOTIFY_PEERS_COUNT, PROP_NOTIFY_PEERS_COUNT,
PROP_NOTIFY_PEERS_INTERVAL, PROP_NOTIFY_PEERS_INTERVAL,
@@ -666,12 +665,10 @@ enum {
PROP_RUNNER_MIN_PORTS, PROP_RUNNER_MIN_PORTS,
PROP_RUNNER_AGG_SELECT_POLICY, PROP_RUNNER_AGG_SELECT_POLICY,
PROP_LINK_WATCHERS, PROP_LINK_WATCHERS,
LAST_PROP );
};
/* Keep aligned with team properties enum */ /* Keep aligned with team properties enum */
static const _NMUtilsTeamPropertyKeys _prop_to_keys[LAST_PROP] = { static const _NMUtilsTeamPropertyKeys _prop_to_keys[_PROPERTY_ENUMS_LAST] = {
[PROP_0] = { NULL, NULL, NULL, 0 },
[PROP_CONFIG] = { NULL, NULL, NULL, 0 }, [PROP_CONFIG] = { NULL, NULL, NULL, 0 },
[PROP_NOTIFY_PEERS_COUNT] = { "notify_peers", "count", NULL, 0 }, [PROP_NOTIFY_PEERS_COUNT] = { "notify_peers", "count", NULL, 0 },
[PROP_NOTIFY_PEERS_INTERVAL] = { "notify_peers", "interval", NULL, 0 }, [PROP_NOTIFY_PEERS_INTERVAL] = { "notify_peers", "interval", NULL, 0 },
@@ -951,7 +948,7 @@ nm_setting_team_remove_runner_tx_hash_by_value (NMSettingTeam *setting,
for (i = 0; i < priv->runner_tx_hash->len; i++) { for (i = 0; i < priv->runner_tx_hash->len; i++) {
if (nm_streq (txhash, priv->runner_tx_hash->pdata[i])) { if (nm_streq (txhash, priv->runner_tx_hash->pdata[i])) {
g_ptr_array_remove_index (priv->runner_tx_hash, i); g_ptr_array_remove_index (priv->runner_tx_hash, i);
g_object_notify (G_OBJECT (setting), NM_SETTING_TEAM_RUNNER_TX_HASH); _notify (setting, PROP_RUNNER_TX_HASH);
return TRUE; return TRUE;
} }
} }
@@ -1014,7 +1011,7 @@ nm_setting_team_remove_runner_tx_hash (NMSettingTeam *setting, guint idx)
g_return_if_fail (idx < priv->runner_tx_hash->len); g_return_if_fail (idx < priv->runner_tx_hash->len);
g_ptr_array_remove_index (priv->runner_tx_hash, idx); g_ptr_array_remove_index (priv->runner_tx_hash, idx);
g_object_notify (G_OBJECT (setting), NM_SETTING_TEAM_RUNNER_TX_HASH); _notify (setting, PROP_RUNNER_TX_HASH);
} }
/** /**
@@ -1047,7 +1044,7 @@ nm_setting_team_add_runner_tx_hash (NMSettingTeam *setting, const char *txhash)
} }
g_ptr_array_add (priv->runner_tx_hash, g_strdup (txhash)); g_ptr_array_add (priv->runner_tx_hash, g_strdup (txhash));
g_object_notify (G_OBJECT (setting), NM_SETTING_TEAM_RUNNER_TX_HASH); _notify (setting, PROP_RUNNER_TX_HASH);
return TRUE; return TRUE;
} }
@@ -1117,7 +1114,7 @@ nm_setting_team_add_link_watcher (NMSettingTeam *setting,
} }
g_ptr_array_add (priv->link_watchers, nm_team_link_watcher_dup (link_watcher)); g_ptr_array_add (priv->link_watchers, nm_team_link_watcher_dup (link_watcher));
g_object_notify (G_OBJECT (setting), NM_SETTING_TEAM_LINK_WATCHERS); _notify (setting, PROP_LINK_WATCHERS);
return TRUE; return TRUE;
} }
@@ -1139,7 +1136,7 @@ nm_setting_team_remove_link_watcher (NMSettingTeam *setting, guint idx)
g_return_if_fail (idx < priv->link_watchers->len); g_return_if_fail (idx < priv->link_watchers->len);
g_ptr_array_remove_index (priv->link_watchers, idx); g_ptr_array_remove_index (priv->link_watchers, idx);
g_object_notify (G_OBJECT (setting), NM_SETTING_TEAM_LINK_WATCHERS); _notify (setting, PROP_LINK_WATCHERS);
} }
/** /**
@@ -1165,7 +1162,7 @@ nm_setting_team_remove_link_watcher_by_value (NMSettingTeam *setting,
for (i = 0; i < priv->link_watchers->len; i++) { for (i = 0; i < priv->link_watchers->len; i++) {
if (nm_team_link_watcher_equal (priv->link_watchers->pdata[i], link_watcher)) { if (nm_team_link_watcher_equal (priv->link_watchers->pdata[i], link_watcher)) {
g_ptr_array_remove_index (priv->link_watchers, i); g_ptr_array_remove_index (priv->link_watchers, i);
g_object_notify (G_OBJECT (setting), NM_SETTING_TEAM_LINK_WATCHERS); _notify (setting, PROP_LINK_WATCHERS);
return TRUE; return TRUE;
} }
} }
@@ -1188,7 +1185,7 @@ nm_setting_team_clear_link_watchers (NMSettingTeam *setting) {
if (priv->link_watchers->len != 0) { if (priv->link_watchers->len != 0) {
g_ptr_array_set_size (priv->link_watchers, 0); g_ptr_array_set_size (priv->link_watchers, 0);
g_object_notify (G_OBJECT (setting), NM_SETTING_TEAM_LINK_WATCHERS); _notify (setting, PROP_LINK_WATCHERS);
} }
} }
@@ -1671,13 +1668,12 @@ nm_setting_team_class_init (NMSettingTeamClass *klass)
* description: Team configuration in JSON. See man teamd.conf for details. * description: Team configuration in JSON. See man teamd.conf for details.
* ---end--- * ---end---
*/ */
g_object_class_install_property obj_properties[PROP_CONFIG] =
(object_class, PROP_CONFIG, g_param_spec_string (NM_SETTING_TEAM_CONFIG, "", "",
g_param_spec_string (NM_SETTING_TEAM_CONFIG, "", "", NULL,
NULL, G_PARAM_READWRITE |
G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE |
NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingTeam:notify-peers-count: * NMSettingTeam:notify-peers-count:
@@ -1686,12 +1682,11 @@ nm_setting_team_class_init (NMSettingTeamClass *klass)
* *
* Since: 1.12 * Since: 1.12
**/ **/
g_object_class_install_property obj_properties[PROP_NOTIFY_PEERS_COUNT] =
(object_class, PROP_NOTIFY_PEERS_COUNT, g_param_spec_int (NM_SETTING_TEAM_NOTIFY_PEERS_COUNT, "", "",
g_param_spec_int (NM_SETTING_TEAM_NOTIFY_PEERS_COUNT, "", "", G_MININT32, G_MAXINT32, 0,
G_MININT32, G_MAXINT32, 0, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingTeam:notify-peers-interval: * NMSettingTeam:notify-peers-interval:
@@ -1700,12 +1695,11 @@ nm_setting_team_class_init (NMSettingTeamClass *klass)
* *
* Since: 1.12 * Since: 1.12
**/ **/
g_object_class_install_property obj_properties[PROP_NOTIFY_PEERS_INTERVAL] =
(object_class, PROP_NOTIFY_PEERS_INTERVAL, g_param_spec_int (NM_SETTING_TEAM_NOTIFY_PEERS_INTERVAL, "", "",
g_param_spec_int (NM_SETTING_TEAM_NOTIFY_PEERS_INTERVAL, "", "", G_MININT32, G_MAXINT32, 0,
G_MININT32, G_MAXINT32, 0, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingTeam:mcast-rejoin-count: * NMSettingTeam:mcast-rejoin-count:
@@ -1714,12 +1708,11 @@ nm_setting_team_class_init (NMSettingTeamClass *klass)
* *
* Since: 1.12 * Since: 1.12
**/ **/
g_object_class_install_property obj_properties[PROP_MCAST_REJOIN_COUNT] =
(object_class, PROP_MCAST_REJOIN_COUNT, g_param_spec_int (NM_SETTING_TEAM_MCAST_REJOIN_COUNT, "", "",
g_param_spec_int (NM_SETTING_TEAM_MCAST_REJOIN_COUNT, "", "", G_MININT32, G_MAXINT32, 0,
G_MININT32, G_MAXINT32, 0, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingTeam:mcast-rejoin-interval: * NMSettingTeam:mcast-rejoin-interval:
@@ -1728,12 +1721,11 @@ nm_setting_team_class_init (NMSettingTeamClass *klass)
* *
* Since: 1.12 * Since: 1.12
**/ **/
g_object_class_install_property obj_properties[PROP_MCAST_REJOIN_INTERVAL] =
(object_class, PROP_MCAST_REJOIN_INTERVAL, g_param_spec_int (NM_SETTING_TEAM_MCAST_REJOIN_INTERVAL, "", "",
g_param_spec_int (NM_SETTING_TEAM_MCAST_REJOIN_INTERVAL, "", "", G_MININT32, G_MAXINT32, 0,
G_MININT32, G_MAXINT32, 0, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingTeam:runner: * NMSettingTeam:runner:
@@ -1748,12 +1740,11 @@ nm_setting_team_class_init (NMSettingTeamClass *klass)
* *
* Since: 1.12 * Since: 1.12
**/ **/
g_object_class_install_property obj_properties[PROP_RUNNER] =
(object_class, PROP_RUNNER, g_param_spec_string (NM_SETTING_TEAM_RUNNER, "", "",
g_param_spec_string (NM_SETTING_TEAM_RUNNER, "", "", NULL,
NULL, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingTeam:runner-hwaddr-policy: * NMSettingTeam:runner-hwaddr-policy:
@@ -1762,12 +1753,11 @@ nm_setting_team_class_init (NMSettingTeamClass *klass)
* *
* Since: 1.12 * Since: 1.12
**/ **/
g_object_class_install_property obj_properties[PROP_RUNNER_HWADDR_POLICY] =
(object_class, PROP_RUNNER_HWADDR_POLICY, g_param_spec_string (NM_SETTING_TEAM_RUNNER_HWADDR_POLICY, "", "",
g_param_spec_string (NM_SETTING_TEAM_RUNNER_HWADDR_POLICY, "", "", NULL,
NULL, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingTeam:runner-tx-hash: * NMSettingTeam:runner-tx-hash:
@@ -1776,13 +1766,12 @@ nm_setting_team_class_init (NMSettingTeamClass *klass)
* *
* Since: 1.12 * Since: 1.12
**/ **/
g_object_class_install_property obj_properties[PROP_RUNNER_TX_HASH] =
(object_class, PROP_RUNNER_TX_HASH, g_param_spec_boxed (NM_SETTING_TEAM_RUNNER_TX_HASH, "", "",
g_param_spec_boxed (NM_SETTING_TEAM_RUNNER_TX_HASH, "", "", G_TYPE_STRV,
G_TYPE_STRV,
G_PARAM_READWRITE | G_PARAM_READWRITE |
NM_SETTING_PARAM_INFERRABLE | NM_SETTING_PARAM_INFERRABLE |
G_PARAM_STATIC_STRINGS)); G_PARAM_STATIC_STRINGS);
/** /**
* NMSettingTeam:runner-tx-balancer: * NMSettingTeam:runner-tx-balancer:
@@ -1791,12 +1780,11 @@ nm_setting_team_class_init (NMSettingTeamClass *klass)
* *
* Since: 1.12 * Since: 1.12
**/ **/
g_object_class_install_property obj_properties[PROP_RUNNER_TX_BALANCER] =
(object_class, PROP_RUNNER_TX_BALANCER, g_param_spec_string (NM_SETTING_TEAM_RUNNER_TX_BALANCER, "", "",
g_param_spec_string (NM_SETTING_TEAM_RUNNER_TX_BALANCER, "", "", NULL,
NULL, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingTeam:runner-tx-balancer-interval: * NMSettingTeam:runner-tx-balancer-interval:
@@ -1805,12 +1793,11 @@ nm_setting_team_class_init (NMSettingTeamClass *klass)
* *
* Since: 1.12 * Since: 1.12
**/ **/
g_object_class_install_property obj_properties[PROP_RUNNER_TX_BALANCER_INTERVAL] =
(object_class, PROP_RUNNER_TX_BALANCER_INTERVAL, g_param_spec_int (NM_SETTING_TEAM_RUNNER_TX_BALANCER_INTERVAL, "", "",
g_param_spec_int (NM_SETTING_TEAM_RUNNER_TX_BALANCER_INTERVAL, "", "", G_MININT32, G_MAXINT32, 0,
G_MININT32, G_MAXINT32, 0, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingTeam:runner-active: * NMSettingTeam:runner-active:
@@ -1819,12 +1806,11 @@ nm_setting_team_class_init (NMSettingTeamClass *klass)
* *
* Since: 1.12 * Since: 1.12
**/ **/
g_object_class_install_property obj_properties[PROP_RUNNER_ACTIVE] =
(object_class, PROP_RUNNER_ACTIVE, g_param_spec_boolean (NM_SETTING_TEAM_RUNNER_ACTIVE, "", "",
g_param_spec_boolean (NM_SETTING_TEAM_RUNNER_ACTIVE, "", "", FALSE,
FALSE, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingTeam:runner-fast-rate: * NMSettingTeam:runner-fast-rate:
@@ -1833,12 +1819,11 @@ nm_setting_team_class_init (NMSettingTeamClass *klass)
* *
* Since: 1.12 * Since: 1.12
**/ **/
g_object_class_install_property obj_properties[PROP_RUNNER_FAST_RATE] =
(object_class, PROP_RUNNER_FAST_RATE, g_param_spec_boolean (NM_SETTING_TEAM_RUNNER_FAST_RATE, "", "",
g_param_spec_boolean (NM_SETTING_TEAM_RUNNER_FAST_RATE, "", "", FALSE,
FALSE, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingTeam:runner-sys-prio: * NMSettingTeam:runner-sys-prio:
@@ -1847,12 +1832,11 @@ nm_setting_team_class_init (NMSettingTeamClass *klass)
* *
* Since: 1.12 * Since: 1.12
**/ **/
g_object_class_install_property obj_properties[PROP_RUNNER_SYS_PRIO] =
(object_class, PROP_RUNNER_SYS_PRIO, g_param_spec_int (NM_SETTING_TEAM_RUNNER_SYS_PRIO, "", "",
g_param_spec_int (NM_SETTING_TEAM_RUNNER_SYS_PRIO, "", "", G_MININT32, G_MAXINT32, 0,
G_MININT32, G_MAXINT32, 0, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingTeam:runner-min-ports: * NMSettingTeam:runner-min-ports:
@@ -1861,12 +1845,11 @@ nm_setting_team_class_init (NMSettingTeamClass *klass)
* *
* Since: 1.12 * Since: 1.12
**/ **/
g_object_class_install_property obj_properties[PROP_RUNNER_MIN_PORTS] =
(object_class, PROP_RUNNER_MIN_PORTS, g_param_spec_int (NM_SETTING_TEAM_RUNNER_MIN_PORTS, "", "",
g_param_spec_int (NM_SETTING_TEAM_RUNNER_MIN_PORTS, "", "", G_MININT32, G_MAXINT32, 0,
G_MININT32, G_MAXINT32, 0, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingTeam:runner-agg-select-policy: * NMSettingTeam:runner-agg-select-policy:
@@ -1875,12 +1858,11 @@ nm_setting_team_class_init (NMSettingTeamClass *klass)
* *
* Since: 1.12 * Since: 1.12
**/ **/
g_object_class_install_property obj_properties[PROP_RUNNER_AGG_SELECT_POLICY] =
(object_class, PROP_RUNNER_AGG_SELECT_POLICY, g_param_spec_string (NM_SETTING_TEAM_RUNNER_AGG_SELECT_POLICY, "", "",
g_param_spec_string (NM_SETTING_TEAM_RUNNER_AGG_SELECT_POLICY, "", "", NULL,
NULL, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingTeam:link-watchers: (type GPtrArray(NMTeamLinkWatcher)) * NMSettingTeam:link-watchers: (type GPtrArray(NMTeamLinkWatcher))
@@ -1896,16 +1878,14 @@ nm_setting_team_class_init (NMSettingTeamClass *klass)
* *
* Since: 1.12 * Since: 1.12
**/ **/
g_object_class_install_property obj_properties[PROP_LINK_WATCHERS] =
(object_class, PROP_LINK_WATCHERS, g_param_spec_boxed (NM_SETTING_TEAM_LINK_WATCHERS, "", "",
g_param_spec_boxed (NM_SETTING_TEAM_LINK_WATCHERS, "", "", G_TYPE_PTR_ARRAY,
G_TYPE_PTR_ARRAY, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
_properties_override_add_transform (properties_override, _properties_override_add_transform (properties_override,
g_object_class_find_property (G_OBJECT_CLASS (setting_class), obj_properties[PROP_LINK_WATCHERS],
NM_SETTING_TEAM_LINK_WATCHERS),
G_VARIANT_TYPE ("aa{sv}"), G_VARIANT_TYPE ("aa{sv}"),
team_link_watchers_to_dbus, team_link_watchers_to_dbus,
team_link_watchers_from_dbus); team_link_watchers_from_dbus);
@@ -1924,6 +1904,8 @@ nm_setting_team_class_init (NMSettingTeamClass *klass)
_nm_setting_get_deprecated_virtual_interface_name, _nm_setting_get_deprecated_virtual_interface_name,
NULL); NULL);
g_object_class_install_properties (object_class, _PROPERTY_ENUMS_LAST, obj_properties);
_nm_setting_class_commit_full (setting_class, NM_META_SETTING_TYPE_TEAM, _nm_setting_class_commit_full (setting_class, NM_META_SETTING_TYPE_TEAM,
NULL, properties_override); NULL, properties_override);
} }

88
libnm-core/nm-setting-tun.c
View File

@@ -51,16 +51,14 @@ typedef struct {
gboolean multi_queue; gboolean multi_queue;
} NMSettingTunPrivate; } NMSettingTunPrivate;
enum { NM_GOBJECT_PROPERTIES_DEFINE_BASE (
PROP_0,
PROP_MODE, PROP_MODE,
PROP_OWNER, PROP_OWNER,
PROP_GROUP, PROP_GROUP,
PROP_PI, PROP_PI,
PROP_VNET_HDR, PROP_VNET_HDR,
PROP_MULTI_QUEUE, PROP_MULTI_QUEUE,
LAST_PROP );
};
/** /**
* nm_setting_tun_new: * nm_setting_tun_new:
@@ -313,14 +311,13 @@ nm_setting_tun_class_init (NMSettingTunClass *klass)
* *
* Since: 1.2 * Since: 1.2
*/ */
g_object_class_install_property obj_properties[PROP_MODE] =
(object_class, PROP_MODE, g_param_spec_uint (NM_SETTING_TUN_MODE, "", "",
g_param_spec_uint (NM_SETTING_TUN_MODE, "", "", 0, G_MAXUINT, NM_SETTING_TUN_MODE_TUN,
0, G_MAXUINT, NM_SETTING_TUN_MODE_TUN, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
G_PARAM_CONSTRUCT | NM_SETTING_PARAM_INFERRABLE |
NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingTun:owner: * NMSettingTun:owner:
@@ -330,13 +327,12 @@ nm_setting_tun_class_init (NMSettingTunClass *klass)
* *
* Since: 1.2 * Since: 1.2
*/ */
g_object_class_install_property obj_properties[PROP_OWNER] =
(object_class, PROP_OWNER, g_param_spec_string (NM_SETTING_TUN_OWNER, "", "",
g_param_spec_string (NM_SETTING_TUN_OWNER, "", "", NULL,
NULL, G_PARAM_READWRITE |
G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE |
NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingTun:group: * NMSettingTun:group:
@@ -346,13 +342,12 @@ nm_setting_tun_class_init (NMSettingTunClass *klass)
* *
* Since: 1.2 * Since: 1.2
*/ */
g_object_class_install_property obj_properties[PROP_GROUP] =
(object_class, PROP_GROUP, g_param_spec_string (NM_SETTING_TUN_GROUP, "", "",
g_param_spec_string (NM_SETTING_TUN_GROUP, "", "", NULL,
NULL, G_PARAM_READWRITE |
G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE |
NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingTun:pi: * NMSettingTun:pi:
@@ -362,13 +357,12 @@ nm_setting_tun_class_init (NMSettingTunClass *klass)
* *
* Since: 1.2 * Since: 1.2
*/ */
g_object_class_install_property obj_properties[PROP_PI] =
(object_class, PROP_PI, g_param_spec_boolean (NM_SETTING_TUN_PI, "", "",
g_param_spec_boolean (NM_SETTING_TUN_PI, "", "", FALSE,
FALSE, G_PARAM_READWRITE |
G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE |
NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingTun:vnet-hdr: * NMSettingTun:vnet-hdr:
@@ -378,13 +372,12 @@ nm_setting_tun_class_init (NMSettingTunClass *klass)
* *
* Since: 1.2 * Since: 1.2
*/ */
g_object_class_install_property obj_properties[PROP_VNET_HDR] =
(object_class, PROP_VNET_HDR, g_param_spec_boolean (NM_SETTING_TUN_VNET_HDR, "", "",
g_param_spec_boolean (NM_SETTING_TUN_VNET_HDR, "", "", FALSE,
FALSE, G_PARAM_READWRITE |
G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE |
NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingTun:multi-queue: * NMSettingTun:multi-queue:
@@ -396,13 +389,14 @@ nm_setting_tun_class_init (NMSettingTunClass *klass)
* *
* Since: 1.2 * Since: 1.2
*/ */
g_object_class_install_property obj_properties[PROP_MULTI_QUEUE] =
(object_class, PROP_MULTI_QUEUE, g_param_spec_boolean (NM_SETTING_TUN_MULTI_QUEUE, "", "",
g_param_spec_boolean (NM_SETTING_TUN_MULTI_QUEUE, "", "", FALSE,
FALSE, G_PARAM_READWRITE |
G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE |
NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
g_object_class_install_properties (object_class, _PROPERTY_ENUMS_LAST, obj_properties);
_nm_setting_class_commit (setting_class, NM_META_SETTING_TYPE_TUN); _nm_setting_class_commit (setting_class, NM_META_SETTING_TYPE_TUN);
} }

96
libnm-core/nm-setting-vlan.c
View File

@@ -53,15 +53,13 @@ typedef struct {
GSList *egress_priority_map; GSList *egress_priority_map;
} NMSettingVlanPrivate; } NMSettingVlanPrivate;
enum { NM_GOBJECT_PROPERTIES_DEFINE (NMSettingVlan,
PROP_0,
PROP_PARENT, PROP_PARENT,
PROP_ID, PROP_ID,
PROP_FLAGS, PROP_FLAGS,
PROP_INGRESS_PRIORITY_MAP, PROP_INGRESS_PRIORITY_MAP,
PROP_EGRESS_PRIORITY_MAP, PROP_EGRESS_PRIORITY_MAP,
LAST_PROP );
};
#define MAX_SKB_PRIO G_MAXUINT32 #define MAX_SKB_PRIO G_MAXUINT32
#define MAX_8021P_PRIO 7 /* Max 802.1p priority */ #define MAX_8021P_PRIO 7 /* Max 802.1p priority */
@@ -214,10 +212,10 @@ set_map (NMSettingVlan *self, NMVlanPriorityMap map, GSList *list)
if (map == NM_VLAN_INGRESS_MAP) { if (map == NM_VLAN_INGRESS_MAP) {
NM_SETTING_VLAN_GET_PRIVATE (self)->ingress_priority_map = list; NM_SETTING_VLAN_GET_PRIVATE (self)->ingress_priority_map = list;
g_object_notify (G_OBJECT (self), NM_SETTING_VLAN_INGRESS_PRIORITY_MAP); _notify (self, PROP_INGRESS_PRIORITY_MAP);
} else if (map == NM_VLAN_EGRESS_MAP) { } else if (map == NM_VLAN_EGRESS_MAP) {
NM_SETTING_VLAN_GET_PRIVATE (self)->egress_priority_map = list; NM_SETTING_VLAN_GET_PRIVATE (self)->egress_priority_map = list;
g_object_notify (G_OBJECT (self), NM_SETTING_VLAN_EGRESS_PRIORITY_MAP); _notify (self, PROP_EGRESS_PRIORITY_MAP);
} else } else
g_assert_not_reached (); g_assert_not_reached ();
} }
@@ -273,9 +271,9 @@ nm_setting_vlan_add_priority_str (NMSettingVlan *setting,
if (check_replace_duplicate_priority (list, item->from, item->to)) { if (check_replace_duplicate_priority (list, item->from, item->to)) {
g_free (item); g_free (item);
if (map == NM_VLAN_INGRESS_MAP) if (map == NM_VLAN_INGRESS_MAP)
g_object_notify (G_OBJECT (setting), NM_SETTING_VLAN_INGRESS_PRIORITY_MAP); _notify (setting, PROP_INGRESS_PRIORITY_MAP);
else else
g_object_notify (G_OBJECT (setting), NM_SETTING_VLAN_EGRESS_PRIORITY_MAP); _notify (setting, PROP_EGRESS_PRIORITY_MAP);
return TRUE; return TRUE;
} }
@@ -377,9 +375,9 @@ nm_setting_vlan_add_priority (NMSettingVlan *setting,
list = get_map (setting, map); list = get_map (setting, map);
if (check_replace_duplicate_priority (list, from, to)) { if (check_replace_duplicate_priority (list, from, to)) {
if (map == NM_VLAN_INGRESS_MAP) if (map == NM_VLAN_INGRESS_MAP)
g_object_notify (G_OBJECT (setting), NM_SETTING_VLAN_INGRESS_PRIORITY_MAP); _notify (setting, PROP_INGRESS_PRIORITY_MAP);
else else
g_object_notify (G_OBJECT (setting), NM_SETTING_VLAN_EGRESS_PRIORITY_MAP); _notify (setting, PROP_EGRESS_PRIORITY_MAP);
return TRUE; return TRUE;
} }
@@ -857,14 +855,13 @@ nm_setting_vlan_class_init (NMSettingVlanClass *klass)
* description: Parent interface of the VLAN. * description: Parent interface of the VLAN.
* ---end--- * ---end---
*/ */
g_object_class_install_property obj_properties[PROP_PARENT] =
(object_class, PROP_PARENT, g_param_spec_string (NM_SETTING_VLAN_PARENT, "", "",
g_param_spec_string (NM_SETTING_VLAN_PARENT, "", "", NULL,
NULL, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
G_PARAM_CONSTRUCT | NM_SETTING_PARAM_INFERRABLE |
NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingVlan:id: * NMSettingVlan:id:
@@ -878,14 +875,13 @@ nm_setting_vlan_class_init (NMSettingVlanClass *klass)
* description: VLAN identifier. * description: VLAN identifier.
* ---end--- * ---end---
*/ */
g_object_class_install_property obj_properties[PROP_ID] =
(object_class, PROP_ID, g_param_spec_uint (NM_SETTING_VLAN_ID, "", "",
g_param_spec_uint (NM_SETTING_VLAN_ID, "", "", 0, 4095, 0,
0, 4095, 0, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
G_PARAM_CONSTRUCT | NM_SETTING_PARAM_INFERRABLE |
NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingVlan:flags: * NMSettingVlan:flags:
@@ -909,19 +905,17 @@ nm_setting_vlan_class_init (NMSettingVlanClass *klass)
* description: VLAN flags. * description: VLAN flags.
* ---end--- * ---end---
*/ */
g_object_class_install_property obj_properties[PROP_FLAGS] =
(object_class, PROP_FLAGS, g_param_spec_flags (NM_SETTING_VLAN_FLAGS, "", "",
g_param_spec_flags (NM_SETTING_VLAN_FLAGS, "", "", NM_TYPE_VLAN_FLAGS,
NM_TYPE_VLAN_FLAGS, NM_VLAN_FLAG_REORDER_HEADERS,
NM_VLAN_FLAG_REORDER_HEADERS, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
G_PARAM_CONSTRUCT | NM_SETTING_PARAM_INFERRABLE |
NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
_properties_override_add_override (properties_override, _properties_override_add_override (properties_override,
g_object_class_find_property (G_OBJECT_CLASS (setting_class), obj_properties[PROP_FLAGS],
NM_SETTING_VLAN_FLAGS),
NULL, NULL,
_override_flags_get, _override_flags_get,
NULL, NULL,
@@ -941,13 +935,12 @@ nm_setting_vlan_class_init (NMSettingVlanClass *klass)
* example: VLAN_INGRESS_PRIORITY_MAP=4:2,3:5 * example: VLAN_INGRESS_PRIORITY_MAP=4:2,3:5
* ---end--- * ---end---
*/ */
g_object_class_install_property obj_properties[PROP_INGRESS_PRIORITY_MAP] =
(object_class, PROP_INGRESS_PRIORITY_MAP, g_param_spec_boxed (NM_SETTING_VLAN_INGRESS_PRIORITY_MAP, "", "",
g_param_spec_boxed (NM_SETTING_VLAN_INGRESS_PRIORITY_MAP, "", "", G_TYPE_STRV,
G_TYPE_STRV, G_PARAM_READWRITE |
G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE |
NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingVlan:egress-priority-map: * NMSettingVlan:egress-priority-map:
@@ -963,13 +956,12 @@ nm_setting_vlan_class_init (NMSettingVlanClass *klass)
* example: VLAN_EGRESS_PRIORITY_MAP=5:4,4:1,3:7 * example: VLAN_EGRESS_PRIORITY_MAP=5:4,4:1,3:7
* ---end--- * ---end---
*/ */
g_object_class_install_property obj_properties[PROP_EGRESS_PRIORITY_MAP] =
(object_class, PROP_EGRESS_PRIORITY_MAP, g_param_spec_boxed (NM_SETTING_VLAN_EGRESS_PRIORITY_MAP, "", "",
g_param_spec_boxed (NM_SETTING_VLAN_EGRESS_PRIORITY_MAP, "", "", G_TYPE_STRV,
G_TYPE_STRV, G_PARAM_READWRITE |
G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE |
NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/* ---ifcfg-rh--- /* ---ifcfg-rh---
* property: interface-name * property: interface-name
@@ -993,6 +985,8 @@ nm_setting_vlan_class_init (NMSettingVlanClass *klass)
_nm_setting_get_deprecated_virtual_interface_name, _nm_setting_get_deprecated_virtual_interface_name,
NULL); NULL);
g_object_class_install_properties (object_class, _PROPERTY_ENUMS_LAST, obj_properties);
_nm_setting_class_commit_full (setting_class, NM_META_SETTING_TYPE_VLAN, _nm_setting_class_commit_full (setting_class, NM_META_SETTING_TYPE_VLAN,
NULL, properties_override); NULL, properties_override);
} }

97
libnm-core/nm-setting-vpn.c
View File

@@ -85,17 +85,14 @@ typedef struct {
guint32 timeout; guint32 timeout;
} NMSettingVpnPrivate; } NMSettingVpnPrivate;
enum { NM_GOBJECT_PROPERTIES_DEFINE (NMSettingVpn,
PROP_0,
PROP_SERVICE_TYPE, PROP_SERVICE_TYPE,
PROP_USER_NAME, PROP_USER_NAME,
PROP_PERSISTENT, PROP_PERSISTENT,
PROP_DATA, PROP_DATA,
PROP_SECRETS, PROP_SECRETS,
PROP_TIMEOUT, PROP_TIMEOUT,
);
LAST_PROP
};
/** /**
* nm_setting_vpn_new: * nm_setting_vpn_new:
@@ -194,7 +191,7 @@ nm_setting_vpn_add_data_item (NMSettingVpn *setting,
g_hash_table_insert (NM_SETTING_VPN_GET_PRIVATE (setting)->data, g_hash_table_insert (NM_SETTING_VPN_GET_PRIVATE (setting)->data,
g_strdup (key), g_strdup (item)); g_strdup (key), g_strdup (item));
g_object_notify (G_OBJECT (setting), NM_SETTING_VPN_DATA); _notify (setting, PROP_DATA);
} }
/** /**
@@ -259,7 +256,7 @@ nm_setting_vpn_remove_data_item (NMSettingVpn *setting, const char *key)
found = g_hash_table_remove (NM_SETTING_VPN_GET_PRIVATE (setting)->data, key); found = g_hash_table_remove (NM_SETTING_VPN_GET_PRIVATE (setting)->data, key);
if (found) if (found)
g_object_notify (G_OBJECT (setting), NM_SETTING_VPN_DATA); _notify (setting, PROP_DATA);
return found; return found;
} }
@@ -371,7 +368,7 @@ nm_setting_vpn_add_secret (NMSettingVpn *setting,
g_hash_table_insert (NM_SETTING_VPN_GET_PRIVATE (setting)->secrets, g_hash_table_insert (NM_SETTING_VPN_GET_PRIVATE (setting)->secrets,
g_strdup (key), g_strdup (secret)); g_strdup (key), g_strdup (secret));
g_object_notify (G_OBJECT (setting), NM_SETTING_VPN_SECRETS); _notify (setting, PROP_SECRETS);
} }
/** /**
@@ -436,7 +433,7 @@ nm_setting_vpn_remove_secret (NMSettingVpn *setting, const char *key)
found = g_hash_table_remove (NM_SETTING_VPN_GET_PRIVATE (setting)->secrets, key); found = g_hash_table_remove (NM_SETTING_VPN_GET_PRIVATE (setting)->secrets, key);
if (found) if (found)
g_object_notify (G_OBJECT (setting), NM_SETTING_VPN_SECRETS); _notify (setting, PROP_SECRETS);
return found; return found;
} }
@@ -694,7 +691,7 @@ update_one_secret (NMSetting *setting, const char *key, GVariant *value, GError
} }
if (success == NM_SETTING_UPDATE_SECRET_SUCCESS_MODIFIED) if (success == NM_SETTING_UPDATE_SECRET_SUCCESS_MODIFIED)
g_object_notify (G_OBJECT (setting), NM_SETTING_VPN_SECRETS); _notify (NM_SETTING_VPN (setting), PROP_SECRETS);
return success; return success;
} }
@@ -754,7 +751,7 @@ set_secret_flags (NMSetting *setting,
g_hash_table_insert (NM_SETTING_VPN_GET_PRIVATE (setting)->data, g_hash_table_insert (NM_SETTING_VPN_GET_PRIVATE (setting)->data,
g_strdup_printf ("%s-flags", secret_name), g_strdup_printf ("%s-flags", secret_name),
g_strdup_printf ("%u", flags)); g_strdup_printf ("%u", flags));
g_object_notify (G_OBJECT (setting), NM_SETTING_VPN_SECRETS); _notify (NM_SETTING_VPN (setting), PROP_SECRETS);
return TRUE; return TRUE;
} }
@@ -851,7 +848,7 @@ clear_secrets_with_flags (NMSetting *setting,
} }
if (changed) if (changed)
g_object_notify (G_OBJECT (setting), NM_SETTING_VPN_SECRETS); _notify (NM_SETTING_VPN (setting), PROP_SECRETS);
return changed; return changed;
} }
@@ -973,12 +970,11 @@ nm_setting_vpn_class_init (NMSettingVpnClass *klass)
* its network. i.e. org.freedesktop.NetworkManager.vpnc for the vpnc * its network. i.e. org.freedesktop.NetworkManager.vpnc for the vpnc
* plugin. * plugin.
**/ **/
g_object_class_install_property obj_properties[PROP_SERVICE_TYPE] =
(object_class, PROP_SERVICE_TYPE, g_param_spec_string (NM_SETTING_VPN_SERVICE_TYPE, "", "",
g_param_spec_string (NM_SETTING_VPN_SERVICE_TYPE, "", "", NULL,
NULL, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingVpn:user-name: * NMSettingVpn:user-name:
@@ -990,12 +986,11 @@ nm_setting_vpn_class_init (NMSettingVpnClass *klass)
* will automatically supply the username of the user which requested the * will automatically supply the username of the user which requested the
* VPN connection. * VPN connection.
**/ **/
g_object_class_install_property obj_properties[PROP_USER_NAME] =
(object_class, PROP_USER_NAME, g_param_spec_string (NM_SETTING_VPN_USER_NAME, "", "",
g_param_spec_string (NM_SETTING_VPN_USER_NAME, "", "", NULL,
NULL, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingVpn:persistent: * NMSettingVpn:persistent:
@@ -1004,12 +999,11 @@ 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.
**/ **/
g_object_class_install_property obj_properties[PROP_PERSISTENT] =
(object_class, PROP_PERSISTENT, g_param_spec_boolean (NM_SETTING_VPN_PERSISTENT, "", "",
g_param_spec_boolean (NM_SETTING_VPN_PERSISTENT, "", "", FALSE,
FALSE, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingVpn:data: (type GHashTable(utf8,utf8)): * NMSettingVpn:data: (type GHashTable(utf8,utf8)):
@@ -1025,16 +1019,14 @@ nm_setting_vpn_class_init (NMSettingVpnClass *klass)
* example: remote=ovpn.corp.com cipher=AES-256-CBC username=joe * example: remote=ovpn.corp.com cipher=AES-256-CBC username=joe
* ---end--- * ---end---
*/ */
g_object_class_install_property obj_properties[PROP_DATA] =
(object_class, PROP_DATA, g_param_spec_boxed (NM_SETTING_VPN_DATA, "", "",
g_param_spec_boxed (NM_SETTING_VPN_DATA, "", "", G_TYPE_HASH_TABLE,
G_TYPE_HASH_TABLE, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
_properties_override_add_transform (properties_override, _properties_override_add_transform (properties_override,
g_object_class_find_property (G_OBJECT_CLASS (setting_class), obj_properties[PROP_DATA],
NM_SETTING_VPN_DATA),
G_VARIANT_TYPE ("a{ss}"), G_VARIANT_TYPE ("a{ss}"),
_nm_utils_strdict_to_dbus, _nm_utils_strdict_to_dbus,
_nm_utils_strdict_from_dbus); _nm_utils_strdict_from_dbus);
@@ -1053,17 +1045,15 @@ nm_setting_vpn_class_init (NMSettingVpnClass *klass)
* example: password=Popocatepetl * example: password=Popocatepetl
* ---end--- * ---end---
*/ */
g_object_class_install_property obj_properties[PROP_SECRETS] =
(object_class, PROP_SECRETS, g_param_spec_boxed (NM_SETTING_VPN_SECRETS, "", "",
g_param_spec_boxed (NM_SETTING_VPN_SECRETS, "", "", G_TYPE_HASH_TABLE,
G_TYPE_HASH_TABLE, G_PARAM_READWRITE |
G_PARAM_READWRITE | NM_SETTING_PARAM_SECRET |
NM_SETTING_PARAM_SECRET | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
_properties_override_add_transform (properties_override, _properties_override_add_transform (properties_override,
g_object_class_find_property (G_OBJECT_CLASS (setting_class), obj_properties[PROP_SECRETS],
NM_SETTING_VPN_SECRETS),
G_VARIANT_TYPE ("a{ss}"), G_VARIANT_TYPE ("a{ss}"),
_nm_utils_strdict_to_dbus, _nm_utils_strdict_to_dbus,
_nm_utils_strdict_from_dbus); _nm_utils_strdict_from_dbus);
@@ -1079,12 +1069,13 @@ nm_setting_vpn_class_init (NMSettingVpnClass *klass)
* *
* Since: 1.2 * Since: 1.2
**/ **/
g_object_class_install_property obj_properties[PROP_TIMEOUT] =
(object_class, PROP_TIMEOUT, g_param_spec_uint (NM_SETTING_VPN_TIMEOUT, "", "",
g_param_spec_uint (NM_SETTING_VPN_TIMEOUT, "", "", 0, G_MAXUINT32, 0,
0, G_MAXUINT32, 0, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
g_object_class_install_properties (object_class, _PROPERTY_ENUMS_LAST, obj_properties);
_nm_setting_class_commit_full (setting_class, NM_META_SETTING_TYPE_VPN, _nm_setting_class_commit_full (setting_class, NM_META_SETTING_TYPE_VPN,
NULL, properties_override); NULL, properties_override);

249
libnm-core/nm-setting-vxlan.c
View File

@@ -59,8 +59,7 @@ typedef struct {
gboolean l3_miss; gboolean l3_miss;
} NMSettingVxlanPrivate; } NMSettingVxlanPrivate;
enum { NM_GOBJECT_PROPERTIES_DEFINE_BASE (
PROP_0,
PROP_PARENT, PROP_PARENT,
PROP_ID, PROP_ID,
PROP_LOCAL, PROP_LOCAL,
@@ -77,9 +76,7 @@ enum {
PROP_RSC, PROP_RSC,
PROP_L2_MISS, PROP_L2_MISS,
PROP_L3_MISS, PROP_L3_MISS,
);
LAST_PROP
};
#define DST_PORT_DEFAULT 8472 #define DST_PORT_DEFAULT 8472
@@ -583,14 +580,13 @@ nm_setting_vxlan_class_init (NMSettingVxlanClass *klass)
* *
* Since: 1.2 * Since: 1.2
**/ **/
g_object_class_install_property obj_properties[PROP_PARENT] =
(object_class, PROP_PARENT, g_param_spec_string (NM_SETTING_VXLAN_PARENT, "", "",
g_param_spec_string (NM_SETTING_VXLAN_PARENT, "", "", NULL,
NULL, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
G_PARAM_CONSTRUCT | NM_SETTING_PARAM_INFERRABLE |
NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingVxlan:id: * NMSettingVxlan:id:
* *
@@ -599,14 +595,13 @@ nm_setting_vxlan_class_init (NMSettingVxlanClass *klass)
* *
* Since: 1.2 * Since: 1.2
**/ **/
g_object_class_install_property obj_properties[PROP_ID] =
(object_class, PROP_ID, g_param_spec_uint (NM_SETTING_VXLAN_ID, "", "",
g_param_spec_uint (NM_SETTING_VXLAN_ID, "", "", 0, (1 << 24) - 1, 0,
0, (1 << 24) - 1, 0, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
G_PARAM_CONSTRUCT | NM_SETTING_PARAM_INFERRABLE |
NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingVxlan:local: * NMSettingVxlan:local:
@@ -615,14 +610,13 @@ nm_setting_vxlan_class_init (NMSettingVxlanClass *klass)
* *
* Since: 1.2 * Since: 1.2
**/ **/
g_object_class_install_property obj_properties[PROP_LOCAL] =
(object_class, PROP_LOCAL, g_param_spec_string (NM_SETTING_VXLAN_LOCAL, "", "",
g_param_spec_string (NM_SETTING_VXLAN_LOCAL, "", "", NULL,
NULL, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
G_PARAM_CONSTRUCT | NM_SETTING_PARAM_INFERRABLE |
NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingVxlan:remote: * NMSettingVxlan:remote:
@@ -633,14 +627,13 @@ nm_setting_vxlan_class_init (NMSettingVxlanClass *klass)
* *
* Since: 1.2 * Since: 1.2
**/ **/
g_object_class_install_property obj_properties[PROP_REMOTE] =
(object_class, PROP_REMOTE, g_param_spec_string (NM_SETTING_VXLAN_REMOTE, "", "",
g_param_spec_string (NM_SETTING_VXLAN_REMOTE, "", "", NULL,
NULL, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
G_PARAM_CONSTRUCT | NM_SETTING_PARAM_INFERRABLE |
NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingVxlan:source-port-min: * NMSettingVxlan:source-port-min:
@@ -650,14 +643,13 @@ nm_setting_vxlan_class_init (NMSettingVxlanClass *klass)
* *
* Since: 1.2 * Since: 1.2
**/ **/
g_object_class_install_property obj_properties[PROP_SOURCE_PORT_MIN] =
(object_class, PROP_SOURCE_PORT_MIN, g_param_spec_uint (NM_SETTING_VXLAN_SOURCE_PORT_MIN, "", "",
g_param_spec_uint (NM_SETTING_VXLAN_SOURCE_PORT_MIN, "", "", 0, G_MAXUINT16, 0,
0, G_MAXUINT16, 0, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
G_PARAM_CONSTRUCT | NM_SETTING_PARAM_INFERRABLE |
NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingVxlan:source-port-max: * NMSettingVxlan:source-port-max:
@@ -667,14 +659,13 @@ nm_setting_vxlan_class_init (NMSettingVxlanClass *klass)
* *
* Since: 1.2 * Since: 1.2
**/ **/
g_object_class_install_property obj_properties[PROP_SOURCE_PORT_MAX] =
(object_class, PROP_SOURCE_PORT_MAX, g_param_spec_uint (NM_SETTING_VXLAN_SOURCE_PORT_MAX, "", "",
g_param_spec_uint (NM_SETTING_VXLAN_SOURCE_PORT_MAX, "", "", 0, G_MAXUINT16, 0,
0, G_MAXUINT16, 0, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
G_PARAM_CONSTRUCT | NM_SETTING_PARAM_INFERRABLE |
NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingVxlan:destination-port: * NMSettingVxlan:destination-port:
@@ -684,14 +675,13 @@ nm_setting_vxlan_class_init (NMSettingVxlanClass *klass)
* *
* Since: 1.2 * Since: 1.2
**/ **/
g_object_class_install_property obj_properties[PROP_DESTINATION_PORT] =
(object_class, PROP_DESTINATION_PORT, g_param_spec_uint (NM_SETTING_VXLAN_DESTINATION_PORT, "", "",
g_param_spec_uint (NM_SETTING_VXLAN_DESTINATION_PORT, "", "", 0, G_MAXUINT16, DST_PORT_DEFAULT,
0, G_MAXUINT16, DST_PORT_DEFAULT, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
G_PARAM_CONSTRUCT | NM_SETTING_PARAM_INFERRABLE |
NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingVxlan:ageing: * NMSettingVxlan:ageing:
@@ -700,14 +690,13 @@ nm_setting_vxlan_class_init (NMSettingVxlanClass *klass)
* *
* Since: 1.2 * Since: 1.2
**/ **/
g_object_class_install_property obj_properties[PROP_AGEING] =
(object_class, PROP_AGEING, g_param_spec_uint (NM_SETTING_VXLAN_AGEING, "", "",
g_param_spec_uint (NM_SETTING_VXLAN_AGEING, "", "", 0, G_MAXUINT32, 300,
0, G_MAXUINT32, 300, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
G_PARAM_CONSTRUCT | NM_SETTING_PARAM_INFERRABLE |
NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingVxlan:limit: * NMSettingVxlan:limit:
@@ -717,14 +706,13 @@ nm_setting_vxlan_class_init (NMSettingVxlanClass *klass)
* *
* Since: 1.2 * Since: 1.2
**/ **/
g_object_class_install_property obj_properties[PROP_LIMIT] =
(object_class, PROP_LIMIT, g_param_spec_uint (NM_SETTING_VXLAN_LIMIT, "", "",
g_param_spec_uint (NM_SETTING_VXLAN_LIMIT, "", "", 0, G_MAXUINT32, 0,
0, G_MAXUINT32, 0, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
G_PARAM_CONSTRUCT | NM_SETTING_PARAM_INFERRABLE |
NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingVxlan:tos: * NMSettingVxlan:tos:
@@ -733,14 +721,13 @@ nm_setting_vxlan_class_init (NMSettingVxlanClass *klass)
* *
* Since: 1.2 * Since: 1.2
**/ **/
g_object_class_install_property obj_properties[PROP_TOS] =
(object_class, PROP_TOS, g_param_spec_uint (NM_SETTING_VXLAN_TOS, "", "",
g_param_spec_uint (NM_SETTING_VXLAN_TOS, "", "", 0, 255, 0,
0, 255, 0, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
G_PARAM_CONSTRUCT | NM_SETTING_PARAM_INFERRABLE |
NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingVxlan:ttl: * NMSettingVxlan:ttl:
@@ -749,14 +736,13 @@ nm_setting_vxlan_class_init (NMSettingVxlanClass *klass)
* *
* Since: 1.2 * Since: 1.2
**/ **/
g_object_class_install_property obj_properties[PROP_TTL] =
(object_class, PROP_TTL, g_param_spec_uint (NM_SETTING_VXLAN_TTL, "", "",
g_param_spec_uint (NM_SETTING_VXLAN_TTL, "", "", 0, 255, 0,
0, 255, 0, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
G_PARAM_CONSTRUCT | NM_SETTING_PARAM_INFERRABLE |
NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingVxlan:proxy: * NMSettingVxlan:proxy:
@@ -765,14 +751,13 @@ nm_setting_vxlan_class_init (NMSettingVxlanClass *klass)
* *
* Since: 1.2 * Since: 1.2
**/ **/
g_object_class_install_property obj_properties[PROP_PROXY] =
(object_class, PROP_PROXY, g_param_spec_boolean (NM_SETTING_VXLAN_PROXY, "", "",
g_param_spec_boolean (NM_SETTING_VXLAN_PROXY, "", "", FALSE,
FALSE, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
G_PARAM_CONSTRUCT | NM_SETTING_PARAM_INFERRABLE |
NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingVxlan:learning: * NMSettingVxlan:learning:
@@ -782,14 +767,13 @@ nm_setting_vxlan_class_init (NMSettingVxlanClass *klass)
* *
* Since: 1.2 * Since: 1.2
**/ **/
g_object_class_install_property obj_properties[PROP_LEARNING] =
(object_class, PROP_LEARNING, g_param_spec_boolean (NM_SETTING_VXLAN_LEARNING, "", "",
g_param_spec_boolean (NM_SETTING_VXLAN_LEARNING, "", "", TRUE,
TRUE, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
G_PARAM_CONSTRUCT | NM_SETTING_PARAM_INFERRABLE |
NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingVxlan:rsc: * NMSettingVxlan:rsc:
* *
@@ -797,14 +781,13 @@ nm_setting_vxlan_class_init (NMSettingVxlanClass *klass)
* *
* Since: 1.2 * Since: 1.2
**/ **/
g_object_class_install_property obj_properties[PROP_RSC] =
(object_class, PROP_RSC, g_param_spec_boolean (NM_SETTING_VXLAN_RSC, "", "",
g_param_spec_boolean (NM_SETTING_VXLAN_RSC, "", "", FALSE,
FALSE, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
G_PARAM_CONSTRUCT | NM_SETTING_PARAM_INFERRABLE |
NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingVxlan:l2-miss: * NMSettingVxlan:l2-miss:
* *
@@ -812,14 +795,13 @@ nm_setting_vxlan_class_init (NMSettingVxlanClass *klass)
* *
* Since: 1.2 * Since: 1.2
**/ **/
g_object_class_install_property obj_properties[PROP_L2_MISS] =
(object_class, PROP_L2_MISS, g_param_spec_boolean (NM_SETTING_VXLAN_L2_MISS, "", "",
g_param_spec_boolean (NM_SETTING_VXLAN_L2_MISS, "", "", FALSE,
FALSE, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
G_PARAM_CONSTRUCT | NM_SETTING_PARAM_INFERRABLE |
NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingVxlan:l3-miss: * NMSettingVxlan:l3-miss:
@@ -828,14 +810,15 @@ nm_setting_vxlan_class_init (NMSettingVxlanClass *klass)
* *
* Since: 1.2 * Since: 1.2
**/ **/
g_object_class_install_property obj_properties[PROP_L3_MISS] =
(object_class, PROP_L3_MISS, g_param_spec_boolean (NM_SETTING_VXLAN_L3_MISS, "", "",
g_param_spec_boolean (NM_SETTING_VXLAN_L3_MISS, "", "", FALSE,
FALSE, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
G_PARAM_CONSTRUCT | NM_SETTING_PARAM_INFERRABLE |
NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
g_object_class_install_properties (object_class, _PROPERTY_ENUMS_LAST, obj_properties);
_nm_setting_class_commit (setting_class, NM_META_SETTING_TYPE_VXLAN); _nm_setting_class_commit (setting_class, NM_META_SETTING_TYPE_VXLAN);
} }

34
libnm-core/nm-setting-wimax.c
View File

@@ -51,13 +51,10 @@ typedef struct {
char *mac_address; char *mac_address;
} NMSettingWimaxPrivate; } NMSettingWimaxPrivate;
enum { NM_GOBJECT_PROPERTIES_DEFINE_BASE (
PROP_0,
PROP_NETWORK_NAME, PROP_NETWORK_NAME,
PROP_MAC_ADDRESS, PROP_MAC_ADDRESS,
);
LAST_PROP
};
/** /**
* nm_setting_wimax_new: * nm_setting_wimax_new:
@@ -227,12 +224,11 @@ nm_setting_wimax_class_init (NMSettingWimaxClass *klass)
* *
* Deprecated: 1.2: WiMAX is no longer supported. * Deprecated: 1.2: WiMAX is no longer supported.
**/ **/
g_object_class_install_property obj_properties[PROP_NETWORK_NAME] =
(object_class, PROP_NETWORK_NAME, g_param_spec_string (NM_SETTING_WIMAX_NETWORK_NAME, "", "",
g_param_spec_string (NM_SETTING_WIMAX_NETWORK_NAME, "", "", NULL,
NULL, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingWimax:mac-address: * NMSettingWimax:mac-address:
@@ -243,20 +239,20 @@ nm_setting_wimax_class_init (NMSettingWimaxClass *klass)
* *
* Deprecated: 1.2: WiMAX is no longer supported. * Deprecated: 1.2: WiMAX is no longer supported.
**/ **/
g_object_class_install_property obj_properties[PROP_MAC_ADDRESS] =
(object_class, PROP_MAC_ADDRESS, g_param_spec_string (NM_SETTING_WIMAX_MAC_ADDRESS, "", "",
g_param_spec_string (NM_SETTING_WIMAX_MAC_ADDRESS, "", "", NULL,
NULL, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
_properties_override_add_transform (properties_override, _properties_override_add_transform (properties_override,
g_object_class_find_property (G_OBJECT_CLASS (setting_class), obj_properties[PROP_MAC_ADDRESS],
NM_SETTING_WIMAX_MAC_ADDRESS),
G_VARIANT_TYPE_BYTESTRING, G_VARIANT_TYPE_BYTESTRING,
_nm_utils_hwaddr_to_dbus, _nm_utils_hwaddr_to_dbus,
_nm_utils_hwaddr_from_dbus); _nm_utils_hwaddr_from_dbus);
g_object_class_install_properties (object_class, _PROPERTY_ENUMS_LAST, obj_properties);
_nm_setting_class_commit_full (setting_class, NM_META_SETTING_TYPE_WIMAX, _nm_setting_class_commit_full (setting_class, NM_META_SETTING_TYPE_WIMAX,
NULL, properties_override); NULL, properties_override);
} }

203
libnm-core/nm-setting-wired.c
View File

@@ -61,8 +61,7 @@ typedef struct {
char *wol_password; char *wol_password;
} NMSettingWiredPrivate; } NMSettingWiredPrivate;
enum { NM_GOBJECT_PROPERTIES_DEFINE (NMSettingWired,
PROP_0,
PROP_PORT, PROP_PORT,
PROP_SPEED, PROP_SPEED,
PROP_DUPLEX, PROP_DUPLEX,
@@ -77,9 +76,7 @@ enum {
PROP_S390_OPTIONS, PROP_S390_OPTIONS,
PROP_WAKE_ON_LAN, PROP_WAKE_ON_LAN,
PROP_WAKE_ON_LAN_PASSWORD, PROP_WAKE_ON_LAN_PASSWORD,
);
LAST_PROP
};
static const char *valid_s390_opts[] = { static const char *valid_s390_opts[] = {
"portno", "layer2", "portname", "protocol", "priority_queueing", "portno", "layer2", "portname", "protocol", "priority_queueing",
@@ -288,7 +285,7 @@ nm_setting_wired_add_mac_blacklist_item (NMSettingWired *setting, const char *ma
mac = nm_utils_hwaddr_canonical (mac, ETH_ALEN); mac = nm_utils_hwaddr_canonical (mac, ETH_ALEN);
g_array_append_val (priv->mac_address_blacklist, mac); g_array_append_val (priv->mac_address_blacklist, mac);
g_object_notify (G_OBJECT (setting), NM_SETTING_WIRED_MAC_ADDRESS_BLACKLIST); _notify (setting, PROP_MAC_ADDRESS_BLACKLIST);
return TRUE; return TRUE;
} }
@@ -310,7 +307,7 @@ nm_setting_wired_remove_mac_blacklist_item (NMSettingWired *setting, guint32 idx
g_return_if_fail (idx < priv->mac_address_blacklist->len); g_return_if_fail (idx < priv->mac_address_blacklist->len);
g_array_remove_index (priv->mac_address_blacklist, idx); g_array_remove_index (priv->mac_address_blacklist, idx);
g_object_notify (G_OBJECT (setting), NM_SETTING_WIRED_MAC_ADDRESS_BLACKLIST); _notify (setting, PROP_MAC_ADDRESS_BLACKLIST);
} }
/** /**
@@ -338,7 +335,7 @@ nm_setting_wired_remove_mac_blacklist_item_by_value (NMSettingWired *setting, co
candidate = g_array_index (priv->mac_address_blacklist, char *, i); candidate = g_array_index (priv->mac_address_blacklist, char *, i);
if (!nm_utils_hwaddr_matches (mac, -1, candidate, -1)) { if (!nm_utils_hwaddr_matches (mac, -1, candidate, -1)) {
g_array_remove_index (priv->mac_address_blacklist, i); g_array_remove_index (priv->mac_address_blacklist, i);
g_object_notify (G_OBJECT (setting), NM_SETTING_WIRED_MAC_ADDRESS_BLACKLIST); _notify (setting, PROP_MAC_ADDRESS_BLACKLIST);
return TRUE; return TRUE;
} }
} }
@@ -357,7 +354,7 @@ nm_setting_wired_clear_mac_blacklist_items (NMSettingWired *setting)
g_return_if_fail (NM_IS_SETTING_WIRED (setting)); g_return_if_fail (NM_IS_SETTING_WIRED (setting));
g_array_set_size (NM_SETTING_WIRED_GET_PRIVATE (setting)->mac_address_blacklist, 0); g_array_set_size (NM_SETTING_WIRED_GET_PRIVATE (setting)->mac_address_blacklist, 0);
g_object_notify (G_OBJECT (setting), NM_SETTING_WIRED_MAC_ADDRESS_BLACKLIST); _notify (setting, PROP_MAC_ADDRESS_BLACKLIST);
} }
/** /**
@@ -530,7 +527,7 @@ nm_setting_wired_add_s390_option (NMSettingWired *setting,
g_hash_table_insert (NM_SETTING_WIRED_GET_PRIVATE (setting)->s390_options, g_hash_table_insert (NM_SETTING_WIRED_GET_PRIVATE (setting)->s390_options,
g_strdup (key), g_strdup (key),
g_strdup (value)); g_strdup (value));
g_object_notify (G_OBJECT (setting), NM_SETTING_WIRED_S390_OPTIONS); _notify (setting, PROP_S390_OPTIONS);
return TRUE; return TRUE;
} }
@@ -557,7 +554,7 @@ nm_setting_wired_remove_s390_option (NMSettingWired *setting,
found = g_hash_table_remove (NM_SETTING_WIRED_GET_PRIVATE (setting)->s390_options, key); found = g_hash_table_remove (NM_SETTING_WIRED_GET_PRIVATE (setting)->s390_options, key);
if (found) if (found)
g_object_notify (G_OBJECT (setting), NM_SETTING_WIRED_S390_OPTIONS); _notify (setting, PROP_S390_OPTIONS);
return found; return found;
} }
@@ -1009,12 +1006,11 @@ nm_setting_wired_class_init (NMSettingWiredClass *klass)
* description: The property is not saved by the plugin. * description: The property is not saved by the plugin.
* ---end--- * ---end---
*/ */
g_object_class_install_property obj_properties[PROP_PORT] =
(object_class, PROP_PORT, g_param_spec_string (NM_SETTING_WIRED_PORT, "", "",
g_param_spec_string (NM_SETTING_WIRED_PORT, "", "", NULL,
NULL, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingWired:speed: * NMSettingWired:speed:
@@ -1040,13 +1036,12 @@ nm_setting_wired_class_init (NMSettingWiredClass *klass)
* parameter in the ETHTOOL_OPTS variable. * parameter in the ETHTOOL_OPTS variable.
* ---end--- * ---end---
*/ */
g_object_class_install_property obj_properties[PROP_SPEED] =
(object_class, PROP_SPEED, g_param_spec_uint (NM_SETTING_WIRED_SPEED, "", "",
g_param_spec_uint (NM_SETTING_WIRED_SPEED, "", "", 0, G_MAXUINT32, 0,
0, G_MAXUINT32, 0, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingWired:duplex: * NMSettingWired:duplex:
@@ -1071,12 +1066,11 @@ nm_setting_wired_class_init (NMSettingWiredClass *klass)
* "duplex" parameter in the ETHOOL_OPTS variable. * "duplex" parameter in the ETHOOL_OPTS variable.
* ---end--- * ---end---
*/ */
g_object_class_install_property obj_properties[PROP_DUPLEX] =
(object_class, PROP_DUPLEX, g_param_spec_string (NM_SETTING_WIRED_DUPLEX, "", "",
g_param_spec_string (NM_SETTING_WIRED_DUPLEX, "", "", NULL,
NULL, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingWired:auto-negotiate: * NMSettingWired:auto-negotiate:
@@ -1098,17 +1092,15 @@ nm_setting_wired_class_init (NMSettingWiredClass *klass)
* "speed" and "duplex" parameters (skips link configuration). * "speed" and "duplex" parameters (skips link configuration).
* ---end--- * ---end---
*/ */
g_object_class_install_property obj_properties[PROP_AUTO_NEGOTIATE] =
(object_class, PROP_AUTO_NEGOTIATE, g_param_spec_boolean (NM_SETTING_WIRED_AUTO_NEGOTIATE, "", "",
g_param_spec_boolean (NM_SETTING_WIRED_AUTO_NEGOTIATE, "", "", FALSE,
FALSE, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
_properties_override_add_override (properties_override, _properties_override_add_override (properties_override,
g_object_class_find_property (G_OBJECT_CLASS (setting_class), obj_properties[PROP_AUTO_NEGOTIATE],
NM_SETTING_WIRED_AUTO_NEGOTIATE),
G_VARIANT_TYPE_BOOLEAN, G_VARIANT_TYPE_BOOLEAN,
_override_autoneg_get, _override_autoneg_get,
NULL, NULL,
@@ -1138,17 +1130,15 @@ nm_setting_wired_class_init (NMSettingWiredClass *klass)
* permanent MAC address exists, the MAC address initially configured on the device. * permanent MAC address exists, the MAC address initially configured on the device.
* ---end--- * ---end---
*/ */
g_object_class_install_property obj_properties[PROP_MAC_ADDRESS] =
(object_class, PROP_MAC_ADDRESS, g_param_spec_string (NM_SETTING_WIRED_MAC_ADDRESS, "", "",
g_param_spec_string (NM_SETTING_WIRED_MAC_ADDRESS, "", "", NULL,
NULL, G_PARAM_READWRITE |
G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE |
NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
_properties_override_add_transform (properties_override, _properties_override_add_transform (properties_override,
g_object_class_find_property (G_OBJECT_CLASS (setting_class), obj_properties[PROP_MAC_ADDRESS],
NM_SETTING_WIRED_MAC_ADDRESS),
G_VARIANT_TYPE_BYTESTRING, G_VARIANT_TYPE_BYTESTRING,
_nm_utils_hwaddr_to_dbus, _nm_utils_hwaddr_to_dbus,
_nm_utils_hwaddr_from_dbus); _nm_utils_hwaddr_from_dbus);
@@ -1196,17 +1186,15 @@ nm_setting_wired_class_init (NMSettingWiredClass *klass)
* For libnm and nmcli, this field is called "cloned-mac-address". * For libnm and nmcli, this field is called "cloned-mac-address".
* ---end--- * ---end---
*/ */
g_object_class_install_property obj_properties[PROP_CLONED_MAC_ADDRESS] =
(object_class, PROP_CLONED_MAC_ADDRESS, g_param_spec_string (NM_SETTING_WIRED_CLONED_MAC_ADDRESS, "", "",
g_param_spec_string (NM_SETTING_WIRED_CLONED_MAC_ADDRESS, "", "", NULL,
NULL, G_PARAM_READWRITE |
G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE |
NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
_properties_override_add_override (properties_override, _properties_override_add_override (properties_override,
g_object_class_find_property (G_OBJECT_CLASS (setting_class), obj_properties[PROP_CLONED_MAC_ADDRESS],
NM_SETTING_WIRED_CLONED_MAC_ADDRESS),
G_VARIANT_TYPE_BYTESTRING, G_VARIANT_TYPE_BYTESTRING,
_nm_utils_hwaddr_cloned_get, _nm_utils_hwaddr_cloned_get,
_nm_utils_hwaddr_cloned_set, _nm_utils_hwaddr_cloned_set,
@@ -1269,13 +1257,12 @@ nm_setting_wired_class_init (NMSettingWiredClass *klass)
* cloned-mac-address. * cloned-mac-address.
* ---end--- * ---end---
*/ */
g_object_class_install_property obj_properties[PROP_GENERATE_MAC_ADDRESS_MASK] =
(object_class, PROP_GENERATE_MAC_ADDRESS_MASK,
g_param_spec_string (NM_SETTING_WIRED_GENERATE_MAC_ADDRESS_MASK, "", "", g_param_spec_string (NM_SETTING_WIRED_GENERATE_MAC_ADDRESS_MASK, "", "",
NULL, NULL,
G_PARAM_READWRITE | G_PARAM_READWRITE |
NM_SETTING_PARAM_FUZZY_IGNORE | NM_SETTING_PARAM_FUZZY_IGNORE |
G_PARAM_STATIC_STRINGS)); G_PARAM_STATIC_STRINGS);
/** /**
* NMSettingWired:mac-address-blacklist: * NMSettingWired:mac-address-blacklist:
@@ -1299,13 +1286,12 @@ nm_setting_wired_class_init (NMSettingWiredClass *klass)
* example: HWADDR_BLACKLIST="00:22:68:11:69:08 00:11:22:11:44:55" * example: HWADDR_BLACKLIST="00:22:68:11:69:08 00:11:22:11:44:55"
* ---end--- * ---end---
*/ */
g_object_class_install_property obj_properties[PROP_MAC_ADDRESS_BLACKLIST] =
(object_class, PROP_MAC_ADDRESS_BLACKLIST, g_param_spec_boxed (NM_SETTING_WIRED_MAC_ADDRESS_BLACKLIST, "", "",
g_param_spec_boxed (NM_SETTING_WIRED_MAC_ADDRESS_BLACKLIST, "", "", G_TYPE_STRV,
G_TYPE_STRV, G_PARAM_READWRITE |
G_PARAM_READWRITE | NM_SETTING_PARAM_FUZZY_IGNORE |
NM_SETTING_PARAM_FUZZY_IGNORE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingWired:mtu: * NMSettingWired:mtu:
@@ -1319,14 +1305,13 @@ nm_setting_wired_class_init (NMSettingWiredClass *klass)
* description: MTU of the interface. * description: MTU of the interface.
* ---end--- * ---end---
*/ */
g_object_class_install_property obj_properties[PROP_MTU] =
(object_class, PROP_MTU, g_param_spec_uint (NM_SETTING_WIRED_MTU, "", "",
g_param_spec_uint (NM_SETTING_WIRED_MTU, "", "", 0, G_MAXUINT32, 0,
0, G_MAXUINT32, 0, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
G_PARAM_CONSTRUCT | NM_SETTING_PARAM_FUZZY_IGNORE |
NM_SETTING_PARAM_FUZZY_IGNORE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingWired:s390-subchannels: * NMSettingWired:s390-subchannels:
@@ -1346,13 +1331,12 @@ nm_setting_wired_class_init (NMSettingWiredClass *klass)
* example: SUBCHANNELS=0.0.b00a,0.0.b00b,0.0.b00c * example: SUBCHANNELS=0.0.b00a,0.0.b00b,0.0.b00c
* ---end--- * ---end---
*/ */
g_object_class_install_property obj_properties[PROP_S390_SUBCHANNELS] =
(object_class, PROP_S390_SUBCHANNELS, g_param_spec_boxed (NM_SETTING_WIRED_S390_SUBCHANNELS, "", "",
g_param_spec_boxed (NM_SETTING_WIRED_S390_SUBCHANNELS, "", "", G_TYPE_STRV,
G_TYPE_STRV, G_PARAM_READWRITE |
G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE |
NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingWired:s390-nettype: * NMSettingWired:s390-nettype:
@@ -1368,13 +1352,12 @@ nm_setting_wired_class_init (NMSettingWiredClass *klass)
* example: NETTYPE=qeth * example: NETTYPE=qeth
* ---end--- * ---end---
*/ */
g_object_class_install_property obj_properties[PROP_S390_NETTYPE] =
(object_class, PROP_S390_NETTYPE, g_param_spec_string (NM_SETTING_WIRED_S390_NETTYPE, "", "",
g_param_spec_string (NM_SETTING_WIRED_S390_NETTYPE, "", "", NULL,
NULL, G_PARAM_READWRITE |
G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE |
NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingWired:s390-options: (type GHashTable(utf8,utf8)): * NMSettingWired:s390-options: (type GHashTable(utf8,utf8)):
@@ -1391,17 +1374,15 @@ nm_setting_wired_class_init (NMSettingWiredClass *klass)
* "portname" and "ctcprot" that have their own variables. * "portname" and "ctcprot" that have their own variables.
* ---end--- * ---end---
*/ */
g_object_class_install_property obj_properties[PROP_S390_OPTIONS] =
(object_class, PROP_S390_OPTIONS, g_param_spec_boxed (NM_SETTING_WIRED_S390_OPTIONS, "", "",
g_param_spec_boxed (NM_SETTING_WIRED_S390_OPTIONS, "", "", G_TYPE_HASH_TABLE,
G_TYPE_HASH_TABLE, G_PARAM_READWRITE |
G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE |
NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
_properties_override_add_transform (properties_override, _properties_override_add_transform (properties_override,
g_object_class_find_property (G_OBJECT_CLASS (setting_class), obj_properties[PROP_S390_OPTIONS],
NM_SETTING_WIRED_S390_OPTIONS),
G_VARIANT_TYPE ("a{ss}"), G_VARIANT_TYPE ("a{ss}"),
_nm_utils_strdict_to_dbus, _nm_utils_strdict_to_dbus,
_nm_utils_strdict_from_dbus); _nm_utils_strdict_from_dbus);
@@ -1420,13 +1401,12 @@ nm_setting_wired_class_init (NMSettingWiredClass *klass)
* *
* Since: 1.2 * Since: 1.2
**/ **/
g_object_class_install_property obj_properties[PROP_WAKE_ON_LAN] =
(object_class, PROP_WAKE_ON_LAN, g_param_spec_uint (NM_SETTING_WIRED_WAKE_ON_LAN, "", "",
g_param_spec_uint (NM_SETTING_WIRED_WAKE_ON_LAN, "", "", 0, G_MAXUINT32, NM_SETTING_WIRED_WAKE_ON_LAN_DEFAULT,
0, G_MAXUINT32, NM_SETTING_WIRED_WAKE_ON_LAN_DEFAULT, G_PARAM_CONSTRUCT |
G_PARAM_CONSTRUCT | G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingWired:wake-on-lan-password: * NMSettingWired:wake-on-lan-password:
@@ -1437,12 +1417,13 @@ nm_setting_wired_class_init (NMSettingWiredClass *klass)
* *
* Since: 1.2 * Since: 1.2
**/ **/
g_object_class_install_property obj_properties[PROP_WAKE_ON_LAN_PASSWORD] =
(object_class, PROP_WAKE_ON_LAN_PASSWORD, g_param_spec_string (NM_SETTING_WIRED_WAKE_ON_LAN_PASSWORD, "", "",
g_param_spec_string (NM_SETTING_WIRED_WAKE_ON_LAN_PASSWORD, "", "", NULL,
NULL, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
g_object_class_install_properties (object_class, _PROPERTY_ENUMS_LAST, obj_properties);
_nm_setting_class_commit_full (setting_class, NM_META_SETTING_TYPE_WIRED, _nm_setting_class_commit_full (setting_class, NM_META_SETTING_TYPE_WIRED,
NULL, properties_override); NULL, properties_override);

302
libnm-core/nm-setting-wireless-security.c
View File

@@ -90,8 +90,7 @@ typedef struct {
NMSettingWirelessSecurityFils fils; NMSettingWirelessSecurityFils fils;
} NMSettingWirelessSecurityPrivate; } NMSettingWirelessSecurityPrivate;
enum { NM_GOBJECT_PROPERTIES_DEFINE (NMSettingWirelessSecurity,
PROP_0,
PROP_KEY_MGMT, PROP_KEY_MGMT,
PROP_WEP_TX_KEYIDX, PROP_WEP_TX_KEYIDX,
PROP_AUTH_ALG, PROP_AUTH_ALG,
@@ -112,9 +111,7 @@ enum {
PROP_LEAP_PASSWORD_FLAGS, PROP_LEAP_PASSWORD_FLAGS,
PROP_WPS_METHOD, PROP_WPS_METHOD,
PROP_FILS, PROP_FILS,
);
LAST_PROP
};
/** /**
* nm_setting_wireless_security_new: * nm_setting_wireless_security_new:
@@ -209,7 +206,7 @@ nm_setting_wireless_security_add_proto (NMSettingWirelessSecurity *setting, cons
} }
priv->proto = g_slist_append (priv->proto, g_ascii_strdown (proto, -1)); priv->proto = g_slist_append (priv->proto, g_ascii_strdown (proto, -1));
g_object_notify (G_OBJECT (setting), NM_SETTING_WIRELESS_SECURITY_PROTO); _notify (setting, PROP_PROTO);
return TRUE; return TRUE;
} }
@@ -234,7 +231,7 @@ nm_setting_wireless_security_remove_proto (NMSettingWirelessSecurity *setting, g
g_free (elt->data); g_free (elt->data);
priv->proto = g_slist_delete_link (priv->proto, elt); priv->proto = g_slist_delete_link (priv->proto, elt);
g_object_notify (G_OBJECT (setting), NM_SETTING_WIRELESS_SECURITY_PROTO); _notify (setting, PROP_PROTO);
} }
/** /**
@@ -260,7 +257,7 @@ nm_setting_wireless_security_remove_proto_by_value (NMSettingWirelessSecurity *s
for (iter = priv->proto; iter; iter = g_slist_next (iter)) { for (iter = priv->proto; iter; iter = g_slist_next (iter)) {
if (strcasecmp (proto, (char *) iter->data) == 0) { if (strcasecmp (proto, (char *) iter->data) == 0) {
priv->proto = g_slist_delete_link (priv->proto, iter); priv->proto = g_slist_delete_link (priv->proto, iter);
g_object_notify (G_OBJECT (setting), NM_SETTING_WIRELESS_SECURITY_PROTO); _notify (setting, PROP_PROTO);
return TRUE; return TRUE;
} }
} }
@@ -284,7 +281,7 @@ nm_setting_wireless_security_clear_protos (NMSettingWirelessSecurity *setting)
priv = NM_SETTING_WIRELESS_SECURITY_GET_PRIVATE (setting); priv = NM_SETTING_WIRELESS_SECURITY_GET_PRIVATE (setting);
g_slist_free_full (priv->proto, g_free); g_slist_free_full (priv->proto, g_free);
priv->proto = NULL; priv->proto = NULL;
g_object_notify (G_OBJECT (setting), NM_SETTING_WIRELESS_SECURITY_PROTO); _notify (setting, PROP_PROTO);
} }
/** /**
@@ -353,7 +350,7 @@ nm_setting_wireless_security_add_pairwise (NMSettingWirelessSecurity *setting, c
} }
priv->pairwise = g_slist_append (priv->pairwise, g_ascii_strdown (pairwise, -1)); priv->pairwise = g_slist_append (priv->pairwise, g_ascii_strdown (pairwise, -1));
g_object_notify (G_OBJECT (setting), NM_SETTING_WIRELESS_SECURITY_PAIRWISE); _notify (setting, PROP_PAIRWISE);
return TRUE; return TRUE;
} }
@@ -379,7 +376,7 @@ nm_setting_wireless_security_remove_pairwise (NMSettingWirelessSecurity *setting
g_free (elt->data); g_free (elt->data);
priv->pairwise = g_slist_delete_link (priv->pairwise, elt); priv->pairwise = g_slist_delete_link (priv->pairwise, elt);
g_object_notify (G_OBJECT (setting), NM_SETTING_WIRELESS_SECURITY_PAIRWISE); _notify (setting, PROP_PAIRWISE);
} }
/** /**
@@ -406,7 +403,7 @@ nm_setting_wireless_security_remove_pairwise_by_value (NMSettingWirelessSecurity
for (iter = priv->pairwise; iter; iter = g_slist_next (iter)) { for (iter = priv->pairwise; iter; iter = g_slist_next (iter)) {
if (strcasecmp (pairwise, (char *) iter->data) == 0) { if (strcasecmp (pairwise, (char *) iter->data) == 0) {
priv->pairwise = g_slist_delete_link (priv->pairwise, iter); priv->pairwise = g_slist_delete_link (priv->pairwise, iter);
g_object_notify (G_OBJECT (setting), NM_SETTING_WIRELESS_SECURITY_PAIRWISE); _notify (setting, PROP_PAIRWISE);
return TRUE; return TRUE;
} }
} }
@@ -430,7 +427,7 @@ nm_setting_wireless_security_clear_pairwise (NMSettingWirelessSecurity *setting)
priv = NM_SETTING_WIRELESS_SECURITY_GET_PRIVATE (setting); priv = NM_SETTING_WIRELESS_SECURITY_GET_PRIVATE (setting);
g_slist_free_full (priv->pairwise, g_free); g_slist_free_full (priv->pairwise, g_free);
priv->pairwise = NULL; priv->pairwise = NULL;
g_object_notify (G_OBJECT (setting), NM_SETTING_WIRELESS_SECURITY_PAIRWISE); _notify (setting, PROP_PAIRWISE);
} }
/** /**
@@ -500,7 +497,7 @@ nm_setting_wireless_security_add_group (NMSettingWirelessSecurity *setting, cons
} }
priv->group = g_slist_append (priv->group, g_ascii_strdown (group, -1)); priv->group = g_slist_append (priv->group, g_ascii_strdown (group, -1));
g_object_notify (G_OBJECT (setting), NM_SETTING_WIRELESS_SECURITY_GROUP); _notify (setting, PROP_GROUP);
return TRUE; return TRUE;
} }
@@ -526,7 +523,7 @@ nm_setting_wireless_security_remove_group (NMSettingWirelessSecurity *setting, g
g_free (elt->data); g_free (elt->data);
priv->group = g_slist_delete_link (priv->group, elt); priv->group = g_slist_delete_link (priv->group, elt);
g_object_notify (G_OBJECT (setting), NM_SETTING_WIRELESS_SECURITY_GROUP); _notify (setting, PROP_GROUP);
} }
/** /**
@@ -554,7 +551,7 @@ nm_setting_wireless_security_remove_group_by_value (NMSettingWirelessSecurity *s
for (iter = priv->group; iter; iter = g_slist_next (iter)) { for (iter = priv->group; iter; iter = g_slist_next (iter)) {
if (strcasecmp (group, (char *) iter->data) == 0) { if (strcasecmp (group, (char *) iter->data) == 0) {
priv->group = g_slist_delete_link (priv->group, iter); priv->group = g_slist_delete_link (priv->group, iter);
g_object_notify (G_OBJECT (setting), NM_SETTING_WIRELESS_SECURITY_GROUP); _notify (setting, PROP_GROUP);
return TRUE; return TRUE;
} }
} }
@@ -578,7 +575,7 @@ nm_setting_wireless_security_clear_groups (NMSettingWirelessSecurity *setting)
priv = NM_SETTING_WIRELESS_SECURITY_GET_PRIVATE (setting); priv = NM_SETTING_WIRELESS_SECURITY_GET_PRIVATE (setting);
g_slist_free_full (priv->group, g_free); g_slist_free_full (priv->group, g_free);
priv->group = NULL; priv->group = NULL;
g_object_notify (G_OBJECT (setting), NM_SETTING_WIRELESS_SECURITY_GROUP); _notify (setting, PROP_GROUP);
} }
/* /*
@@ -721,22 +718,22 @@ nm_setting_wireless_security_set_wep_key (NMSettingWirelessSecurity *setting, gu
case 0: case 0:
g_free (priv->wep_key0); g_free (priv->wep_key0);
priv->wep_key0 = g_strdup (key); priv->wep_key0 = g_strdup (key);
g_object_notify (G_OBJECT (setting), NM_SETTING_WIRELESS_SECURITY_WEP_KEY0); _notify (setting, PROP_WEP_KEY0);
break; break;
case 1: case 1:
g_free (priv->wep_key1); g_free (priv->wep_key1);
priv->wep_key1 = g_strdup (key); priv->wep_key1 = g_strdup (key);
g_object_notify (G_OBJECT (setting), NM_SETTING_WIRELESS_SECURITY_WEP_KEY1); _notify (setting, PROP_WEP_KEY1);
break; break;
case 2: case 2:
g_free (priv->wep_key2); g_free (priv->wep_key2);
priv->wep_key2 = g_strdup (key); priv->wep_key2 = g_strdup (key);
g_object_notify (G_OBJECT (setting), NM_SETTING_WIRELESS_SECURITY_WEP_KEY2); _notify (setting, PROP_WEP_KEY2);
break; break;
case 3: case 3:
g_free (priv->wep_key3); g_free (priv->wep_key3);
priv->wep_key3 = g_strdup (key); priv->wep_key3 = g_strdup (key);
g_object_notify (G_OBJECT (setting), NM_SETTING_WIRELESS_SECURITY_WEP_KEY3); _notify (setting, PROP_WEP_KEY3);
break; break;
default: default:
g_assert_not_reached (); g_assert_not_reached ();
@@ -1465,13 +1462,12 @@ nm_setting_wireless_security_class_init (NMSettingWirelessSecurityClass *klass)
* description: Key management menthod. * description: Key management menthod.
* ---end--- * ---end---
*/ */
g_object_class_install_property obj_properties[PROP_KEY_MGMT] =
(object_class, PROP_KEY_MGMT, g_param_spec_string (NM_SETTING_WIRELESS_SECURITY_KEY_MGMT, "", "",
g_param_spec_string (NM_SETTING_WIRELESS_SECURITY_KEY_MGMT, "", "", NULL,
NULL, G_PARAM_READWRITE |
G_PARAM_READWRITE | NM_SETTING_PARAM_REQUIRED |
NM_SETTING_PARAM_REQUIRED | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingWirelessSecurity:wep-tx-keyidx: * NMSettingWirelessSecurity:wep-tx-keyidx:
@@ -1489,13 +1485,12 @@ nm_setting_wireless_security_class_init (NMSettingWirelessSecurityClass *klass)
* description: Index of active WEP key. * description: Index of active WEP key.
* ---end--- * ---end---
*/ */
g_object_class_install_property obj_properties[PROP_WEP_TX_KEYIDX] =
(object_class, PROP_WEP_TX_KEYIDX, g_param_spec_uint (NM_SETTING_WIRELESS_SECURITY_WEP_TX_KEYIDX, "", "",
g_param_spec_uint (NM_SETTING_WIRELESS_SECURITY_WEP_TX_KEYIDX, "", "", 0, 3, 0,
0, 3, 0, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingWirelessSecurity:auth-alg: * NMSettingWirelessSecurity:auth-alg:
@@ -1513,12 +1508,11 @@ nm_setting_wireless_security_class_init (NMSettingWirelessSecurityClass *klass)
* description: Authentication algorithm for WEP. * description: Authentication algorithm for WEP.
* ---end--- * ---end---
*/ */
g_object_class_install_property obj_properties[PROP_AUTH_ALG] =
(object_class, PROP_AUTH_ALG, g_param_spec_string (NM_SETTING_WIRELESS_SECURITY_AUTH_ALG, "", "",
g_param_spec_string (NM_SETTING_WIRELESS_SECURITY_AUTH_ALG, "", "", NULL,
NULL, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingWirelessSecurity:proto: * NMSettingWirelessSecurity:proto:
@@ -1535,12 +1529,11 @@ nm_setting_wireless_security_class_init (NMSettingWirelessSecurityClass *klass)
* description: Allowed WPA protocols, WPA and WPA2 (RSN). * description: Allowed WPA protocols, WPA and WPA2 (RSN).
* ---end--- * ---end---
*/ */
g_object_class_install_property obj_properties[PROP_PROTO] =
(object_class, PROP_PROTO, g_param_spec_boxed (NM_SETTING_WIRELESS_SECURITY_PROTO, "", "",
g_param_spec_boxed (NM_SETTING_WIRELESS_SECURITY_PROTO, "", "", G_TYPE_STRV,
G_TYPE_STRV, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingWirelessSecurity:pairwise: * NMSettingWirelessSecurity:pairwise:
@@ -1558,12 +1551,11 @@ nm_setting_wireless_security_class_init (NMSettingWirelessSecurityClass *klass)
* separated list. * separated list.
* ---end--- * ---end---
*/ */
g_object_class_install_property obj_properties[PROP_PAIRWISE] =
(object_class, PROP_PAIRWISE, g_param_spec_boxed (NM_SETTING_WIRELESS_SECURITY_PAIRWISE, "", "",
g_param_spec_boxed (NM_SETTING_WIRELESS_SECURITY_PAIRWISE, "", "", G_TYPE_STRV,
G_TYPE_STRV, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingWirelessSecurity:group: * NMSettingWirelessSecurity:group:
@@ -1581,12 +1573,11 @@ nm_setting_wireless_security_class_init (NMSettingWirelessSecurityClass *klass)
* separated list. * separated list.
* ---end--- * ---end---
*/ */
g_object_class_install_property obj_properties[PROP_GROUP] =
(object_class, PROP_GROUP, g_param_spec_boxed (NM_SETTING_WIRELESS_SECURITY_GROUP, "", "",
g_param_spec_boxed (NM_SETTING_WIRELESS_SECURITY_GROUP, "", "", G_TYPE_STRV,
G_TYPE_STRV, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingWirelessSecurity:pmf: * NMSettingWirelessSecurity:pmf:
@@ -1610,14 +1601,13 @@ nm_setting_wireless_security_class_init (NMSettingWirelessSecurityClass *klass)
* example: PMF=required * example: PMF=required
* ---end--- * ---end---
*/ */
g_object_class_install_property obj_properties[PROP_PMF] =
(object_class, PROP_PMF, g_param_spec_int (NM_SETTING_WIRELESS_SECURITY_PMF, "", "",
g_param_spec_int (NM_SETTING_WIRELESS_SECURITY_PMF, "", "", G_MININT32, G_MAXINT32, 0,
G_MININT32, G_MAXINT32, 0, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
G_PARAM_CONSTRUCT | NM_SETTING_PARAM_FUZZY_IGNORE |
NM_SETTING_PARAM_FUZZY_IGNORE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingWirelessSecurity:leap-username: * NMSettingWirelessSecurity:leap-username:
@@ -1631,12 +1621,11 @@ nm_setting_wireless_security_class_init (NMSettingWirelessSecurityClass *klass)
* description: Login name for LEAP. * description: Login name for LEAP.
* ---end--- * ---end---
*/ */
g_object_class_install_property obj_properties[PROP_LEAP_USERNAME] =
(object_class, PROP_LEAP_USERNAME, g_param_spec_string (NM_SETTING_WIRELESS_SECURITY_LEAP_USERNAME, "", "",
g_param_spec_string (NM_SETTING_WIRELESS_SECURITY_LEAP_USERNAME, "", "", NULL,
NULL, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingWirelessSecurity:wep-key0: * NMSettingWirelessSecurity:wep-key0:
@@ -1650,13 +1639,12 @@ nm_setting_wireless_security_class_init (NMSettingWirelessSecurityClass *klass)
* description: The first WEP key (used in most networks). See also DEFAULTKEY for key index. * description: The first WEP key (used in most networks). See also DEFAULTKEY for key index.
* ---end--- * ---end---
*/ */
g_object_class_install_property obj_properties[PROP_WEP_KEY0] =
(object_class, PROP_WEP_KEY0, g_param_spec_string (NM_SETTING_WIRELESS_SECURITY_WEP_KEY0, "", "",
g_param_spec_string (NM_SETTING_WIRELESS_SECURITY_WEP_KEY0, "", "", NULL,
NULL, G_PARAM_READWRITE |
G_PARAM_READWRITE | NM_SETTING_PARAM_SECRET |
NM_SETTING_PARAM_SECRET | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingWirelessSecurity:wep-key1: * NMSettingWirelessSecurity:wep-key1:
@@ -1670,13 +1658,12 @@ nm_setting_wireless_security_class_init (NMSettingWirelessSecurityClass *klass)
* description: WEP key with index 1. See also DEFAULTKEY for key index. * description: WEP key with index 1. See also DEFAULTKEY for key index.
* ---end--- * ---end---
*/ */
g_object_class_install_property obj_properties[PROP_WEP_KEY1] =
(object_class, PROP_WEP_KEY1, g_param_spec_string (NM_SETTING_WIRELESS_SECURITY_WEP_KEY1, "", "",
g_param_spec_string (NM_SETTING_WIRELESS_SECURITY_WEP_KEY1, "", "", NULL,
NULL, G_PARAM_READWRITE |
G_PARAM_READWRITE | NM_SETTING_PARAM_SECRET |
NM_SETTING_PARAM_SECRET | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingWirelessSecurity:wep-key2: * NMSettingWirelessSecurity:wep-key2:
@@ -1690,13 +1677,12 @@ nm_setting_wireless_security_class_init (NMSettingWirelessSecurityClass *klass)
* description: WEP key with index 2. See also DEFAULTKEY for key index. * description: WEP key with index 2. See also DEFAULTKEY for key index.
* ---end--- * ---end---
*/ */
g_object_class_install_property obj_properties[PROP_WEP_KEY2] =
(object_class, PROP_WEP_KEY2, g_param_spec_string (NM_SETTING_WIRELESS_SECURITY_WEP_KEY2, "", "",
g_param_spec_string (NM_SETTING_WIRELESS_SECURITY_WEP_KEY2, "", "", NULL,
NULL, G_PARAM_READWRITE |
G_PARAM_READWRITE | NM_SETTING_PARAM_SECRET |
NM_SETTING_PARAM_SECRET | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingWirelessSecurity:wep-key3: * NMSettingWirelessSecurity:wep-key3:
@@ -1710,13 +1696,12 @@ nm_setting_wireless_security_class_init (NMSettingWirelessSecurityClass *klass)
* description: WEP key with index 3. See also DEFAULTKEY for key index. * description: WEP key with index 3. See also DEFAULTKEY for key index.
* ---end--- * ---end---
*/ */
g_object_class_install_property obj_properties[PROP_WEP_KEY3] =
(object_class, PROP_WEP_KEY3, g_param_spec_string (NM_SETTING_WIRELESS_SECURITY_WEP_KEY3, "", "",
g_param_spec_string (NM_SETTING_WIRELESS_SECURITY_WEP_KEY3, "", "", NULL,
NULL, G_PARAM_READWRITE |
G_PARAM_READWRITE | NM_SETTING_PARAM_SECRET |
NM_SETTING_PARAM_SECRET | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingWirelessSecurity:wep-key-flags: * NMSettingWirelessSecurity:wep-key-flags:
@@ -1732,13 +1717,12 @@ nm_setting_wireless_security_class_init (NMSettingWirelessSecurityClass *klass)
* description: Password flags for KEY<i>, KEY_PASSPHRASE<i> password. * description: Password flags for KEY<i>, KEY_PASSPHRASE<i> password.
* ---end--- * ---end---
*/ */
g_object_class_install_property obj_properties[PROP_WEP_KEY_FLAGS] =
(object_class, PROP_WEP_KEY_FLAGS, g_param_spec_flags (NM_SETTING_WIRELESS_SECURITY_WEP_KEY_FLAGS, "", "",
g_param_spec_flags (NM_SETTING_WIRELESS_SECURITY_WEP_KEY_FLAGS, "", "", NM_TYPE_SETTING_SECRET_FLAGS,
NM_TYPE_SETTING_SECRET_FLAGS, NM_SETTING_SECRET_FLAG_NONE,
NM_SETTING_SECRET_FLAG_NONE, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingWirelessSecurity:psk: * NMSettingWirelessSecurity:psk:
@@ -1756,13 +1740,12 @@ nm_setting_wireless_security_class_init (NMSettingWirelessSecurityClass *klass)
* description: Pre-Shared-Key for WPA networks. * description: Pre-Shared-Key for WPA networks.
* ---end--- * ---end---
*/ */
g_object_class_install_property obj_properties[PROP_PSK] =
(object_class, PROP_PSK, g_param_spec_string (NM_SETTING_WIRELESS_SECURITY_PSK, "", "",
g_param_spec_string (NM_SETTING_WIRELESS_SECURITY_PSK, "", "", NULL,
NULL, G_PARAM_READWRITE |
G_PARAM_READWRITE | NM_SETTING_PARAM_SECRET |
NM_SETTING_PARAM_SECRET | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingWirelessSecurity:psk-flags: * NMSettingWirelessSecurity:psk-flags:
@@ -1778,13 +1761,12 @@ nm_setting_wireless_security_class_init (NMSettingWirelessSecurityClass *klass)
* example: WPA_PSK_FLAGS=user * example: WPA_PSK_FLAGS=user
* ---end--- * ---end---
*/ */
g_object_class_install_property obj_properties[PROP_PSK_FLAGS] =
(object_class, PROP_PSK_FLAGS, g_param_spec_flags (NM_SETTING_WIRELESS_SECURITY_PSK_FLAGS, "", "",
g_param_spec_flags (NM_SETTING_WIRELESS_SECURITY_PSK_FLAGS, "", "", NM_TYPE_SETTING_SECRET_FLAGS,
NM_TYPE_SETTING_SECRET_FLAGS, NM_SETTING_SECRET_FLAG_NONE,
NM_SETTING_SECRET_FLAG_NONE, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingWirelessSecurity:leap-password: * NMSettingWirelessSecurity:leap-password:
@@ -1799,13 +1781,12 @@ nm_setting_wireless_security_class_init (NMSettingWirelessSecurityClass *klass)
* lookaside file, or it can be owned by a secret agent. * lookaside file, or it can be owned by a secret agent.
* ---end--- * ---end---
*/ */
g_object_class_install_property obj_properties[PROP_LEAP_PASSWORD] =
(object_class, PROP_LEAP_PASSWORD, g_param_spec_string (NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD, "", "",
g_param_spec_string (NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD, "", "", NULL,
NULL, G_PARAM_READWRITE |
G_PARAM_READWRITE | NM_SETTING_PARAM_SECRET |
NM_SETTING_PARAM_SECRET | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingWirelessSecurity:leap-password-flags: * NMSettingWirelessSecurity:leap-password-flags:
@@ -1820,13 +1801,12 @@ nm_setting_wireless_security_class_init (NMSettingWirelessSecurityClass *klass)
* description: Password flags for IEEE_8021X_PASSWORD_FLAGS. * description: Password flags for IEEE_8021X_PASSWORD_FLAGS.
* ---end--- * ---end---
*/ */
g_object_class_install_property obj_properties[PROP_LEAP_PASSWORD_FLAGS] =
(object_class, PROP_LEAP_PASSWORD_FLAGS, g_param_spec_flags (NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD_FLAGS, "", "",
g_param_spec_flags (NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD_FLAGS, "", "", NM_TYPE_SETTING_SECRET_FLAGS,
NM_TYPE_SETTING_SECRET_FLAGS, NM_SETTING_SECRET_FLAG_NONE,
NM_SETTING_SECRET_FLAG_NONE, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingWirelessSecurity:wep-key-type: * NMSettingWirelessSecurity:wep-key-type:
@@ -1848,18 +1828,16 @@ nm_setting_wireless_security_class_init (NMSettingWirelessSecurityClass *klass)
* example: KEY1=s:ahoj, KEY1=0a1c45bc02, KEY_PASSPHRASE1=mysupersecretkey * example: KEY1=s:ahoj, KEY1=0a1c45bc02, KEY_PASSPHRASE1=mysupersecretkey
* ---end--- * ---end---
*/ */
g_object_class_install_property obj_properties[PROP_WEP_KEY_TYPE] =
(object_class, PROP_WEP_KEY_TYPE, g_param_spec_enum (NM_SETTING_WIRELESS_SECURITY_WEP_KEY_TYPE, "", "",
g_param_spec_enum (NM_SETTING_WIRELESS_SECURITY_WEP_KEY_TYPE, "", "", NM_TYPE_WEP_KEY_TYPE,
NM_TYPE_WEP_KEY_TYPE, NM_WEP_KEY_TYPE_UNKNOWN,
NM_WEP_KEY_TYPE_UNKNOWN, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
_properties_override_add_transform (properties_override, _properties_override_add_transform (properties_override,
g_object_class_find_property (G_OBJECT_CLASS (setting_class), obj_properties[PROP_WEP_KEY_TYPE],
NM_SETTING_WIRELESS_SECURITY_WEP_KEY_TYPE),
G_VARIANT_TYPE_UINT32, G_VARIANT_TYPE_UINT32,
wep_key_type_to_dbus, wep_key_type_to_dbus,
NULL); NULL);
@@ -1885,14 +1863,13 @@ nm_setting_wireless_security_class_init (NMSettingWirelessSecurityClass *klass)
* example: WPS_METHOD=disabled, WPS_METHOD="pin pbc" * example: WPS_METHOD=disabled, WPS_METHOD="pin pbc"
* ---end--- * ---end---
*/ */
g_object_class_install_property obj_properties[PROP_WPS_METHOD] =
(object_class, PROP_WPS_METHOD, g_param_spec_uint (NM_SETTING_WIRELESS_SECURITY_WPS_METHOD, "", "",
g_param_spec_uint (NM_SETTING_WIRELESS_SECURITY_WPS_METHOD, "", "", 0, G_MAXUINT32, NM_SETTING_WIRELESS_SECURITY_WPS_METHOD_DEFAULT,
0, G_MAXUINT32, NM_SETTING_WIRELESS_SECURITY_WPS_METHOD_DEFAULT, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
G_PARAM_CONSTRUCT | NM_SETTING_PARAM_FUZZY_IGNORE |
NM_SETTING_PARAM_FUZZY_IGNORE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingWirelessSecurity:fils: * NMSettingWirelessSecurity:fils:
@@ -1916,14 +1893,15 @@ nm_setting_wireless_security_class_init (NMSettingWirelessSecurityClass *klass)
* example: FILS=required * example: FILS=required
* ---end--- * ---end---
*/ */
g_object_class_install_property obj_properties[PROP_FILS] =
(object_class, PROP_FILS, g_param_spec_int (NM_SETTING_WIRELESS_SECURITY_FILS, "", "",
g_param_spec_int (NM_SETTING_WIRELESS_SECURITY_FILS, "", "", G_MININT32, G_MAXINT32, 0,
G_MININT32, G_MAXINT32, 0, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
G_PARAM_CONSTRUCT | NM_SETTING_PARAM_FUZZY_IGNORE |
NM_SETTING_PARAM_FUZZY_IGNORE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
g_object_class_install_properties (object_class, _PROPERTY_ENUMS_LAST, obj_properties);
_nm_setting_class_commit_full (setting_class, NM_META_SETTING_TYPE_WIRELESS_SECURITY, _nm_setting_class_commit_full (setting_class, NM_META_SETTING_TYPE_WIRELESS_SECURITY,
NULL, properties_override); NULL, properties_override);

233
libnm-core/nm-setting-wireless.c
View File

@@ -64,8 +64,7 @@ typedef struct {
guint32 wowl; guint32 wowl;
} NMSettingWirelessPrivate; } NMSettingWirelessPrivate;
enum { NM_GOBJECT_PROPERTIES_DEFINE (NMSettingWireless,
PROP_0,
PROP_SSID, PROP_SSID,
PROP_MODE, PROP_MODE,
PROP_BAND, PROP_BAND,
@@ -83,9 +82,7 @@ enum {
PROP_POWERSAVE, PROP_POWERSAVE,
PROP_MAC_ADDRESS_RANDOMIZATION, PROP_MAC_ADDRESS_RANDOMIZATION,
PROP_WAKE_ON_WLAN, PROP_WAKE_ON_WLAN,
);
LAST_PROP
};
static gboolean static gboolean
match_cipher (const char *cipher, match_cipher (const char *cipher,
@@ -523,7 +520,7 @@ nm_setting_wireless_add_mac_blacklist_item (NMSettingWireless *setting, const ch
mac = nm_utils_hwaddr_canonical (mac, ETH_ALEN); mac = nm_utils_hwaddr_canonical (mac, ETH_ALEN);
g_array_append_val (priv->mac_address_blacklist, mac); g_array_append_val (priv->mac_address_blacklist, mac);
g_object_notify (G_OBJECT (setting), NM_SETTING_WIRELESS_MAC_ADDRESS_BLACKLIST); _notify (setting, PROP_MAC_ADDRESS_BLACKLIST);
return TRUE; return TRUE;
} }
@@ -545,7 +542,7 @@ nm_setting_wireless_remove_mac_blacklist_item (NMSettingWireless *setting, guint
g_return_if_fail (idx < priv->mac_address_blacklist->len); g_return_if_fail (idx < priv->mac_address_blacklist->len);
g_array_remove_index (priv->mac_address_blacklist, idx); g_array_remove_index (priv->mac_address_blacklist, idx);
g_object_notify (G_OBJECT (setting), NM_SETTING_WIRELESS_MAC_ADDRESS_BLACKLIST); _notify (setting, PROP_MAC_ADDRESS_BLACKLIST);
} }
/** /**
@@ -573,7 +570,7 @@ nm_setting_wireless_remove_mac_blacklist_item_by_value (NMSettingWireless *setti
candidate = g_array_index (priv->mac_address_blacklist, char *, i); candidate = g_array_index (priv->mac_address_blacklist, char *, i);
if (!nm_utils_hwaddr_matches (mac, -1, candidate, -1)) { if (!nm_utils_hwaddr_matches (mac, -1, candidate, -1)) {
g_array_remove_index (priv->mac_address_blacklist, i); g_array_remove_index (priv->mac_address_blacklist, i);
g_object_notify (G_OBJECT (setting), NM_SETTING_WIRELESS_MAC_ADDRESS_BLACKLIST); _notify (setting, PROP_MAC_ADDRESS_BLACKLIST);
return TRUE; return TRUE;
} }
} }
@@ -592,7 +589,7 @@ nm_setting_wireless_clear_mac_blacklist_items (NMSettingWireless *setting)
g_return_if_fail (NM_IS_SETTING_WIRELESS (setting)); g_return_if_fail (NM_IS_SETTING_WIRELESS (setting));
g_array_set_size (NM_SETTING_WIRELESS_GET_PRIVATE (setting)->mac_address_blacklist, 0); g_array_set_size (NM_SETTING_WIRELESS_GET_PRIVATE (setting)->mac_address_blacklist, 0);
g_object_notify (G_OBJECT (setting), NM_SETTING_WIRELESS_MAC_ADDRESS_BLACKLIST); _notify (setting, PROP_MAC_ADDRESS_BLACKLIST);
} }
/** /**
@@ -695,7 +692,7 @@ nm_setting_wireless_add_seen_bssid (NMSettingWireless *setting,
if (!found) { if (!found) {
priv->seen_bssids = g_slist_prepend (priv->seen_bssids, lower_bssid); priv->seen_bssids = g_slist_prepend (priv->seen_bssids, lower_bssid);
g_object_notify (G_OBJECT (setting), NM_SETTING_WIRELESS_SEEN_BSSIDS); _notify (setting, PROP_SEEN_BSSIDS);
} else } else
g_free (lower_bssid); g_free (lower_bssid);
@@ -1076,7 +1073,7 @@ set_property (GObject *object, guint prop_id,
* In this case, we also clear mac-address-randomization flag */ * In this case, we also clear mac-address-randomization flag */
if (priv->mac_address_randomization != NM_SETTING_MAC_RANDOMIZATION_DEFAULT) { if (priv->mac_address_randomization != NM_SETTING_MAC_RANDOMIZATION_DEFAULT) {
priv->mac_address_randomization = NM_SETTING_MAC_RANDOMIZATION_DEFAULT; priv->mac_address_randomization = NM_SETTING_MAC_RANDOMIZATION_DEFAULT;
g_object_notify (object, NM_SETTING_WIRELESS_MAC_ADDRESS_RANDOMIZATION); _notify (NM_SETTING_WIRELESS (object), PROP_MAC_ADDRESS_RANDOMIZATION);
} }
} }
break; break;
@@ -1218,12 +1215,11 @@ nm_setting_wireless_class_init (NMSettingWirelessClass *klass)
* example: ESSID="Quick Net" * example: ESSID="Quick Net"
* ---end--- * ---end---
*/ */
g_object_class_install_property obj_properties[PROP_SSID] =
(object_class, PROP_SSID, g_param_spec_boxed (NM_SETTING_WIRELESS_SSID, "", "",
g_param_spec_boxed (NM_SETTING_WIRELESS_SSID, "", "", G_TYPE_BYTES,
G_TYPE_BYTES, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingWireless:mode: * NMSettingWireless:mode:
@@ -1238,12 +1234,11 @@ nm_setting_wireless_class_init (NMSettingWirelessClass *klass)
* description: Wi-Fi network mode. * description: Wi-Fi network mode.
* ---end--- * ---end---
*/ */
g_object_class_install_property obj_properties[PROP_MODE] =
(object_class, PROP_MODE, g_param_spec_string (NM_SETTING_WIRELESS_MODE, "", "",
g_param_spec_string (NM_SETTING_WIRELESS_MODE, "", "", NULL,
NULL, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingWireless:band: * NMSettingWireless:band:
@@ -1264,12 +1259,11 @@ nm_setting_wireless_class_init (NMSettingWirelessClass *klass)
* example: BAND=bg * example: BAND=bg
* ---end--- * ---end---
*/ */
g_object_class_install_property obj_properties[PROP_BAND] =
(object_class, PROP_BAND, g_param_spec_string (NM_SETTING_WIRELESS_BAND, "", "",
g_param_spec_string (NM_SETTING_WIRELESS_BAND, "", "", NULL,
NULL, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingWireless:channel: * NMSettingWireless:channel:
@@ -1288,13 +1282,12 @@ nm_setting_wireless_class_init (NMSettingWirelessClass *klass)
* example: CHANNEL=6 * example: CHANNEL=6
* ---end--- * ---end---
*/ */
g_object_class_install_property obj_properties[PROP_CHANNEL] =
(object_class, PROP_CHANNEL, g_param_spec_uint (NM_SETTING_WIRELESS_CHANNEL, "", "",
g_param_spec_uint (NM_SETTING_WIRELESS_CHANNEL, "", "", 0, G_MAXUINT32, 0,
0, G_MAXUINT32, 0, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingWireless:bssid: * NMSettingWireless:bssid:
@@ -1311,16 +1304,14 @@ nm_setting_wireless_class_init (NMSettingWirelessClass *klass)
* example: BSSID=00:1E:BD:64:83:21 * example: BSSID=00:1E:BD:64:83:21
* ---end--- * ---end---
*/ */
g_object_class_install_property obj_properties[PROP_BSSID] =
(object_class, PROP_BSSID, g_param_spec_string (NM_SETTING_WIRELESS_BSSID, "", "",
g_param_spec_string (NM_SETTING_WIRELESS_BSSID, "", "", NULL,
NULL, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
_properties_override_add_transform (properties_override, _properties_override_add_transform (properties_override,
g_object_class_find_property (G_OBJECT_CLASS (setting_class), obj_properties[PROP_BSSID],
NM_SETTING_WIRELESS_BSSID),
G_VARIANT_TYPE_BYTESTRING, G_VARIANT_TYPE_BYTESTRING,
_nm_utils_hwaddr_to_dbus, _nm_utils_hwaddr_to_dbus,
_nm_utils_hwaddr_from_dbus); _nm_utils_hwaddr_from_dbus);
@@ -1339,14 +1330,13 @@ nm_setting_wireless_class_init (NMSettingWirelessClass *klass)
* description: This property is not handled by ifcfg-rh plugin. * description: This property is not handled by ifcfg-rh plugin.
* ---end--- * ---end---
*/ */
g_object_class_install_property obj_properties[PROP_RATE] =
(object_class, PROP_RATE, g_param_spec_uint (NM_SETTING_WIRELESS_RATE, "", "",
g_param_spec_uint (NM_SETTING_WIRELESS_RATE, "", "", 0, G_MAXUINT32, 0,
0, G_MAXUINT32, 0, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
G_PARAM_CONSTRUCT | NM_SETTING_PARAM_FUZZY_IGNORE |
NM_SETTING_PARAM_FUZZY_IGNORE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingWireless:tx-power: * NMSettingWireless:tx-power:
@@ -1361,14 +1351,13 @@ nm_setting_wireless_class_init (NMSettingWirelessClass *klass)
* description: This property is not handled by ifcfg-rh plugin. * description: This property is not handled by ifcfg-rh plugin.
* ---end--- * ---end---
*/ */
g_object_class_install_property obj_properties[PROP_TX_POWER] =
(object_class, PROP_TX_POWER, g_param_spec_uint (NM_SETTING_WIRELESS_TX_POWER, "", "",
g_param_spec_uint (NM_SETTING_WIRELESS_TX_POWER, "", "", 0, G_MAXUINT32, 0,
0, G_MAXUINT32, 0, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
G_PARAM_CONSTRUCT | NM_SETTING_PARAM_FUZZY_IGNORE |
NM_SETTING_PARAM_FUZZY_IGNORE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingWireless:mac-address: * NMSettingWireless:mac-address:
@@ -1394,16 +1383,14 @@ nm_setting_wireless_class_init (NMSettingWirelessClass *klass)
* permanent MAC address exists, the MAC address initially configured on the device. * permanent MAC address exists, the MAC address initially configured on the device.
* ---end--- * ---end---
*/ */
g_object_class_install_property obj_properties[PROP_MAC_ADDRESS] =
(object_class, PROP_MAC_ADDRESS, g_param_spec_string (NM_SETTING_WIRELESS_MAC_ADDRESS, "", "",
g_param_spec_string (NM_SETTING_WIRELESS_MAC_ADDRESS, "", "", NULL,
NULL, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
_properties_override_add_transform (properties_override, _properties_override_add_transform (properties_override,
g_object_class_find_property (G_OBJECT_CLASS (setting_class), obj_properties[PROP_MAC_ADDRESS],
NM_SETTING_WIRELESS_MAC_ADDRESS),
G_VARIANT_TYPE_BYTESTRING, G_VARIANT_TYPE_BYTESTRING,
_nm_utils_hwaddr_to_dbus, _nm_utils_hwaddr_to_dbus,
_nm_utils_hwaddr_from_dbus); _nm_utils_hwaddr_from_dbus);
@@ -1450,17 +1437,15 @@ nm_setting_wireless_class_init (NMSettingWirelessClass *klass)
* For libnm and nmcli, this field is called "cloned-mac-address". * For libnm and nmcli, this field is called "cloned-mac-address".
* ---end--- * ---end---
*/ */
g_object_class_install_property obj_properties[PROP_CLONED_MAC_ADDRESS] =
(object_class, PROP_CLONED_MAC_ADDRESS, g_param_spec_string (NM_SETTING_WIRELESS_CLONED_MAC_ADDRESS, "", "",
g_param_spec_string (NM_SETTING_WIRELESS_CLONED_MAC_ADDRESS, "", "", NULL,
NULL, G_PARAM_READWRITE |
G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE |
NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
_properties_override_add_override (properties_override, _properties_override_add_override (properties_override,
g_object_class_find_property (G_OBJECT_CLASS (setting_class), obj_properties[PROP_CLONED_MAC_ADDRESS],
NM_SETTING_WIRELESS_CLONED_MAC_ADDRESS),
G_VARIANT_TYPE_BYTESTRING, G_VARIANT_TYPE_BYTESTRING,
_nm_utils_hwaddr_cloned_get, _nm_utils_hwaddr_cloned_get,
_nm_utils_hwaddr_cloned_set, _nm_utils_hwaddr_cloned_set,
@@ -1523,13 +1508,12 @@ nm_setting_wireless_class_init (NMSettingWirelessClass *klass)
* cloned-mac-address. * cloned-mac-address.
* ---end--- * ---end---
*/ */
g_object_class_install_property obj_properties[PROP_GENERATE_MAC_ADDRESS_MASK] =
(object_class, PROP_GENERATE_MAC_ADDRESS_MASK,
g_param_spec_string (NM_SETTING_WIRELESS_GENERATE_MAC_ADDRESS_MASK, "", "", g_param_spec_string (NM_SETTING_WIRELESS_GENERATE_MAC_ADDRESS_MASK, "", "",
NULL, NULL,
G_PARAM_READWRITE | G_PARAM_READWRITE |
NM_SETTING_PARAM_FUZZY_IGNORE | NM_SETTING_PARAM_FUZZY_IGNORE |
G_PARAM_STATIC_STRINGS)); G_PARAM_STATIC_STRINGS);
/** /**
* NMSettingWireless:mac-address-blacklist: * NMSettingWireless:mac-address-blacklist:
@@ -1551,13 +1535,12 @@ nm_setting_wireless_class_init (NMSettingWirelessClass *klass)
* is listed. * is listed.
* ---end--- * ---end---
*/ */
g_object_class_install_property obj_properties[PROP_MAC_ADDRESS_BLACKLIST] =
(object_class, PROP_MAC_ADDRESS_BLACKLIST, g_param_spec_boxed (NM_SETTING_WIRELESS_MAC_ADDRESS_BLACKLIST, "", "",
g_param_spec_boxed (NM_SETTING_WIRELESS_MAC_ADDRESS_BLACKLIST, "", "", G_TYPE_STRV,
G_TYPE_STRV, G_PARAM_READWRITE |
G_PARAM_READWRITE | NM_SETTING_PARAM_FUZZY_IGNORE |
NM_SETTING_PARAM_FUZZY_IGNORE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingWireless:seen-bssids: * NMSettingWireless:seen-bssids:
@@ -1575,13 +1558,12 @@ nm_setting_wireless_class_init (NMSettingWirelessClass *klass)
* description: This property is not handled by ifcfg-rh plugin. * description: This property is not handled by ifcfg-rh plugin.
* ---end--- * ---end---
*/ */
g_object_class_install_property obj_properties[PROP_SEEN_BSSIDS] =
(object_class, PROP_SEEN_BSSIDS, g_param_spec_boxed (NM_SETTING_WIRELESS_SEEN_BSSIDS, "", "",
g_param_spec_boxed (NM_SETTING_WIRELESS_SEEN_BSSIDS, "", "", G_TYPE_STRV,
G_TYPE_STRV, G_PARAM_READWRITE |
G_PARAM_READWRITE | NM_SETTING_PARAM_FUZZY_IGNORE |
NM_SETTING_PARAM_FUZZY_IGNORE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingWireless:mtu: * NMSettingWireless:mtu:
@@ -1595,14 +1577,13 @@ nm_setting_wireless_class_init (NMSettingWirelessClass *klass)
* description: MTU of the wireless interface. * description: MTU of the wireless interface.
* ---end--- * ---end---
*/ */
g_object_class_install_property obj_properties[PROP_MTU] =
(object_class, PROP_MTU, g_param_spec_uint (NM_SETTING_WIRELESS_MTU, "", "",
g_param_spec_uint (NM_SETTING_WIRELESS_MTU, "", "", 0, G_MAXUINT32, 0,
0, G_MAXUINT32, 0, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
G_PARAM_CONSTRUCT | NM_SETTING_PARAM_FUZZY_IGNORE |
NM_SETTING_PARAM_FUZZY_IGNORE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingWireless:hidden: * NMSettingWireless:hidden:
@@ -1628,12 +1609,11 @@ nm_setting_wireless_class_init (NMSettingWirelessClass *klass)
* description: Whether the network hides the SSID. * description: Whether the network hides the SSID.
* ---end--- * ---end---
*/ */
g_object_class_install_property obj_properties[PROP_HIDDEN] =
(object_class, PROP_HIDDEN, g_param_spec_boolean (NM_SETTING_WIRELESS_HIDDEN, "", "",
g_param_spec_boolean (NM_SETTING_WIRELESS_HIDDEN, "", "", FALSE,
FALSE, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingWireless:powersave: * NMSettingWireless:powersave:
@@ -1654,12 +1634,11 @@ nm_setting_wireless_class_init (NMSettingWirelessClass *klass)
* example: POWERSAVE=enable * example: POWERSAVE=enable
* ---end--- * ---end---
*/ */
g_object_class_install_property obj_properties[PROP_POWERSAVE] =
(object_class, PROP_POWERSAVE, g_param_spec_uint (NM_SETTING_WIRELESS_POWERSAVE, "", "",
g_param_spec_uint (NM_SETTING_WIRELESS_POWERSAVE, "", "", 0, G_MAXUINT32, NM_SETTING_WIRELESS_POWERSAVE_DEFAULT,
0, G_MAXUINT32, NM_SETTING_WIRELESS_POWERSAVE_DEFAULT, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingWireless:mac-address-randomization: * NMSettingWireless:mac-address-randomization:
@@ -1682,12 +1661,11 @@ nm_setting_wireless_class_init (NMSettingWirelessClass *klass)
* example: MAC_ADDRESS_RANDOMIZATION=always * example: MAC_ADDRESS_RANDOMIZATION=always
* ---end--- * ---end---
*/ */
g_object_class_install_property obj_properties[PROP_MAC_ADDRESS_RANDOMIZATION] =
(object_class, PROP_MAC_ADDRESS_RANDOMIZATION, g_param_spec_uint (NM_SETTING_WIRELESS_MAC_ADDRESS_RANDOMIZATION, "", "",
g_param_spec_uint (NM_SETTING_WIRELESS_MAC_ADDRESS_RANDOMIZATION, "", "", 0, G_MAXUINT32, NM_SETTING_MAC_RANDOMIZATION_DEFAULT,
0, G_MAXUINT32, NM_SETTING_MAC_RANDOMIZATION_DEFAULT, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/* Compatibility for deprecated property */ /* Compatibility for deprecated property */
/* ---ifcfg-rh--- /* ---ifcfg-rh---
@@ -1727,13 +1705,14 @@ nm_setting_wireless_class_init (NMSettingWirelessClass *klass)
* *
* Since: 1.12 * Since: 1.12
**/ **/
g_object_class_install_property obj_properties[PROP_WAKE_ON_WLAN] =
(object_class, PROP_WAKE_ON_WLAN, g_param_spec_uint (NM_SETTING_WIRELESS_WAKE_ON_WLAN, "", "",
g_param_spec_uint (NM_SETTING_WIRELESS_WAKE_ON_WLAN, "", "", 0, G_MAXUINT32, NM_SETTING_WIRELESS_WAKE_ON_WLAN_DEFAULT,
0, G_MAXUINT32, NM_SETTING_WIRELESS_WAKE_ON_WLAN_DEFAULT, G_PARAM_CONSTRUCT |
G_PARAM_CONSTRUCT | G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
g_object_class_install_properties (object_class, _PROPERTY_ENUMS_LAST, obj_properties);
_nm_setting_class_commit_full (setting_class, NM_META_SETTING_TYPE_WIRELESS, _nm_setting_class_commit_full (setting_class, NM_META_SETTING_TYPE_WIRELESS,
NULL, properties_override); NULL, properties_override);

70
libnm-core/nm-setting-wpan.c
View File

@@ -39,14 +39,13 @@
#define IEEE802154_MAX_CHANNEL 26 #define IEEE802154_MAX_CHANNEL 26
#endif #endif
enum { NM_GOBJECT_PROPERTIES_DEFINE_BASE (
PROP_0,
PROP_MAC_ADDRESS, PROP_MAC_ADDRESS,
PROP_PAN_ID, PROP_PAN_ID,
PROP_SHORT_ADDRESS, PROP_SHORT_ADDRESS,
PROP_PAGE, PROP_PAGE,
PROP_CHANNEL, PROP_CHANNEL,
}; );
typedef struct { typedef struct {
char *mac_address; char *mac_address;
@@ -328,36 +327,33 @@ nm_setting_wpan_class_init (NMSettingWpanClass *klass)
* (e.g. 76:d8:9b:87:66:60:84:ee). * (e.g. 76:d8:9b:87:66:60:84:ee).
* ---end--- * ---end---
*/ */
g_object_class_install_property obj_properties[PROP_MAC_ADDRESS] =
(object_class, PROP_MAC_ADDRESS, g_param_spec_string (NM_SETTING_WPAN_MAC_ADDRESS, "", "",
g_param_spec_string (NM_SETTING_WPAN_MAC_ADDRESS, "", "", NULL,
NULL, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingWpan:pan-id: * NMSettingWpan:pan-id:
* *
* IEEE 802.15.4 Personal Area Network (PAN) identifier. * IEEE 802.15.4 Personal Area Network (PAN) identifier.
**/ **/
g_object_class_install_property obj_properties[PROP_PAN_ID] =
(object_class, PROP_PAN_ID, g_param_spec_uint (NM_SETTING_WPAN_PAN_ID, "", "",
g_param_spec_uint (NM_SETTING_WPAN_PAN_ID, "", "", 0, G_MAXUINT16, G_MAXUINT16,
0, G_MAXUINT16, G_MAXUINT16, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingWpan:short-address: * NMSettingWpan:short-address:
* *
* Short IEEE 802.15.4 address to be used within a restricted environment. * Short IEEE 802.15.4 address to be used within a restricted environment.
**/ **/
g_object_class_install_property obj_properties[PROP_SHORT_ADDRESS] =
(object_class, PROP_SHORT_ADDRESS, g_param_spec_uint (NM_SETTING_WPAN_SHORT_ADDRESS, "", "",
g_param_spec_uint (NM_SETTING_WPAN_SHORT_ADDRESS, "", "", 0, G_MAXUINT16, G_MAXUINT16,
0, G_MAXUINT16, G_MAXUINT16, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingWpan:page: * NMSettingWpan:page:
@@ -367,14 +363,13 @@ nm_setting_wpan_class_init (NMSettingWpanClass *klass)
* *
* Since: 1.16 * Since: 1.16
**/ **/
g_object_class_install_property obj_properties[PROP_PAGE] =
(object_class, PROP_PAGE, g_param_spec_int (NM_SETTING_WPAN_PAGE, "", "",
g_param_spec_int (NM_SETTING_WPAN_PAGE, "", "", G_MININT16,
G_MININT16, G_MAXINT16,
G_MAXINT16, NM_SETTING_WPAN_PAGE_DEFAULT,
NM_SETTING_WPAN_PAGE_DEFAULT, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingWpan:channel: * NMSettingWpan:channel:
@@ -384,14 +379,15 @@ nm_setting_wpan_class_init (NMSettingWpanClass *klass)
* *
* Since: 1.16 * Since: 1.16
**/ **/
g_object_class_install_property obj_properties[PROP_CHANNEL] =
(object_class, PROP_CHANNEL, g_param_spec_int (NM_SETTING_WPAN_CHANNEL, "", "",
g_param_spec_int (NM_SETTING_WPAN_CHANNEL, "", "", G_MININT16,
G_MININT16, G_MAXINT16,
G_MAXINT16, NM_SETTING_WPAN_CHANNEL_DEFAULT,
NM_SETTING_WPAN_CHANNEL_DEFAULT, G_PARAM_READWRITE |
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
g_object_class_install_properties (object_class, _PROPERTY_ENUMS_LAST, obj_properties);
_nm_setting_class_commit (setting_class, NM_META_SETTING_TYPE_WPAN); _nm_setting_class_commit (setting_class, NM_META_SETTING_TYPE_WPAN);
} }

20
libnm-core/nm-setting.c
View File

@@ -67,12 +67,9 @@ typedef struct {
NMSettingPriority priority; NMSettingPriority priority;
} SettingInfo; } SettingInfo;
enum { NM_GOBJECT_PROPERTIES_DEFINE_BASE (
PROP_0,
PROP_NAME, PROP_NAME,
);
PROP_LAST
};
typedef struct { typedef struct {
GenData *gendata; GenData *gendata;
@@ -2593,10 +2590,11 @@ nm_setting_class_init (NMSettingClass *setting_class)
* connection. Each setting type has a name unique to that type, for * connection. Each setting type has a name unique to that type, for
* example "ppp" or "802-11-wireless" or "802-3-ethernet". * example "ppp" or "802-11-wireless" or "802-3-ethernet".
**/ **/
g_object_class_install_property obj_properties[PROP_NAME] =
(object_class, PROP_NAME, g_param_spec_string (NM_SETTING_NAME, "", "",
g_param_spec_string (NM_SETTING_NAME, "", "", NULL,
NULL, G_PARAM_READABLE |
G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
G_PARAM_STATIC_STRINGS));
g_object_class_install_properties (object_class, _PROPERTY_ENUMS_LAST, obj_properties);
} }