libnm: for embedded private structure in NMSetting set the offset to zero
Preferably, we embed the private struct in the GObject struct itself. In the past, we didn't do that, because the struct was in public headers and changing that would have been an ABI break. For those struct, we still use g_type_class_add_private(). We have some structs, where the private struct is embedded. An alternative to that would be, to not have the private struct at all, like done for NMSettingOvsBridge. Anyway. So for direct properties we need to capture the offset of the field (in the private struct). We can either set the offset of the private struct in _nm_setting_class_commit() to zero and let the field offset include the private structure offset. Or, the offset of the private struct is accounted during _nm_setting_class_commit(). Both approaches are basically the same. Just do it consistently. For no particular reason, choose to set the offset of the private data to zero for those types.
This commit is contained in:
Thomas Haller
@@ -1443,8 +1443,8 @@ nm_setting_bridge_class_init(NMSettingBridgeClass *klass)
|
||||
NM_SETTING_BRIDGE_MAC_ADDRESS,
|
||||
PROP_MAC_ADDRESS,
|
||||
NM_SETTING_PARAM_INFERRABLE,
|
||||
NMSettingBridgePrivate,
|
||||
mac_address,
|
||||
NMSettingBridge,
|
||||
_priv.mac_address,
|
||||
.direct_set_string_mac_address_len = ETH_ALEN);
|
||||
|
||||
/**
|
||||
@@ -1465,8 +1465,8 @@ nm_setting_bridge_class_init(NMSettingBridgeClass *klass)
|
||||
PROP_STP,
|
||||
NM_BRIDGE_STP_DEF,
|
||||
NM_SETTING_PARAM_INFERRABLE,
|
||||
NMSettingBridgePrivate,
|
||||
stp);
|
||||
NMSettingBridge,
|
||||
_priv.stp);
|
||||
|
||||
/**
|
||||
* NMSettingBridge:priority:
|
||||
@@ -1491,8 +1491,8 @@ nm_setting_bridge_class_init(NMSettingBridgeClass *klass)
|
||||
NM_BRIDGE_PRIORITY_MAX,
|
||||
NM_BRIDGE_PRIORITY_DEF,
|
||||
NM_SETTING_PARAM_INFERRABLE,
|
||||
NMSettingBridgePrivate,
|
||||
priority);
|
||||
NMSettingBridge,
|
||||
_priv.priority);
|
||||
|
||||
/**
|
||||
* NMSettingBridge:forward-delay:
|
||||
@@ -1515,8 +1515,8 @@ nm_setting_bridge_class_init(NMSettingBridgeClass *klass)
|
||||
NM_BRIDGE_FORWARD_DELAY_MAX,
|
||||
NM_BRIDGE_FORWARD_DELAY_DEF,
|
||||
NM_SETTING_PARAM_INFERRABLE,
|
||||
NMSettingBridgePrivate,
|
||||
forward_delay);
|
||||
NMSettingBridge,
|
||||
_priv.forward_delay);
|
||||
|
||||
/**
|
||||
* NMSettingBridge:hello-time:
|
||||
@@ -1539,8 +1539,8 @@ nm_setting_bridge_class_init(NMSettingBridgeClass *klass)
|
||||
NM_BRIDGE_HELLO_TIME_MAX,
|
||||
NM_BRIDGE_HELLO_TIME_DEF,
|
||||
NM_SETTING_PARAM_INFERRABLE,
|
||||
NMSettingBridgePrivate,
|
||||
hello_time);
|
||||
NMSettingBridge,
|
||||
_priv.hello_time);
|
||||
|
||||
/**
|
||||
* NMSettingBridge:max-age:
|
||||
@@ -1563,8 +1563,8 @@ nm_setting_bridge_class_init(NMSettingBridgeClass *klass)
|
||||
NM_BRIDGE_MAX_AGE_MAX,
|
||||
NM_BRIDGE_MAX_AGE_DEF,
|
||||
NM_SETTING_PARAM_INFERRABLE,
|
||||
NMSettingBridgePrivate,
|
||||
max_age);
|
||||
NMSettingBridge,
|
||||
_priv.max_age);
|
||||
|
||||
/**
|
||||
* NMSettingBridge:ageing-time:
|
||||
@@ -1587,8 +1587,8 @@ nm_setting_bridge_class_init(NMSettingBridgeClass *klass)
|
||||
NM_BRIDGE_AGEING_TIME_MAX,
|
||||
NM_BRIDGE_AGEING_TIME_DEF,
|
||||
NM_SETTING_PARAM_INFERRABLE,
|
||||
NMSettingBridgePrivate,
|
||||
ageing_time);
|
||||
NMSettingBridge,
|
||||
_priv.ageing_time);
|
||||
|
||||
/**
|
||||
* NMSettingBridge:group-forward-mask:
|
||||
@@ -1610,8 +1610,8 @@ nm_setting_bridge_class_init(NMSettingBridgeClass *klass)
|
||||
0xFFFF,
|
||||
0,
|
||||
NM_SETTING_PARAM_INFERRABLE,
|
||||
NMSettingBridgePrivate,
|
||||
group_forward_mask);
|
||||
NMSettingBridge,
|
||||
_priv.group_forward_mask);
|
||||
|
||||
/**
|
||||
* NMSettingBridge:multicast-snooping:
|
||||
@@ -1637,8 +1637,8 @@ nm_setting_bridge_class_init(NMSettingBridgeClass *klass)
|
||||
PROP_MULTICAST_SNOOPING,
|
||||
NM_BRIDGE_MULTICAST_SNOOPING_DEF,
|
||||
NM_SETTING_PARAM_INFERRABLE,
|
||||
NMSettingBridgePrivate,
|
||||
multicast_snooping);
|
||||
NMSettingBridge,
|
||||
_priv.multicast_snooping);
|
||||
|
||||
/**
|
||||
* NMSettingBridge:vlan-filtering:
|
||||
@@ -1661,8 +1661,8 @@ nm_setting_bridge_class_init(NMSettingBridgeClass *klass)
|
||||
PROP_VLAN_FILTERING,
|
||||
FALSE,
|
||||
NM_SETTING_PARAM_INFERRABLE,
|
||||
NMSettingBridgePrivate,
|
||||
vlan_filtering);
|
||||
NMSettingBridge,
|
||||
_priv.vlan_filtering);
|
||||
|
||||
/**
|
||||
* NMSettingBridge:vlan-default-pvid:
|
||||
@@ -1688,8 +1688,8 @@ nm_setting_bridge_class_init(NMSettingBridgeClass *klass)
|
||||
NM_BRIDGE_VLAN_VID_MAX,
|
||||
NM_BRIDGE_VLAN_DEFAULT_PVID_DEF,
|
||||
NM_SETTING_PARAM_INFERRABLE,
|
||||
NMSettingBridgePrivate,
|
||||
vlan_default_pvid);
|
||||
NMSettingBridge,
|
||||
_priv.vlan_default_pvid);
|
||||
|
||||
/**
|
||||
* NMSettingBridge:vlans: (type GPtrArray(NMBridgeVlan))
|
||||
@@ -1764,8 +1764,8 @@ nm_setting_bridge_class_init(NMSettingBridgeClass *klass)
|
||||
NM_SETTING_BRIDGE_GROUP_ADDRESS,
|
||||
PROP_GROUP_ADDRESS,
|
||||
NM_SETTING_PARAM_INFERRABLE,
|
||||
NMSettingBridgePrivate,
|
||||
group_address,
|
||||
NMSettingBridge,
|
||||
_priv.group_address,
|
||||
.direct_set_string_mac_address_len = ETH_ALEN);
|
||||
|
||||
/**
|
||||
@@ -1792,8 +1792,8 @@ nm_setting_bridge_class_init(NMSettingBridgeClass *klass)
|
||||
NM_SETTING_BRIDGE_VLAN_PROTOCOL,
|
||||
PROP_VLAN_PROTOCOL,
|
||||
NM_SETTING_PARAM_INFERRABLE,
|
||||
NMSettingBridgePrivate,
|
||||
vlan_protocol);
|
||||
NMSettingBridge,
|
||||
_priv.vlan_protocol);
|
||||
|
||||
/**
|
||||
* NMSettingBridge:vlan-stats-enabled:
|
||||
@@ -1815,8 +1815,8 @@ nm_setting_bridge_class_init(NMSettingBridgeClass *klass)
|
||||
PROP_VLAN_STATS_ENABLED,
|
||||
NM_BRIDGE_VLAN_STATS_ENABLED_DEF,
|
||||
NM_SETTING_PARAM_INFERRABLE,
|
||||
NMSettingBridgePrivate,
|
||||
vlan_stats_enabled);
|
||||
NMSettingBridge,
|
||||
_priv.vlan_stats_enabled);
|
||||
|
||||
/**
|
||||
* NMSettingBridge:multicast-router:
|
||||
@@ -1843,8 +1843,8 @@ nm_setting_bridge_class_init(NMSettingBridgeClass *klass)
|
||||
NM_SETTING_BRIDGE_MULTICAST_ROUTER,
|
||||
PROP_MULTICAST_ROUTER,
|
||||
NM_SETTING_PARAM_INFERRABLE,
|
||||
NMSettingBridgePrivate,
|
||||
multicast_router);
|
||||
NMSettingBridge,
|
||||
_priv.multicast_router);
|
||||
|
||||
/**
|
||||
* NMSettingBridge:multicast-query-use-ifaddr:
|
||||
@@ -1868,8 +1868,8 @@ nm_setting_bridge_class_init(NMSettingBridgeClass *klass)
|
||||
PROP_MULTICAST_QUERY_USE_IFADDR,
|
||||
NM_BRIDGE_MULTICAST_QUERY_USE_IFADDR_DEF,
|
||||
NM_SETTING_PARAM_INFERRABLE,
|
||||
NMSettingBridgePrivate,
|
||||
multicast_query_use_ifaddr);
|
||||
NMSettingBridge,
|
||||
_priv.multicast_query_use_ifaddr);
|
||||
|
||||
/**
|
||||
* NMSettingBridge:multicast-querier:
|
||||
@@ -1892,8 +1892,8 @@ nm_setting_bridge_class_init(NMSettingBridgeClass *klass)
|
||||
PROP_MULTICAST_QUERIER,
|
||||
NM_BRIDGE_MULTICAST_QUERIER_DEF,
|
||||
NM_SETTING_PARAM_INFERRABLE,
|
||||
NMSettingBridgePrivate,
|
||||
multicast_querier);
|
||||
NMSettingBridge,
|
||||
_priv.multicast_querier);
|
||||
|
||||
/**
|
||||
* NMSettingBridge:multicast-hash-max:
|
||||
@@ -1917,8 +1917,8 @@ nm_setting_bridge_class_init(NMSettingBridgeClass *klass)
|
||||
NM_BRIDGE_MULTICAST_HASH_MAX_MAX,
|
||||
NM_BRIDGE_MULTICAST_HASH_MAX_DEF,
|
||||
NM_SETTING_PARAM_INFERRABLE,
|
||||
NMSettingBridgePrivate,
|
||||
multicast_hash_max);
|
||||
NMSettingBridge,
|
||||
_priv.multicast_hash_max);
|
||||
|
||||
/**
|
||||
* NMSettingBridge:multicast-last-member-count:
|
||||
@@ -1944,8 +1944,8 @@ nm_setting_bridge_class_init(NMSettingBridgeClass *klass)
|
||||
NM_BRIDGE_MULTICAST_LAST_MEMBER_COUNT_MAX,
|
||||
NM_BRIDGE_MULTICAST_LAST_MEMBER_COUNT_DEF,
|
||||
NM_SETTING_PARAM_INFERRABLE,
|
||||
NMSettingBridgePrivate,
|
||||
multicast_last_member_count);
|
||||
NMSettingBridge,
|
||||
_priv.multicast_last_member_count);
|
||||
|
||||
/**
|
||||
* NMSettingBridge:multicast-last-member-interval:
|
||||
@@ -1970,8 +1970,8 @@ nm_setting_bridge_class_init(NMSettingBridgeClass *klass)
|
||||
NM_BRIDGE_MULTICAST_LAST_MEMBER_INTERVAL_MAX,
|
||||
NM_BRIDGE_MULTICAST_LAST_MEMBER_INTERVAL_DEF,
|
||||
NM_SETTING_PARAM_INFERRABLE,
|
||||
NMSettingBridgePrivate,
|
||||
multicast_last_member_interval);
|
||||
NMSettingBridge,
|
||||
_priv.multicast_last_member_interval);
|
||||
|
||||
/**
|
||||
* NMSettingBridge:multicast-membership-interval:
|
||||
@@ -1997,8 +1997,8 @@ nm_setting_bridge_class_init(NMSettingBridgeClass *klass)
|
||||
NM_BRIDGE_MULTICAST_MEMBERSHIP_INTERVAL_MAX,
|
||||
NM_BRIDGE_MULTICAST_MEMBERSHIP_INTERVAL_DEF,
|
||||
NM_SETTING_PARAM_INFERRABLE,
|
||||
NMSettingBridgePrivate,
|
||||
multicast_membership_interval);
|
||||
NMSettingBridge,
|
||||
_priv.multicast_membership_interval);
|
||||
|
||||
/**
|
||||
* NMSettingBridge:multicast-querier-interval:
|
||||
@@ -2023,8 +2023,8 @@ nm_setting_bridge_class_init(NMSettingBridgeClass *klass)
|
||||
NM_BRIDGE_MULTICAST_QUERIER_INTERVAL_MAX,
|
||||
NM_BRIDGE_MULTICAST_QUERIER_INTERVAL_DEF,
|
||||
NM_SETTING_PARAM_INFERRABLE,
|
||||
NMSettingBridgePrivate,
|
||||
multicast_querier_interval);
|
||||
NMSettingBridge,
|
||||
_priv.multicast_querier_interval);
|
||||
|
||||
/**
|
||||
* NMSettingBridge:multicast-query-interval:
|
||||
@@ -2049,8 +2049,8 @@ nm_setting_bridge_class_init(NMSettingBridgeClass *klass)
|
||||
NM_BRIDGE_MULTICAST_QUERY_INTERVAL_MAX,
|
||||
NM_BRIDGE_MULTICAST_QUERY_INTERVAL_DEF,
|
||||
NM_SETTING_PARAM_INFERRABLE,
|
||||
NMSettingBridgePrivate,
|
||||
multicast_query_interval);
|
||||
NMSettingBridge,
|
||||
_priv.multicast_query_interval);
|
||||
|
||||
/**
|
||||
* NMSettingBridge:multicast-query-response-interval:
|
||||
@@ -2075,8 +2075,8 @@ nm_setting_bridge_class_init(NMSettingBridgeClass *klass)
|
||||
NM_BRIDGE_MULTICAST_QUERY_RESPONSE_INTERVAL_MAX,
|
||||
NM_BRIDGE_MULTICAST_QUERY_RESPONSE_INTERVAL_DEF,
|
||||
NM_SETTING_PARAM_INFERRABLE,
|
||||
NMSettingBridgePrivate,
|
||||
multicast_query_response_interval);
|
||||
NMSettingBridge,
|
||||
_priv.multicast_query_response_interval);
|
||||
|
||||
/**
|
||||
* NMSettingBridge:multicast-startup-query-count:
|
||||
@@ -2100,8 +2100,8 @@ nm_setting_bridge_class_init(NMSettingBridgeClass *klass)
|
||||
NM_BRIDGE_MULTICAST_STARTUP_QUERY_COUNT_MAX,
|
||||
NM_BRIDGE_MULTICAST_STARTUP_QUERY_COUNT_DEF,
|
||||
NM_SETTING_PARAM_INFERRABLE,
|
||||
NMSettingBridgePrivate,
|
||||
multicast_startup_query_count);
|
||||
NMSettingBridge,
|
||||
_priv.multicast_startup_query_count);
|
||||
|
||||
/**
|
||||
* NMSettingBridge:multicast-startup-query-interval:
|
||||
@@ -2126,8 +2126,8 @@ nm_setting_bridge_class_init(NMSettingBridgeClass *klass)
|
||||
NM_BRIDGE_MULTICAST_STARTUP_QUERY_INTERVAL_MAX,
|
||||
NM_BRIDGE_MULTICAST_STARTUP_QUERY_INTERVAL_DEF,
|
||||
NM_SETTING_PARAM_INFERRABLE,
|
||||
NMSettingBridgePrivate,
|
||||
multicast_startup_query_interval);
|
||||
NMSettingBridge,
|
||||
_priv.multicast_startup_query_interval);
|
||||
|
||||
g_object_class_install_properties(object_class, _PROPERTY_ENUMS_LAST, obj_properties);
|
||||
|
||||
@@ -2135,5 +2135,5 @@ nm_setting_bridge_class_init(NMSettingBridgeClass *klass)
|
||||
NM_META_SETTING_TYPE_BRIDGE,
|
||||
NULL,
|
||||
properties_override,
|
||||
G_STRUCT_OFFSET(NMSettingBridge, _priv));
|
||||
0);
|
||||
}
|
||||
|
||||
@@ -543,5 +543,5 @@ nm_setting_ovs_external_ids_class_init(NMSettingOvsExternalIDsClass *klass)
|
||||
NM_META_SETTING_TYPE_OVS_EXTERNAL_IDS,
|
||||
NULL,
|
||||
properties_override,
|
||||
G_STRUCT_OFFSET(NMSettingOvsExternalIDs, _priv));
|
||||
0);
|
||||
}
|
||||
|
||||
@@ -576,5 +576,5 @@ nm_setting_user_class_init(NMSettingUserClass *klass)
|
||||
NM_META_SETTING_TYPE_USER,
|
||||
NULL,
|
||||
properties_override,
|
||||
G_STRUCT_OFFSET(NMSettingUser, _priv));
|
||||
0);
|
||||
}
|
||||
|
||||
@@ -2362,8 +2362,8 @@ nm_setting_wireguard_class_init(NMSettingWireGuardClass *klass)
|
||||
NM_SETTING_WIREGUARD_PRIVATE_KEY,
|
||||
PROP_PRIVATE_KEY,
|
||||
NM_SETTING_PARAM_SECRET,
|
||||
NMSettingWireGuardPrivate,
|
||||
private_key,
|
||||
NMSettingWireGuard,
|
||||
_priv.private_key,
|
||||
.direct_hook.set_string_fcn =
|
||||
_set_string_fcn_public_key);
|
||||
|
||||
@@ -2379,8 +2379,8 @@ nm_setting_wireguard_class_init(NMSettingWireGuardClass *klass)
|
||||
obj_properties,
|
||||
NM_SETTING_WIREGUARD_PRIVATE_KEY_FLAGS,
|
||||
PROP_PRIVATE_KEY_FLAGS,
|
||||
NMSettingWireGuardPrivate,
|
||||
private_key_flags);
|
||||
NMSettingWireGuard,
|
||||
_priv.private_key_flags);
|
||||
|
||||
/**
|
||||
* NMSettingWireGuard:fwmark:
|
||||
@@ -2401,8 +2401,8 @@ nm_setting_wireguard_class_init(NMSettingWireGuardClass *klass)
|
||||
G_MAXUINT32,
|
||||
0,
|
||||
NM_SETTING_PARAM_INFERRABLE,
|
||||
NMSettingWireGuardPrivate,
|
||||
fwmark);
|
||||
NMSettingWireGuard,
|
||||
_priv.fwmark);
|
||||
|
||||
/**
|
||||
* NMSettingWireGuard:listen-port:
|
||||
@@ -2420,8 +2420,8 @@ nm_setting_wireguard_class_init(NMSettingWireGuardClass *klass)
|
||||
65535,
|
||||
0,
|
||||
NM_SETTING_PARAM_INFERRABLE,
|
||||
NMSettingWireGuardPrivate,
|
||||
listen_port);
|
||||
NMSettingWireGuard,
|
||||
_priv.listen_port);
|
||||
|
||||
/**
|
||||
* NMSettingWireGuard:peer-routes:
|
||||
@@ -2446,8 +2446,8 @@ nm_setting_wireguard_class_init(NMSettingWireGuardClass *klass)
|
||||
PROP_PEER_ROUTES,
|
||||
TRUE,
|
||||
NM_SETTING_PARAM_INFERRABLE,
|
||||
NMSettingWireGuardPrivate,
|
||||
peer_routes);
|
||||
NMSettingWireGuard,
|
||||
_priv.peer_routes);
|
||||
|
||||
/**
|
||||
* NMSettingWireGuard:mtu:
|
||||
@@ -2469,8 +2469,8 @@ nm_setting_wireguard_class_init(NMSettingWireGuardClass *klass)
|
||||
G_MAXUINT32,
|
||||
0,
|
||||
NM_SETTING_PARAM_INFERRABLE,
|
||||
NMSettingWireGuardPrivate,
|
||||
mtu);
|
||||
NMSettingWireGuard,
|
||||
_priv.mtu);
|
||||
|
||||
/**
|
||||
* NMSettingWireGuard:ip4-auto-default-route:
|
||||
@@ -2497,8 +2497,8 @@ nm_setting_wireguard_class_init(NMSettingWireGuardClass *klass)
|
||||
NM_SETTING_WIREGUARD_IP4_AUTO_DEFAULT_ROUTE,
|
||||
PROP_IP4_AUTO_DEFAULT_ROUTE,
|
||||
NM_SETTING_PARAM_FUZZY_IGNORE,
|
||||
NMSettingWireGuardPrivate,
|
||||
ip4_auto_default_route);
|
||||
NMSettingWireGuard,
|
||||
_priv.ip4_auto_default_route);
|
||||
|
||||
/**
|
||||
* NMSettingWireGuard:ip6-auto-default-route:
|
||||
@@ -2512,8 +2512,8 @@ nm_setting_wireguard_class_init(NMSettingWireGuardClass *klass)
|
||||
NM_SETTING_WIREGUARD_IP6_AUTO_DEFAULT_ROUTE,
|
||||
PROP_IP6_AUTO_DEFAULT_ROUTE,
|
||||
NM_SETTING_PARAM_FUZZY_IGNORE,
|
||||
NMSettingWireGuardPrivate,
|
||||
ip6_auto_default_route);
|
||||
NMSettingWireGuard,
|
||||
_priv.ip6_auto_default_route);
|
||||
|
||||
/* ---dbus---
|
||||
* property: peers
|
||||
@@ -2535,5 +2535,5 @@ nm_setting_wireguard_class_init(NMSettingWireGuardClass *klass)
|
||||
NM_META_SETTING_TYPE_WIREGUARD,
|
||||
NULL,
|
||||
properties_override,
|
||||
G_STRUCT_OFFSET(NMSettingWireGuard, _priv));
|
||||
0);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user