- tor-commits - lists.torproject.org

[tor/master] relay: Clarify a comment in selftest.c
by nickm＠torproject.org 09 Jun '20

09 Jun '20

commit e887887cd32f9e78e3b6e9c47661eaf750b4c0fb Author: teor <teor(a)riseup.net> Date: Thu May 7 20:57:14 2020 +1000 relay: Clarify a comment in selftest.c --- src/feature/relay/selftest.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/feature/relay/selftest.c b/src/feature/relay/selftest.c index 875bf7a9f..4bbdeb3b9 100644 --- a/src/feature/relay/selftest.c +++ b/src/feature/relay/selftest.c @@ -255,7 +255,10 @@ router_do_reachability_checks(int test_or, int test_dir) if (router_should_check_reachability(test_or, test_dir)) { if (test_or && (!orport_reachable || !circuit_enough_testing_circs())) { - /* We'll separate IPv4 and IPv6 reachability detection in #34067. */ + /* At the moment, tor relays believe that they are reachable when they + * receive any create cell on an inbound connection. We'll do separate + * IPv4 and IPv6 reachability checks in #34067, and make them more + * precise. */ router_do_orport_reachability_checks(me, AF_INET, orport_reachable); router_do_orport_reachability_checks(me, AF_INET6, orport_reachable); }

1 0

[tor/master] Appease practracker: wrapping costs lines
by nickm＠torproject.org 09 Jun '20

09 Jun '20

commit 24099680f19abe67f4b362d49c66e68c971fca0e Author: teor <teor(a)riseup.net> Date: Thu May 7 20:19:19 2020 +1000 Appease practracker: wrapping costs lines --- scripts/maint/practracker/exceptions.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/maint/practracker/exceptions.txt b/scripts/maint/practracker/exceptions.txt index c0562bb87..96d72362b 100644 --- a/scripts/maint/practracker/exceptions.txt +++ b/scripts/maint/practracker/exceptions.txt @@ -117,7 +117,7 @@ problem function-size /src/core/or/circuitpadding_machines.c:circpad_machine_cli problem dependency-violation /src/core/or/circuitpadding_machines.c 1 problem function-size /src/core/or/circuitstats.c:circuit_build_times_parse_state() 123 problem dependency-violation /src/core/or/circuitstats.c 11 -problem file-size /src/core/or/circuituse.c 3195 +problem file-size /src/core/or/circuituse.c 3200 problem function-size /src/core/or/circuituse.c:circuit_is_acceptable() 128 problem function-size /src/core/or/circuituse.c:circuit_expire_building() 389 problem function-size /src/core/or/circuituse.c:circuit_log_ancient_one_hop_circuits() 126 @@ -198,7 +198,7 @@ problem function-size /src/feature/control/control_events.c:control_event_stream problem include-count /src/feature/control/control_getinfo.c 56 problem function-size /src/feature/control/control_getinfo.c:getinfo_helper_misc() 108 problem function-size /src/feature/control/control_getinfo.c:getinfo_helper_dir() 297 -problem function-size /src/feature/control/control_getinfo.c:getinfo_helper_events() 234 +problem function-size /src/feature/control/control_getinfo.c:getinfo_helper_events() 237 problem function-size /src/feature/dirauth/bwauth.c:dirserv_read_measured_bandwidths() 121 problem file-size /src/feature/dirauth/dirvote.c 4734 problem include-count /src/feature/dirauth/dirvote.c 55 @@ -255,9 +255,9 @@ problem function-size /src/feature/nodelist/microdesc.c:microdesc_cache_rebuild( problem include-count /src/feature/nodelist/networkstatus.c 65 problem function-size /src/feature/nodelist/networkstatus.c:networkstatus_check_consensus_signature() 175 problem function-size /src/feature/nodelist/networkstatus.c:networkstatus_set_current_consensus() 289 -problem function-size /src/feature/nodelist/node_select.c:router_pick_directory_server_impl() 124 +problem function-size /src/feature/nodelist/node_select.c:router_pick_directory_server_impl() 126 problem function-size /src/feature/nodelist/node_select.c:compute_weighted_bandwidths() 204 -problem function-size /src/feature/nodelist/node_select.c:router_pick_trusteddirserver_impl() 114 +problem function-size /src/feature/nodelist/node_select.c:router_pick_trusteddirserver_impl() 116 problem function-size /src/feature/nodelist/nodelist.c:compute_frac_paths_available() 190 problem file-size /src/feature/nodelist/routerlist.c 3300 problem function-size /src/feature/nodelist/routerlist.c:router_rebuild_store() 148

1 0

[tor/master] routerinfo: Make router_get_orport() return an error status
by nickm＠torproject.org 09 Jun '20

09 Jun '20

commit c76f310fe724c3d93416b4e23a219feda8e6f217 Author: teor <teor(a)riseup.net> Date: Thu May 7 20:25:36 2020 +1000 routerinfo: Make router_get_orport() return an error status Part of 33222. --- src/feature/nodelist/routerinfo.c | 20 +++++++++++++------- src/feature/nodelist/routerinfo.h | 2 +- src/feature/relay/selftest.c | 3 +-- 3 files changed, 15 insertions(+), 10 deletions(-) diff --git a/src/feature/nodelist/routerinfo.c b/src/feature/nodelist/routerinfo.c index d2462a53d..55f21dfe6 100644 --- a/src/feature/nodelist/routerinfo.c +++ b/src/feature/nodelist/routerinfo.c @@ -21,9 +21,8 @@ * family into *ap_out. * * If the requested ORPort does not exist, sets *ap_out to the null - * address and port. You can check the returned value using - * tor_addr_port_is_valid_ap(ap_out, 0). */ -void + * address and port, and returns -1. Otherwise, returns 0. */ +int router_get_orport(const routerinfo_t *router, tor_addr_port_t *ap_out, int family) @@ -32,15 +31,22 @@ router_get_orport(const routerinfo_t *router, if (family == AF_INET) { tor_addr_from_ipv4h(&ap_out->addr, router->addr); ap_out->port = router->or_port; + return 0; } else if (family == AF_INET6) { - /* If there is no IPv6 address, ipv6_addr will be the null address and - * port. */ - tor_addr_copy(&ap_out->addr, &router->ipv6_addr); - ap_out->port = router->ipv6_orport; + /* IPv6 addresses are optional, so check if it is valid. */ + if (tor_addr_port_is_valid(&router->ipv6_addr, router->ipv6_orport, 0)) { + tor_addr_copy(&ap_out->addr, &router->ipv6_addr); + ap_out->port = router->ipv6_orport; + return 0; + } else { + tor_addr_port_make_null_ap(ap_out, AF_INET6); + return -1; + } } else { /* Unsupported address family */ tor_assert_nonfatal_unreached(); tor_addr_port_make_null_ap(ap_out, AF_UNSPEC); + return -1; } } diff --git a/src/feature/nodelist/routerinfo.h b/src/feature/nodelist/routerinfo.h index 47601a131..2e12cbeba 100644 --- a/src/feature/nodelist/routerinfo.h +++ b/src/feature/nodelist/routerinfo.h @@ -12,7 +12,7 @@ #ifndef TOR_ROUTERINFO_H #define TOR_ROUTERINFO_H -void router_get_orport(const routerinfo_t *router, +int router_get_orport(const routerinfo_t *router, tor_addr_port_t *addr_port_out, int family); int router_has_orport(const routerinfo_t *router, diff --git a/src/feature/relay/selftest.c b/src/feature/relay/selftest.c index 4093218fb..875bf7a9f 100644 --- a/src/feature/relay/selftest.c +++ b/src/feature/relay/selftest.c @@ -163,8 +163,7 @@ extend_info_from_router(const routerinfo_t *r, int family) else ed_id_key = NULL; - router_get_orport(r, &ap, family); - if (!tor_addr_port_is_valid_ap(&ap, 0)) { + if (router_get_orport(r, &ap, family) < 0) { /* We don't have an ORPort for the requested family. */ return NULL; }

1 0

[tor/master] protover: Declare support for Relay=3
by nickm＠torproject.org 09 Jun '20

09 Jun '20

commit e787e521af990a76c6e42cd1a8d3f46f41561f24 Author: teor <teor(a)riseup.net> Date: Mon May 11 11:08:20 2020 +1000 protover: Declare support for Relay=3 Declare support for the new Relay=3 IPv6 extend protocol, in C and Rust. Part of 33226. --- src/core/or/protover.c | 2 +- src/rust/protover/protover.rs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/core/or/protover.c b/src/core/or/protover.c index c3f443631..43fb67772 100644 --- a/src/core/or/protover.c +++ b/src/core/or/protover.c @@ -403,7 +403,7 @@ protover_get_supported_protocols(void) #endif "Microdesc=1-2 " "Padding=2 " - "Relay=1-2"; + "Relay=1-3"; } /** The protocols from protover_get_supported_protocols(), as parsed into a diff --git a/src/rust/protover/protover.rs b/src/rust/protover/protover.rs index 6d2ef33ee..3a7379d89 100644 --- a/src/rust/protover/protover.rs +++ b/src/rust/protover/protover.rs @@ -169,7 +169,7 @@ pub(crate) fn get_supported_protocols_cstr() -> &'static CStr { LinkAuth=3 \ Microdesc=1-2 \ Padding=2 \ - Relay=1-2" + Relay=1-3" ) } else { cstr!( @@ -184,7 +184,7 @@ pub(crate) fn get_supported_protocols_cstr() -> &'static CStr { LinkAuth=1,3 \ Microdesc=1-2 \ Padding=2 \ - Relay=1-2" + Relay=1-3" ) } }

1 0

[tor/master] routerlist: Choose nodes that can initiate IPv6 extends
by nickm＠torproject.org 09 Jun '20

09 Jun '20

commit 1c1faf586ab7083221e02da4315679c5cf13d151 Author: teor <teor(a)riseup.net> Date: Mon May 11 17:00:25 2020 +1000 routerlist: Choose nodes that can initiate IPv6 extends Part of 33226. --- src/core/or/circuitbuild.c | 17 ++++++++----- src/feature/nodelist/node_select.c | 49 ++++++++++++++++++++++---------------- src/feature/nodelist/node_select.h | 2 ++ src/feature/nodelist/routerlist.c | 9 ++++--- src/feature/nodelist/routerlist.h | 3 ++- 5 files changed, 50 insertions(+), 30 deletions(-) diff --git a/src/core/or/circuitbuild.c b/src/core/or/circuitbuild.c index ba70c4753..1cf9e588f 100644 --- a/src/core/or/circuitbuild.c +++ b/src/core/or/circuitbuild.c @@ -1796,12 +1796,13 @@ pick_restricted_middle_node(router_crn_flags_t flags, /* Add all running nodes to all_live_nodes */ router_add_running_nodes_to_smartlist(all_live_nodes, - (flags & CRN_NEED_UPTIME) != 0, - (flags & CRN_NEED_CAPACITY) != 0, - (flags & CRN_NEED_GUARD) != 0, - (flags & CRN_NEED_DESC) != 0, - (flags & CRN_PREF_ADDR) != 0, - (flags & CRN_DIRECT_CONN) != 0); + (flags & CRN_NEED_UPTIME) != 0, + (flags & CRN_NEED_CAPACITY) != 0, + (flags & CRN_NEED_GUARD) != 0, + (flags & CRN_NEED_DESC) != 0, + (flags & CRN_PREF_ADDR) != 0, + (flags & CRN_DIRECT_CONN) != 0, + (flags & CRN_INITIATE_IPV6_EXTEND) != 0); /* Filter all_live_nodes to only add live *and* whitelisted middles * to the list whitelisted_live_middles. */ @@ -2306,6 +2307,10 @@ choose_good_middle_server(uint8_t purpose, flags |= CRN_NEED_UPTIME; if (state->need_capacity) flags |= CRN_NEED_CAPACITY; + /* Picking the second-last node. (The last node is the relay doing the + * self-test.) */ + if (state->is_ipv6_selftest && cur_len == state->desired_path_len - 2) + flags |= CRN_INITIATE_IPV6_EXTEND; /** If a hidden service circuit wants a specific middle node, pin it. */ if (middle_node_must_be_vanguard(options, purpose, cur_len)) { diff --git a/src/feature/nodelist/node_select.c b/src/feature/nodelist/node_select.c index 40d0f2a5b..8e7da1ae2 100644 --- a/src/feature/nodelist/node_select.c +++ b/src/feature/nodelist/node_select.c @@ -930,25 +930,33 @@ nodelist_subtract(smartlist_t *sl, const smartlist_t *excluded) bitarray_free(excluded_idx); } -/** Return a random running node from the nodelist. Never - * pick a node that is in - * excludedsmartlist, or which matches excludedset, - * even if they are the only nodes available. - * If CRN_NEED_UPTIME is set in flags and any router has more than - * a minimum uptime, return one of those. - * If CRN_NEED_CAPACITY is set in flags, weight your choice by the - * advertised capacity of each router. - * If CRN_NEED_GUARD is set in flags, consider only Guard routers. - * If CRN_WEIGHT_AS_EXIT is set in flags, we weight bandwidths as if - * picking an exit node, otherwise we weight bandwidths for picking a relay - * node (that is, possibly discounting exit nodes). - * If CRN_NEED_DESC is set in flags, we only consider nodes that - * have a routerinfo or microdescriptor -- that is, enough info to be - * used to build a circuit. - * If CRN_PREF_ADDR is set in flags, we only consider nodes that - * have an address that is preferred by the ClientPreferIPv6ORPort setting - * (regardless of this flag, we exclude nodes that aren't allowed by the - * firewall, including ClientUseIPv4 0 and fascist_firewall_use_ipv6() == 0). +/** Return a random running node from the nodelist. Never pick a node that is + * in excludedsmartlist, or which matches excludedset, even if + * they are the only nodes available. + * + * If the following flags are set: + * - CRN_NEED_UPTIME: if any router has more than a minimum uptime, + * return one of those; + * - CRN_NEED_CAPACITY: weight your choice by the advertised capacity + * of each router; + * - CRN_NEED_GUARD: only consider Guard routers; + * - CRN_WEIGHT_AS_EXIT: we weight bandwidths as if picking an exit + * node, otherwise we weight bandwidths for + * picking a relay node (that is, possibly + * discounting exit nodes); + * - CRN_NEED_DESC: only consider nodes that have a routerinfo or + * microdescriptor -- that is, enough info to be + * used to build a circuit; + * - CRN_DIRECT_CONN: only consider nodes that are suitable for direct + * connections. Check ReachableAddresses, + * ClientUseIPv4 0, and + * fascist_firewall_use_ipv6() == 0); + * - CRN_PREF_ADDR: only consider nodes that have an address that is + * preferred by the ClientPreferIPv6ORPort setting. + * - CRN_RENDEZVOUS_V3: only consider nodes that can become v3 onion + * service rendezvous points. + * - CRN_INITIATE_IPV6_EXTEND: only consider routers than can initiate + * IPv6 extends. */ const node_t * router_choose_random_node(smartlist_t *excludedsmartlist, @@ -963,6 +971,7 @@ router_choose_random_node(smartlist_t *excludedsmartlist, const int pref_addr = (flags & CRN_PREF_ADDR) != 0; const int direct_conn = (flags & CRN_DIRECT_CONN) != 0; const int rendezvous_v3 = (flags & CRN_RENDEZVOUS_V3) != 0; + const bool initiate_ipv6_extend = (flags & CRN_INITIATE_IPV6_EXTEND) != 0; const smartlist_t *node_list = nodelist_get_list(); smartlist_t *sl=smartlist_new(), @@ -997,7 +1006,7 @@ router_choose_random_node(smartlist_t *excludedsmartlist, router_add_running_nodes_to_smartlist(sl, need_uptime, need_capacity, need_guard, need_desc, pref_addr, - direct_conn); + direct_conn, initiate_ipv6_extend); log_debug(LD_CIRC, "We found %d running nodes.", smartlist_len(sl)); diff --git a/src/feature/nodelist/node_select.h b/src/feature/nodelist/node_select.h index 2e67f990f..29b6e6f2c 100644 --- a/src/feature/nodelist/node_select.h +++ b/src/feature/nodelist/node_select.h @@ -28,6 +28,8 @@ typedef enum router_crn_flags_t { /* On clients, only provide nodes with HSRend >= 2 protocol version which * is required for hidden service version >= 3. */ CRN_RENDEZVOUS_V3 = 1<<9, + /* On clients, only provide nodes that can initiate IPv6 extends. */ + CRN_INITIATE_IPV6_EXTEND = 1<<10, } router_crn_flags_t; /** Possible ways to weight routers when choosing one randomly. See diff --git a/src/feature/nodelist/routerlist.c b/src/feature/nodelist/routerlist.c index e51125626..0d3d1bea3 100644 --- a/src/feature/nodelist/routerlist.c +++ b/src/feature/nodelist/routerlist.c @@ -512,13 +512,15 @@ routers_have_same_or_addrs(const routerinfo_t *r1, const routerinfo_t *r2) } /** Add every suitable node from our nodelist to sl, so that - * we can pick a node for a circuit. + * we can pick a node for a circuit. See router_choose_random_node() + * for details. */ void router_add_running_nodes_to_smartlist(smartlist_t *sl, int need_uptime, int need_capacity, int need_guard, int need_desc, int pref_addr, - int direct_conn) + int direct_conn, + bool initiate_ipv6_extend) { const int check_reach = !router_or_conn_should_skip_reachable_address_check( get_options(), @@ -545,7 +547,8 @@ router_add_running_nodes_to_smartlist(smartlist_t *sl, int need_uptime, FIREWALL_OR_CONNECTION, pref_addr)) continue; - + if (initiate_ipv6_extend && !node_supports_initiating_ipv6_extends(node)) + continue; smartlist_add(sl, (void *)node); } SMARTLIST_FOREACH_END(node); } diff --git a/src/feature/nodelist/routerlist.h b/src/feature/nodelist/routerlist.h index 401ce5e35..1297bb4b6 100644 --- a/src/feature/nodelist/routerlist.h +++ b/src/feature/nodelist/routerlist.h @@ -61,7 +61,8 @@ int routers_have_same_or_addrs(const routerinfo_t *r1, const routerinfo_t *r2); void router_add_running_nodes_to_smartlist(smartlist_t *sl, int need_uptime, int need_capacity, int need_guard, int need_desc, int pref_addr, - int direct_conn); + int direct_conn, + bool initiate_ipv6_extend); const routerinfo_t *routerlist_find_my_routerinfo(void); uint32_t router_get_advertised_bandwidth(const routerinfo_t *router);

1 0

[tor/master] Define and use TOR_ADDRPORT_BUF_LEN
by nickm＠torproject.org 09 Jun '20

09 Jun '20

commit 0daa1da3ba0ba1dbf2892e042573887f430b32fd Author: Neel Chauhan <neel(a)neelc.org> Date: Sun Apr 26 13:06:11 2020 -0700 Define and use TOR_ADDRPORT_BUF_LEN --- changes/ticket33956 | 5 +++++ src/core/or/channeltls.c | 10 +++------- src/lib/net/address.c | 3 +-- src/lib/net/address.h | 9 +++++++++ 4 files changed, 18 insertions(+), 9 deletions(-) diff --git a/changes/ticket33956 b/changes/ticket33956 new file mode 100644 index 000000000..7ad802797 --- /dev/null +++ b/changes/ticket33956 @@ -0,0 +1,5 @@ + o Code simplification and refactoring: + - Define and use a new constant TOR_ADDRPORT_BUF_LEN which is like + TOR_ADDR_BUF_LEN but includes enough space for an IP address, + brackets, seperating colon, and port number. Closes ticket 33956. + Patch by Neel Chauhan. diff --git a/src/core/or/channeltls.c b/src/core/or/channeltls.c index be941c176..484727268 100644 --- a/src/core/or/channeltls.c +++ b/src/core/or/channeltls.c @@ -564,10 +564,7 @@ channel_tls_get_transport_name_method(channel_t *chan, char **transport_out) static const char * channel_tls_get_remote_descr_method(channel_t *chan, int flags) { - /* IPv6 address, colon, port */ -#define MAX_DESCR_LEN (TOR_ADDR_BUF_LEN + 1 + 5) - - static char buf[MAX_DESCR_LEN + 1]; + static char buf[TOR_ADDRPORT_BUF_LEN]; channel_tls_t *tlschan = BASE_CHAN_TO_TLS(chan); connection_t *conn; const char *answer = NULL; @@ -580,15 +577,14 @@ channel_tls_get_remote_descr_method(channel_t *chan, int flags) switch (flags) { case 0: /* Canonical address with port*/ - tor_snprintf(buf, MAX_DESCR_LEN + 1, + tor_snprintf(buf, TOR_ADDRPORT_BUF_LEN, "%s:%u", conn->address, conn->port); answer = buf; break; case GRD_FLAG_ORIGINAL: /* Actual address with port */ addr_str = tor_addr_to_str_dup(&(tlschan->conn->real_addr)); - tor_snprintf(buf, MAX_DESCR_LEN + 1, - "%s:%u", addr_str, conn->port); + tor_snprintf(buf, TOR_ADDRPORT_BUF_LEN, "%s:%u", addr_str, conn->port); tor_free(addr_str); answer = buf; break; diff --git a/src/lib/net/address.c b/src/lib/net/address.c index e112da947..7f6359387 100644 --- a/src/lib/net/address.c +++ b/src/lib/net/address.c @@ -1188,8 +1188,7 @@ fmt_addr_impl(const tor_addr_t *addr, int decorate) const char * fmt_addrport(const tor_addr_t *addr, uint16_t port) { - /* Add space for a colon and up to 5 digits. */ - static char buf[TOR_ADDR_BUF_LEN + 6]; + static char buf[TOR_ADDRPORT_BUF_LEN]; tor_snprintf(buf, sizeof(buf), "%s:%u", fmt_and_decorate_addr(addr), port); return buf; } diff --git a/src/lib/net/address.h b/src/lib/net/address.h index 1cf78beca..eca5ddab7 100644 --- a/src/lib/net/address.h +++ b/src/lib/net/address.h @@ -213,6 +213,15 @@ tor_addr_eq_ipv4h(const tor_addr_t *a, uint32_t u) */ #define TOR_ADDR_BUF_LEN 48 +/** Length of a buffer containing an IP address along with a port number and + * a seperating colon. + * + * This allows enough space for + * "[ffff:ffff:ffff:ffff:ffff:ffff:255.255.255.255]:12345", + * plus a terminating NUL. + */ +#define TOR_ADDRPORT_BUF_LEN (TOR_ADDR_BUF_LEN + 6) + char *tor_addr_to_str_dup(const tor_addr_t *addr) ATTR_MALLOC; /** Wrapper function of fmt_addr_impl(). It does not decorate IPv6

1 0

[tor/master] relay: Improve docs on inform_testing_reachability()
by nickm＠torproject.org 09 Jun '20

09 Jun '20

commit 492c512af4a4f9ee143b945296fd1c61fc68dba1 Author: teor <teor(a)riseup.net> Date: Thu May 7 22:06:13 2020 +1000 relay: Improve docs on inform_testing_reachability() Document race conditions that we'll resolve in 34067 and 34137. Part of 33222. --- src/feature/relay/selftest.c | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/src/feature/relay/selftest.c b/src/feature/relay/selftest.c index 3035c252d..e311c08ec 100644 --- a/src/feature/relay/selftest.c +++ b/src/feature/relay/selftest.c @@ -269,9 +269,12 @@ router_do_reachability_checks(int test_or, int test_dir) } } -/** We've decided to start our reachability testing. If all - * is set, log this to the user. Return 1 if we did, or 0 if - * we chose not to log anything. */ +/** If reachability testing is in progress, let the user know that it's + * happening. + * + * If all is set, log a notice-level message. Return 1 if we did, or 0 if + * we chose not to log anything, because we were unable to test reachability. + */ int inform_testing_reachability(void) { @@ -279,6 +282,20 @@ inform_testing_reachability(void) char ipv6_or_buf[TOR_ADDRPORT_BUF_LEN]; char ipv4_dir_buf[TOR_ADDRPORT_BUF_LEN]; + /* There's a race condition here, between: + * - tor launching reachability tests, + * - any circuits actually completing, + * - routerinfo updates, and + * - these log messages. + * In rare cases, we might log the wrong ports, log when we didn't actually + * start reachability tests, or fail to log after we actually started + * reachability tests. + * + * After we separate the IPv4 and IPv6 reachability flags in #34067, tor + * will test any IPv6 address that it discovers after launching reachability + * checks. We'll deal with late disabled IPv6 ORPorts and IPv4 DirPorts, and + * extra or skipped log messages in #34137. + */ const routerinfo_t *me = router_get_my_routerinfo(); if (!me) return 0;

1 0

[tor/master] relay: Rewrite inform_testing_reachability()
by nickm＠torproject.org 09 Jun '20

09 Jun '20

commit 504b16fb757d14f58e20294f7aca338dc6826140 Author: teor <teor(a)riseup.net> Date: Thu May 7 20:59:10 2020 +1000 relay: Rewrite inform_testing_reachability() Rewrite inform_testing_reachability() to use separate buffers for IPv4 ORPort, IPv6 ORPort, and IPv4 DirPort. And use consistent APIs to fill those buffers. Part of 33222. --- src/feature/relay/selftest.c | 42 +++++++++++++++++++++++++----------------- src/lib/net/address.c | 11 +++++++++++ src/lib/net/address.h | 1 + 3 files changed, 37 insertions(+), 17 deletions(-) diff --git a/src/feature/relay/selftest.c b/src/feature/relay/selftest.c index 4bbdeb3b9..3035c252d 100644 --- a/src/feature/relay/selftest.c +++ b/src/feature/relay/selftest.c @@ -275,39 +275,47 @@ router_do_reachability_checks(int test_or, int test_dir) int inform_testing_reachability(void) { - char extra_addrbuf[128]; - char *address; + char ipv4_or_buf[TOR_ADDRPORT_BUF_LEN]; + char ipv6_or_buf[TOR_ADDRPORT_BUF_LEN]; + char ipv4_dir_buf[TOR_ADDRPORT_BUF_LEN]; + const routerinfo_t *me = router_get_my_routerinfo(); if (!me) return 0; - address = tor_dup_ip(me->addr); + /* IPv4 ORPort */ + strlcpy(ipv4_or_buf, fmt_addr32_port(me->addr, me->or_port), + sizeof(ipv4_or_buf)); control_event_server_status(LOG_NOTICE, - "CHECKING_REACHABILITY ORADDRESS=%s:%d", - address, me->or_port); + "CHECKING_REACHABILITY ORADDRESS=%s", + ipv4_or_buf); + /* IPv6 ORPort */ const bool has_ipv6 = tor_addr_port_is_valid(&me->ipv6_addr, me->ipv6_orport, 0); if (has_ipv6) { - tor_snprintf(extra_addrbuf, sizeof(extra_addrbuf), " and %s", - fmt_addrport(&me->ipv6_addr, me->ipv6_orport)); + strlcpy(ipv6_or_buf, fmt_addrport(&me->ipv6_addr, me->ipv6_orport), + sizeof(ipv6_or_buf)); /* We'll add an IPv6 control event in #34068. */ } + /* IPv4 DirPort (there are no advertised IPv6 DirPorts) */ if (me->dir_port) { - tor_snprintf(extra_addrbuf, sizeof(extra_addrbuf), " and DirPort %s:%d", - address, me->dir_port); + strlcpy(ipv4_dir_buf, fmt_addr32_port(me->addr, me->dir_port), + sizeof(ipv4_dir_buf)); control_event_server_status(LOG_NOTICE, - "CHECKING_REACHABILITY DIRADDRESS=%s:%d", - address, me->dir_port); + "CHECKING_REACHABILITY DIRADDRESS=%s", + ipv4_dir_buf); } - log_notice(LD_OR, "Now checking whether ORPort%s %s:%d%s %s reachable... " - "(this may take up to %d minutes -- look for log " - "messages indicating success)", + log_notice(LD_OR, "Now checking whether ORPort%s %s%s%s%s%s %s reachable... " + "(this may take up to %d minutes -- look for log " + "messages indicating success)", has_ipv6 ? "s" : "", - address, me->or_port, - has_ipv6 || me->dir_port ? extra_addrbuf : "", + ipv4_or_buf, + has_ipv6 ? " and " : "", + has_ipv6 ? ipv6_or_buf : "", + me->dir_port ? " and DirPort " : "", + me->dir_port ? ipv4_dir_buf : "", has_ipv6 || me->dir_port ? "are" : "is", TIMEOUT_UNTIL_UNREACHABILITY_COMPLAINT/60); - tor_free(address); return 1; } diff --git a/src/lib/net/address.c b/src/lib/net/address.c index 7f6359387..76c7aadd2 100644 --- a/src/lib/net/address.c +++ b/src/lib/net/address.c @@ -1206,6 +1206,17 @@ fmt_addr32(uint32_t addr) return buf; } +/** Like fmt_addrport(), but takes addr as a host-order IPv4 + * addresses. Also not thread-safe, also clobbers its return buffer on + * repeated calls. */ +const char * +fmt_addr32_port(uint32_t addr, uint16_t port) +{ + static char buf[INET_NTOA_BUF_LEN + 6]; + snprintf(buf, sizeof(buf), "%s:%u", fmt_addr32(addr), port); + return buf; +} + /** Return a string representing family. * * This string is a string constant, and must not be freed. diff --git a/src/lib/net/address.h b/src/lib/net/address.h index eca5ddab7..5ab654ef1 100644 --- a/src/lib/net/address.h +++ b/src/lib/net/address.h @@ -236,6 +236,7 @@ const char *fmt_addr_impl(const tor_addr_t *addr, int decorate); const char *fmt_addrport(const tor_addr_t *addr, uint16_t port); #define fmt_addrport_ap(ap) fmt_addrport(&(ap)->addr, (ap)->port) const char *fmt_addr32(uint32_t addr); +const char *fmt_addr32_port(uint32_t addr, uint16_t port); const char *fmt_af_family(sa_family_t family); const char *fmt_addr_family(const tor_addr_t *addr);

1 0

[tor/master] circuit: Add flags for IPv6 extends
by nickm＠torproject.org 09 Jun '20

09 Jun '20

commit 9e7f51e469cd275ef519498945124fe5addc889f Author: teor <teor(a)riseup.net> Date: Mon May 11 16:54:01 2020 +1000 circuit: Add flags for IPv6 extends But don't implement the actual node selection yet. Part of 33226. --- src/core/or/circuitbuild.c | 12 ++++++++---- src/core/or/circuitlist.c | 4 ++-- src/core/or/circuituse.c | 17 ++++++++++++----- src/core/or/circuituse.h | 16 +++++++++++----- src/core/or/cpath_build_state_st.h | 2 ++ src/feature/relay/selftest.c | 8 ++++++-- 6 files changed, 41 insertions(+), 18 deletions(-) diff --git a/src/core/or/circuitbuild.c b/src/core/or/circuitbuild.c index 8d5988b63..ba70c4753 100644 --- a/src/core/or/circuitbuild.c +++ b/src/core/or/circuitbuild.c @@ -439,7 +439,8 @@ onion_populate_cpath(origin_circuit_t *circ) /** Create and return a new origin circuit. Initialize its purpose and * build-state based on our arguments. The flags argument is a - * bitfield of CIRCLAUNCH_* flags. */ + * bitfield of CIRCLAUNCH_* flags, see circuit_launch_by_extend_info() for + * more details. */ origin_circuit_t * origin_circuit_init(uint8_t purpose, int flags) { @@ -455,13 +456,16 @@ origin_circuit_init(uint8_t purpose, int flags) ((flags & CIRCLAUNCH_NEED_CAPACITY) ? 1 : 0); circ->build_state->is_internal = ((flags & CIRCLAUNCH_IS_INTERNAL) ? 1 : 0); + circ->build_state->is_ipv6_selftest = + ((flags & CIRCLAUNCH_IS_IPV6_SELFTEST) ? 1 : 0); circ->base_.purpose = purpose; return circ; } -/** Build a new circuit for purpose. If exit - * is defined, then use that as your exit router, else choose a suitable - * exit node. +/** Build a new circuit for purpose. If exit is defined, then use + * that as your exit router, else choose a suitable exit node. The flags + * argument is a bitfield of CIRCLAUNCH_* flags, see + * circuit_launch_by_extend_info() for more details. * * Also launch a connection to the first OR in the chosen path, if * it's not open already. diff --git a/src/core/or/circuitlist.c b/src/core/or/circuitlist.c index ca174c442..bfee4104e 100644 --- a/src/core/or/circuitlist.c +++ b/src/core/or/circuitlist.c @@ -1943,8 +1943,8 @@ circuit_find_to_cannibalize(uint8_t purpose_to_produce, extend_info_t *info, } /* Ignore any circuits for which we can't use the Guard. It is possible - * that the Guard was removed from the samepled set after the circuit - * was created so avoid using it. */ + * that the Guard was removed from the sampled set after the circuit + * was created, so avoid using it. */ if (!entry_guard_could_succeed(circ->guard_state)) { goto next; } diff --git a/src/core/or/circuituse.c b/src/core/or/circuituse.c index 46ebcc5dc..71063dc72 100644 --- a/src/core/or/circuituse.c +++ b/src/core/or/circuituse.c @@ -2092,11 +2092,18 @@ circuit_should_cannibalize_to_build(uint8_t purpose_to_build, } /** Launch a new circuit with purpose purpose and exit node - * extend_info (or NULL to select a random exit node). If flags - * contains CIRCLAUNCH_NEED_UPTIME, choose among routers with high uptime. If - * CIRCLAUNCH_NEED_CAPACITY is set, choose among routers with high bandwidth. - * If CIRCLAUNCH_IS_INTERNAL is true, the last hop need not be an exit node. - * If CIRCLAUNCH_ONEHOP_TUNNEL is set, the circuit will have only one hop. + * extend_info (or NULL to select a random exit node). + * + * If flags contains: + * - CIRCLAUNCH_ONEHOP_TUNNEL: the circuit will have only one hop; + * - CIRCLAUNCH_NEED_UPTIME: choose routers with high uptime; + * - CIRCLAUNCH_NEED_CAPACITY: choose routers with high bandwidth; + * - CIRCLAUNCH_IS_IPV6_SELFTEST: the second-last hop must support IPv6 + * extends; + * - CIRCLAUNCH_IS_INTERNAL: the last hop need not be an exit node; + * - CIRCLAUNCH_IS_V3_RP: the last hop must support v3 onion service + * rendezvous. + * * Return the newly allocated circuit on success, or NULL on failure. */ origin_circuit_t * circuit_launch_by_extend_info(uint8_t purpose, diff --git a/src/core/or/circuituse.h b/src/core/or/circuituse.h index 95d36d647..028fe4aa4 100644 --- a/src/core/or/circuituse.h +++ b/src/core/or/circuituse.h @@ -36,17 +36,23 @@ void circuit_try_attaching_streams(origin_circuit_t *circ); void circuit_build_failed(origin_circuit_t *circ); /** Flag to set when a circuit should have only a single hop. */ -#define CIRCLAUNCH_ONEHOP_TUNNEL (1<<0) +#define CIRCLAUNCH_ONEHOP_TUNNEL (1<<0) /** Flag to set when a circuit needs to be built of high-uptime nodes */ -#define CIRCLAUNCH_NEED_UPTIME (1<<1) +#define CIRCLAUNCH_NEED_UPTIME (1<<1) /** Flag to set when a circuit needs to be built of high-capacity nodes */ -#define CIRCLAUNCH_NEED_CAPACITY (1<<2) +#define CIRCLAUNCH_NEED_CAPACITY (1<<2) /** Flag to set when the last hop of a circuit doesn't need to be an * exit node. */ -#define CIRCLAUNCH_IS_INTERNAL (1<<3) +#define CIRCLAUNCH_IS_INTERNAL (1<<3) /** Flag to set when we are trying to launch a v3 rendezvous circuit. We need * to apply some additional filters on the node picked. */ -#define CIRCLAUNCH_IS_V3_RP (1<<4) +#define CIRCLAUNCH_IS_V3_RP (1<<4) +/** Flag to set when we are trying to launch a self-testing circuit to our + * IPv6 ORPort. We need to apply some additional filters on the second-last + * node in the circuit. (We are both the client and the last node in the + * circuit.) */ +#define CIRCLAUNCH_IS_IPV6_SELFTEST (1<<5) + origin_circuit_t *circuit_launch_by_extend_info(uint8_t purpose, extend_info_t *info, int flags); diff --git a/src/core/or/cpath_build_state_st.h b/src/core/or/cpath_build_state_st.h index ee9a0d972..eb8e97edc 100644 --- a/src/core/or/cpath_build_state_st.h +++ b/src/core/or/cpath_build_state_st.h @@ -24,6 +24,8 @@ struct cpath_build_state_t { unsigned int need_capacity : 1; /** Whether the last hop was picked with exiting in mind. */ unsigned int is_internal : 1; + /** Is this an IPv6 ORPort self-testing circuit? */ + unsigned int is_ipv6_selftest : 1; /** Did we pick this as a one-hop tunnel (not safe for other streams)? * These are for encrypted dir conns that exit to this router, not * for arbitrary exits from the circuit. */ diff --git a/src/feature/relay/selftest.c b/src/feature/relay/selftest.c index e311c08ec..ae5633bfb 100644 --- a/src/feature/relay/selftest.c +++ b/src/feature/relay/selftest.c @@ -190,15 +190,19 @@ router_do_orport_reachability_checks(const routerinfo_t *me, int orport_reachable) { extend_info_t *ei = extend_info_from_router(me, family); + int ipv6_flags = (family == AF_INET6 ? CIRCLAUNCH_IS_IPV6_SELFTEST : 0); - /* If we don't have an IPv6 ORPort, ei will be NULL. */ + /* If we're trying to test IPv6, but we don't have an IPv6 ORPort, ei will + * be NULL. */ if (ei) { const char *family_name = fmt_af_family(family); log_info(LD_CIRC, "Testing %s of my %s ORPort: %s.", !orport_reachable ? "reachability" : "bandwidth", family_name, fmt_addrport(&ei->addr, ei->port)); circuit_launch_by_extend_info(CIRCUIT_PURPOSE_TESTING, ei, - CIRCLAUNCH_NEED_CAPACITY|CIRCLAUNCH_IS_INTERNAL); + CIRCLAUNCH_NEED_CAPACITY| + CIRCLAUNCH_IS_INTERNAL| + ipv6_flags); extend_info_free(ei); } }

1 0

[tor/master] nodelist: Fix a comment and a log message
by nickm＠torproject.org 09 Jun '20

09 Jun '20

commit 8829d2d64428675e205889dc0af22cd2d98d53f0 Author: teor <teor(a)riseup.net> Date: Mon May 11 17:01:49 2020 +1000 nodelist: Fix a comment and a log message --- src/feature/nodelist/node_select.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/feature/nodelist/node_select.c b/src/feature/nodelist/node_select.c index 8e7da1ae2..fe88b7230 100644 --- a/src/feature/nodelist/node_select.c +++ b/src/feature/nodelist/node_select.c @@ -992,7 +992,7 @@ router_choose_random_node(smartlist_t *excludedsmartlist, smartlist_add(excludednodes, (node_t*)node); } else if (rendezvous_v3 && !node_supports_v3_rendezvous_point(node)) { - /* Exclude relays that do not support to rendezvous for a hidden service + /* Exclude relays that can not become a rendezvous for a hidden service * version 3. */ smartlist_add(excludednodes, (node_t*)node); } @@ -1030,11 +1030,12 @@ router_choose_random_node(smartlist_t *excludedsmartlist, if (!choice && (need_uptime || need_capacity || need_guard || pref_addr)) { /* try once more -- recurse but with fewer restrictions. */ log_info(LD_CIRC, - "We couldn't find any live%s%s%s routers; falling back " + "We couldn't find any live%s%s%s%s routers; falling back " "to list of all routers.", need_capacity?", fast":"", need_uptime?", stable":"", - need_guard?", guard":""); + need_guard?", guard":"", + pref_addr?", preferred address":""); flags &= ~ (CRN_NEED_UPTIME|CRN_NEED_CAPACITY|CRN_NEED_GUARD| CRN_PREF_ADDR); choice = router_choose_random_node(

1 0