diff options
| author | Thomas Haller <thaller@redhat.com> | 2021-05-17 17:03:56 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2021-05-18 09:41:55 +0200 |
| commit | 75a64dd199425dc6de6bf79f78b6a0ed5c7c49a8 (patch) | |
| tree | 117f9f5317a29300ceae4f2c8db0afcbccf5a02d | |
| parent | 4d929cc023638437b21d190daea9c5429c0da3f0 (diff) | |
| download | NetworkManager-75a64dd199425dc6de6bf79f78b6a0ed5c7c49a8.tar.gz | |
core: add nm_l3_config_data_iter_ip_{address,route}_for_each() helpers
| -rw-r--r-- | .clang-format | 4 | ||||
| -rw-r--r-- | src/core/nm-l3-config-data.h | 9 |
2 files changed, 12 insertions, 1 deletions
diff --git a/.clang-format b/.clang-format index 13c9899c60..8538f3dfe8 100644 --- a/.clang-format +++ b/.clang-format @@ -105,9 +105,11 @@ ForEachMacros: ['c_list_for_each', 'nm_ip_config_iter_ip_route_for_each', 'nm_json_array_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_route_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_obj_for_each', 'nm_manager_for_each_active_connection', diff --git a/src/core/nm-l3-config-data.h b/src/core/nm-l3-config-data.h index a5116a4a58..c8a47064f5 100644 --- a/src/core/nm-l3-config-data.h +++ b/src/core/nm-l3-config-data.h @@ -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))); \ 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) \ 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));) @@ -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)); \ 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) \ 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));) |