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

libnm: add nm_connection_serialization_options_equal() helper

Browse source 
(cherry picked from commit cea52c7cbd)
This commit is contained in:
Thomas Haller 2021-06-15 12:36:58 +02:00
parent 91e6f4ff52
commit b9d4f7dd00
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
2 changed files with 39 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2527,6 +2527,38 @@ _nm_connection_find_secret(NMConnection * self,
/*****************************************************************************/
static const NMConnectionSerializationOptions _connection_serialization_options_empty = {
.timestamp =
{
.has = FALSE,
.val = 0,
},
.seen_bssids = NULL,
};
gboolean
nm_connection_serialization_options_equal(const NMConnectionSerializationOptions *a,
const NMConnectionSerializationOptions *b)
{
if (!a)
a = &_connection_serialization_options_empty;
if (!b)
b = &_connection_serialization_options_empty;
if (a == b)
return TRUE;
if (a->timestamp.has != b->timestamp.has)
return FALSE;
if (a->timestamp.has && a->timestamp.val != b->timestamp.val)
return FALSE;
if (!nm_utils_strv_equal(a->seen_bssids ?: NM_STRV_EMPTY_CC(),
b->seen_bssids ?: NM_STRV_EMPTY_CC()))
return FALSE;
return TRUE;
}
/**
* nm_connection_to_dbus:
* @connection: the #NMConnection
@ -2559,6 +2591,9 @@ nm_connection_to_dbus_full(NMConnection * connection,
priv = NM_CONNECTION_GET_PRIVATE(connection);
if (!options)
options = &_connection_serialization_options_empty;
for (i = 0; i < (int) _NM_META_SETTING_TYPE_NUM; i++) {
NMSetting *setting = priv->settings[nm_meta_setting_types_by_priority[i]];
GVariant * setting_dict;

5
src/libnm-core-intern/nm-core-internal.h
View file

@ -207,10 +207,13 @@ typedef struct {
bool has;
} timestamp;
const char **seen_bssids;
const char *const *seen_bssids;
} NMConnectionSerializationOptions;
gboolean nm_connection_serialization_options_equal(const NMConnectionSerializationOptions *a,
const NMConnectionSerializationOptions *b);
GVariant *nm_connection_to_dbus_full(NMConnection * connection,
NMConnectionSerializationFlags flags,
const NMConnectionSerializationOptions *options);