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

platform,core: merge branch 'th/platform-struct-packing'

Browse source 
https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/1217
This commit is contained in:
Thomas Haller 2022-05-11 17:08:22 +02:00
commit 265a4a07bd
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
4 changed files with 82 additions and 69 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/core/nm-audit-manager.c
View file

@ -135,10 +135,13 @@ build_message(NMStrBuf *strbuf, AuditBackend backend, GPtrArray *fields)
#if HAVE_LIBAUDIT
if (backend == BACKEND_AUDITD) {
if (field->need_encoding) {
gs_free char *value = NULL;
nm_auto_free char *value = NULL;
value = audit_encode_nv_string(field->name, str, 0);
nm_str_buf_append(strbuf, value);
if (value)
nm_str_buf_append(strbuf, value);
else
nm_str_buf_append_printf(strbuf, "%s=???", field->name);
} else
nm_str_buf_append_printf(strbuf, "%s=%s", field->name, str);
continue;

7
src/libnm-glib-aux/nm-shared-utils.c
View file

@ -37,6 +37,13 @@ const void *const _NM_PTRARRAY_EMPTY[1] = {NULL};
const NMIPAddr nm_ip_addr_zero = {};
/* We use _nm_alignas(NMIPAddr). Ensure that this struct has the same
* alignment as in_addr_t and struct in6_addr. */
G_STATIC_ASSERT(_nm_alignof(NMIPAddr) == 4);
G_STATIC_ASSERT(_nm_alignof(in_addr_t) == 4);
G_STATIC_ASSERT(_nm_alignof(struct in_addr) == 4);
G_STATIC_ASSERT(_nm_alignof(struct in6_addr) == 4);
/* this initializes a struct in_addr/in6_addr and allows for untrusted
* arguments (like unsuitable @addr_family or @src_len). It's almost safe
* in the sense that it verifies input arguments strictly. Also, it

2
src/libnm-glib-aux/nm-shared-utils.h
View file

@ -216,7 +216,7 @@ nm_ether_addr_equal(const NMEtherAddr *a, const NMEtherAddr *b)
typedef struct {
union {
guint8 addr_ptr[1];
guint8 addr_ptr[sizeof(struct in6_addr)];
in_addr_t addr4;
struct in_addr addr4_struct;
struct in6_addr addr6;

135
src/libnm-platform/nm-platform.h
View file

@ -333,6 +333,9 @@ typedef enum {
* should be configured. */ \
bool a_force_commit : 1; \
\
/* Don't have a bitfield as last field in __NMPlatformIPAddress_COMMON. It would then
* be unclear how the following fields get merged. We could also use a zero bitfield,
* but instead we just have there the uint8 field. */ \
guint8 plen; \
;
@ -343,10 +346,7 @@ typedef enum {
**/
typedef struct {
__NMPlatformIPAddress_COMMON;
union {
guint8 address_ptr[1];
guint32 __dummy_for_32bit_alignment;
};
_nm_alignas(NMIPAddr) guint8 address_ptr[];
} NMPlatformIPAddress;
/**
@ -358,11 +358,15 @@ struct _NMPlatformIP4Address {
/* Whether the address is ready to be configured. By default, an address is, but this
* flag may indicate that the address is just for tracking purpose only, but the ACD
* state is not yet ready for the address to be configured. */
* state is not yet ready for the address to be configured.
*
* This bit fits actually in an alignment gap between __NMPlatformIPAddress_COMMON and
* "address" field. Usually "address" must be the first field after __NMPlatformIPAddress_COMMON,
* but there is a gap. We have a static assertion that checks this, so all is good. */
bool a_acd_not_ready : 1;
/* The local address IFA_LOCAL. */
in_addr_t address;
_nm_alignas(NMIPAddr) in_addr_t address;
/* The IFA_ADDRESS PTP peer address. This field is rather important, because
* it constitutes the identifier for the IPv4 address (e.g. you can add two
@ -390,7 +394,7 @@ struct _NMPlatformIP4Address {
**/
struct _NMPlatformIP6Address {
__NMPlatformIPAddress_COMMON;
struct in6_addr address;
_nm_alignas(NMIPAddr) struct in6_addr address;
struct in6_addr peer_address;
};
@ -426,60 +430,6 @@ typedef union {
#define __NMPlatformIPRoute_COMMON \
__NMPlatformObjWithIfindex_COMMON; \
\
/* The NMIPConfigSource. For routes that we receive from cache this corresponds
* to the rtm_protocol field (and is one of the NM_IP_CONFIG_SOURCE_RTPROT_* values).
* When adding a route, the source will be coerced to the protocol using
* nmp_utils_ip_config_source_coerce_to_rtprot().
*
* rtm_protocol is part of the primary key of an IPv4 route (meaning, you can add
* two IPv4 routes that only differ in their rtm_protocol. For IPv6, that is not
* the case.
*
* When deleting an IPv4/IPv6 route, the rtm_protocol field must match (even
* if it is not part of the primary key for IPv6) -- unless rtm_protocol is set
* to zero, in which case the first matching route (with proto ignored) is deleted. */ \
NMIPConfigSource rt_source; \
\
guint8 plen; \
\
/* RTA_METRICS:
*
* For IPv4 routes, these properties are part of their
* ID (meaning: you can add otherwise identical IPv4 routes that
* only differ by the metric property).
* On the other hand, for IPv6 you cannot add two IPv6 routes that only differ
* by an RTA_METRICS property.
*
* When deleting a route, kernel seems to ignore the RTA_METRICS properties.
* That is a problem/bug for IPv4 because you cannot explicitly select which
* route to delete. Kernel just picks the first. See rh#1475642. */ \
\
/* RTA_METRICS.RTAX_LOCK (iproute2: "lock" arguments) */ \
bool lock_window : 1; \
bool lock_cwnd : 1; \
bool lock_initcwnd : 1; \
bool lock_initrwnd : 1; \
bool lock_mtu : 1; \
\
/* if TRUE, the "metric" field is interpreted as an offset that is added to a default
* metric. For example, form a DHCP lease we don't know the actually used metric, because
* that is determined by upper layers (the configuration). However, we have a default
* metric that should be used. So we set "metric_any" to %TRUE, which means to use
* the default metric. However, we still treat the "metric" field as an offset that
* will be added to the default metric. In most case, you want that "metric" is zero
* when setting "metric_any". */ \
bool metric_any : 1; \
\
/* like "metric_any", the table is determined by other layers of the code.
* This field overrides "table_coerced" field. If "table_any" is true, then
* the "table_coerced" field is ignored (unlike for the metric). */ \
bool table_any : 1; \
/* Meta flags not honored by NMPlatform (netlink code). Instead, they can be
* used by the upper layers which use NMPlatformIPRoute to track routes that
* should be configured. */ \
/* Whether the route should be committed even if it was removed externally. */ \
bool r_force_commit : 1; \
\
/* rtnh_flags
*
* Routes with rtm_flags RTM_F_CLONED are hidden by platform and
@ -521,21 +471,74 @@ typedef union {
* zero (RT_TABLE_UNSPEC) are swapped, so that the default is the main
* table. Use nm_platform_route_table_coerce()/nm_platform_route_table_uncoerce(). */ \
guint32 table_coerced; \
/* The NMIPConfigSource. For routes that we receive from cache this corresponds
* to the rtm_protocol field (and is one of the NM_IP_CONFIG_SOURCE_RTPROT_* values).
* When adding a route, the source will be coerced to the protocol using
* nmp_utils_ip_config_source_coerce_to_rtprot().
*
* rtm_protocol is part of the primary key of an IPv4 route (meaning, you can add
* two IPv4 routes that only differ in their rtm_protocol. For IPv6, that is not
* the case.
*
* When deleting an IPv4/IPv6 route, the rtm_protocol field must match (even
* if it is not part of the primary key for IPv6) -- unless rtm_protocol is set
* to zero, in which case the first matching route (with proto ignored) is deleted. */ \
NMIPConfigSource rt_source; \
\
/* RTA_METRICS:
*
* For IPv4 routes, these properties are part of their
* ID (meaning: you can add otherwise identical IPv4 routes that
* only differ by the metric property).
* On the other hand, for IPv6 you cannot add two IPv6 routes that only differ
* by an RTA_METRICS property.
*
* When deleting a route, kernel seems to ignore the RTA_METRICS properties.
* That is a problem/bug for IPv4 because you cannot explicitly select which
* route to delete. Kernel just picks the first. See rh#1475642. */ \
\
/* RTA_METRICS.RTAX_LOCK (iproute2: "lock" arguments) */ \
bool lock_window : 1; \
bool lock_cwnd : 1; \
bool lock_initcwnd : 1; \
bool lock_initrwnd : 1; \
bool lock_mtu : 1; \
\
/* if TRUE, the "metric" field is interpreted as an offset that is added to a default
* metric. For example, form a DHCP lease we don't know the actually used metric, because
* that is determined by upper layers (the configuration). However, we have a default
* metric that should be used. So we set "metric_any" to %TRUE, which means to use
* the default metric. However, we still treat the "metric" field as an offset that
* will be added to the default metric. In most case, you want that "metric" is zero
* when setting "metric_any". */ \
bool metric_any : 1; \
\
/* like "metric_any", the table is determined by other layers of the code.
* This field overrides "table_coerced" field. If "table_any" is true, then
* the "table_coerced" field is ignored (unlike for the metric). */ \
bool table_any : 1; \
/* Meta flags not honored by NMPlatform (netlink code). Instead, they can be
* used by the upper layers which use NMPlatformIPRoute to track routes that
* should be configured. */ \
/* Whether the route should be committed even if it was removed externally. */ \
bool r_force_commit : 1; \
\
/* rtm_type.
*
* This is not the original type, if type_coerced is 0 then
* it means RTN_UNSPEC otherwise the type value is preserved.
* */ \
*/ \
guint8 type_coerced; \
\
/* Don't have a bitfield as last field in __NMPlatformIPAddress_COMMON. It would then
* be unclear how the following fields get merged. We could also use a zero bitfield,
* but instead we just have there the uint8 field. */ \
guint8 plen; \
;
typedef struct {
__NMPlatformIPRoute_COMMON;
union {
guint8 network_ptr[1];
guint32 __dummy_for_32bit_alignment;
};
_nm_alignas(NMIPAddr) guint8 network_ptr[];
} NMPlatformIPRoute;
#define NM_PLATFORM_IP_ROUTE_CAST(route) \