colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

platform: move known_subnets variable to inner scope in nm_platform_ip_address_sync()

Browse Source
This commit is contained in:
Thomas Haller
2022-04-02 10:34:17 +02:00
parent 40f22e69c8
commit e1431b43a2
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/libnm-platform/nm-platform.c
View File

@@ -3969,7 +3969,6 @@ nm_platform_ip_address_sync(NMPlatform *self,
NMPLookup lookup; NMPLookup lookup;
gs_unref_hashtable GHashTable *known_addresses_idx = NULL; gs_unref_hashtable GHashTable *known_addresses_idx = NULL;
gs_unref_ptrarray GPtrArray *plat_addresses = NULL; gs_unref_ptrarray GPtrArray *plat_addresses = NULL;
GHashTable *known_subnets = NULL;
gboolean success; gboolean success;
guint i_plat; guint i_plat;
guint i_know; guint i_know;
@@ -4031,9 +4030,10 @@ nm_platform_ip_address_sync(NMPlatform *self,
if (nm_g_ptr_array_len(plat_addresses) > 0) { if (nm_g_ptr_array_len(plat_addresses) > 0) {
/* Delete addresses that interfere with our intended order. */ /* Delete addresses that interfere with our intended order. */
if (IS_IPv4) { if (IS_IPv4) {
GHashTable *known_subnets = NULL;
GHashTable *plat_subnets;
gs_free bool *plat_handled_to_free = NULL; gs_free bool *plat_handled_to_free = NULL;
bool *plat_handled = NULL; bool *plat_handled = NULL;
GHashTable *plat_subnets;
/* For IPv4, we only consider it a conflict for addresses in the same /* For IPv4, we only consider it a conflict for addresses in the same
* subnet. That's where kernel will assign a primary/secondary flag. * subnet. That's where kernel will assign a primary/secondary flag.
@@ -4129,6 +4129,7 @@ nm_platform_ip_address_sync(NMPlatform *self,
} }
} }
ip4_addr_subnets_destroy_index(plat_subnets, plat_addresses); ip4_addr_subnets_destroy_index(plat_subnets, plat_addresses);
ip4_addr_subnets_destroy_index(known_subnets, known_addresses);
} else { } else {
guint known_addresses_len; guint known_addresses_len;
IP6AddrScope cur_scope; IP6AddrScope cur_scope;
@@ -4239,9 +4240,6 @@ next_plat:;
if (!known_addresses) if (!known_addresses)
return TRUE; return TRUE;
if (IS_IPv4)
ip4_addr_subnets_destroy_index(known_subnets, known_addresses);
success = TRUE; success = TRUE;
/* Add missing addresses. New addresses are added by kernel with top /* Add missing addresses. New addresses are added by kernel with top