aboutsummaryrefslogtreecommitdiff
path: root/src/test/test_channel.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2020-07-13 10:10:25 -0400
committerNick Mathewson <nickm@torproject.org>2020-07-13 10:10:25 -0400
commit59133051f9040717f2f87aa5c2b051eadce2ebdf (patch)
tree54331997ef3a303f6a00aac377f6d90bfce91703 /src/test/test_channel.c
parentc84ce716dce09eb26f26e3303efa2c0a04a870b7 (diff)
downloadtor-59133051f9040717f2f87aa5c2b051eadce2ebdf.tar.gz
tor-59133051f9040717f2f87aa5c2b051eadce2ebdf.zip
Update channel_matches_target_addr_for_extend test to current API
Diffstat (limited to 'src/test/test_channel.c')
-rw-r--r--src/test/test_channel.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/test/test_channel.c b/src/test/test_channel.c
index 53ca8d9bba..2b723b4a8d 100644
--- a/src/test/test_channel.c
+++ b/src/test/test_channel.c
@@ -1549,8 +1549,8 @@ test_channel_listener(void *arg)
orcon->real_addr = addr; \
STMT_END;
-#define TEST_MATCHES_ADDR(chan, addr, rv, exp) STMT_BEGIN \
- rv = channel_matches_target_addr_for_extend(chan, &addr); \
+#define TEST_MATCHES_ADDR(chan, addr4, addr6, rv, exp) STMT_BEGIN \
+ rv = channel_matches_target_addr_for_extend(chan, addr4, addr6); \
tt_int_op(rv, OP_EQ, exp); \
STMT_END;
@@ -1571,18 +1571,18 @@ test_channel_matches_target_addr_for_extend(void *arg)
/* Test for IPv4 addresses. */
addr.family = AF_INET;
TEST_SETUP_MATCHES_ADDR(orcon, addr, "1.2.3.4", rv);
- TEST_MATCHES_ADDR(chan, addr, rv, 1);
+ TEST_MATCHES_ADDR(chan, &addr, NULL, rv, 1);
tor_inet_pton(addr.family, "2.5.3.4", &addr.addr);
- TEST_MATCHES_ADDR(chan, addr, rv, 0);
+ TEST_MATCHES_ADDR(chan, &addr, NULL, rv, 0);
/* Test for IPv6 addresses. */
addr.family = AF_INET6;
TEST_SETUP_MATCHES_ADDR(orcon, addr, "3:4:7:1:9:8:09:10", rv);
- TEST_MATCHES_ADDR(chan, addr, rv, 1);
+ TEST_MATCHES_ADDR(chan, NULL, &addr, rv, 1);
tor_inet_pton(addr.family, "::", &addr.addr);
- TEST_MATCHES_ADDR(chan, addr, rv, 0);
+ TEST_MATCHES_ADDR(chan, NULL, &addr, rv, 0);
done:
circuitmux_clear_policy(chan->cmux);