system/NetworkManager
system/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager synced 2024-09-06 09:04:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

device: merge branch 'th/device-reapply-metric' (partial)

Browse source 
https://github.com/NetworkManager/NetworkManager/pull/138
This commit is contained in:
Thomas Haller 2018-06-15 09:09:54 +02:00
parent 9c0db98094 6e12e18c15
commit 086eadd5ba
3 changed files with 32 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
shared/nm-utils/nm-macros-internal.h
View file

@ -807,8 +807,8 @@ nm_g_object_unref (gpointer obj)
g_object_unref (obj);
}
/* Assigns GObject @obj to destination @pdst, and takes an additional ref.
* The previous value of @pdst is unrefed.
/* Assigns GObject @obj to destination @pp, and takes an additional ref.
* The previous value of @pp is unrefed.
*
* It makes sure to first increase the ref-count of @obj, and handles %NULL
* @obj correctly.
@ -816,22 +816,18 @@ nm_g_object_unref (gpointer obj)
#define nm_g_object_ref_set(pp, obj) \
({ \
typeof (*(pp)) *const _pp = (pp); \
typeof (**_pp) *const _obj = (obj); \
typeof (**_pp) *_p; \
typeof (*_pp) const _obj = (obj); \
typeof (*_pp) _p; \
gboolean _changed = FALSE; \
\
nm_assert (!_pp || !*_pp || G_IS_OBJECT (*_pp)); \
nm_assert (!_obj || G_IS_OBJECT (_obj)); \
\
if ( _pp \
&& ((_p = *_pp) != _obj)) { \
if (_obj) { \
nm_assert (G_IS_OBJECT (_obj)); \
g_object_ref (_obj); \
} \
if (_p) { \
nm_assert (G_IS_OBJECT (_p)); \
*_pp = NULL; \
g_object_unref (_p); \
} \
nm_g_object_ref (_obj); \
*_pp = _obj; \
nm_g_object_unref (_p); \
_changed = TRUE; \
} \
_changed; \

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

@ -134,7 +134,7 @@ void nm_device_commit_mtu (NMDevice *self);
}
gboolean _nm_device_hash_check_invalid_keys (GHashTable *hash, const char *setting_name,
GError **error, const char **argv);
GError **error, const char **whitelist);
#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 }))

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

@ -10194,43 +10194,45 @@ _cleanup_ip_pre (NMDevice *self, int addr_family, CleanupType cleanup_type)
gboolean
_nm_device_hash_check_invalid_keys (GHashTable *hash, const char *setting_name,
GError **error, const char **argv)
GError **error, const char **whitelist)
{
guint found_keys = 0;
guint found_whitelisted_keys = 0;
guint i;
nm_assert (hash && g_hash_table_size (hash) > 0);
nm_assert (argv && argv[0]);
nm_assert (whitelist && whitelist[0]);
#if NM_MORE_ASSERTS > 10
/* Assert that the keys are unique. */
/* Require whitelist to only contain unique keys. */
{
gs_unref_hashtable GHashTable *check_dups = g_hash_table_new_full (nm_str_hash, g_str_equal, NULL, NULL);
for (i = 0; argv[i]; i++) {
if (!g_hash_table_add (check_dups, (char *) argv[i]))
for (i = 0; whitelist[i]; i++) {
if (!g_hash_table_add (check_dups, (char *) whitelist[i]))
nm_assert (FALSE);
}
nm_assert (g_hash_table_size (check_dups) > 0);
}
#endif
for (i = 0; argv[i]; i++) {
if (g_hash_table_contains (hash, argv[i]))
found_keys++;
for (i = 0; whitelist[i]; i++) {
if (g_hash_table_contains (hash, whitelist[i]))
found_whitelisted_keys++;
}
if (found_keys != g_hash_table_size (hash)) {
if (found_whitelisted_keys == g_hash_table_size (hash)) {
/* Good, there are only whitelisted keys in the hash. */
return TRUE;
}
if (error) {
GHashTableIter iter;
const char *k = NULL;
const char *first_invalid_key = NULL;
if (!error)
return FALSE;
g_hash_table_iter_init (&iter, hash);
while (g_hash_table_iter_next (&iter, (gpointer *) &k, NULL)) {
if (nm_utils_strv_find_first ((char **) argv, -1, k) < 0) {
if (nm_utils_strv_find_first ((char **) whitelist, -1, k) < 0) {
first_invalid_key = k;
break;
}
@ -10250,10 +10252,9 @@ _nm_device_hash_check_invalid_keys (GHashTable *hash, const char *setting_name,
first_invalid_key);
}
g_return_val_if_fail (first_invalid_key, FALSE);
return FALSE;
}
return TRUE;
return FALSE;
}
void
@ -10396,9 +10397,11 @@ can_reapply_change (NMDevice *self, const char *setting_name,
NM_SETTING_CONNECTION_METERED,
NM_SETTING_CONNECTION_LLDP);
} else if (NM_IN_STRSET (setting_name,
NM_SETTING_IP4_CONFIG_SETTING_NAME,
NM_SETTING_IP6_CONFIG_SETTING_NAME,
NM_SETTING_PROXY_SETTING_NAME)) {
return TRUE;
} else if (NM_IN_STRSET (setting_name,
NM_SETTING_IP4_CONFIG_SETTING_NAME,
NM_SETTING_IP6_CONFIG_SETTING_NAME)) {
if (g_hash_table_contains (diffs, NM_SETTING_IP_CONFIG_ROUTE_TABLE)) {
/* changing the route-table setting is complicated, because it affects
* how we sync the routes. Don't support changing it without full
@ -10529,7 +10532,7 @@ check_and_reapply_connection (NMDevice *self,
if (diffs) {
NMConnection *connection_clean = connection;
gs_free NMConnection *connection_clean_free = NULL;
gs_unref_object NMConnection *connection_clean_free = NULL;
{
NMSettingConnection *s_con_a, *s_con_n;