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

core: use NMPtrArray in nm_l3_config_data_add_dependent_onlink_routes()

Browse source
This commit is contained in:
Thomas Haller 2023-01-05 11:32:14 +01:00
parent f9cf8b43c6
commit f1b89fccdf
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
1 changed files with 14 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/core/nm-l3-config-data.c
View file

@ -8,6 +8,7 @@
#include "nm-compat-headers/linux/if_addr.h"
#include <linux/rtnetlink.h>
#include "libnm-glib-aux/nm-ptr-array.h"
#include "libnm-core-intern/nm-core-internal.h"
#include "libnm-glib-aux/nm-enum-utils.h"
#include "libnm-glib-aux/nm-ref-string.h"
@ -2541,11 +2542,12 @@ nm_l3_config_data_get_blacklisted_ip4_routes(const NML3ConfigData *self, gboolea
void
nm_l3_config_data_add_dependent_onlink_routes(NML3ConfigData *self, int addr_family)
{
gs_unref_ptrarray GPtrArray *extra_onlink_routes = NULL;
NMPtrArrayStack extra_onlink_routes_stack = NM_PTR_ARRAY_STACK_INIT(nmp_object_unref);
nm_auto_ptrarray NMPtrArray *extra_onlink_routes = &extra_onlink_routes_stack.arr;
const NMPObject *obj_src;
NMDedupMultiIter iter;
int IS_IPv4;
guint i;
gsize i;
if (addr_family == AF_UNSPEC) {
nm_l3_config_data_add_dependent_onlink_routes(self, AF_INET);
@ -2591,20 +2593,17 @@ nm_l3_config_data_add_dependent_onlink_routes(NML3ConfigData *self, int addr_fam
}
/* we cannot add the route right away, because that invalidates the iteration. */
if (!extra_onlink_routes)
extra_onlink_routes = g_ptr_array_new_with_free_func((GDestroyNotify) nmp_object_unref);
g_ptr_array_add(extra_onlink_routes, new_route);
nm_ptr_array_add(&extra_onlink_routes, new_route);
}
if (extra_onlink_routes) {
for (i = 0; i < extra_onlink_routes->len; i++) {
nm_l3_config_data_add_route_full(self,
addr_family,
extra_onlink_routes->pdata[i],
NULL,
NM_L3_CONFIG_ADD_FLAGS_EXCLUSIVE,
NULL,
NULL);
}
for (i = 0; i < extra_onlink_routes->len; i++) {
nm_l3_config_data_add_route_full(self,
addr_family,
extra_onlink_routes->ptrs[i],
NULL,
NM_L3_CONFIG_ADD_FLAGS_EXCLUSIVE,
NULL,
NULL);
}
}