summaryrefslogtreecommitdiff
path: root/src/nm-cloud-setup/nmcs-provider.h
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2023-05-12 12:45:16 +0200
committerThomas Haller <thaller@redhat.com>2023-05-12 12:45:16 +0200
commitfe5dfe97f970cd358cbd06edb82f33d8ca207c59 (patch)
treedc8cfb99c31ac38b5263a7f332000e04f1c01804 /src/nm-cloud-setup/nmcs-provider.h
parenta206042eda16abdb4df71a510be78480036048b2 (diff)
parentc72e085f5cb1c10a380aed0969c1503f374667c5 (diff)
downloadNetworkManager-fe5dfe97f970cd358cbd06edb82f33d8ca207c59.tar.gz
cloud-setup: merge branch 'lr/more-cloud-setup-tests'
https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/1606
Diffstat (limited to 'src/nm-cloud-setup/nmcs-provider.h')
-rw-r--r--src/nm-cloud-setup/nmcs-provider.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/nm-cloud-setup/nmcs-provider.h b/src/nm-cloud-setup/nmcs-provider.h
index 09cdb4143d..9e5eeebe69 100644
--- a/src/nm-cloud-setup/nmcs-provider.h
+++ b/src/nm-cloud-setup/nmcs-provider.h
@@ -34,8 +34,8 @@ typedef struct {
bool has_cidr : 1;
bool has_gateway : 1;
- NMIPRoute **iproutes_arr;
- gsize iproutes_len;
+ /* Array of NMIPRoute (must own/free the entries). */
+ GPtrArray *iproutes;
/* TRUE, if the configuration was requested via hwaddrs argument to
* nmcs_provider_get_config(). */
@@ -59,7 +59,8 @@ static inline gboolean
nmcs_provider_get_config_iface_data_is_valid(const NMCSProviderGetConfigIfaceData *config_data)
{
return config_data && config_data->iface_idx >= 0
- && ((config_data->has_ipv4s && config_data->has_cidr) || config_data->iproutes_len);
+ && ((config_data->has_ipv4s && config_data->has_cidr)
+ || nm_g_ptr_array_len(config_data->iproutes) > 0);
}
/*****************************************************************************/