From f79d5a903b769f45f084d81a732ec9b3dcc3f2a9 Mon Sep 17 00:00:00 2001

From: Thomas Haller <thaller@redhat.com>

Date: Wed, 1 Sep 2021 09:30:29 +0200

Subject: [PATCH 01/10] cloud-setup: return structure for get_config() result

 instead of generic hash table

Returning a struct seems easier to understand, because then the result

is typed.

Also, we might return additional results, which are system wide and not

per-interface.

(cherry picked from commit 323e18276894591712a5e29f6e907562c79c5216)

(cherry picked from commit c94b1c43d4b5c5b88d67d7966d23a005028e78d8)

---

 src/nm-cloud-setup/main.c          | 54 ++++++++++++++++--------------

 src/nm-cloud-setup/nmcs-provider.c | 28 ++++++++++++++--

 src/nm-cloud-setup/nmcs-provider.h | 20 ++++++++++-

 3 files changed, 72 insertions(+), 30 deletions(-)

diff --git a/src/nm-cloud-setup/main.c b/src/nm-cloud-setup/main.c

index 8dc67851794c..04b29f8a4b74 100644

--- a/src/nm-cloud-setup/main.c

+++ b/src/nm-cloud-setup/main.c

@@ -200,30 +200,30 @@ _nmc_get_device_by_hwaddr(NMClient *nmc, const char *hwaddr)

 /*****************************************************************************/

 typedef struct {

-    GMainLoop * main_loop;

-    GHashTable *config_dict;

+    GMainLoop *                  main_loop;

+    NMCSProviderGetConfigResult *result;

 } GetConfigData;

 static void

-_get_config_cb(GObject *source, GAsyncResult *result, gpointer user_data)

+_get_config_cb(GObject *source, GAsyncResult *res, gpointer user_data)

 {

-    GetConfigData *    data                    = user_data;

-    gs_unref_hashtable GHashTable *config_dict = NULL;

-    gs_free_error GError *error                = NULL;

+    GetConfigData *                              data                                = user_data;

+    nm_auto_free_nmcs_provider_get_config_result NMCSProviderGetConfigResult *result = NULL;

+    gs_free_error GError *error                                                      = NULL;

-    config_dict = nmcs_provider_get_config_finish(NMCS_PROVIDER(source), result, &error);

+    result = nmcs_provider_get_config_finish(NMCS_PROVIDER(source), res, &error);

-    if (!config_dict) {

+    if (!result) {

         if (!nm_utils_error_is_cancelled(error))

             _LOGI("failure to get meta data: %s", error->message);

     } else

         _LOGD("meta data received");

-    data->config_dict = g_steal_pointer(&config_dict);

+    data->result = g_steal_pointer(&result);

     g_main_loop_quit(data->main_loop);

 }

-static GHashTable *

+static NMCSProviderGetConfigResult *

 _get_config(GCancellable *sigterm_cancellable, NMCSProvider *provider, NMClient *nmc)

 {

     nm_auto_unref_gmainloop GMainLoop *main_loop = g_main_loop_new(NULL, FALSE);

@@ -243,7 +243,7 @@ _get_config(GCancellable *sigterm_cancellable, NMCSProvider *provider, NMClient

     g_main_loop_run(main_loop);

-    return data.config_dict;

+    return data.result;

 }

 /*****************************************************************************/

@@ -396,13 +396,13 @@ _nmc_mangle_connection(NMDevice *                            device,

 /*****************************************************************************/

 static guint

-_config_data_get_num_valid(GHashTable *config_dict)

+_config_data_get_num_valid(const NMCSProviderGetConfigResult *result)

 {

     const NMCSProviderGetConfigIfaceData *config_data;

     GHashTableIter                        h_iter;

     guint                                 n = 0;

-    g_hash_table_iter_init(&h_iter, config_dict);

+    g_hash_table_iter_init(&h_iter, result->iface_datas);

     while (g_hash_table_iter_next(&h_iter, NULL, (gpointer *) &config_data)) {

         if (nmcs_provider_get_config_iface_data_is_valid(config_data))

             n++;

@@ -525,7 +525,9 @@ try_again:

 }

 static gboolean

-_config_all(GCancellable *sigterm_cancellable, NMClient *nmc, GHashTable *config_dict)

+_config_all(GCancellable *                     sigterm_cancellable,

+            NMClient *                         nmc,

+            const NMCSProviderGetConfigResult *result)

 {

     GHashTableIter                        h_iter;

     const NMCSProviderGetConfigIfaceData *c_config_data;

@@ -533,9 +535,9 @@ _config_all(GCancellable *sigterm_cancellable, NMClient *nmc, GHashTable *config

     gboolean                              is_single_nic;

     gboolean                              any_changes = FALSE;

-    is_single_nic = (_config_data_get_num_valid(config_dict) <= 1);

+    is_single_nic = (_config_data_get_num_valid(result) <= 1);

-    g_hash_table_iter_init(&h_iter, config_dict);

+    g_hash_table_iter_init(&h_iter, result->iface_datas);

     while (g_hash_table_iter_next(&h_iter, (gpointer *) &c_hwaddr, (gpointer *) &c_config_data)) {

         if (_config_one(sigterm_cancellable, nmc, is_single_nic, c_hwaddr, c_config_data))

             any_changes = TRUE;

@@ -564,12 +566,12 @@ sigterm_handler(gpointer user_data)

 int

 main(int argc, const char *const *argv)

 {

-    gs_unref_object GCancellable *    sigterm_cancellable     = NULL;

-    nm_auto_destroy_and_unref_gsource GSource *sigterm_source = NULL;

-    gs_unref_object NMCSProvider *provider                    = NULL;

-    gs_unref_object NMClient *nmc                             = NULL;

-    gs_unref_hashtable GHashTable *config_dict                = NULL;

-    gs_free_error GError *error                               = NULL;

+    gs_unref_object GCancellable *    sigterm_cancellable                            = NULL;

+    nm_auto_destroy_and_unref_gsource GSource *sigterm_source                        = NULL;

+    gs_unref_object NMCSProvider *provider                                           = NULL;

+    gs_unref_object NMClient *                   nmc                                 = NULL;

+    nm_auto_free_nmcs_provider_get_config_result NMCSProviderGetConfigResult *result = NULL;

+    gs_free_error GError *error                                                      = NULL;

     _nm_logging_enabled_init(g_getenv(NMCS_ENV_VARIABLE("NM_CLOUD_SETUP_LOG")));

@@ -614,17 +616,17 @@ main(int argc, const char *const *argv)

         goto done;

     }

-    config_dict = _get_config(sigterm_cancellable, provider, nmc);

-    if (!config_dict)

+    result = _get_config(sigterm_cancellable, provider, nmc);

+    if (!result)

         goto done;

-    if (_config_all(sigterm_cancellable, nmc, config_dict))

+    if (_config_all(sigterm_cancellable, nmc, result))

         _LOGI("some changes were applied for provider %s", nmcs_provider_get_name(provider));

     else

         _LOGD("no changes were applied for provider %s", nmcs_provider_get_name(provider));

 done:

-    nm_clear_pointer(&config_dict, g_hash_table_unref);

+    nm_clear_pointer(&result, nmcs_provider_get_config_result_free);

     g_clear_object(&nmc;;

     g_clear_object(&provider);

diff --git a/src/nm-cloud-setup/nmcs-provider.c b/src/nm-cloud-setup/nmcs-provider.c

index 678152aa95e0..77f8090a8225 100644

--- a/src/nm-cloud-setup/nmcs-provider.c

+++ b/src/nm-cloud-setup/nmcs-provider.c

@@ -49,6 +49,28 @@ nmcs_provider_get_main_context(NMCSProvider *self)

     return nm_http_client_get_main_context(NMCS_PROVIDER_GET_PRIVATE(self)->http_client);

 }

+/*****************************************************************************/

+

+static NMCSProviderGetConfigResult *

+nmcs_provider_get_config_result_new(GHashTable *iface_datas)

+{

+    NMCSProviderGetConfigResult *result;

+

+    result  = g_new(NMCSProviderGetConfigResult, 1);

+    *result = (NMCSProviderGetConfigResult){

+        .iface_datas = g_hash_table_ref(iface_datas),

+    };

+    return result;

+}

+

+void

+nmcs_provider_get_config_result_free(NMCSProviderGetConfigResult *result)

+{

+    if (result) {

+        nm_g_hash_table_unref(result->iface_datas);

+        g_free(result);

+    }

+}

 /*****************************************************************************/

@@ -137,8 +159,8 @@ _get_config_task_maybe_return(NMCSProviderGetConfigTaskData *get_config_data, GE

     } else {

         _LOGD("get-config: success");

         g_task_return_pointer(get_config_data->task,

-                              g_hash_table_ref(get_config_data->result_dict),

-                              (GDestroyNotify) g_hash_table_unref);

+                              nmcs_provider_get_config_result_new(get_config_data->result_dict),

+                              (GDestroyNotify) nmcs_provider_get_config_result_free);

     }

     nm_clear_g_signal_handler(g_task_get_cancellable(get_config_data->task),

@@ -217,7 +239,7 @@ nmcs_provider_get_config(NMCSProvider *      self,

     NMCS_PROVIDER_GET_CLASS(self)->get_config(self, get_config_data);

 }

-GHashTable *

+NMCSProviderGetConfigResult *

 nmcs_provider_get_config_finish(NMCSProvider *self, GAsyncResult *result, GError **error)

 {

     g_return_val_if_fail(NMCS_IS_PROVIDER(self), FALSE);

diff --git a/src/nm-cloud-setup/nmcs-provider.h b/src/nm-cloud-setup/nmcs-provider.h

index 13212b8e4cb4..730ddc9d8f09 100644

--- a/src/nm-cloud-setup/nmcs-provider.h

+++ b/src/nm-cloud-setup/nmcs-provider.h

@@ -43,6 +43,24 @@ nmcs_provider_get_config_iface_data_is_valid(const NMCSProviderGetConfigIfaceDat

 NMCSProviderGetConfigIfaceData *nmcs_provider_get_config_iface_data_new(gboolean was_requested);

+/*****************************************************************************/

+

+typedef struct {

+    /* A dictionary of (const char *) -> (NMCSProviderGetConfigIfaceData *).

+     * This is the per-interface result of get_config(). */

+    GHashTable *iface_datas;

+} NMCSProviderGetConfigResult;

+

+void nmcs_provider_get_config_result_free(NMCSProviderGetConfigResult *result);

+

+NM_AUTO_DEFINE_FCN0(NMCSProviderGetConfigResult *,

+                    _nm_auto_free_nmcs_provider_get_config_result,

+                    nmcs_provider_get_config_result_free);

+#define nm_auto_free_nmcs_provider_get_config_result \

+    nm_auto(_nm_auto_free_nmcs_provider_get_config_result)

+

+/*****************************************************************************/

+

 typedef struct {

     GTask *task;

@@ -124,7 +142,7 @@ void nmcs_provider_get_config(NMCSProvider *      provider,

                               GAsyncReadyCallback callback,

                               gpointer            user_data);

-GHashTable *

+NMCSProviderGetConfigResult *

 nmcs_provider_get_config_finish(NMCSProvider *provider, GAsyncResult *result, GError **error);

 #endif /* __NMCS_PROVIDER_H__ */

-- 

2.31.1

From 165dd652446673c826ef0da33b865da359aa22ee Mon Sep 17 00:00:00 2001

From: Thomas Haller <thaller@redhat.com>

Date: Wed, 1 Sep 2021 09:42:37 +0200

Subject: [PATCH 02/10] cloud-setup: cache number of valid interfaces in

 get-config result

Now that we return a struct from get_config(), we can have system-wide

properties returned.

Let it count and cache the number of valid iface_datas.

Currently that is not yet used, but it will be.

(cherry picked from commit a3cd66d3fadcecab9b186cc7f634f6ec6a5a92ee)

(cherry picked from commit e74375fc3b68b07d1ed5f6ebca40cbe5b20ed47b)

---

 src/nm-cloud-setup/main.c          | 22 +---------------------

 src/nm-cloud-setup/nmcs-provider.c | 15 +++++++++++++--

 src/nm-cloud-setup/nmcs-provider.h |  3 +++

 3 files changed, 17 insertions(+), 23 deletions(-)

diff --git a/src/nm-cloud-setup/main.c b/src/nm-cloud-setup/main.c

index 04b29f8a4b74..686cd2fc0c84 100644

--- a/src/nm-cloud-setup/main.c

+++ b/src/nm-cloud-setup/main.c

@@ -395,26 +395,9 @@ _nmc_mangle_connection(NMDevice *                            device,

 /*****************************************************************************/

-static guint

-_config_data_get_num_valid(const NMCSProviderGetConfigResult *result)

-{

-    const NMCSProviderGetConfigIfaceData *config_data;

-    GHashTableIter                        h_iter;

-    guint                                 n = 0;

-

-    g_hash_table_iter_init(&h_iter, result->iface_datas);

-    while (g_hash_table_iter_next(&h_iter, NULL, (gpointer *) &config_data)) {

-        if (nmcs_provider_get_config_iface_data_is_valid(config_data))

-            n++;

-    }

-

-    return n;

-}

-

 static gboolean

 _config_one(GCancellable *                        sigterm_cancellable,

             NMClient *                            nmc,

-            gboolean                              is_single_nic,

             const char *                          hwaddr,

             const NMCSProviderGetConfigIfaceData *config_data)

 {

@@ -532,14 +515,11 @@ _config_all(GCancellable *                     sigterm_cancellable,

     GHashTableIter                        h_iter;

     const NMCSProviderGetConfigIfaceData *c_config_data;

     const char *                          c_hwaddr;

-    gboolean                              is_single_nic;

     gboolean                              any_changes = FALSE;

-    is_single_nic = (_config_data_get_num_valid(result) <= 1);

-

     g_hash_table_iter_init(&h_iter, result->iface_datas);

     while (g_hash_table_iter_next(&h_iter, (gpointer *) &c_hwaddr, (gpointer *) &c_config_data)) {

-        if (_config_one(sigterm_cancellable, nmc, is_single_nic, c_hwaddr, c_config_data))

+        if (_config_one(sigterm_cancellable, nmc, c_hwaddr, c_config_data))

             any_changes = TRUE;

     }

diff --git a/src/nm-cloud-setup/nmcs-provider.c b/src/nm-cloud-setup/nmcs-provider.c

index 77f8090a8225..8f82ddb493ea 100644

--- a/src/nm-cloud-setup/nmcs-provider.c

+++ b/src/nm-cloud-setup/nmcs-provider.c

@@ -54,12 +54,23 @@ nmcs_provider_get_main_context(NMCSProvider *self)

 static NMCSProviderGetConfigResult *

 nmcs_provider_get_config_result_new(GHashTable *iface_datas)

 {

-    NMCSProviderGetConfigResult *result;

+    const NMCSProviderGetConfigIfaceData *iface_data;

+    NMCSProviderGetConfigResult *         result;

+    GHashTableIter                        h_iter;

+    guint                                 num_valid_ifaces = 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))

+            num_valid_ifaces++;

+    }

     result  = g_new(NMCSProviderGetConfigResult, 1);

     *result = (NMCSProviderGetConfigResult){

-        .iface_datas = g_hash_table_ref(iface_datas),

+        .iface_datas      = g_hash_table_ref(iface_datas),

+        .num_valid_ifaces = num_valid_ifaces,

     };

+

     return result;

 }

diff --git a/src/nm-cloud-setup/nmcs-provider.h b/src/nm-cloud-setup/nmcs-provider.h

index 730ddc9d8f09..2e4c8d167a73 100644

--- a/src/nm-cloud-setup/nmcs-provider.h

+++ b/src/nm-cloud-setup/nmcs-provider.h

@@ -49,6 +49,9 @@ typedef struct {

     /* A dictionary of (const char *) -> (NMCSProviderGetConfigIfaceData *).

      * This is the per-interface result of get_config(). */

     GHashTable *iface_datas;

+

+    /* The number of iface_datas that are nmcs_provider_get_config_iface_data_is_valid(). */

+    guint num_valid_ifaces;

 } NMCSProviderGetConfigResult;

 void nmcs_provider_get_config_result_free(NMCSProviderGetConfigResult *result);

-- 

2.31.1

From 2e6d23ef2496b7a26f6406fab1d274eee66467af Mon Sep 17 00:00:00 2001

From: Thomas Haller <thaller@redhat.com>

Date: Wed, 1 Sep 2021 10:11:31 +0200

Subject: [PATCH 03/10] 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)

---

 src/nm-cloud-setup/nmcs-provider.c | 6 +++++-

 src/nm-cloud-setup/nmcs-provider.h | 3 +++

 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/nm-cloud-setup/nmcs-provider.c b/src/nm-cloud-setup/nmcs-provider.c

index 8f82ddb493ea..8901100378d0 100644

--- a/src/nm-cloud-setup/nmcs-provider.c

+++ b/src/nm-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/src/nm-cloud-setup/nmcs-provider.h b/src/nm-cloud-setup/nmcs-provider.h

index 2e4c8d167a73..31fec4449f9e 100644

--- a/src/nm-cloud-setup/nmcs-provider.h

+++ b/src/nm-cloud-setup/nmcs-provider.h

@@ -52,6 +52,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);

-- 

2.31.1

From d80ef34f9390eb2baecb863cbbeded3dbffa1d8e Mon Sep 17 00:00:00 2001

From: Thomas Haller <thaller@redhat.com>

Date: Wed, 1 Sep 2021 10:15:37 +0200

Subject: [PATCH 04/10] cloud-setup: skip configuring policy routing if there

 is only one interface/address

nm-cloud-setup automatically configures the network. That may conflict

with what the user wants. In case the user configures some specific

setup, they are encouraged to disable nm-cloud-setup (and its

automatism).

Still, what we do by default matters, and should play as well with

user's expectations. Configuring policy routing and a higher priority

table (30400+) that hijacks the traffic can cause problems.

If the system only has one IPv4 address and one interface, then there

is no point in configuring policy routing at all. Detect that, and skip

the change in that case.

Note that of course we need to handle the case where previously multiple

IP addresses were configured and an update gives only one address. In

that case we need to clear the previously configured rules/routes. The

patch achieves this.

(cherry picked from commit 5f047968d7a48999d20001f83e2005caa43c80ce)

(cherry picked from commit 8bc8a0f56b97c28cf26fd678a549db41399adcb7)

---

 src/nm-cloud-setup/main.c | 41 +++++++++++++++++++++++++++++++--------

 1 file changed, 33 insertions(+), 8 deletions(-)

diff --git a/src/nm-cloud-setup/main.c b/src/nm-cloud-setup/main.c

index 686cd2fc0c84..bb5c0d5ded9d 100644

--- a/src/nm-cloud-setup/main.c

+++ b/src/nm-cloud-setup/main.c

@@ -269,7 +269,9 @@ _nmc_skip_connection(NMConnection *connection)

 static gboolean

 _nmc_mangle_connection(NMDevice *                            device,

                        NMConnection *                        connection,

+                       const NMCSProviderGetConfigResult *   result,

                        const NMCSProviderGetConfigIfaceData *config_data,

+                       gboolean *                            out_skipped_single_addr,

                        gboolean *                            out_changed)

 {

     NMSettingIPConfig * s_ip;

@@ -288,6 +290,9 @@ _nmc_mangle_connection(NMDevice *                            device,

     gs_unref_ptrarray GPtrArray *rules_new  = NULL;

     gs_unref_ptrarray GPtrArray *routes_new = NULL;

+    NM_SET_OUT(out_skipped_single_addr, FALSE);

+    NM_SET_OUT(out_changed, FALSE);

+

     if (!nm_streq0(nm_connection_get_connection_type(connection), NM_SETTING_WIRED_SETTING_NAME))

         return FALSE;

@@ -329,7 +334,11 @@ _nmc_mangle_connection(NMDevice *                            device,

         }

     }

-    if (config_data->has_ipv4s && config_data->has_cidr) {

+    if (result->num_valid_ifaces <= 1 && result->num_ipv4s <= 1) {

+        /* this setup only has one interface and one IPv4 address (or less).

+         * We don't need to configure policy routing in this case. */

+        NM_SET_OUT(out_skipped_single_addr, TRUE);

+    } else if (config_data->has_ipv4s && config_data->has_cidr) {

         for (i = 0; i < config_data->ipv4s_len; i++) {

             NMIPAddress *entry;

@@ -398,6 +407,7 @@ _nmc_mangle_connection(NMDevice *                            device,

 static gboolean

 _config_one(GCancellable *                        sigterm_cancellable,

             NMClient *                            nmc,

+            const NMCSProviderGetConfigResult *   result,

             const char *                          hwaddr,

             const NMCSProviderGetConfigIfaceData *config_data)

 {

@@ -406,6 +416,7 @@ _config_one(GCancellable *                        sigterm_cancellable,

     guint64                       applied_version_id;

     gs_free_error GError *error = NULL;

     gboolean              changed;

+    gboolean              skipped_single_addr;

     gboolean              version_id_changed;

     guint                 try_count;

     gboolean              any_changes = FALSE;

@@ -454,16 +465,30 @@ try_again:

         return any_changes;

     }

-    if (!_nmc_mangle_connection(device, applied_connection, config_data, &changed)) {

+    if (!_nmc_mangle_connection(device,

+                                applied_connection,

+                                result,

+                                config_data,

+                                &skipped_single_addr,

+                                &changed)) {

         _LOGD("config device %s: device has no suitable applied connection. Skip", hwaddr);

         return any_changes;

     }

     if (!changed) {

-        _LOGD("config device %s: device needs no update to applied connection \"%s\" (%s). Skip",

-              hwaddr,

-              nm_connection_get_id(applied_connection),

-              nm_connection_get_uuid(applied_connection));

+        if (skipped_single_addr) {

+            _LOGD("config device %s: device needs no update to applied connection \"%s\" (%s) "

+                  "because there are not multiple IP addresses. Skip",

+                  hwaddr,

+                  nm_connection_get_id(applied_connection),

+                  nm_connection_get_uuid(applied_connection));

+        } else {

+            _LOGD(

+                "config device %s: device needs no update to applied connection \"%s\" (%s). Skip",

+                hwaddr,

+                nm_connection_get_id(applied_connection),

+                nm_connection_get_uuid(applied_connection));

+        }

         return any_changes;

     }

@@ -472,7 +497,7 @@ try_again:

           nm_connection_get_id(applied_connection),

           nm_connection_get_uuid(applied_connection));

-    /* we are about to call Reapply(). If if that fails, it counts as if we changed something. */

+    /* we are about to call Reapply(). Even if that fails, it counts as if we changed something. */

     any_changes = TRUE;

     if (!nmcs_device_reapply(device,

@@ -519,7 +544,7 @@ _config_all(GCancellable *                     sigterm_cancellable,

     g_hash_table_iter_init(&h_iter, result->iface_datas);

     while (g_hash_table_iter_next(&h_iter, (gpointer *) &c_hwaddr, (gpointer *) &c_config_data)) {

-        if (_config_one(sigterm_cancellable, nmc, c_hwaddr, c_config_data))

+        if (_config_one(sigterm_cancellable, nmc, result, c_hwaddr, c_config_data))

             any_changes = TRUE;

     }

-- 

2.31.1

From 0042bff5e16e71f548dcb8d046a5dbd3f694de8f Mon Sep 17 00:00:00 2001

From: Thomas Haller <thaller@redhat.com>

Date: Wed, 1 Sep 2021 14:34:51 +0200

Subject: [PATCH 05/10] cloud-setup: add "hwaddr" to

 NMCSProviderGetConfigIfaceData struct

get-config() gives a NMCSProviderGetConfigResult structure, and the

main part of data is the GHashTable of MAC addresses and

NMCSProviderGetConfigIfaceData instances.

Let NMCSProviderGetConfigIfaceData also have a reference to the MAC

address. This way, I'll be able to create a (sorted) list of interface

datas, that also contain the MAC address.

(cherry picked from commit ec56fe60fbf31768d0d1cae8bb325c1fdf7dbf07)

(cherry picked from commit cc289e53699872a3617aef321453ef6a885d0148)

---

 src/nm-cloud-setup/nmcs-provider-aliyun.c | 32 ++++++++++-------------

 src/nm-cloud-setup/nmcs-provider-azure.c  | 21 +++++++--------

 src/nm-cloud-setup/nmcs-provider-ec2.c    | 27 ++++++++-----------

 src/nm-cloud-setup/nmcs-provider-gcp.c    | 20 +++++++-------

 src/nm-cloud-setup/nmcs-provider.c        | 22 +++++++++++-----

 src/nm-cloud-setup/nmcs-provider.h        | 12 +++++++--

 6 files changed, 68 insertions(+), 66 deletions(-)

diff --git a/src/nm-cloud-setup/nmcs-provider-aliyun.c b/src/nm-cloud-setup/nmcs-provider-aliyun.c

index 01a4af0ff5b8..126980fdfe44 100644

--- a/src/nm-cloud-setup/nmcs-provider-aliyun.c

+++ b/src/nm-cloud-setup/nmcs-provider-aliyun.c

@@ -134,7 +134,6 @@ _get_config_fetch_done_cb(NMHttpClient *         http_client,

                           GetConfigFetchDoneType fetch_type)

 {

     NMCSProviderGetConfigTaskData *get_config_data;

-    const char *                   hwaddr = NULL;

     gs_unref_bytes GBytes *response       = NULL;

     gs_free_error GError *          error = NULL;

     NMCSProviderGetConfigIfaceData *config_iface_data;

@@ -146,7 +145,7 @@ _get_config_fetch_done_cb(NMHttpClient *         http_client,

     gsize                           i;

     gsize                           len;

-    nm_utils_user_data_unpack(user_data, &get_config_data, &hwaddr);

+    nm_utils_user_data_unpack(user_data, &get_config_data, &config_iface_data);

     nm_http_client_poll_get_finish(http_client, result, NULL, &response, &error);

@@ -156,8 +155,6 @@ _get_config_fetch_done_cb(NMHttpClient *         http_client,

     if (error)

         goto out;

-    config_iface_data = g_hash_table_lookup(get_config_data->result_dict, hwaddr);

-

     switch (fetch_type) {

     case GET_CONFIG_FETCH_DONE_TYPE_PRIVATE_IPV4S:

@@ -300,22 +297,21 @@ _get_config_metadata_ready_cb(GObject *source, GAsyncResult *result, gpointer us

         gs_free char *                  uri2 = NULL;

         gs_free char *                  uri3 = NULL;

         gs_free char *                  uri4 = NULL;

-        const char *                    hwaddr;

-        if (!g_hash_table_lookup_extended(get_config_data->result_dict,

-                                          v_hwaddr,

-                                          (gpointer *) &hwaddr,

-                                          (gpointer *) &config_iface_data)) {

+        config_iface_data = g_hash_table_lookup(get_config_data->result_dict, v_hwaddr);

+

+        if (!config_iface_data) {

             if (!get_config_data->any) {

                 _LOGD("get-config: skip fetching meta data for %s (%s)",

                       v_hwaddr,

                       v_mac_data->path);

                 continue;

             }

-            config_iface_data = nmcs_provider_get_config_iface_data_new(FALSE);

-            g_hash_table_insert(get_config_data->result_dict,

-                                (char *) (hwaddr = g_strdup(v_hwaddr)),

-                                config_iface_data);

+

+            config_iface_data =

+                nmcs_provider_get_config_iface_data_create(get_config_data->result_dict,

+                                                           FALSE,

+                                                           v_hwaddr);

         }

         nm_assert(config_iface_data->iface_idx == -1);

@@ -324,7 +320,7 @@ _get_config_metadata_ready_cb(GObject *source, GAsyncResult *result, gpointer us

         _LOGD("get-config: start fetching meta data for #%" G_GSSIZE_FORMAT ", %s (%s)",

               config_iface_data->iface_idx,

-              hwaddr,

+              config_iface_data->hwaddr,

               v_mac_data->path);

         get_config_data->n_pending++;

@@ -342,7 +338,7 @@ _get_config_metadata_ready_cb(GObject *source, GAsyncResult *result, gpointer us

             NULL,

             NULL,

             _get_config_fetch_done_cb_vpc_cidr_block,

-            nm_utils_user_data_pack(get_config_data, hwaddr));

+            nm_utils_user_data_pack(get_config_data, config_iface_data));

         get_config_data->n_pending++;

         nm_http_client_poll_get(

@@ -359,7 +355,7 @@ _get_config_metadata_ready_cb(GObject *source, GAsyncResult *result, gpointer us

             NULL,

             NULL,

             _get_config_fetch_done_cb_private_ipv4s,

-            nm_utils_user_data_pack(get_config_data, hwaddr));

+            nm_utils_user_data_pack(get_config_data, config_iface_data));

         get_config_data->n_pending++;

         nm_http_client_poll_get(

@@ -376,7 +372,7 @@ _get_config_metadata_ready_cb(GObject *source, GAsyncResult *result, gpointer us

             NULL,

             NULL,

             _get_config_fetch_done_cb_netmask,

-            nm_utils_user_data_pack(get_config_data, hwaddr));

+            nm_utils_user_data_pack(get_config_data, config_iface_data));

         get_config_data->n_pending++;

         nm_http_client_poll_get(

@@ -393,7 +389,7 @@ _get_config_metadata_ready_cb(GObject *source, GAsyncResult *result, gpointer us

             NULL,

             NULL,

             _get_config_fetch_done_cb_gateway,

-            nm_utils_user_data_pack(get_config_data, hwaddr));

+            nm_utils_user_data_pack(get_config_data, config_iface_data));

     }

     _nmcs_provider_get_config_task_maybe_return(get_config_data, NULL);

diff --git a/src/nm-cloud-setup/nmcs-provider-azure.c b/src/nm-cloud-setup/nmcs-provider-azure.c

index 69785d64a8ac..b3f0c68ba666 100644

--- a/src/nm-cloud-setup/nmcs-provider-azure.c

+++ b/src/nm-cloud-setup/nmcs-provider-azure.c

@@ -97,7 +97,6 @@ typedef struct {

     gssize                          intern_iface_idx;

     gssize                          extern_iface_idx;

     guint                           n_iface_data_pending;

-    const char *                    hwaddr;

 } AzureIfaceData;

 static void

@@ -378,25 +377,24 @@ _get_config_iface_cb(GObject *source, GAsyncResult *result, gpointer user_data)

         goto out_done;

     }

-    if (!g_hash_table_lookup_extended(get_config_data->result_dict,

-                                      v_hwaddr,

-                                      (gpointer *) &iface_data->hwaddr,

-                                      (gpointer *) &iface_data->iface_get_config)) {

+    iface_data->iface_get_config = g_hash_table_lookup(get_config_data->result_dict, v_hwaddr);

+