fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-07 04:58:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

libnm: use _nm_setting_property_define_string() for string NMSetting properties

Browse source 
(cherry picked from commit a3eb2c7026)
This commit is contained in:
Thomas Haller 2021-06-17 22:53:52 +02:00
parent 2e93f82746
commit 17fab764fc
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
8 changed files with 214 additions and 178 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/libnm-core-impl/nm-setting-6lowpan.c
View file

@ -196,8 +196,9 @@ finalize(GObject *object)
static void static void
nm_setting_6lowpan_class_init(NMSetting6LowpanClass *klass) nm_setting_6lowpan_class_init(NMSetting6LowpanClass *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);
GArray * properties_override = _nm_sett_info_property_override_create_array();
g_type_class_add_private(klass, sizeof(NMSetting6LowpanPrivate)); g_type_class_add_private(klass, sizeof(NMSetting6LowpanPrivate));
@ -215,14 +216,17 @@ nm_setting_6lowpan_class_init(NMSetting6LowpanClass *klass)
* *
* Since: 1.14 * Since: 1.14
**/ **/
obj_properties[PROP_PARENT] = g_param_spec_string( _nm_setting_property_define_string(properties_override,
NM_SETTING_6LOWPAN_PARENT, obj_properties,
"", NM_SETTING_6LOWPAN_PARENT,
"", PROP_PARENT,
NULL, NM_SETTING_PARAM_INFERRABLE,
G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS); nm_setting_6lowpan_get_parent);
g_object_class_install_properties(object_class, _PROPERTY_ENUMS_LAST, obj_properties); g_object_class_install_properties(object_class, _PROPERTY_ENUMS_LAST, obj_properties);
_nm_setting_class_commit(setting_class, NM_META_SETTING_TYPE_6LOWPAN); _nm_setting_class_commit_full(setting_class,
NM_META_SETTING_TYPE_6LOWPAN,
NULL,
properties_override);
} }

56
src/libnm-core-impl/nm-setting-adsl.c
View file

@ -351,8 +351,9 @@ finalize(GObject *object)
static void static void
nm_setting_adsl_class_init(NMSettingAdslClass *klass) nm_setting_adsl_class_init(NMSettingAdslClass *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);
GArray * properties_override = _nm_sett_info_property_override_create_array();
g_type_class_add_private(klass, sizeof(NMSettingAdslPrivate)); g_type_class_add_private(klass, sizeof(NMSettingAdslPrivate));
@ -369,23 +370,24 @@ nm_setting_adsl_class_init(NMSettingAdslClass *klass)
* *
* Username used to authenticate with the ADSL service. * Username used to authenticate with the ADSL service.
**/ **/
obj_properties[PROP_USERNAME] = g_param_spec_string(NM_SETTING_ADSL_USERNAME, _nm_setting_property_define_string(properties_override,
"", obj_properties,
"", NM_SETTING_ADSL_USERNAME,
NULL, PROP_USERNAME,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); NM_SETTING_PARAM_NONE,
nm_setting_adsl_get_username);
/** /**
* NMSettingAdsl:password: * NMSettingAdsl:password:
* *
* Password used to authenticate with the ADSL service. * Password used to authenticate with the ADSL service.
**/ **/
obj_properties[PROP_PASSWORD] = _nm_setting_property_define_string(properties_override,
g_param_spec_string(NM_SETTING_ADSL_PASSWORD, obj_properties,
"", NM_SETTING_ADSL_PASSWORD,
"", PROP_PASSWORD,
NULL, NM_SETTING_PARAM_SECRET,
G_PARAM_READWRITE | NM_SETTING_PARAM_SECRET | G_PARAM_STATIC_STRINGS); nm_setting_adsl_get_password);
/** /**
* NMSettingAdsl:password-flags: * NMSettingAdsl:password-flags:
@ -405,23 +407,24 @@ nm_setting_adsl_class_init(NMSettingAdslClass *klass)
* *
* ADSL connection protocol. Can be "pppoa", "pppoe" or "ipoatm". * ADSL connection protocol. Can be "pppoa", "pppoe" or "ipoatm".
**/ **/
obj_properties[PROP_PROTOCOL] = g_param_spec_string(NM_SETTING_ADSL_PROTOCOL, _nm_setting_property_define_string(properties_override,
"", obj_properties,
"", NM_SETTING_ADSL_PROTOCOL,
NULL, PROP_PROTOCOL,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); NM_SETTING_PARAM_NONE,
nm_setting_adsl_get_protocol);
/** /**
* NMSettingAdsl:encapsulation: * NMSettingAdsl:encapsulation:
* *
* Encapsulation of ADSL connection. Can be "vcmux" or "llc". * Encapsulation of ADSL connection. Can be "vcmux" or "llc".
**/ **/
obj_properties[PROP_ENCAPSULATION] = _nm_setting_property_define_string(properties_override,
g_param_spec_string(NM_SETTING_ADSL_ENCAPSULATION, obj_properties,
"", NM_SETTING_ADSL_ENCAPSULATION,
"", PROP_ENCAPSULATION,
NULL, NM_SETTING_PARAM_NONE,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); nm_setting_adsl_get_encapsulation);
/** /**
* NMSettingAdsl:vpi: * NMSettingAdsl:vpi:
@ -451,5 +454,8 @@ nm_setting_adsl_class_init(NMSettingAdslClass *klass)
g_object_class_install_properties(object_class, _PROPERTY_ENUMS_LAST, obj_properties); 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_full(setting_class,
NM_META_SETTING_TYPE_ADSL,
NULL,
properties_override);
} }

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

@ -1872,12 +1872,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---
*/ */
obj_properties[PROP_ID] = g_param_spec_string(NM_SETTING_CONNECTION_ID, _nm_setting_property_define_string(properties_override,
"", obj_properties,
"", NM_SETTING_CONNECTION_ID,
NULL, PROP_ID,
G_PARAM_READWRITE | NM_SETTING_PARAM_FUZZY_IGNORE NM_SETTING_PARAM_FUZZY_IGNORE,
| G_PARAM_STATIC_STRINGS); nm_setting_connection_get_id);
/** /**
* NMSettingConnection:uuid: * NMSettingConnection:uuid:
@ -1902,12 +1902,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---
*/ */
obj_properties[PROP_UUID] = g_param_spec_string( _nm_setting_property_define_string(properties_override,
NM_SETTING_CONNECTION_UUID, obj_properties,
"", NM_SETTING_CONNECTION_UUID,
"", PROP_UUID,
NULL, NM_SETTING_PARAM_FUZZY_IGNORE,
G_PARAM_READWRITE | NM_SETTING_PARAM_FUZZY_IGNORE | G_PARAM_STATIC_STRINGS); nm_setting_connection_get_uuid);
/** /**
* NMSettingConnection:stable-id: * NMSettingConnection:stable-id:
@ -1986,18 +1986,17 @@ nm_setting_connection_class_init(NMSettingConnectionClass *klass)
* can be required for some connection types. * can be required for some connection types.
* ---end--- * ---end---
*/ */
obj_properties[PROP_INTERFACE_NAME] = g_param_spec_string( _nm_setting_property_define_string_full(
NM_SETTING_CONNECTION_INTERFACE_NAME,
"",
"",
NULL,
G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS);
_nm_properties_override_gobj(
properties_override, properties_override,
obj_properties[PROP_INTERFACE_NAME], obj_properties,
NM_SETT_INFO_PROPERT_TYPE_GPROP(G_VARIANT_TYPE_STRING, NM_SETTING_CONNECTION_INTERFACE_NAME,
.missing_from_dbus_fcn = PROP_INTERFACE_NAME,
nm_setting_connection_no_interface_name, )); NM_SETTING_PARAM_INFERRABLE,
NM_SETT_INFO_PROPERT_TYPE_DBUS(G_VARIANT_TYPE_STRING,
.to_dbus_fcn = _nm_setting_property_to_dbus_fcn_get_string,
.missing_from_dbus_fcn =
nm_setting_connection_no_interface_name),
nm_setting_connection_get_interface_name);
/** /**
* NMSettingConnection:type: * NMSettingConnection:type:
@ -2017,12 +2016,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---
*/ */
obj_properties[PROP_TYPE] = g_param_spec_string(NM_SETTING_CONNECTION_TYPE, _nm_setting_property_define_string(properties_override,
"", obj_properties,
"", NM_SETTING_CONNECTION_TYPE,
NULL, PROP_TYPE,
G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE NM_SETTING_PARAM_INFERRABLE,
| G_PARAM_STATIC_STRINGS); nm_setting_connection_get_connection_type);
/** /**
* NMSettingConnection:permissions: * NMSettingConnection:permissions:
@ -2220,13 +2219,13 @@ nm_setting_connection_class_init(NMSettingConnectionClass *klass)
* example: ZONE=Work * example: ZONE=Work
* ---end--- * ---end---
*/ */
obj_properties[PROP_ZONE] = _nm_setting_property_define_string(properties_override,
g_param_spec_string(NM_SETTING_CONNECTION_ZONE, obj_properties,
"", NM_SETTING_CONNECTION_ZONE,
"", PROP_ZONE,
NULL, NM_SETTING_PARAM_FUZZY_IGNORE
G_PARAM_READWRITE | NM_SETTING_PARAM_FUZZY_IGNORE | NM_SETTING_PARAM_REAPPLY_IMMEDIATELY,
| NM_SETTING_PARAM_REAPPLY_IMMEDIATELY | G_PARAM_STATIC_STRINGS); nm_setting_connection_get_zone);
/** /**
* NMSettingConnection:master: * NMSettingConnection:master:
@ -2242,13 +2241,12 @@ nm_setting_connection_class_init(NMSettingConnectionClass *klass)
* for compatibility with legacy tooling. * for compatibility with legacy tooling.
* ---end--- * ---end---
*/ */
obj_properties[PROP_MASTER] = _nm_setting_property_define_string(properties_override,
g_param_spec_string(NM_SETTING_CONNECTION_MASTER, obj_properties,
"", NM_SETTING_CONNECTION_MASTER,
"", PROP_MASTER,
NULL, NM_SETTING_PARAM_FUZZY_IGNORE | NM_SETTING_PARAM_INFERRABLE,
G_PARAM_READWRITE | NM_SETTING_PARAM_FUZZY_IGNORE nm_setting_connection_get_master);
| NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS);
/** /**
* NMSettingConnection:slave-type: * NMSettingConnection:slave-type:
@ -2267,13 +2265,12 @@ nm_setting_connection_class_init(NMSettingConnectionClass *klass)
* and BRIDGE_UUID for bridging. * and BRIDGE_UUID for bridging.
* ---end--- * ---end---
*/ */
obj_properties[PROP_SLAVE_TYPE] = _nm_setting_property_define_string(properties_override,
g_param_spec_string(NM_SETTING_CONNECTION_SLAVE_TYPE, obj_properties,
"", NM_SETTING_CONNECTION_SLAVE_TYPE,
"", PROP_SLAVE_TYPE,
NULL, NM_SETTING_PARAM_FUZZY_IGNORE | NM_SETTING_PARAM_INFERRABLE,
G_PARAM_READWRITE | NM_SETTING_PARAM_FUZZY_IGNORE nm_setting_connection_get_slave_type);
| NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS);
/** /**
* NMSettingConnection:autoconnect-slaves: * NMSettingConnection:autoconnect-slaves:
@ -2555,11 +2552,12 @@ nm_setting_connection_class_init(NMSettingConnectionClass *klass)
* example: https://yourdevice.example.com/model.json * example: https://yourdevice.example.com/model.json
* ---end--- * ---end---
*/ */
obj_properties[PROP_MUD_URL] = g_param_spec_string(NM_SETTING_CONNECTION_MUD_URL, _nm_setting_property_define_string(properties_override,
"", obj_properties,
"", NM_SETTING_CONNECTION_MUD_URL,
NULL, PROP_MUD_URL,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); NM_SETTING_PARAM_NONE,
nm_setting_connection_get_mud_url);
g_object_class_install_properties(object_class, _PROPERTY_ENUMS_LAST, obj_properties); g_object_class_install_properties(object_class, _PROPERTY_ENUMS_LAST, obj_properties);

27
src/libnm-core-impl/nm-setting-ip-config.c
View file

@ -5760,10 +5760,35 @@ _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();
_nm_properties_override_gobj(
properties_override,
obj_properties[PROP_METHOD],
&nm_sett_info_propert_type_string,
.to_dbus_data.get_string =
(const char *(*) (NMSetting *) ) nm_setting_ip_config_get_method);
_nm_properties_override_gobj( _nm_properties_override_gobj(
properties_override, properties_override,
obj_properties[PROP_GATEWAY], obj_properties[PROP_GATEWAY],
NM_SETT_INFO_PROPERT_TYPE_GPROP(G_VARIANT_TYPE_STRING, .from_dbus_fcn = ip_gateway_set, )); NM_SETT_INFO_PROPERT_TYPE_DBUS(G_VARIANT_TYPE_STRING,
.to_dbus_fcn = _nm_setting_property_to_dbus_fcn_get_string,
.from_dbus_fcn = ip_gateway_set),
.to_dbus_data.get_string =
(const char *(*) (NMSetting *) ) nm_setting_ip_config_get_gateway);
_nm_properties_override_gobj(
properties_override,
obj_properties[PROP_DHCP_HOSTNAME],
&nm_sett_info_propert_type_string,
.to_dbus_data.get_string =
(const char *(*) (NMSetting *) ) nm_setting_ip_config_get_dhcp_hostname);
_nm_properties_override_gobj(
properties_override,
obj_properties[PROP_DHCP_IAID],
&nm_sett_info_propert_type_string,
.to_dbus_data.get_string =
(const char *(*) (NMSetting *) ) nm_setting_ip_config_get_dhcp_iaid);
/* ---dbus--- /* ---dbus---
* property: routing-rules * property: routing-rules

60
src/libnm-core-impl/nm-setting-ip-tunnel.c
View file

@ -675,12 +675,12 @@ nm_setting_ip_tunnel_class_init(NMSettingIPTunnelClass *klass)
* *
* Since: 1.2 * Since: 1.2
**/ **/
obj_properties[PROP_PARENT] = g_param_spec_string( _nm_setting_property_define_string(properties_override,
NM_SETTING_IP_TUNNEL_PARENT, obj_properties,
"", NM_SETTING_IP_TUNNEL_PARENT,
"", PROP_PARENT,
NULL, NM_SETTING_PARAM_INFERRABLE,
G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS); nm_setting_ip_tunnel_get_parent);
/** /**
* NMSettingIPTunnel:mode: * NMSettingIPTunnel:mode:
@ -707,12 +707,12 @@ nm_setting_ip_tunnel_class_init(NMSettingIPTunnelClass *klass)
* *
* Since: 1.2 * Since: 1.2
**/ **/
obj_properties[PROP_LOCAL] = g_param_spec_string(NM_SETTING_IP_TUNNEL_LOCAL, _nm_setting_property_define_string(properties_override,
"", obj_properties,
"", NM_SETTING_IP_TUNNEL_LOCAL,
NULL, PROP_LOCAL,
G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE NM_SETTING_PARAM_INFERRABLE,
| G_PARAM_STATIC_STRINGS); nm_setting_ip_tunnel_get_local);
/** /**
* NMSettingIPTunnel:remote: * NMSettingIPTunnel:remote:
@ -722,12 +722,12 @@ nm_setting_ip_tunnel_class_init(NMSettingIPTunnelClass *klass)
* *
* Since: 1.2 * Since: 1.2
**/ **/
obj_properties[PROP_REMOTE] = g_param_spec_string( _nm_setting_property_define_string(properties_override,
NM_SETTING_IP_TUNNEL_REMOTE, obj_properties,
"", NM_SETTING_IP_TUNNEL_REMOTE,
"", PROP_REMOTE,
NULL, NM_SETTING_PARAM_INFERRABLE,
G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS); nm_setting_ip_tunnel_get_remote);
/** /**
* NMSettingIPTunnel:ttl * NMSettingIPTunnel:ttl
@ -786,12 +786,12 @@ nm_setting_ip_tunnel_class_init(NMSettingIPTunnelClass *klass)
* *
* Since: 1.2 * Since: 1.2
**/ **/
obj_properties[PROP_INPUT_KEY] = g_param_spec_string( _nm_setting_property_define_string(properties_override,
NM_SETTING_IP_TUNNEL_INPUT_KEY, obj_properties,
"", NM_SETTING_IP_TUNNEL_INPUT_KEY,
"", PROP_INPUT_KEY,
NULL, NM_SETTING_PARAM_INFERRABLE,
G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS); nm_setting_ip_tunnel_get_input_key);
/** /**
* NMSettingIPTunnel:output-key: * NMSettingIPTunnel:output-key:
@ -801,12 +801,12 @@ nm_setting_ip_tunnel_class_init(NMSettingIPTunnelClass *klass)
* *
* Since: 1.2 * Since: 1.2
**/ **/
obj_properties[PROP_OUTPUT_KEY] = g_param_spec_string( _nm_setting_property_define_string(properties_override,
NM_SETTING_IP_TUNNEL_OUTPUT_KEY, obj_properties,
"", NM_SETTING_IP_TUNNEL_OUTPUT_KEY,
"", PROP_OUTPUT_KEY,
NULL, NM_SETTING_PARAM_INFERRABLE,
G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS); nm_setting_ip_tunnel_get_output_key);
/** /**
* NMSettingIPTunnel:encapsulation-limit: * NMSettingIPTunnel:encapsulation-limit:

36
src/libnm-core-impl/nm-setting-ip4-config.c
View file

@ -847,12 +847,12 @@ 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---
*/ */
obj_properties[PROP_DHCP_CLIENT_ID] = _nm_setting_property_define_string(properties_override,
g_param_spec_string(NM_SETTING_IP4_CONFIG_DHCP_CLIENT_ID, obj_properties,
"", NM_SETTING_IP4_CONFIG_DHCP_CLIENT_ID,
"", PROP_DHCP_CLIENT_ID,
NULL, NM_SETTING_PARAM_NONE,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); nm_setting_ip4_config_get_dhcp_client_id);
/* ---ifcfg-rh--- /* ---ifcfg-rh---
* property: dad-timeout * property: dad-timeout
@ -898,12 +898,12 @@ nm_setting_ip4_config_class_init(NMSettingIP4ConfigClass *klass)
* example: DHCP_FQDN=foo.bar.com * example: DHCP_FQDN=foo.bar.com
* ---end--- * ---end---
*/ */
obj_properties[PROP_DHCP_FQDN] = _nm_setting_property_define_string(properties_override,
g_param_spec_string(NM_SETTING_IP4_CONFIG_DHCP_FQDN, obj_properties,
"", NM_SETTING_IP4_CONFIG_DHCP_FQDN,
"", PROP_DHCP_FQDN,
NULL, NM_SETTING_PARAM_NONE,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); nm_setting_ip4_config_get_dhcp_fqdn);
/** /**
* NMSettingIP4Config:dhcp-vendor-class-identifier: * NMSettingIP4Config:dhcp-vendor-class-identifier:
@ -924,12 +924,12 @@ nm_setting_ip4_config_class_init(NMSettingIP4ConfigClass *klass)
* example: DHCP_VENDOR_CLASS_IDENTIFIER=foo * example: DHCP_VENDOR_CLASS_IDENTIFIER=foo
* ---end--- * ---end---
*/ */
obj_properties[PROP_DHCP_VENDOR_CLASS_IDENTIFIER] = _nm_setting_property_define_string(properties_override,
g_param_spec_string(NM_SETTING_IP4_CONFIG_DHCP_VENDOR_CLASS_IDENTIFIER, obj_properties,
"", NM_SETTING_IP4_CONFIG_DHCP_VENDOR_CLASS_IDENTIFIER,
"", PROP_DHCP_VENDOR_CLASS_IDENTIFIER,
NULL, NM_SETTING_PARAM_NONE,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); nm_setting_ip4_config_get_dhcp_vendor_class_identifier);
/* IP4-specific property overrides */ /* IP4-specific property overrides */

24
src/libnm-core-impl/nm-setting-ip6-config.c
View file

@ -914,12 +914,12 @@ nm_setting_ip6_config_class_init(NMSettingIP6ConfigClass *klass)
* example: IPV6_TOKEN=::53 * example: IPV6_TOKEN=::53
* ---end--- * ---end---
*/ */
obj_properties[PROP_TOKEN] = g_param_spec_string(NM_SETTING_IP6_CONFIG_TOKEN, _nm_setting_property_define_string(properties_override,
"", obj_properties,
"", NM_SETTING_IP6_CONFIG_TOKEN,
NULL, PROP_TOKEN,
G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE NM_SETTING_PARAM_INFERRABLE,
| G_PARAM_STATIC_STRINGS); nm_setting_ip6_config_get_token);
/** /**
* NMSettingIP6Config:ra-timeout: * NMSettingIP6Config:ra-timeout:
@ -994,12 +994,12 @@ 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---
*/ */
obj_properties[PROP_DHCP_DUID] = _nm_setting_property_define_string(properties_override,
g_param_spec_string(NM_SETTING_IP6_CONFIG_DHCP_DUID, obj_properties,
"", NM_SETTING_IP6_CONFIG_DHCP_DUID,
"", PROP_DHCP_DUID,
NULL, NM_SETTING_PARAM_NONE,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); nm_setting_ip6_config_get_dhcp_duid);
/* IP6-specific property overrides */ /* IP6-specific property overrides */

59
src/libnm-core-impl/nm-setting-wired.c
View file

@ -1291,11 +1291,12 @@ 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---
*/ */
obj_properties[PROP_PORT] = g_param_spec_string(NM_SETTING_WIRED_PORT, _nm_setting_property_define_string(properties_override,
"", obj_properties,
"", NM_SETTING_WIRED_PORT,
NULL, PROP_PORT,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); NM_SETTING_PARAM_NONE,
nm_setting_wired_get_port);
/** /**
* NMSettingWired:speed: * NMSettingWired:speed:
@ -1352,11 +1353,12 @@ nm_setting_wired_class_init(NMSettingWiredClass *klass)
* "duplex" parameter in the ETHOOL_OPTS variable. * "duplex" parameter in the ETHOOL_OPTS variable.
* ---end--- * ---end---
*/ */
obj_properties[PROP_DUPLEX] = g_param_spec_string(NM_SETTING_WIRED_DUPLEX, _nm_setting_property_define_string(properties_override,
"", obj_properties,
"", NM_SETTING_WIRED_DUPLEX,
NULL, PROP_DUPLEX,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); NM_SETTING_PARAM_NONE,
nm_setting_wired_get_duplex);
/** /**
* NMSettingWired:auto-negotiate: * NMSettingWired:auto-negotiate:
@ -1529,12 +1531,12 @@ nm_setting_wired_class_init(NMSettingWiredClass *klass)
* cloned-mac-address. * cloned-mac-address.
* ---end--- * ---end---
*/ */
obj_properties[PROP_GENERATE_MAC_ADDRESS_MASK] = g_param_spec_string( _nm_setting_property_define_string(properties_override,
NM_SETTING_WIRED_GENERATE_MAC_ADDRESS_MASK, obj_properties,
"", NM_SETTING_WIRED_GENERATE_MAC_ADDRESS_MASK,
"", PROP_GENERATE_MAC_ADDRESS_MASK,
NULL, NM_SETTING_PARAM_FUZZY_IGNORE,
G_PARAM_READWRITE | NM_SETTING_PARAM_FUZZY_IGNORE | G_PARAM_STATIC_STRINGS); nm_setting_wired_get_generate_mac_address_mask);
/** /**
* NMSettingWired:mac-address-blacklist: * NMSettingWired:mac-address-blacklist:
@ -1625,12 +1627,12 @@ nm_setting_wired_class_init(NMSettingWiredClass *klass)
* example: NETTYPE=qeth * example: NETTYPE=qeth
* ---end--- * ---end---
*/ */
obj_properties[PROP_S390_NETTYPE] = g_param_spec_string( _nm_setting_property_define_string(properties_override,
NM_SETTING_WIRED_S390_NETTYPE, obj_properties,
"", NM_SETTING_WIRED_S390_NETTYPE,
"", PROP_S390_NETTYPE,
NULL, NM_SETTING_PARAM_INFERRABLE,
G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS); nm_setting_wired_get_s390_nettype);
/** /**
* NMSettingWired:s390-options: (type GHashTable(utf8,utf8)): * NMSettingWired:s390-options: (type GHashTable(utf8,utf8)):
@ -1706,12 +1708,13 @@ nm_setting_wired_class_init(NMSettingWiredClass *klass)
* example: ETHTOOL_OPTS="wol gs sopass 00:11:22:33:44:55" * example: ETHTOOL_OPTS="wol gs sopass 00:11:22:33:44:55"
* ---end--- * ---end---
*/ */
obj_properties[PROP_WAKE_ON_LAN_PASSWORD] = _nm_setting_property_define_string(properties_override,
g_param_spec_string(NM_SETTING_WIRED_WAKE_ON_LAN_PASSWORD, obj_properties,
"", NM_SETTING_WIRED_WAKE_ON_LAN_PASSWORD,
"", PROP_WAKE_ON_LAN_PASSWORD,
NULL, NM_SETTING_PARAM_NONE,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); nm_setting_wired_get_wake_on_lan_password);
/** /**
* NMSettingWired:accept-all-mac-addresses: * NMSettingWired:accept-all-mac-addresses:
* *