reach into address bytes when converting struct in6_addr to ziti_addr…

…ess. (#869)
openziti · Jun 14, 2024 · 2cab71f · 2cab71f
1 parent 35e298d
commit 2cab71f
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/lib/ziti-tunnel/intercept.c b/lib/ziti-tunnel/intercept.c
@@ -53,7 +53,7 @@ void ziti_address_from_in6_addr(ziti_address *za, const struct in6_addr *a) {
     za->type = ziti_address_cidr;
     za->addr.cidr.af = AF_INET6;
     za->addr.cidr.bits = 128;
-    memcpy(&za->addr.cidr.ip, &a, sizeof(struct in6_addr));
+    memcpy(&za->addr.cidr.ip, &a->s6_addr, sizeof(struct in6_addr));
 }
 
 void ziti_address_from_sockaddr_in(ziti_address *za, const struct sockaddr_in *sin) {

diff --git a/lib/ziti-tunnel/tests/address_test.cpp b/lib/ziti-tunnel/tests/address_test.cpp
@@ -88,4 +88,20 @@ TEST_CASE("address_match", "[address]") {
     REQUIRE(model_map_get(&tctx.intercepts_cache, "tcp:192.168.0.10:81") == intercept_s3);
 
     // todo hostname and wildcard dns matching
+}
+
+TEST_CASE("address_conversion", "[address]") {
+    const char *ip6_str = "2768:8631:c02:ffc9::1308";
+    ip_addr_t ip6;
+    ipaddr_aton(ip6_str, &ip6);
+    ziti_address za_from_ip6;
+    ziti_address_from_ip_addr(&za_from_ip6, &ip6);
+
+    ziti_address za_from_str;
+    ziti_address_from_string(&za_from_str, ip6_str);
+
+    char za_str[128];
+    ziti_address_print(za_str, sizeof(za_str), &za_from_ip6);
+    fprintf(stderr, "%s converted to %s\n", ip6_str, za_str);
+    REQUIRE(ziti_address_match(&za_from_ip6, &za_from_str) == 0);
 }