Merge tag 'debian/1.42.4-1' into debian/bullseye-backports

network-manager Debian release 1.42.4-1

6 files changed, 51 insertions, 51 deletions

diff --git a/src/nm-initrd-generator/nm-initrd-generator.c b/src/nm-initrd-generator/nm-initrd-generator.c
index 09f8baf2..d84e95e5 100644
--- a/src/nm-initrd-generator/nm-initrd-generator.c
+++ b/src/nm-initrd-generator/nm-initrd-generator.c
@@ -103,50 +103,50 @@ main(int argc, char *argv[])
     gboolean           dump_to_stdout      = FALSE;
     gs_strfreev char **remaining           = NULL;
     GOptionEntry       option_entries[]    = {
-                 {"connections-dir",
+        {"connections-dir",
                   'c',
                   0,
                   G_OPTION_ARG_FILENAME,
                   &connections_dir,
                   "Output connection directory",
                   NM_KEYFILE_PATH_NAME_RUN},
-                 {"persistent-connections-dir",
+        {"persistent-connections-dir",
                   'p',
                   0,
                   G_OPTION_ARG_FILENAME,
                   &etc_connections_dir,
                   "Persistent connection directory",
                   NM_KEYFILE_PATH_NAME_ETC_DEFAULT},
-                 {"initrd-data-dir",
+        {"initrd-data-dir",
                   'i',
                   0,
                   G_OPTION_ARG_FILENAME,
                   &initrd_dir,
                   "Output initrd data directory",
                   DEFAULT_INITRD_DATA_DIR},
-                 {"sysfs-dir",
+        {"sysfs-dir",
                   'd',
                   0,
                   G_OPTION_ARG_FILENAME,
                   &sysfs_dir,
                   "The sysfs mount point",
                   DEFAULT_SYSFS_DIR},
-                 {"run-config-dir",
+        {"run-config-dir",
                   'r',
                   0,
                   G_OPTION_ARG_FILENAME,
                   &run_config_dir,
                   "Output config directory",
                   DEFAULT_RUN_CONFIG_DIR},
-                 {"stdout",
+        {"stdout",
                   's',
                   0,
                   G_OPTION_ARG_NONE,
                   &dump_to_stdout,
                   "Dump connections to standard output",
                   NULL},
-                 {G_OPTION_REMAINING, '\0', 0, G_OPTION_ARG_STRING_ARRAY, &remaining, NULL, NULL},
-                 {NULL}};
+        {G_OPTION_REMAINING, '\0', 0, G_OPTION_ARG_STRING_ARRAY, &remaining, NULL, NULL},
+        {NULL}};
     nm_auto_free_option_context GOptionContext *option_context = NULL;
     gs_free_error GError                       *error          = NULL;
     gs_free char                               *hostname       = NULL;
@@ -241,7 +241,7 @@ main(int argc, char *argv[])
             g_print("\n*** Hostname '%s' ***\n", hostname);
 
         for (i = 0; i < confs->len; i++) {
-            NMUtilsNamedValue *v    = &g_array_index(confs, NMUtilsNamedValue, i);
+            NMUtilsNamedValue *v    = &nm_g_array_index(confs, NMUtilsNamedValue, i);
             gs_free char      *name = g_path_get_basename(v->name);
 
             g_print("\n*** Configuration '%s' ***\n\n%s\n", name, v->value_str);
@@ -277,7 +277,7 @@ main(int argc, char *argv[])
         }
 
         for (i = 0; i < confs->len; i++) {
-            NMUtilsNamedValue *v = &g_array_index(confs, NMUtilsNamedValue, i);
+            NMUtilsNamedValue *v = &nm_g_array_index(confs, NMUtilsNamedValue, i);
 
             if (!g_file_set_contents(v->name, v->value_str, strlen(v->value_str), &error)) {
                 _LOGW(LOGD_CORE, "%s: %s", v->name, error->message);
diff --git a/src/nm-initrd-generator/nm-initrd-generator.h b/src/nm-initrd-generator/nm-initrd-generator.h
index 0761c9bb..87db9fc6 100644
--- a/src/nm-initrd-generator/nm-initrd-generator.h
+++ b/src/nm-initrd-generator/nm-initrd-generator.h
@@ -24,10 +24,10 @@ get_ip_address_family(const char *str, gboolean with_prefix)
         return AF_UNSPEC;
 
     if (with_prefix) {
-        if (nm_utils_parse_inaddr_prefix_bin(AF_UNSPEC, str, &addr_family, NULL, NULL))
+        if (nm_inet_parse_with_prefix_bin(AF_UNSPEC, str, &addr_family, NULL, NULL))
             return addr_family;
     } else {
-        if (nm_utils_parse_inaddr_bin(AF_UNSPEC, str, &addr_family, NULL))
+        if (nm_inet_parse_bin(AF_UNSPEC, str, &addr_family, NULL))
             return addr_family;
     }
 
diff --git a/src/nm-initrd-generator/nmi-cmdline-reader.c b/src/nm-initrd-generator/nmi-cmdline-reader.c
index 36bfdb0b..bafad041 100644
--- a/src/nm-initrd-generator/nmi-cmdline-reader.c
+++ b/src/nm-initrd-generator/nmi-cmdline-reader.c
@@ -539,8 +539,8 @@ reader_parse_ip(Reader *reader, const char *sysfs_dir, char *argument)
     int                            client_ip_prefix           = -1;
     gboolean                       clear_ip4_required_timeout = TRUE;
     const char                    *dns[2]                     = {
-                                               NULL,
-                                               NULL,
+        NULL,
+        NULL,
     };
     int dns_addr_family[2] = {
         AF_UNSPEC,
@@ -637,8 +637,8 @@ reader_parse_ip(Reader *reader, const char *sysfs_dir, char *argument)
         gboolean is_ipv4 = client_ip_family == AF_INET;
         NMIPAddr addr;
 
-        if (is_ipv4 && nm_utils_parse_inaddr_bin(AF_INET, netmask, NULL, &addr))
-            client_ip_prefix = _nm_utils_ip4_netmask_to_prefix(addr.addr4);
+        if (is_ipv4 && nm_inet_parse_bin(AF_INET, netmask, NULL, &addr))
+            client_ip_prefix = nm_ip4_addr_netmask_to_prefix(addr.addr4);
         else
             client_ip_prefix = _nm_utils_ascii_str_to_int64(netmask, 10, 0, is_ipv4 ? 32 : 128, -1);
 
@@ -651,15 +651,15 @@ reader_parse_ip(Reader *reader, const char *sysfs_dir, char *argument)
         NMIPAddress *address = NULL;
         NMIPAddr     addr;
 
-        if (nm_utils_parse_inaddr_prefix_bin(client_ip_family,
-                                             client_ip,
-                                             NULL,
-                                             &addr,
-                                             client_ip_prefix == -1 ? &client_ip_prefix : NULL)) {
+        if (nm_inet_parse_with_prefix_bin(client_ip_family,
+                                          client_ip,
+                                          NULL,
+                                          &addr,
+                                          client_ip_prefix == -1 ? &client_ip_prefix : NULL)) {
             if (client_ip_prefix == -1) {
                 switch (client_ip_family) {
                 case AF_INET:
-                    client_ip_prefix = _nm_utils_ip4_get_default_prefix(addr.addr4);
+                    client_ip_prefix = nm_ip4_addr_get_default_prefix(addr.addr4);
                     break;
                 case AF_INET6:
                     client_ip_prefix = 64;
@@ -847,7 +847,7 @@ reader_parse_ip(Reader *reader, const char *sysfs_dir, char *argument)
     for (i = 0; i < 2; i++) {
         if (dns_addr_family[i] == AF_UNSPEC)
             break;
-        nm_assert(nm_utils_ipaddr_is_valid(dns_addr_family[i], dns[i]));
+        nm_assert(nm_inet_is_valid(dns_addr_family[i], dns[i]));
         nm_setting_ip_config_add_dns(NM_IS_IPv4(dns_addr_family[i]) ? s_ip4 : s_ip6, dns[i]);
     }
 
@@ -969,14 +969,14 @@ reader_add_routes(Reader *reader, GPtrArray *array)
             connection = reader_get_default_connection(reader);
 
         if (net && *net) {
-            if (!nm_utils_parse_inaddr_prefix_bin(family, net, &family, &net_addr, &net_prefix)) {
+            if (!nm_inet_parse_with_prefix_bin(family, net, &family, &net_addr, &net_prefix)) {
                 _LOGW(LOGD_CORE, "Unrecognized address: %s", net);
                 continue;
             }
         }
 
         if (gateway && *gateway) {
-            if (!nm_utils_parse_inaddr_bin(family, gateway, &family, &gateway_addr)) {
+            if (!nm_inet_parse_bin(family, gateway, &family, &gateway_addr)) {
                 _LOGW(LOGD_CORE, "Unrecognized address: %s", gateway);
                 continue;
             }
diff --git a/src/nm-initrd-generator/nmi-dt-reader.c b/src/nm-initrd-generator/nmi-dt-reader.c
index 99fe25a2..f1279d58 100644
--- a/src/nm-initrd-generator/nmi-dt-reader.c
+++ b/src/nm-initrd-generator/nmi-dt-reader.c
@@ -96,7 +96,7 @@ str_addr(const char *str, int *family)
 {
     NMIPAddr addr_bin;
 
-    if (!nm_utils_parse_inaddr_bin_full(*family, TRUE, str, family, &addr_bin)) {
+    if (!nm_inet_parse_bin_full(*family, TRUE, str, family, &addr_bin)) {
         _LOGW(LOGD_CORE, "Malformed IP address: '%s'", str);
         return NULL;
     }
@@ -290,7 +290,7 @@ nmi_dt_reader_parse(const char *sysfs_dir)
             guint32 netmask_v4;
 
             nm_ip_address_get_address_binary(netmask, &netmask_v4);
-            prefix = _nm_utils_ip4_netmask_to_prefix(netmask_v4);
+            prefix = nm_ip4_addr_netmask_to_prefix(netmask_v4);
         }
 
         if (prefix == -1)
diff --git a/src/nm-initrd-generator/nmi-ibft-reader.c b/src/nm-initrd-generator/nmi-ibft-reader.c
index 3f30e531..2a3bbdfb 100644
--- a/src/nm-initrd-generator/nmi-ibft-reader.c
+++ b/src/nm-initrd-generator/nmi-ibft-reader.c
@@ -80,7 +80,7 @@ nmi_ibft_read(const char *sysfs_dir)
     gs_free char         *ibft_path = NULL;
     GDir                 *ibft_dir;
     const char           *dir_name;
-    GHashTable           *ibft, *nic;
+    GHashTable           *ibft;
     char                 *mac;
     gs_free_error GError *error = NULL;
 
@@ -93,10 +93,11 @@ nmi_ibft_read(const char *sysfs_dir)
                                  g_free,
                                  (GDestroyNotify) g_hash_table_unref);
 
-    if (!g_file_test(ibft_path, G_FILE_TEST_IS_DIR))
+    if (!g_file_test(ibft_path, G_FILE_TEST_IS_DIR)) {
         nmp_utils_modprobe(NULL, FALSE, "iscsi_ibft", NULL);
-    if (!g_file_test(ibft_path, G_FILE_TEST_IS_DIR))
-        return ibft;
+        if (!g_file_test(ibft_path, G_FILE_TEST_IS_DIR))
+            return ibft;
+    }
 
     ibft_dir = g_dir_open(ibft_path, 0, &error);
     if (!ibft_dir) {
@@ -105,20 +106,21 @@ nmi_ibft_read(const char *sysfs_dir)
     }
 
     while ((dir_name = g_dir_read_name(ibft_dir))) {
+        gs_unref_hashtable GHashTable *nic = NULL;
+
         if (!g_str_has_prefix(dir_name, "ethernet"))
             continue;
 
         nic = load_one_nic(ibft_path, dir_name);
-        mac = g_hash_table_lookup(nic, "mac");
+        mac = nm_g_hash_table_lookup(nic, "mac");
 
         if (!mac) {
             _LOGW(LOGD_CORE, "Ignoring an iBFT record without a MAC address");
-            g_hash_table_unref(nic);
             continue;
         }
 
         mac = g_ascii_strup(mac, -1);
-        if (!g_hash_table_insert(ibft, mac, nic))
+        if (!g_hash_table_insert(ibft, mac, g_steal_pointer(&nic)))
             _LOGW(LOGD_CORE, "Duplicate iBFT record for %s", mac);
     }
 
@@ -217,7 +219,7 @@ ip_setting_add_from_block(GHashTable *nic, NMConnection *connection, GError **er
                  FALSE,
                  NULL);
 
-    if (s_gateway && !nm_utils_ipaddr_is_valid(family, s_gateway)) {
+    if (s_gateway && !nm_inet_is_valid(family, s_gateway)) {
         g_set_error(error,
                     NM_SETTINGS_ERROR,
                     NM_SETTINGS_ERROR_INVALID_CONNECTION,
@@ -226,7 +228,7 @@ ip_setting_add_from_block(GHashTable *nic, NMConnection *connection, GError **er
         return FALSE;
     }
 
-    if (s_dns1 && !nm_utils_ipaddr_is_valid(family, s_dns1)) {
+    if (s_dns1 && !nm_inet_is_valid(family, s_dns1)) {
         g_set_error(error,
                     NM_SETTINGS_ERROR,
                     NM_SETTINGS_ERROR_INVALID_CONNECTION,
@@ -235,7 +237,7 @@ ip_setting_add_from_block(GHashTable *nic, NMConnection *connection, GError **er
         return FALSE;
     }
 
-    if (s_dns2 && !nm_utils_ipaddr_is_valid(family, s_dns2)) {
+    if (s_dns2 && !nm_inet_is_valid(family, s_dns2)) {
         g_set_error(error,
                     NM_SETTINGS_ERROR,
                     NM_SETTINGS_ERROR_INVALID_CONNECTION,
@@ -305,13 +307,12 @@ connection_setting_add(GHashTable   *nic,
                          s_index ? " " : "",
                          s_index ? s_index : "");
 
-    uuid = nm_uuid_generate_from_strings("ibft",
-                                         s_hwaddr,
-                                         s_vlanid ? "V" : "v",
-                                         s_vlanid ? s_vlanid : "",
-                                         s_ipaddr ? "A" : "DHCP",
-                                         s_ipaddr ? s_ipaddr : "",
-                                         NULL);
+    uuid = nm_uuid_generate_from_strings_old("ibft",
+                                             s_hwaddr,
+                                             s_vlanid ? "V" : "v",
+                                             s_vlanid ? s_vlanid : "",
+                                             s_ipaddr ? "A" : "DHCP",
+                                             s_ipaddr ? s_ipaddr : "");
 
     s_con = (NMSetting *) nm_connection_get_setting_connection(connection);
     if (!s_con) {
diff --git a/src/nm-initrd-generator/tests/test-cmdline-reader.c b/src/nm-initrd-generator/tests/test-cmdline-reader.c
index 977e58b9..2dfc23a3 100644
--- a/src/nm-initrd-generator/tests/test-cmdline-reader.c
+++ b/src/nm-initrd-generator/tests/test-cmdline-reader.c
@@ -1680,13 +1680,12 @@ test_ibft_ip_dev(void)
                     NM_SETTING_VLAN_SETTING_NAME);
     g_assert_cmpstr(nm_setting_connection_get_interface_name(s_con), ==, NULL);
 
-    expected_uuid = nm_uuid_generate_from_strings("ibft",
-                                                  s_hwaddr,
-                                                  s_vlanid ? "V" : "v",
-                                                  s_vlanid ? s_vlanid : "",
-                                                  s_ipaddr ? "A" : "DHCP",
-                                                  s_ipaddr ? s_ipaddr : "",
-                                                  NULL);
+    expected_uuid = nm_uuid_generate_from_strings_old("ibft",
+                                                      s_hwaddr,
+                                                      s_vlanid ? "V" : "v",
+                                                      s_vlanid ? s_vlanid : "",
+                                                      s_ipaddr ? "A" : "DHCP",
+                                                      s_ipaddr ? s_ipaddr : "");
 
     g_assert_cmpstr(expected_uuid, ==, "16d9bd1c-e2ab-31ef-9196-860078e81a23");
     g_assert_cmpstr(nm_connection_get_uuid(connection), ==, expected_uuid);