about summary refs log tree commit diff
path: root/clients/cloud-setup/nmcs-provider.h
diff options
context:
space:
mode:
authorSebastien Bacher <seb128@ubuntu.com>2020-07-02 11:35:14 +0200
committerSebastien Bacher <seb128@ubuntu.com>2020-07-02 11:52:25 +0200
commitc6c4e39b012d544c1f1ed816686c8ae1599da793 (patch)
tree094d5e07c1d135d0ee67d99e051fd6a9a367a6a4 /clients/cloud-setup/nmcs-provider.h
parent7368e45ff5b3b8b328d55408bcd403e4d6c564d0 (diff)
parentacd7b014c72673f5b0c0b91309e27028886da167 (diff)
Merge remote-tracking branch 'salsa/debian/master' into ubuntu/master
Diffstat (limited to 'clients/cloud-setup/nmcs-provider.h')
-rw-r--r--clients/cloud-setup/nmcs-provider.h8
1 files changed, 6 insertions, 2 deletions
diff --git a/clients/cloud-setup/nmcs-provider.h b/clients/cloud-setup/nmcs-provider.h
index e5a44da1..e5950f93 100644
--- a/clients/cloud-setup/nmcs-provider.h
+++ b/clients/cloud-setup/nmcs-provider.h
@@ -18,6 +18,9 @@ typedef struct {
 	bool has_ipv4s:1;
 	bool has_cidr:1;
 
+	NMIPRoute **iproutes_arr;
+	gsize iproutes_len;
+
 	/* TRUE, if the configuration was requested via hwaddrs argument to
 	 * nmcs_provider_get_config(). */
 	bool was_requested:1;
@@ -29,8 +32,9 @@ nmcs_provider_get_config_iface_data_is_valid (const NMCSProviderGetConfigIfaceDa
 {
 	return    config_data
 	       && config_data->iface_idx >= 0
-	       && config_data->has_cidr
-	       && config_data->has_ipv4s;
+	       && (   (   config_data->has_ipv4s
+	               && config_data->has_cidr)
+	           || config_data->iproutes_len);
 }
 
 NMCSProviderGetConfigIfaceData *nmcs_provider_get_config_iface_data_new (gboolean was_requested);