From ef7a97977a9a0327f084eec9dfa34750c6ee7959 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Wed, 1 Sep 2021 10:11:31 +0200 Subject: [PATCH] cloud-setup: count numbers of valid IPv4 addresses in get-config result Will be used next. (cherry picked from commit 7969ae1a82b90c3a9dbe33875d138c7b55cf6ac8) (cherry picked from commit ae504433f11480fde2436d3a5acba026db6c47bd) --- clients/cloud-setup/nmcs-provider.c | 6 +++++- clients/cloud-setup/nmcs-provider.h | 3 +++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/clients/cloud-setup/nmcs-provider.c b/clients/cloud-setup/nmcs-provider.c index 795532d344..152b874a15 100644 --- a/clients/cloud-setup/nmcs-provider.c +++ b/clients/cloud-setup/nmcs-provider.c @@ -58,17 +58,21 @@ nmcs_provider_get_config_result_new(GHashTable *iface_datas) NMCSProviderGetConfigResult * result; GHashTableIter h_iter; guint num_valid_ifaces = 0; + guint num_ipv4s = 0; g_hash_table_iter_init(&h_iter, iface_datas); while (g_hash_table_iter_next(&h_iter, NULL, (gpointer *) &iface_data)) { - if (nmcs_provider_get_config_iface_data_is_valid(iface_data)) + if (nmcs_provider_get_config_iface_data_is_valid(iface_data)) { num_valid_ifaces++; + num_ipv4s += iface_data->ipv4s_len; + } } result = g_new(NMCSProviderGetConfigResult, 1); *result = (NMCSProviderGetConfigResult){ .iface_datas = g_hash_table_ref(iface_datas), .num_valid_ifaces = num_valid_ifaces, + .num_ipv4s = num_ipv4s, }; return result; diff --git a/clients/cloud-setup/nmcs-provider.h b/clients/cloud-setup/nmcs-provider.h index 6832aa7f07..9e6fb2cb87 100644 --- a/clients/cloud-setup/nmcs-provider.h +++ b/clients/cloud-setup/nmcs-provider.h @@ -50,6 +50,9 @@ typedef struct { /* The number of iface_datas that are nmcs_provider_get_config_iface_data_is_valid(). */ guint num_valid_ifaces; + + /* the number of IPv4 addresses over all valid iface_datas. */ + guint num_ipv4s; } NMCSProviderGetConfigResult; void nmcs_provider_get_config_result_free(NMCSProviderGetConfigResult *result);