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

core: add nm_l3_config_data_iter_ip_{address,route}_for_each() helpers

Browse Source
This commit is contained in:
Thomas Haller
2021-05-17 17:03:56 +02:00
parent 4d929cc023
commit 75a64dd199
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.clang-format
View File

@@ -105,9 +105,11 @@ ForEachMacros: ['c_list_for_each',
'nm_ip_config_iter_ip_route_for_each', 'nm_ip_config_iter_ip_route_for_each',
'nm_json_array_foreach', 'nm_json_array_foreach',
'nm_json_object_foreach', 'nm_json_object_foreach',
'nm_l3_config_data_iter_ip_address_for_each',
'nm_l3_config_data_iter_ip4_address_for_each', 'nm_l3_config_data_iter_ip4_address_for_each',
'nm_l3_config_data_iter_ip4_route_for_each',
'nm_l3_config_data_iter_ip6_address_for_each', 'nm_l3_config_data_iter_ip6_address_for_each',
'nm_l3_config_data_iter_ip_route_for_each',
'nm_l3_config_data_iter_ip4_route_for_each',
'nm_l3_config_data_iter_ip6_route_for_each', 'nm_l3_config_data_iter_ip6_route_for_each',
'nm_l3_config_data_iter_obj_for_each', 'nm_l3_config_data_iter_obj_for_each',
'nm_manager_for_each_active_connection', 'nm_manager_for_each_active_connection',

9
src/core/nm-l3-config-data.h
View File

@@ -252,6 +252,11 @@ nm_l3_config_data_lookup_routes(const NML3ConfigData *self, int addr_family)
for (nm_dedup_multi_iter_init((iter), nm_l3_config_data_lookup_objs((self), (type))); \ for (nm_dedup_multi_iter_init((iter), nm_l3_config_data_lookup_objs((self), (type))); \
nm_platform_dedup_multi_iter_next_obj((iter), (obj), (type));) nm_platform_dedup_multi_iter_next_obj((iter), (obj), (type));)
#define nm_l3_config_data_iter_ip_address_for_each(iter, self, addr_family, address) \
for (nm_dedup_multi_iter_init((iter), \
nm_l3_config_data_lookup_addresses((self), (addr_family))); \
nm_platform_dedup_multi_iter_next_ip_address((iter), (address));)
#define nm_l3_config_data_iter_ip4_address_for_each(iter, self, address) \ #define nm_l3_config_data_iter_ip4_address_for_each(iter, self, address) \
for (nm_dedup_multi_iter_init((iter), nm_l3_config_data_lookup_addresses((self), AF_INET)); \ for (nm_dedup_multi_iter_init((iter), nm_l3_config_data_lookup_addresses((self), AF_INET)); \
nm_platform_dedup_multi_iter_next_ip4_address((iter), (address));) nm_platform_dedup_multi_iter_next_ip4_address((iter), (address));)
@@ -260,6 +265,10 @@ nm_l3_config_data_lookup_routes(const NML3ConfigData *self, int addr_family)
for (nm_dedup_multi_iter_init((iter), nm_l3_config_data_lookup_addresses((self), AF_INET6)); \ for (nm_dedup_multi_iter_init((iter), nm_l3_config_data_lookup_addresses((self), AF_INET6)); \
nm_platform_dedup_multi_iter_next_ip6_address((iter), (address));) nm_platform_dedup_multi_iter_next_ip6_address((iter), (address));)
#define nm_l3_config_data_iter_ip_route_for_each(iter, self, addr_family, route) \
for (nm_dedup_multi_iter_init((iter), nm_l3_config_data_lookup_routes((self), (addr_family))); \
nm_platform_dedup_multi_iter_next_ip_route((iter), (route));)
#define nm_l3_config_data_iter_ip4_route_for_each(iter, self, route) \ #define nm_l3_config_data_iter_ip4_route_for_each(iter, self, route) \
for (nm_dedup_multi_iter_init((iter), nm_l3_config_data_lookup_routes((self), AF_INET)); \ for (nm_dedup_multi_iter_init((iter), nm_l3_config_data_lookup_routes((self), AF_INET)); \
nm_platform_dedup_multi_iter_next_ip4_route((iter), (route));) nm_platform_dedup_multi_iter_next_ip4_route((iter), (route));)