- tor-commits - lists.torproject.org

[tor/master] relay: Add an address family to self-test launches
by nickm＠torproject.org 09 Jun '20

09 Jun '20

commit 18174fb82f236dd2c8c841f61cfe3d53697be2f8 Author: teor <teor(a)torproject.org> Date: Thu Apr 30 15:38:41 2020 +1000 relay: Add an address family to self-test launches Add an address family argument to the functions that launch relay ORPort self-test circuits. Part of 33222. --- src/feature/nodelist/routerinfo.c | 27 ++++++++++++++++++++++----- src/feature/nodelist/routerinfo.h | 5 +++-- src/feature/relay/selftest.c | 24 ++++++++++++++++++------ 3 files changed, 43 insertions(+), 13 deletions(-) diff --git a/src/feature/nodelist/routerinfo.c b/src/feature/nodelist/routerinfo.c index 0bf2a977f..d2462a53d 100644 --- a/src/feature/nodelist/routerinfo.c +++ b/src/feature/nodelist/routerinfo.c @@ -17,14 +17,31 @@ #include "feature/nodelist/node_st.h" #include "feature/nodelist/routerinfo_st.h" -/** Copy the primary (IPv4) OR port (IP address and TCP port) for - * router into *ap_out. */ +/** Copy the OR port (IP address and TCP port) for router and + * 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 -router_get_prim_orport(const routerinfo_t *router, tor_addr_port_t *ap_out) +router_get_orport(const routerinfo_t *router, + tor_addr_port_t *ap_out, + int family) { tor_assert(ap_out != NULL); - tor_addr_from_ipv4h(&ap_out->addr, router->addr); - ap_out->port = router->or_port; + if (family == AF_INET) { + tor_addr_from_ipv4h(&ap_out->addr, router->addr); + ap_out->port = router->or_port; + } 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; + } else { + /* Unsupported address family */ + tor_assert_nonfatal_unreached(); + tor_addr_port_make_null_ap(ap_out, AF_UNSPEC); + } } int diff --git a/src/feature/nodelist/routerinfo.h b/src/feature/nodelist/routerinfo.h index 604e47899..47601a131 100644 --- a/src/feature/nodelist/routerinfo.h +++ b/src/feature/nodelist/routerinfo.h @@ -12,8 +12,9 @@ #ifndef TOR_ROUTERINFO_H #define TOR_ROUTERINFO_H -void router_get_prim_orport(const routerinfo_t *router, - tor_addr_port_t *addr_port_out); +void router_get_orport(const routerinfo_t *router, + tor_addr_port_t *addr_port_out, + int family); int router_has_orport(const routerinfo_t *router, const tor_addr_port_t *orport); diff --git a/src/feature/relay/selftest.c b/src/feature/relay/selftest.c index 79d56a0bc..5fc23b7e1 100644 --- a/src/feature/relay/selftest.c +++ b/src/feature/relay/selftest.c @@ -127,15 +127,23 @@ router_should_check_reachability(int test_or, int test_dir) } /** Allocate and return a new extend_info_t that can be used to build - * a circuit to or through the router r. Uses the primary - * address of the router, so should only be called on a server. */ + * a circuit to or through the router r, using an address from + * family (if available). + * + * Clients don't have routerinfos, so this function should only be called on a + * server. + * + * If the requested address is not available, returns NULL. */ static extend_info_t * -extend_info_from_router(const routerinfo_t *r) +extend_info_from_router(const routerinfo_t *r, int family) { crypto_pk_t *rsa_pubkey; extend_info_t *info; tor_addr_port_t ap; - tor_assert(r); + + if (BUG(!r)) { + return NULL; + } /* Relays always assume that the first hop is reachable. They ignore * ReachableAddresses. */ @@ -147,7 +155,11 @@ extend_info_from_router(const routerinfo_t *r) else ed_id_key = NULL; - router_get_prim_orport(r, &ap); + router_get_orport(r, &ap, family); + if (!tor_addr_port_is_valid_ap(&ap, 0)) { + /* We don't have an ORPort for the requested family. */ + return NULL; + } rsa_pubkey = router_get_rsa_onion_pkey(r->onion_pkey, r->onion_pkey_len); info = extend_info_new(r->nickname, r->cache_info.identity_digest, ed_id_key, @@ -178,7 +190,7 @@ 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())) { - extend_info_t *ei = extend_info_from_router(me); + extend_info_t *ei = extend_info_from_router(me, AF_INET); /* XXX IPv6 self testing */ log_info(LD_CIRC, "Testing %s of my ORPort: %s:%d.", !orport_reachable ? "reachability" : "bandwidth",

1 0

[tor/master] relay: Refactor reachability circuit launches
by nickm＠torproject.org 09 Jun '20

09 Jun '20

commit a250dd6042c6d5afd108d793e4fab8079c9818a1 Author: teor <teor(a)torproject.org> Date: Thu Apr 30 21:05:18 2020 +1000 relay: Refactor reachability circuit launches Split OR and Dir reachability circuits into their own functions. Part of 33222. --- src/feature/relay/selftest.c | 83 ++++++++++++++++++++++++++++---------------- 1 file changed, 54 insertions(+), 29 deletions(-) diff --git a/src/feature/relay/selftest.c b/src/feature/relay/selftest.c index c3c75c899..fe2da42bb 100644 --- a/src/feature/relay/selftest.c +++ b/src/feature/relay/selftest.c @@ -169,6 +169,57 @@ extend_info_from_router(const routerinfo_t *r, int family) return info; } +/** Launch a self-testing circuit to our ORPort. The circuit can be used to + * test reachability or bandwidth. me is our own routerinfo. + * + * Logs an info-level status message. If orport_reachable is false, + * call it a reachability circuit. Otherwise, call it a bandwidth circuit. + * + * See router_do_reachability_checks() for details. */ +static void +router_do_orport_reachability_checks(const routerinfo_t *me, + int orport_reachable) +{ + extend_info_t *ei = extend_info_from_router(me, AF_INET); + /* XXX IPv6 self testing */ + log_info(LD_CIRC, "Testing %s of my ORPort: %s:%d.", + !orport_reachable ? "reachability" : "bandwidth", + fmt_addr32(me->addr), me->or_port); + circuit_launch_by_extend_info(CIRCUIT_PURPOSE_TESTING, ei, + CIRCLAUNCH_NEED_CAPACITY|CIRCLAUNCH_IS_INTERNAL); + extend_info_free(ei); +} + +/** Launch a self-testing circuit, and ask an exit to connect to our DirPort. + * me is our own routerinfo. + * + * See router_do_reachability_checks() for details. */ +static void +router_do_dirport_reachability_checks(const routerinfo_t *me) +{ + tor_addr_t addr; + tor_addr_from_ipv4h(&addr, me->addr); + if (!connection_get_by_type_addr_port_purpose( + CONN_TYPE_DIR, &addr, me->dir_port, + DIR_PURPOSE_FETCH_SERVERDESC)) { + /* XXX IPv6 self testing */ + tor_addr_port_t my_dirport; + memcpy(&my_dirport.addr, &addr, sizeof(addr)); + my_dirport.port = me->dir_port; + /* ask myself, via tor, for my server descriptor. */ + directory_request_t *req = + directory_request_new(DIR_PURPOSE_FETCH_SERVERDESC); + directory_request_set_dir_addr_port(req, &my_dirport); + directory_request_set_directory_id_digest(req, + me->cache_info.identity_digest); + // ask via an anon circuit, connecting to our dirport. + directory_request_set_indirection(req, DIRIND_ANON_DIRPORT); + directory_request_set_resource(req, "authority.z"); + directory_initiate_request(req); + directory_request_free(req); + } +} + /** Some time has passed, or we just got new directory information. * See if we currently believe our ORPort or DirPort to be * unreachable. If so, launch a new test for it. @@ -186,40 +237,14 @@ router_do_reachability_checks(int test_or, int test_dir) const routerinfo_t *me = router_get_my_routerinfo(); const or_options_t *options = get_options(); int orport_reachable = router_skip_orport_reachability_check(options); - tor_addr_t addr; if (router_should_check_reachability(test_or, test_dir)) { if (test_or && (!orport_reachable || !circuit_enough_testing_circs())) { - extend_info_t *ei = extend_info_from_router(me, AF_INET); - /* XXX IPv6 self testing */ - log_info(LD_CIRC, "Testing %s of my ORPort: %s:%d.", - !orport_reachable ? "reachability" : "bandwidth", - fmt_addr32(me->addr), me->or_port); - circuit_launch_by_extend_info(CIRCUIT_PURPOSE_TESTING, ei, - CIRCLAUNCH_NEED_CAPACITY|CIRCLAUNCH_IS_INTERNAL); - extend_info_free(ei); + router_do_orport_reachability_checks(me, orport_reachable); } - /* XXX IPv6 self testing */ - tor_addr_from_ipv4h(&addr, me->addr); - if (test_dir && !router_skip_dirport_reachability_check(options) && - !connection_get_by_type_addr_port_purpose( - CONN_TYPE_DIR, &addr, me->dir_port, - DIR_PURPOSE_FETCH_SERVERDESC)) { - tor_addr_port_t my_dirport; - memcpy(&my_dirport.addr, &addr, sizeof(addr)); - my_dirport.port = me->dir_port; - /* ask myself, via tor, for my server descriptor. */ - directory_request_t *req = - directory_request_new(DIR_PURPOSE_FETCH_SERVERDESC); - directory_request_set_dir_addr_port(req, &my_dirport); - directory_request_set_directory_id_digest(req, - me->cache_info.identity_digest); - // ask via an anon circuit, connecting to our dirport. - directory_request_set_indirection(req, DIRIND_ANON_DIRPORT); - directory_request_set_resource(req, "authority.z"); - directory_initiate_request(req); - directory_request_free(req); + if (test_dir && !router_skip_dirport_reachability_check(options)) { + router_do_dirport_reachability_checks(me); } } }

1 0

[tor/master] relay: Minor selftest comment updates
by nickm＠torproject.org 09 Jun '20

09 Jun '20

commit 42e765efad79d1615f27614d25b7fa062a78684e Author: teor <teor(a)torproject.org> Date: Thu Apr 30 15:08:57 2020 +1000 relay: Minor selftest comment updates Part of 33222. --- src/feature/relay/selftest.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/feature/relay/selftest.c b/src/feature/relay/selftest.c index 3b938d750..79d56a0bc 100644 --- a/src/feature/relay/selftest.c +++ b/src/feature/relay/selftest.c @@ -107,6 +107,7 @@ router_should_check_reachability(int test_or, int test_dir) if (!me) return 0; + /* Doesn't check our IPv6 address, see #34065. */ if (routerset_contains_router(options->ExcludeNodes, me, -1) && options->StrictNodes) { /* If we've excluded ourself, and StrictNodes is set, we can't test @@ -136,7 +137,8 @@ extend_info_from_router(const routerinfo_t *r) tor_addr_port_t ap; tor_assert(r); - /* Make sure we don't need to check address reachability */ + /* Relays always assume that the first hop is reachable. They ignore + * ReachableAddresses. */ tor_assert_nonfatal(router_connect_assume_or_reachable(get_options(), 0)); const ed25519_public_key_t *ed_id_key;

1 0

[tor/master] relay: Launch IPv4 and IPv6 ORPort self-test circuits
by nickm＠torproject.org 09 Jun '20

09 Jun '20

commit 2a0e48385d01ddb2c8a332faed1445110131d723 Author: teor <teor(a)torproject.org> Date: Thu Apr 30 21:51:45 2020 +1000 relay: Launch IPv4 and IPv6 ORPort self-test circuits When launching relay ORPort reachability self-tests, launch tests to the IPv4 and IPv6 ORPorts (if available). Part of 33222. --- src/feature/relay/selftest.c | 35 +++++++++++++++++++++++++---------- src/lib/net/address.c | 25 ++++++++++++++++++------- src/lib/net/address.h | 1 + 3 files changed, 44 insertions(+), 17 deletions(-) diff --git a/src/feature/relay/selftest.c b/src/feature/relay/selftest.c index 821422597..939fc90c8 100644 --- a/src/feature/relay/selftest.c +++ b/src/feature/relay/selftest.c @@ -15,24 +15,31 @@ #include "core/or/or.h" #include "app/config/config.h" + #include "core/mainloop/connection.h" #include "core/mainloop/mainloop.h" #include "core/mainloop/netstatus.h" + #include "core/or/circuitbuild.h" #include "core/or/circuitlist.h" #include "core/or/circuituse.h" #include "core/or/crypt_path_st.h" +#include "core/or/extend_info_st.h" #include "core/or/origin_circuit_st.h" #include "core/or/relay.h" + #include "feature/control/control_events.h" + #include "feature/dirclient/dirclient.h" #include "feature/dircommon/directory.h" + #include "feature/nodelist/authority_cert_st.h" #include "feature/nodelist/routerinfo.h" #include "feature/nodelist/routerinfo_st.h" #include "feature/nodelist/routerlist.h" // but... #include "feature/nodelist/routerset.h" #include "feature/nodelist/torcert.h" + #include "feature/relay/relay_periodic.h" #include "feature/relay/router.h" #include "feature/relay/selftest.h" @@ -169,8 +176,9 @@ extend_info_from_router(const routerinfo_t *r, int family) return info; } -/** Launch a self-testing circuit to our ORPort. The circuit can be used to - * test reachability or bandwidth. me is our own routerinfo. +/** Launch a self-testing circuit to one of our ORPorts, using an address from + * family (if available). The circuit can be used to test reachability + * or bandwidth. me is our own routerinfo. * * Logs an info-level status message. If orport_reachable is false, * call it a reachability circuit. Otherwise, call it a bandwidth circuit. @@ -178,16 +186,21 @@ extend_info_from_router(const routerinfo_t *r, int family) * See router_do_reachability_checks() for details. */ static void router_do_orport_reachability_checks(const routerinfo_t *me, + int family, int orport_reachable) { - extend_info_t *ei = extend_info_from_router(me, AF_INET); - /* XXX IPv6 self testing */ - log_info(LD_CIRC, "Testing %s of my ORPort: %s:%d.", - !orport_reachable ? "reachability" : "bandwidth", - fmt_addr32(me->addr), me->or_port); - circuit_launch_by_extend_info(CIRCUIT_PURPOSE_TESTING, ei, + extend_info_t *ei = extend_info_from_router(me, family); + + /* If 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); - extend_info_free(ei); + extend_info_free(ei); + } } /** Launch a self-testing circuit, and ask an exit to connect to our DirPort. @@ -242,7 +255,9 @@ 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())) { - router_do_orport_reachability_checks(me, orport_reachable); + /* We'll separate IPv4 and IPv6 reachability detection in #34067. */ + router_do_orport_reachability_checks(me, AF_INET, orport_reachable); + router_do_orport_reachability_checks(me, AF_INET6, orport_reachable); } if (test_dir && !router_skip_dirport_reachability_check(options)) { diff --git a/src/lib/net/address.c b/src/lib/net/address.c index 4193053ee..e112da947 100644 --- a/src/lib/net/address.c +++ b/src/lib/net/address.c @@ -1207,20 +1207,17 @@ fmt_addr32(uint32_t addr) return buf; } -/** Return a string representing the family of addr. +/** Return a string representing family. * * This string is a string constant, and must not be freed. * This function is thread-safe. */ const char * -fmt_addr_family(const tor_addr_t *addr) +fmt_af_family(sa_family_t family) { static int default_bug_once = 0; - IF_BUG_ONCE(!addr) - return "NULL pointer"; - - switch (tor_addr_family(addr)) { + switch (family) { case AF_INET6: return "IPv6"; case AF_INET: @@ -1232,7 +1229,7 @@ fmt_addr_family(const tor_addr_t *addr) default: if (!default_bug_once) { log_warn(LD_BUG, "Called with unknown address family %d", - (int)tor_addr_family(addr)); + (int)family); default_bug_once = 1; } return "unknown"; @@ -1240,6 +1237,20 @@ fmt_addr_family(const tor_addr_t *addr) //return "(unreachable code)"; } +/** Return a string representing the family of addr. + * + * This string is a string constant, and must not be freed. + * This function is thread-safe. + */ +const char * +fmt_addr_family(const tor_addr_t *addr) +{ + IF_BUG_ONCE(!addr) + return "NULL pointer"; + + return fmt_af_family(tor_addr_family(addr)); +} + /** Convert the string in src to a tor_addr_t addr. The string * may be an IPv4 address, or an IPv6 address surrounded by square brackets. * diff --git a/src/lib/net/address.h b/src/lib/net/address.h index b5754087c..1cf78beca 100644 --- a/src/lib/net/address.h +++ b/src/lib/net/address.h @@ -227,6 +227,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_af_family(sa_family_t family); const char *fmt_addr_family(const tor_addr_t *addr); MOCK_DECL(int,get_interface_address6,(int severity, sa_family_t family,

1 0

[tor/master] relay: Log IPv4 and IPv6 ORPorts when testing reachability
by nickm＠torproject.org 09 Jun '20

09 Jun '20

commit aade9f31e7a578a78d359be65f5a3805801bf329 Author: teor <teor(a)torproject.org> Date: Thu Apr 30 22:30:02 2020 +1000 relay: Log IPv4 and IPv6 ORPorts when testing reachability When a relay starts testing reachability, log its IPv6 ORPort. The existing code logs the IPv4 ORPort and DirPort. The IPv4 ORPort is required. The other ports are only logged if they are present. Part of 33222. --- src/feature/relay/selftest.c | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/src/feature/relay/selftest.c b/src/feature/relay/selftest.c index 939fc90c8..d19eb00d4 100644 --- a/src/feature/relay/selftest.c +++ b/src/feature/relay/selftest.c @@ -272,7 +272,7 @@ router_do_reachability_checks(int test_or, int test_dir) int inform_testing_reachability(void) { - char dirbuf[128]; + char extra_addrbuf[128]; char *address; const routerinfo_t *me = router_get_my_routerinfo(); if (!me) @@ -281,20 +281,28 @@ inform_testing_reachability(void) control_event_server_status(LOG_NOTICE, "CHECKING_REACHABILITY ORADDRESS=%s:%d", address, me->or_port); + 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)); + /* We'll add an IPv6 control event in #34068. */ + } if (me->dir_port) { - tor_snprintf(dirbuf, sizeof(dirbuf), " and DirPort %s:%d", + tor_snprintf(extra_addrbuf, sizeof(extra_addrbuf), " and DirPort %s:%d", address, me->dir_port); control_event_server_status(LOG_NOTICE, "CHECKING_REACHABILITY DIRADDRESS=%s:%d", address, me->dir_port); } - log_notice(LD_OR, "Now checking whether ORPort %s:%d%s %s reachable... " + 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)", - address, me->or_port, - me->dir_port ? dirbuf : "", - me->dir_port ? "are" : "is", - TIMEOUT_UNTIL_UNREACHABILITY_COMPLAINT/60); + has_ipv6 ? "s" : "", + address, me->or_port, + has_ipv6 || me->dir_port ? extra_addrbuf : "", + has_ipv6 || me->dir_port ? "are" : "is", + TIMEOUT_UNTIL_UNREACHABILITY_COMPLAINT/60); tor_free(address); return 1;

1 0

[tor/master] relay: Update some self-test comments for IPv6
by nickm＠torproject.org 09 Jun '20

09 Jun '20

commit 4969dee10254548d6f3718afe74496bfa0601063 Author: teor <teor(a)torproject.org> Date: Thu Apr 30 22:33:06 2020 +1000 relay: Update some self-test comments for IPv6 Part of 33222. --- 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 d19eb00d4..4a8ecdd94 100644 --- a/src/feature/relay/selftest.c +++ b/src/feature/relay/selftest.c @@ -328,6 +328,7 @@ router_orport_found_reachable(void) if (options->TestingTorNetwork == 1) { reschedule_descriptor_update_check(); } + /* We'll add an IPv6 event in #34068. */ control_event_server_status(LOG_NOTICE, "REACHABILITY_SUCCEEDED ORADDRESS=%s:%d", address, me->or_port); @@ -365,7 +366,9 @@ router_dirport_found_reachable(void) } /** We have enough testing circuits open. Send a bunch of "drop" - * cells down each of them, to exercise our bandwidth. */ + * cells down each of them, to exercise our bandwidth. + * + * May use IPv4 and IPv6 testing circuits (if available). */ void router_perform_bandwidth_test(int num_circs, time_t now) {

1 0

[tor/master] relay: Refactor dirport self-test circuit launch
by nickm＠torproject.org 09 Jun '20

09 Jun '20

commit 01d940e71b02fd133eda56e0bc9bee113854af7c Author: teor <teor(a)torproject.org> Date: Thu Apr 30 21:11:12 2020 +1000 relay: Refactor dirport self-test circuit launch Remove some redundant variables, and improve some comments. Explain that there are no advertised IPv6 DirPorts. Part of 33222. --- src/feature/relay/selftest.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/src/feature/relay/selftest.c b/src/feature/relay/selftest.c index fe2da42bb..821422597 100644 --- a/src/feature/relay/selftest.c +++ b/src/feature/relay/selftest.c @@ -193,26 +193,28 @@ router_do_orport_reachability_checks(const routerinfo_t *me, /** Launch a self-testing circuit, and ask an exit to connect to our DirPort. * me is our own routerinfo. * + * Relays don't advertise IPv6 DirPorts, so this function only supports IPv4. + * * See router_do_reachability_checks() for details. */ static void router_do_dirport_reachability_checks(const routerinfo_t *me) { - tor_addr_t addr; - tor_addr_from_ipv4h(&addr, me->addr); + tor_addr_port_t my_dirport; + tor_addr_from_ipv4h(&my_dirport.addr, me->addr); + my_dirport.port = me->dir_port; + + /* If there is already a pending connection, don't open another one. */ if (!connection_get_by_type_addr_port_purpose( - CONN_TYPE_DIR, &addr, me->dir_port, + CONN_TYPE_DIR, + &my_dirport.addr, my_dirport.port, DIR_PURPOSE_FETCH_SERVERDESC)) { - /* XXX IPv6 self testing */ - tor_addr_port_t my_dirport; - memcpy(&my_dirport.addr, &addr, sizeof(addr)); - my_dirport.port = me->dir_port; /* ask myself, via tor, for my server descriptor. */ directory_request_t *req = directory_request_new(DIR_PURPOSE_FETCH_SERVERDESC); directory_request_set_dir_addr_port(req, &my_dirport); directory_request_set_directory_id_digest(req, me->cache_info.identity_digest); - // ask via an anon circuit, connecting to our dirport. + /* ask via an anon circuit, connecting to our dirport. */ directory_request_set_indirection(req, DIRIND_ANON_DIRPORT); directory_request_set_resource(req, "authority.z"); directory_initiate_request(req);

1 0

[tor/master] circuitbuild: Allow relays to send IPv6 extend cells
by nickm＠torproject.org 09 Jun '20

09 Jun '20

commit 4a36dfebee080ccd56501042b2943c114544d7eb Author: teor <teor(a)torproject.org> Date: Thu Apr 30 22:55:52 2020 +1000 circuitbuild: Allow relays to send IPv6 extend cells Allow relays and bridges to send IPv4 or IPv6 extend cells. But keep restricting clients to IPv4 extend cells, because sending IPv6 extend cells would be an obvious version distinguisher. Part of 33222. --- src/core/or/circuitbuild.c | 31 +++++++++++++++++++++++++------ 1 file changed, 25 insertions(+), 6 deletions(-) diff --git a/src/core/or/circuitbuild.c b/src/core/or/circuitbuild.c index 75581abd3..c4d544a64 100644 --- a/src/core/or/circuitbuild.c +++ b/src/core/or/circuitbuild.c @@ -1075,14 +1075,25 @@ circuit_send_intermediate_onion_skin(origin_circuit_t *circ, crypt_path_t *hop) { int len; + int family = tor_addr_family(&hop->extend_info->addr); extend_cell_t ec; memset(&ec, 0, sizeof(ec)); log_debug(LD_CIRC,"starting to send subsequent skin."); - if (tor_addr_family(&hop->extend_info->addr) != AF_INET) { - log_warn(LD_BUG, "Trying to extend to a non-IPv4 address."); - return - END_CIRC_REASON_INTERNAL; + /* Relays and bridges can send IPv6 extends. But for clients, it's an + * obvious version distinguisher. */ + if (server_mode(get_options())) { + if (family != AF_INET && family != AF_INET6) { + log_warn(LD_BUG, "Server trying to extend to an invalid address " + "family."); + return - END_CIRC_REASON_INTERNAL; + } + } else { + if (family != AF_INET) { + log_warn(LD_BUG, "Client trying to extend to a non-IPv4 address."); + return - END_CIRC_REASON_INTERNAL; + } } circuit_pick_extend_handshake(&ec.cell_type, @@ -1090,9 +1101,17 @@ circuit_send_intermediate_onion_skin(origin_circuit_t *circ, &ec.create_cell.handshake_type, hop->extend_info); - tor_addr_copy(&ec.orport_ipv4.addr, &hop->extend_info->addr); - ec.orport_ipv4.port = hop->extend_info->port; - tor_addr_make_unspec(&ec.orport_ipv6.addr); + /* At the moment, extend_info only has one ORPort address. We'll add a + * second address in #34069, to support dual-stack extend cells. */ + if (family == AF_INET) { + tor_addr_copy(&ec.orport_ipv4.addr, &hop->extend_info->addr); + ec.orport_ipv4.port = hop->extend_info->port; + tor_addr_make_unspec(&ec.orport_ipv6.addr); + } else { + tor_addr_copy(&ec.orport_ipv6.addr, &hop->extend_info->addr); + ec.orport_ipv6.port = hop->extend_info->port; + tor_addr_make_unspec(&ec.orport_ipv4.addr); + } memcpy(ec.node_id, hop->extend_info->identity_digest, DIGEST_LEN); /* Set the ED25519 identity too -- it will only get included * in the extend2 cell if we're configured to use it, though. */

1 0

[tor/master] Replace several C identifiers.
by nickm＠torproject.org 09 Jun '20

09 Jun '20

commit 05c56ae455de1f8e1dc9816ab9dcd7f0cdc2c994 Author: teor <teor(a)riseup.net> Date: Thu May 7 20:07:13 2020 +1000 Replace several C identifiers. This is an automated commit, generated by this command: ./scripts/maint/rename_c_identifier.py \ router_skip_orport_reachability_check router_should_skip_orport_reachability_check \ router_skip_dirport_reachability_check router_should_skip_dirport_reachability_check \ router_connect_assume_or_reachable client_or_conn_should_skip_reachable_address_check \ router_connect_assume_dir_reachable client_dir_conn_should_skip_reachable_address_check It was generated with --no-verify, so it probably breaks some commit hooks. The commiter should be sure to fix them up in a subsequent commit. --- src/core/or/circuitbuild.c | 2 +- src/core/or/circuituse.c | 4 ++-- src/feature/control/control_getinfo.c | 8 ++++---- src/feature/nodelist/node_select.c | 8 ++++---- src/feature/nodelist/routerlist.c | 6 +++--- src/feature/nodelist/routerlist.h | 4 ++-- src/feature/relay/relay_periodic.c | 4 ++-- src/feature/relay/router.c | 4 ++-- src/feature/relay/selftest.c | 14 +++++++------- src/feature/relay/selftest.h | 8 ++++---- src/feature/stats/predict_ports.c | 4 ++-- 11 files changed, 33 insertions(+), 33 deletions(-) diff --git a/src/core/or/circuitbuild.c b/src/core/or/circuitbuild.c index c4d544a64..8d5988b63 100644 --- a/src/core/or/circuitbuild.c +++ b/src/core/or/circuitbuild.c @@ -1051,7 +1051,7 @@ circuit_build_no_more_hops(origin_circuit_t *circ) control_event_client_status(LOG_NOTICE, "CIRCUIT_ESTABLISHED"); clear_broken_connection_map(1); if (server_mode(options) && - !router_skip_orport_reachability_check(options)) { + !router_should_skip_orport_reachability_check(options)) { inform_testing_reachability(); router_do_reachability_checks(1, 1); } diff --git a/src/core/or/circuituse.c b/src/core/or/circuituse.c index 51e328133..3ab527f42 100644 --- a/src/core/or/circuituse.c +++ b/src/core/or/circuituse.c @@ -1641,7 +1641,7 @@ static void circuit_testing_opened(origin_circuit_t *circ) { if (have_performed_bandwidth_test || - !router_skip_orport_reachability_check(get_options())) { + !router_should_skip_orport_reachability_check(get_options())) { /* either we've already done everything we want with testing circuits, * or this testing circuit became open due to a fluke, e.g. we picked * a last hop where we already had the connection open due to an @@ -1659,7 +1659,7 @@ static void circuit_testing_failed(origin_circuit_t *circ, int at_last_hop) { const or_options_t *options = get_options(); - if (server_mode(options) && router_skip_orport_reachability_check(options)) + if (server_mode(options) && router_should_skip_orport_reachability_check(options)) return; log_info(LD_GENERAL, diff --git a/src/feature/control/control_getinfo.c b/src/feature/control/control_getinfo.c index d80d5a73f..52cf54b1c 100644 --- a/src/feature/control/control_getinfo.c +++ b/src/feature/control/control_getinfo.c @@ -1276,15 +1276,15 @@ getinfo_helper_events(control_connection_t *control_conn, *answer = tor_strdup(directories_have_accepted_server_descriptor() ? "1" : "0"); } else if (!strcmp(question, "status/reachability-succeeded/or")) { - *answer = tor_strdup(router_skip_orport_reachability_check(options) ? + *answer = tor_strdup(router_should_skip_orport_reachability_check(options) ? "1" : "0"); } else if (!strcmp(question, "status/reachability-succeeded/dir")) { - *answer = tor_strdup(router_skip_dirport_reachability_check(options) ? + *answer = tor_strdup(router_should_skip_dirport_reachability_check(options) ? "1" : "0"); } else if (!strcmp(question, "status/reachability-succeeded")) { tor_asprintf(answer, "OR=%d DIR=%d", - router_skip_orport_reachability_check(options) ? 1 : 0, - router_skip_dirport_reachability_check(options) ? 1 : 0); + router_should_skip_orport_reachability_check(options) ? 1 : 0, + router_should_skip_dirport_reachability_check(options) ? 1 : 0); } else if (!strcmp(question, "status/bootstrap-phase")) { *answer = control_event_boot_last_msg(); } else if (!strcmpstart(question, "status/version/")) { diff --git a/src/feature/nodelist/node_select.c b/src/feature/nodelist/node_select.c index da10856f5..d2118c524 100644 --- a/src/feature/nodelist/node_select.c +++ b/src/feature/nodelist/node_select.c @@ -321,9 +321,9 @@ router_pick_directory_server_impl(dirinfo_type_t type, int flags, overloaded_direct = smartlist_new(); overloaded_tunnel = smartlist_new(); - const int skip_or_fw = router_connect_assume_or_reachable(options, + const int skip_or_fw = client_or_conn_should_skip_reachable_address_check(options, try_ip_pref); - const int skip_dir_fw = router_connect_assume_dir_reachable(options, + const int skip_dir_fw = client_dir_conn_should_skip_reachable_address_check(options, try_ip_pref); const int must_have_or = dirclient_must_use_begindir(options); @@ -1122,9 +1122,9 @@ router_pick_trusteddirserver_impl(const smartlist_t *sourcelist, overloaded_direct = smartlist_new(); overloaded_tunnel = smartlist_new(); - const int skip_or_fw = router_connect_assume_or_reachable(options, + const int skip_or_fw = client_or_conn_should_skip_reachable_address_check(options, try_ip_pref); - const int skip_dir_fw = router_connect_assume_dir_reachable(options, + const int skip_dir_fw = client_dir_conn_should_skip_reachable_address_check(options, try_ip_pref); const int must_have_or = dirclient_must_use_begindir(options); diff --git a/src/feature/nodelist/routerlist.c b/src/feature/nodelist/routerlist.c index df94e1dce..0e8fff7c3 100644 --- a/src/feature/nodelist/routerlist.c +++ b/src/feature/nodelist/routerlist.c @@ -476,7 +476,7 @@ router_reload_router_list(void) * Finally, return true if ReachableAddresses is set. */ int -router_connect_assume_or_reachable(const or_options_t *options, +client_or_conn_should_skip_reachable_address_check(const or_options_t *options, int try_ip_pref) { /* Servers always have and prefer IPv4. @@ -491,7 +491,7 @@ router_connect_assume_or_reachable(const or_options_t *options, * This function is obsolete, because clients only use ORPorts. */ int -router_connect_assume_dir_reachable(const or_options_t *options, +client_dir_conn_should_skip_reachable_address_check(const or_options_t *options, int try_ip_pref) { /* Servers always have and prefer IPv4. @@ -518,7 +518,7 @@ router_add_running_nodes_to_smartlist(smartlist_t *sl, int need_uptime, int need_desc, int pref_addr, int direct_conn) { - const int check_reach = !router_connect_assume_or_reachable(get_options(), + const int check_reach = !client_or_conn_should_skip_reachable_address_check(get_options(), pref_addr); /* XXXX MOVE */ SMARTLIST_FOREACH_BEGIN(nodelist_get_list(), const node_t *, node) { diff --git a/src/feature/nodelist/routerlist.h b/src/feature/nodelist/routerlist.h index 78d8bfc64..55eec6c3f 100644 --- a/src/feature/nodelist/routerlist.h +++ b/src/feature/nodelist/routerlist.h @@ -50,9 +50,9 @@ typedef enum was_router_added_t { int router_reload_router_list(void); -int router_connect_assume_or_reachable(const or_options_t *options, +int client_or_conn_should_skip_reachable_address_check(const or_options_t *options, int try_ip_pref); -int router_connect_assume_dir_reachable(const or_options_t *options, +int client_dir_conn_should_skip_reachable_address_check(const or_options_t *options, int try_ip_pref); void router_reset_status_download_failures(void); int routers_have_same_or_addrs(const routerinfo_t *r1, const routerinfo_t *r2); diff --git a/src/feature/relay/relay_periodic.c b/src/feature/relay/relay_periodic.c index c8b6a7d80..2b6be1ce1 100644 --- a/src/feature/relay/relay_periodic.c +++ b/src/feature/relay/relay_periodic.c @@ -201,7 +201,7 @@ reachability_warnings_callback(time_t now, const or_options_t *options) have_completed_a_circuit()) { /* every 20 minutes, check and complain if necessary */ const routerinfo_t *me = router_get_my_routerinfo(); - if (me && !router_skip_orport_reachability_check(options)) { + if (me && !router_should_skip_orport_reachability_check(options)) { char *address = tor_dup_ip(me->addr); log_warn(LD_CONFIG,"Your server (%s:%d) has not managed to confirm that " "its ORPort is reachable. Relays do not publish descriptors " @@ -214,7 +214,7 @@ reachability_warnings_callback(time_t now, const or_options_t *options) tor_free(address); } - if (me && !router_skip_dirport_reachability_check(options)) { + if (me && !router_should_skip_dirport_reachability_check(options)) { char *address = tor_dup_ip(me->addr); log_warn(LD_CONFIG, "Your server (%s:%d) has not managed to confirm that its " diff --git a/src/feature/relay/router.c b/src/feature/relay/router.c index ebe656590..1a35e27e1 100644 --- a/src/feature/relay/router.c +++ b/src/feature/relay/router.c @@ -1361,14 +1361,14 @@ decide_if_publishable_server(void) return 1; if (!router_get_advertised_or_port(options)) return 0; - if (!router_skip_orport_reachability_check(options)) + if (!router_should_skip_orport_reachability_check(options)) return 0; if (router_have_consensus_path() == CONSENSUS_PATH_INTERNAL) { /* All set: there are no exits in the consensus (maybe this is a tiny * test network), so we can't check our DirPort reachability. */ return 1; } else { - return router_skip_dirport_reachability_check(options); + return router_should_skip_dirport_reachability_check(options); } } diff --git a/src/feature/relay/selftest.c b/src/feature/relay/selftest.c index 4a8ecdd94..a498e3dff 100644 --- a/src/feature/relay/selftest.c +++ b/src/feature/relay/selftest.c @@ -77,7 +77,7 @@ router_reachability_checks_disabled(const or_options_t *options) * - the network is disabled. */ int -router_skip_orport_reachability_check(const or_options_t *options) +router_should_skip_orport_reachability_check(const or_options_t *options) { int reach_checks_disabled = router_reachability_checks_disabled(options); return reach_checks_disabled || @@ -94,7 +94,7 @@ router_skip_orport_reachability_check(const or_options_t *options) * - the network is disabled. */ int -router_skip_dirport_reachability_check(const or_options_t *options) +router_should_skip_dirport_reachability_check(const or_options_t *options) { int reach_checks_disabled = router_reachability_checks_disabled(options) || !options->DirPort_set; @@ -154,7 +154,7 @@ extend_info_from_router(const routerinfo_t *r, int family) /* Relays always assume that the first hop is reachable. They ignore * ReachableAddresses. */ - tor_assert_nonfatal(router_connect_assume_or_reachable(get_options(), 0)); + tor_assert_nonfatal(client_or_conn_should_skip_reachable_address_check(get_options(), 0)); const ed25519_public_key_t *ed_id_key; if (r->cache_info.signing_key_cert) @@ -251,7 +251,7 @@ router_do_reachability_checks(int test_or, int test_dir) { const routerinfo_t *me = router_get_my_routerinfo(); const or_options_t *options = get_options(); - int orport_reachable = router_skip_orport_reachability_check(options); + int orport_reachable = router_should_skip_orport_reachability_check(options); if (router_should_check_reachability(test_or, test_dir)) { if (test_or && (!orport_reachable || !circuit_enough_testing_circs())) { @@ -260,7 +260,7 @@ router_do_reachability_checks(int test_or, int test_dir) router_do_orport_reachability_checks(me, AF_INET6, orport_reachable); } - if (test_dir && !router_skip_dirport_reachability_check(options)) { + if (test_dir && !router_should_skip_dirport_reachability_check(options)) { router_do_dirport_reachability_checks(me); } } @@ -319,7 +319,7 @@ router_orport_found_reachable(void) log_notice(LD_OR,"Self-testing indicates your ORPort is reachable from " "the outside. Excellent.%s", options->PublishServerDescriptor_ != NO_DIRINFO - && router_skip_dirport_reachability_check(options) ? + && router_should_skip_dirport_reachability_check(options) ? " Publishing server descriptor." : ""); can_reach_or_port = 1; mark_my_descriptor_dirty("ORPort found reachable"); @@ -347,7 +347,7 @@ router_dirport_found_reachable(void) log_notice(LD_DIRSERV,"Self-testing indicates your DirPort is reachable " "from the outside. Excellent.%s", options->PublishServerDescriptor_ != NO_DIRINFO - && router_skip_orport_reachability_check(options) ? + && router_should_skip_orport_reachability_check(options) ? " Publishing server descriptor." : ""); can_reach_dir_port = 1; if (router_should_advertise_dirport(options, me->dir_port)) { diff --git a/src/feature/relay/selftest.h b/src/feature/relay/selftest.h index ce30d92a2..f2350cf8f 100644 --- a/src/feature/relay/selftest.h +++ b/src/feature/relay/selftest.h @@ -15,8 +15,8 @@ #ifdef HAVE_MODULE_RELAY struct or_options_t; -int router_skip_orport_reachability_check(const struct or_options_t *options); -int router_skip_dirport_reachability_check(const struct or_options_t *options); +int router_should_skip_orport_reachability_check(const struct or_options_t *options); +int router_should_skip_dirport_reachability_check(const struct or_options_t *options); void router_do_reachability_checks(int test_or, int test_dir); void router_perform_bandwidth_test(int num_circs, time_t now); @@ -29,9 +29,9 @@ void router_reset_reachability(void); #else /* !defined(HAVE_MODULE_RELAY) */ -#define router_skip_orport_reachability_check(opts) \ +#define router_should_skip_orport_reachability_check(opts) \ ((void)(opts), 0) -#define router_skip_dirport_reachability_check(opts) \ +#define router_should_skip_dirport_reachability_check(opts) \ ((void)(opts), 0) static inline void diff --git a/src/feature/stats/predict_ports.c b/src/feature/stats/predict_ports.c index 4cb576c7c..440cea672 100644 --- a/src/feature/stats/predict_ports.c +++ b/src/feature/stats/predict_ports.c @@ -270,10 +270,10 @@ rep_hist_circbuilding_dormant(time_t now) /* see if we'll still need to build testing circuits */ if (server_mode(options) && - (!router_skip_orport_reachability_check(options) || + (!router_should_skip_orport_reachability_check(options) || !circuit_enough_testing_circs())) return 0; - if (!router_skip_dirport_reachability_check(options)) + if (!router_should_skip_dirport_reachability_check(options)) return 0; return 1;

1 0

[tor/master] Replace several C identifiers.
by nickm＠torproject.org 09 Jun '20

09 Jun '20

commit e1eecac88866fa66e9d77c251a31d85131f11aef Author: teor <teor(a)riseup.net> Date: Thu May 7 20:17:57 2020 +1000 Replace several C identifiers. This is an automated commit, generated by this command: ./scripts/maint/rename_c_identifier.py \ client_or_conn_should_skip_reachable_address_check router_or_conn_should_skip_reachable_address_check \ client_dir_conn_should_skip_reachable_address_check router_dir_conn_should_skip_reachable_address_check --- src/feature/nodelist/node_select.c | 8 ++++---- src/feature/nodelist/routerlist.c | 6 +++--- src/feature/nodelist/routerlist.h | 4 ++-- src/feature/relay/selftest.c | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/feature/nodelist/node_select.c b/src/feature/nodelist/node_select.c index bd63cd3b6..40d0f2a5b 100644 --- a/src/feature/nodelist/node_select.c +++ b/src/feature/nodelist/node_select.c @@ -321,10 +321,10 @@ router_pick_directory_server_impl(dirinfo_type_t type, int flags, overloaded_direct = smartlist_new(); overloaded_tunnel = smartlist_new(); - const int skip_or_fw = client_or_conn_should_skip_reachable_address_check( + const int skip_or_fw = router_or_conn_should_skip_reachable_address_check( options, try_ip_pref); - const int skip_dir_fw = client_dir_conn_should_skip_reachable_address_check( + const int skip_dir_fw = router_dir_conn_should_skip_reachable_address_check( options, try_ip_pref); const int must_have_or = dirclient_must_use_begindir(options); @@ -1124,10 +1124,10 @@ router_pick_trusteddirserver_impl(const smartlist_t *sourcelist, overloaded_direct = smartlist_new(); overloaded_tunnel = smartlist_new(); - const int skip_or_fw = client_or_conn_should_skip_reachable_address_check( + const int skip_or_fw = router_or_conn_should_skip_reachable_address_check( options, try_ip_pref); - const int skip_dir_fw = client_dir_conn_should_skip_reachable_address_check( + const int skip_dir_fw = router_dir_conn_should_skip_reachable_address_check( options, try_ip_pref); const int must_have_or = dirclient_must_use_begindir(options); diff --git a/src/feature/nodelist/routerlist.c b/src/feature/nodelist/routerlist.c index 2a5353c56..e51125626 100644 --- a/src/feature/nodelist/routerlist.c +++ b/src/feature/nodelist/routerlist.c @@ -476,7 +476,7 @@ router_reload_router_list(void) * Finally, return true if ReachableAddresses is set. */ int -client_or_conn_should_skip_reachable_address_check( +router_or_conn_should_skip_reachable_address_check( const or_options_t *options, int try_ip_pref) { @@ -492,7 +492,7 @@ client_or_conn_should_skip_reachable_address_check( * This function is obsolete, because clients only use ORPorts. */ int -client_dir_conn_should_skip_reachable_address_check( +router_dir_conn_should_skip_reachable_address_check( const or_options_t *options, int try_ip_pref) { @@ -520,7 +520,7 @@ router_add_running_nodes_to_smartlist(smartlist_t *sl, int need_uptime, int need_desc, int pref_addr, int direct_conn) { - const int check_reach = !client_or_conn_should_skip_reachable_address_check( + const int check_reach = !router_or_conn_should_skip_reachable_address_check( get_options(), pref_addr); /* XXXX MOVE */ diff --git a/src/feature/nodelist/routerlist.h b/src/feature/nodelist/routerlist.h index 5256298d8..401ce5e35 100644 --- a/src/feature/nodelist/routerlist.h +++ b/src/feature/nodelist/routerlist.h @@ -50,10 +50,10 @@ typedef enum was_router_added_t { int router_reload_router_list(void); -int client_or_conn_should_skip_reachable_address_check( +int router_or_conn_should_skip_reachable_address_check( const or_options_t *options, int try_ip_pref); -int client_dir_conn_should_skip_reachable_address_check( +int router_dir_conn_should_skip_reachable_address_check( const or_options_t *options, int try_ip_pref); void router_reset_status_download_failures(void); diff --git a/src/feature/relay/selftest.c b/src/feature/relay/selftest.c index 23e4a7dec..4093218fb 100644 --- a/src/feature/relay/selftest.c +++ b/src/feature/relay/selftest.c @@ -154,7 +154,7 @@ extend_info_from_router(const routerinfo_t *r, int family) /* Relays always assume that the first hop is reachable. They ignore * ReachableAddresses. */ - tor_assert_nonfatal(client_or_conn_should_skip_reachable_address_check( + tor_assert_nonfatal(router_or_conn_should_skip_reachable_address_check( get_options(), 0)); const ed25519_public_key_t *ed_id_key;

1 0