about summary refs log tree commit diff
path: root/src/core/tests/test-utils.c
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2022-01-13 22:34:27 +0100
committerMichael Biebl <biebl@debian.org>2022-01-13 22:34:27 +0100
commitdd97d276b5d70c3397a4e59c978ca5228f06ba44 (patch)
tree5fb3f5e0f5da28e39d3261d50561349a512ba297 /src/core/tests/test-utils.c
parent3e2f6719468f8d957ae3cb112f3cb75b9c82d6a7 (diff)
parent88c227d90a6b7b388c5c85d72802a0ca8f05ed5c (diff)
Update upstream source from tag 'upstream/1.34.0'
Update to upstream version '1.34.0'
with Debian dir b598c27ee9cef517760bc745aa6a3bb7d9fb2ecb
Diffstat (limited to 'src/core/tests/test-utils.c')
-rw-r--r--src/core/tests/test-utils.c75
1 files changed, 35 insertions, 40 deletions
diff --git a/src/core/tests/test-utils.c b/src/core/tests/test-utils.c
index 1d562bde..59d5fd53 100644
--- a/src/core/tests/test-utils.c
+++ b/src/core/tests/test-utils.c
@@ -16,60 +16,55 @@ test_stable_privacy(void)
     struct in6_addr addr1;
 
     inet_pton(AF_INET6, "1234::", &addr1);
-    nm_utils_ipv6_addr_set_stable_privacy_impl(NM_UTILS_STABLE_TYPE_UUID,
-                                               &addr1,
-                                               "eth666",
-                                               "6b138152-9f3e-4b97-aaf7-e6e553f2a24e",
-                                               0,
-                                               (guint8 *) "key",
-                                               3,
-                                               NULL);
+    nm_utils_ipv6_addr_set_stable_privacy_with_host_id(NM_UTILS_STABLE_TYPE_UUID,
+                                                       &addr1,
+                                                       "eth666",
+                                                       "6b138152-9f3e-4b97-aaf7-e6e553f2a24e",
+                                                       0,
+                                                       (guint8 *) "key",
+                                                       3);
     nmtst_assert_ip6_address(&addr1, "1234::4ceb:14cd:3d54:793f");
 
     /* We get an address without the UUID. */
     inet_pton(AF_INET6, "1::", &addr1);
-    nm_utils_ipv6_addr_set_stable_privacy_impl(NM_UTILS_STABLE_TYPE_UUID,
-                                               &addr1,
-                                               "eth666",
-                                               "",
-                                               384,
-                                               (guint8 *) "key",
-                                               3,
-                                               NULL);
+    nm_utils_ipv6_addr_set_stable_privacy_with_host_id(NM_UTILS_STABLE_TYPE_UUID,
+                                                       &addr1,
+                                                       "eth666",
+                                                       "",
+                                                       384,
+                                                       (guint8 *) "key",
+                                                       3);
     nmtst_assert_ip6_address(&addr1, "1::11aa:2530:9144:dafa");
 
     /* We get a different address in a different network. */
     inet_pton(AF_INET6, "2::", &addr1);
-    nm_utils_ipv6_addr_set_stable_privacy_impl(NM_UTILS_STABLE_TYPE_UUID,
-                                               &addr1,
-                                               "eth666",
-                                               "",
-                                               384,
-                                               (guint8 *) "key",
-                                               3,
-                                               NULL);
+    nm_utils_ipv6_addr_set_stable_privacy_with_host_id(NM_UTILS_STABLE_TYPE_UUID,
+                                                       &addr1,
+                                                       "eth666",
+                                                       "",
+                                                       384,
+                                                       (guint8 *) "key",
+                                                       3);
     nmtst_assert_ip6_address(&addr1, "2::338e:8d:c11:8726");
 
     inet_pton(AF_INET6, "1234::", &addr1);
-    nm_utils_ipv6_addr_set_stable_privacy_impl(NM_UTILS_STABLE_TYPE_STABLE_ID,
-                                               &addr1,
-                                               "eth666",
-                                               "6b138152-9f3e-4b97-aaf7-e6e553f2a24e",
-                                               0,
-                                               (guint8 *) "key",
-                                               3,
-                                               NULL);
+    nm_utils_ipv6_addr_set_stable_privacy_with_host_id(NM_UTILS_STABLE_TYPE_STABLE_ID,
+                                                       &addr1,
+                                                       "eth666",
+                                                       "6b138152-9f3e-4b97-aaf7-e6e553f2a24e",
+                                                       0,
+                                                       (guint8 *) "key",
+                                                       3);
     nmtst_assert_ip6_address(&addr1, "1234::ad4c:ae44:3d30:af1e");
 
     inet_pton(AF_INET6, "1234::", &addr1);
-    nm_utils_ipv6_addr_set_stable_privacy_impl(NM_UTILS_STABLE_TYPE_STABLE_ID,
-                                               &addr1,
-                                               "eth666",
-                                               "stable-id-1",
-                                               0,
-                                               (guint8 *) "key",
-                                               3,
-                                               NULL);
+    nm_utils_ipv6_addr_set_stable_privacy_with_host_id(NM_UTILS_STABLE_TYPE_STABLE_ID,
+                                                       &addr1,
+                                                       "eth666",
+                                                       "stable-id-1",
+                                                       0,
+                                                       (guint8 *) "key",
+                                                       3);
     nmtst_assert_ip6_address(&addr1, "1234::4944:67b0:7a6c:1cf");
 }