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

libnm: reorder fields in NMIPAddress/NMIPRoute struct

Browse source 
Order the fields by their size, to minimize the alignment gaps.
I guess, that doesn't matter because the alignment of the heap
allocation is larger than what we can safe here. Still, there is
on reason to do it any other way.

Also, it's not possible via API to set family/prefix to values outside
their range, so an 8bit integer is always sufficient. And we don't want
that invariant to change. We don't ever want to allow the caller to set
values that are clearly invalid, and will assert against that early (g_return()).
Point is, we can do this and there is no danger of future problems.
And even if we will support larger values, it's all an implementation
detail anyway.

(cherry picked from commit 6208a1bb84)
This commit is contained in:
Thomas Haller 2022-02-03 22:49:37 +01:00
parent 1701048e02
commit beca3a4d46
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -169,9 +169,10 @@ G_DEFINE_BOXED_TYPE(NMIPAddress, nm_ip_address, nm_ip_address_dup, nm_ip_address
struct NMIPAddress {
guint refcount;
char *address;
int prefix, family;
gint8 family;
guint8 prefix;
char *address;
GHashTable *attributes;
};
@ -608,13 +609,14 @@ G_DEFINE_BOXED_TYPE(NMIPRoute, nm_ip_route, nm_ip_route_dup, nm_ip_route_unref)
struct NMIPRoute {
guint refcount;
int family;
char *dest;
guint prefix;
char *next_hop;
gint64 metric;
gint8 family;
guint8 prefix;
char *dest;
char *next_hop;
GHashTable *attributes;
gint64 metric;
};
/**