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

device: internally export nm_device_hash_check_invalid_keys()

Browse source
This commit is contained in:
Beniamino Galvani 2017-03-03 12:03:26 +01:00
parent 8eb49639fc
commit 8922f9aabe
2 changed files with 21 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/devices/nm-device-private.h
View file

@ -134,4 +134,9 @@ guint32 nm_device_get_configured_mtu_for_wired (NMDevice *self, gboolean *out_is
NM_DEVICE_CLASS (klass)->link_types = link_types; \ NM_DEVICE_CLASS (klass)->link_types = link_types; \
} }
gboolean _nm_device_hash_check_invalid_keys (GHashTable *hash, const char *setting_name,
GError **error, const char **argv);
#define nm_device_hash_check_invalid_keys(hash, setting_name, error, ...) \
_nm_device_hash_check_invalid_keys (hash, setting_name, error, ((const char *[]) { __VA_ARGS__, NULL }))
#endif /* NM_DEVICE_PRIVATE_H */ #endif /* NM_DEVICE_PRIVATE_H */

32
src/devices/nm-device.c
View file

@ -8331,8 +8331,9 @@ _cleanup_ip6_pre (NMDevice *self, CleanupType cleanup_type)
addrconf6_cleanup (self); addrconf6_cleanup (self);
} }
static gboolean gboolean
_hash_check_invalid_keys_impl (GHashTable *hash, const char *setting_name, GError **error, const char **argv) _nm_device_hash_check_invalid_keys (GHashTable *hash, const char *setting_name,
GError **error, const char **argv)
{ {
guint found_keys = 0; guint found_keys = 0;
guint i; guint i;
@ -8395,7 +8396,6 @@ _hash_check_invalid_keys_impl (GHashTable *hash, const char *setting_name, GErro
return TRUE; return TRUE;
} }
#define _hash_check_invalid_keys(hash, setting_name, error, ...) _hash_check_invalid_keys_impl (hash, setting_name, error, ((const char *[]) { __VA_ARGS__, NULL }))
void void
nm_device_reactivate_ip4_config (NMDevice *self, nm_device_reactivate_ip4_config (NMDevice *self,
@ -8517,10 +8517,10 @@ reapply_connection (NMDevice *self,
/************************************************************************** /**************************************************************************
* check for unsupported changes and reject to reapply * check for unsupported changes and reject to reapply
*************************************************************************/ *************************************************************************/
if (!_hash_check_invalid_keys (diffs, NULL, error, if (!nm_device_hash_check_invalid_keys (diffs, NULL, error,
NM_SETTING_IP4_CONFIG_SETTING_NAME, NM_SETTING_IP4_CONFIG_SETTING_NAME,
NM_SETTING_IP6_CONFIG_SETTING_NAME, NM_SETTING_IP6_CONFIG_SETTING_NAME,
NM_SETTING_CONNECTION_SETTING_NAME)) NM_SETTING_CONNECTION_SETTING_NAME))
return FALSE; return FALSE;
/* whitelist allowed properties from "connection" setting which are allowed to differ. /* whitelist allowed properties from "connection" setting which are allowed to differ.
@ -8528,15 +8528,15 @@ reapply_connection (NMDevice *self,
* This includes UUID, there is no principal problem with reapplying a connection * This includes UUID, there is no principal problem with reapplying a connection
* and changing it's UUID. In fact, disallowing it makes it cumbersome for the user * and changing it's UUID. In fact, disallowing it makes it cumbersome for the user
* to reapply any connection but the original settings-connection. */ * to reapply any connection but the original settings-connection. */
if (!_hash_check_invalid_keys (diffs ? g_hash_table_lookup (diffs, NM_SETTING_CONNECTION_SETTING_NAME) : NULL, if (!nm_device_hash_check_invalid_keys (diffs ? g_hash_table_lookup (diffs, NM_SETTING_CONNECTION_SETTING_NAME) : NULL,
NM_SETTING_CONNECTION_SETTING_NAME, NM_SETTING_CONNECTION_SETTING_NAME,
error, error,
NM_SETTING_CONNECTION_ID, NM_SETTING_CONNECTION_ID,
NM_SETTING_CONNECTION_UUID, NM_SETTING_CONNECTION_UUID,
NM_SETTING_CONNECTION_STABLE_ID, NM_SETTING_CONNECTION_STABLE_ID,
NM_SETTING_CONNECTION_AUTOCONNECT, NM_SETTING_CONNECTION_AUTOCONNECT,
NM_SETTING_CONNECTION_ZONE, NM_SETTING_CONNECTION_ZONE,
NM_SETTING_CONNECTION_METERED)) NM_SETTING_CONNECTION_METERED))
return FALSE; return FALSE;
if ( version_id != 0 if ( version_id != 0