torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'bug24734_squashed'

Browse Source
This commit is contained in:
Nick Mathewson
2018-05-01 08:51:32 -04:00
parent 3a2470762d 5458ff20a5
commit 07b486c17a
6 changed files with 77 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/test/test_policy.c
+4 -10
View File
@@ -1923,11 +1923,8 @@ test_policies_fascist_firewall_allows_address(void *arg)
tor_addr_port_t chosen_rs_ap; \
tor_addr_make_null(&chosen_rs_ap.addr, AF_INET); \
chosen_rs_ap.port = 0; \
tt_int_op(fascist_firewall_choose_address_rs(&(fake_rs), \
(fw_connection), \
(pref_only), \
&chosen_rs_ap), \
OP_EQ, (expect_rv)); \
fascist_firewall_choose_address_rs(&(fake_rs), (fw_connection), \
(pref_only), &chosen_rs_ap); \
tt_assert(tor_addr_eq(&(expect_ap).addr, &chosen_rs_ap.addr)); \
tt_int_op((expect_ap).port, OP_EQ, chosen_rs_ap.port); \
STMT_END
@@ -1940,11 +1937,8 @@ test_policies_fascist_firewall_allows_address(void *arg)
tor_addr_port_t chosen_node_ap; \
tor_addr_make_null(&chosen_node_ap.addr, AF_INET); \
chosen_node_ap.port = 0; \
tt_int_op(fascist_firewall_choose_address_node(&(fake_node), \
(fw_connection), \
(pref_only), \
&chosen_node_ap), \
OP_EQ, (expect_rv)); \
fascist_firewall_choose_address_node(&(fake_node),(fw_connection), \
(pref_only), &chosen_node_ap); \
tt_assert(tor_addr_eq(&(expect_ap).addr, &chosen_node_ap.addr)); \
tt_int_op((expect_ap).port, OP_EQ, chosen_node_ap.port); \
STMT_END