- tor-commits - lists.torproject.org

[tor/release-0.2.2] refuse moria1.exit if moria1 is excluded
by arma＠torproject.org 27 Apr '11

27 Apr '11

commit 2b5c39211c2259404ab9bc23a1788b6d529e838f Author: Roger Dingledine <arma(a)torproject.org> Date: Fri Mar 11 05:29:28 2011 -0500 refuse moria1.exit if moria1 is excluded add a note reminding us to do this for foo.moria1.exit if we decide to. --- src/or/connection_edge.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index fff42be..4c74426 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -1610,6 +1610,10 @@ connection_ap_handshake_rewrite_and_attach(edge_connection_t *conn, tor_assert(!automap); if (s) { if (s[1] != '\0') { + /* XXX022-1090 we should look this up as a relay and see if it's + * in our excluded set, and refuse it here if so. But first, + * figure out what's up with this 'remapped_to_exit' business + * and whether that needs careful treatment. -RD */ conn->chosen_exit_name = tor_strdup(s+1); if (remapped_to_exit) /* 5 tries before it expires the addressmap */ conn->chosen_exit_retries = TRACKHOSTEXITS_RETRIES; @@ -1627,11 +1631,14 @@ connection_ap_handshake_rewrite_and_attach(edge_connection_t *conn, conn->chosen_exit_name = tor_strdup(socks->address); r = router_get_by_nickname(conn->chosen_exit_name, 1); *socks->address = 0; - if (r) { + if (r && (!options->_ExcludeExitNodesUnion || + !routerset_contains_router(options->_ExcludeExitNodesUnion, + r))) { strlcpy(socks->address, r->address, sizeof(socks->address)); } else { log_warn(LD_APP, - "Unrecognized server in exit address '%s.exit'. Refusing.", + "%s relay in exit address '%s.exit'. Refusing.", + r ? "Excluded" : "Unrecognized", safe_str_client(socks->address)); connection_mark_unattached_ap(conn, END_STREAM_REASON_TORPROTOCOL); return -1;

1 0

[tor/release-0.2.2] three more cases where maybe we want to exclude
by arma＠torproject.org 27 Apr '11

27 Apr '11

commit 5710ea64757cf0b36ab6d97409bbb9213116f949 Author: Roger Dingledine <arma(a)torproject.org> Date: Fri Mar 11 06:19:15 2011 -0500 three more cases where maybe we want to exclude --- src/or/circuitbuild.c | 1 + src/or/router.c | 2 ++ 2 files changed, 3 insertions(+), 0 deletions(-) diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index b8a82e8..4fa87c0 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -4570,6 +4570,7 @@ launch_direct_bridge_descriptor_fetch(bridge_info_t *bridge) return; /* it's already on the way */ address = tor_dup_addr(&bridge->addr); + /* XXX022-1090 if we ExcludeNodes this bridge, should this step fail? -RD */ directory_initiate_command(address, &bridge->addr, bridge->port, 0, 0, /* does not matter */ diff --git a/src/or/router.c b/src/or/router.c index c15b9b2..6993e1e 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -857,6 +857,7 @@ consider_testing_reachability(int test_or, int test_dir) log_info(LD_CIRC, "Testing %s of my ORPort: %s:%d.", !orport_reachable ? "reachability" : "bandwidth", me->address, me->or_port); + /* XXX022-1090 If we ExcludeNodes ourself, should this fail? -RD */ circuit_launch_by_router(CIRCUIT_PURPOSE_TESTING, me, CIRCLAUNCH_NEED_CAPACITY|CIRCLAUNCH_IS_INTERNAL); } @@ -867,6 +868,7 @@ consider_testing_reachability(int test_or, int test_dir) CONN_TYPE_DIR, &addr, me->dir_port, DIR_PURPOSE_FETCH_SERVERDESC)) { /* ask myself, via tor, for my server descriptor. */ + /* XXX022-1090 If we ExcludeNodes ourself, should this fail? -RD */ directory_initiate_command(me->address, &addr, me->or_port, me->dir_port, 0, /* does not matter */

1 0

[tor/release-0.2.2] Add an XXX022-1090 to note consider_exit_fmily b0rkenness
by arma＠torproject.org 27 Apr '11

27 Apr '11

commit affdec8d044513fb87a6dd8931be49974326e8e7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Mar 25 15:02:37 2011 -0400 Add an XXX022-1090 to note consider_exit_fmily b0rkenness --- src/or/circuitbuild.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index 4fa87c0..b6627a0 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -4142,6 +4142,8 @@ choose_random_entry(cpath_build_state_t *state) /* still no? if we're using bridges, * and our chosen exit is in the same family as all our * bridges, then be flexible about families. */ + /* XXXX022-1090 This is probably not what people want. Better to choose + * a new exit. */ consider_exit_family = 0; goto retry; }

1 0

[tor/release-0.2.2] If we're excluded, and StrictNodes is set, do not do self-tests.
by arma＠torproject.org 27 Apr '11

27 Apr '11

commit ca74badbe95be77bd990c9c4f9c1b26052d4159e Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 28 14:14:45 2011 -0400 If we're excluded, and StrictNodes is set, do not do self-tests. --- src/or/router.c | 22 ++++++++++++++++++++-- 1 files changed, 20 insertions(+), 2 deletions(-) diff --git a/src/or/router.c b/src/or/router.c index 6993e1e..64cb079 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -850,14 +850,33 @@ consider_testing_reachability(int test_or, int test_dir) routerinfo_t *me = router_get_my_routerinfo(); int orport_reachable = check_whether_orport_reachable(); tor_addr_t addr; + or_options_t *options = get_options(); if (!me) return; + if (routerset_contains_router(options->ExcludeNodes, me) && + options->StrictNodes) { + /* If we've excluded ourself, and StrictNodes is set, we can't test + * ourself. */ + if (test_or || test_dir) { +#define SELF_EXCLUDED_WARN_INTERVAL 3600 + static ratelim_t warning_limit=RATELIM_INIT(SELF_EXCLUDED_WARN_INTERVAL); + char *msg; + if ((msg = rate_limit_log(&warning_limit, approx_time()))) { + log_warn(LD_CIRC, "Can't peform self-tests for this relay: we have " + "listed ourself in ExcludeNodes, and StrictNodes is set. " + "We will cannot learn whether we are usable, and will not " + "be able to advertise ourself.%s", msg); + tor_free(msg); + } + } + return; + } + if (test_or && (!orport_reachable || !circuit_enough_testing_circs())) { log_info(LD_CIRC, "Testing %s of my ORPort: %s:%d.", !orport_reachable ? "reachability" : "bandwidth", me->address, me->or_port); - /* XXX022-1090 If we ExcludeNodes ourself, should this fail? -RD */ circuit_launch_by_router(CIRCUIT_PURPOSE_TESTING, me, CIRCLAUNCH_NEED_CAPACITY|CIRCLAUNCH_IS_INTERNAL); } @@ -868,7 +887,6 @@ consider_testing_reachability(int test_or, int test_dir) CONN_TYPE_DIR, &addr, me->dir_port, DIR_PURPOSE_FETCH_SERVERDESC)) { /* ask myself, via tor, for my server descriptor. */ - /* XXX022-1090 If we ExcludeNodes ourself, should this fail? -RD */ directory_initiate_command(me->address, &addr, me->or_port, me->dir_port, 0, /* does not matter */

1 0

[tor/release-0.2.2] Note that circuit purpose changing can violate ExcludeNodes
by arma＠torproject.org 27 Apr '11

27 Apr '11

commit db2fd28308fb019e59280219cf95f09f5208092f Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 28 16:44:40 2011 -0400 Note that circuit purpose changing can violate ExcludeNodes --- src/or/rendservice.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/src/or/rendservice.c b/src/or/rendservice.c index 88f1ba3..5b85394 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -1352,6 +1352,9 @@ rend_service_intro_has_opened(origin_circuit_t *circuit) log_info(LD_CIRC|LD_REND, "We have just finished an introduction " "circuit, but we already have enough. Redefining purpose to " "general."); + /* XXX022-1090: This can wind up violating ExcludeNodes/ + * ExitNodes/ExcludeExitNodes restrictions. + */ TO_CIRCUIT(circuit)->purpose = CIRCUIT_PURPOSE_C_GENERAL; circuit_has_opened(circuit); return;

1 0

[tor/release-0.2.2] make formal a constraint that's been true a while now
by arma＠torproject.org 27 Apr '11

27 Apr '11

commit 9f47cfc21a8fa91b98a48291c316121135fa3f17 Author: Roger Dingledine <arma(a)torproject.org> Date: Fri Mar 11 05:39:26 2011 -0500 make formal a constraint that's been true a while now --- src/or/config.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index bd904dc..404e648 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -3189,6 +3189,12 @@ options_validate(or_options_t *old_options, or_options_t *options, REJECT("Servers must be able to freely connect to the rest " "of the Internet, so they must not set UseBridges."); + /* If both of these are set, we'll end up with funny behavior where we + * demand enough entrynodes be up and running else we won't build + * circuits, yet we never actually use them. */ + if (options->UseBridges && options->EntryNodes) + REJECT("You cannot set both UseBridges and EntryNodes."); + options->_AllowInvalid = 0; if (options->AllowInvalidNodes) { SMARTLIST_FOREACH(options->AllowInvalidNodes, const char *, cp, {

1 0

[tor/release-0.2.2] Expose a new process_signal(uintptr_t), not signal_callback()
by arma＠torproject.org 27 Apr '11

27 Apr '11

commit f810a1afe990788cd8f944a515a493902df84ed1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 26 15:20:08 2011 -0400 Expose a new process_signal(uintptr_t), not signal_callback() This is a tweak to the bug2917 fix. Basically, if we want to simulate a signal arriving in the controller, we shouldn't have to pretend that we're Libevent, or depend on how Tor sets up its Libevent callbacks. --- src/or/control.c | 3 ++- src/or/main.c | 10 +++++++++- src/or/main.h | 2 +- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/src/or/control.c b/src/or/control.c index bb1c330..9f7739a 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -1222,7 +1222,8 @@ handle_control_signal(control_connection_t *conn, uint32_t len, /* Flush the "done" first if the signal might make us shut down. */ if (sig == SIGTERM || sig == SIGINT) connection_handle_write(TO_CONN(conn), 1); - signal_callback(0,0,(void*)(uintptr_t)sig); + + process_signal(sig); return 0; } diff --git a/src/or/main.c b/src/or/main.c index 5e4d88c..1699568 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -1578,12 +1578,20 @@ do_main_loop(void) /** Libevent callback: invoked when we get a signal. */ -void +static void signal_callback(int fd, short events, void *arg) { uintptr_t sig = (uintptr_t)arg; (void)fd; (void)events; + + process_signal(sig); +} + +/** Do the work of acting on a signal received in <b>sig</b> */ +void +process_signal(uintptr_t sig) +{ switch (sig) { case SIGTERM: diff --git a/src/or/main.h b/src/or/main.h index 626bf1c..0551f7a 100644 --- a/src/or/main.h +++ b/src/or/main.h @@ -47,7 +47,7 @@ void ip_address_changed(int at_interface); void dns_servers_relaunch_checks(void); void handle_signals(int is_parent); -void signal_callback(int fd, short events, void *arg); +void process_signal(uintptr_t sig); int try_locking(or_options_t *options, int err_if_locked); int have_lockfile(void);

1 0

[tor/release-0.2.2] Make eventdns server functions const void* to match libevent
by arma＠torproject.org 27 Apr '11

27 Apr '11

commit 6a829a340477a117d2e7cacc44688988d4b5be41 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jan 10 16:00:48 2011 -0500 Make eventdns server functions const void* to match libevent partial fix for bug 2332 --- src/or/dnsserv.c | 2 +- src/or/eventdns.c | 4 ++-- src/or/eventdns.h | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/or/dnsserv.c b/src/or/dnsserv.c index c491656..63ecbd2 100644 --- a/src/or/dnsserv.c +++ b/src/or/dnsserv.c @@ -280,7 +280,7 @@ dnsserv_resolved(edge_connection_t *conn, conn->socks_request->command == SOCKS_COMMAND_RESOLVE) { evdns_server_request_add_a_reply(req, name, - 1, (char*)answer, ttl); + 1, answer, ttl); } else if (answer_type == RESOLVED_TYPE_HOSTNAME && conn->socks_request->command == SOCKS_COMMAND_RESOLVE_PTR) { char *ans = tor_strndup(answer, answer_len); diff --git a/src/or/eventdns.c b/src/or/eventdns.c index 75a25bd..04913bf 100644 --- a/src/or/eventdns.c +++ b/src/or/eventdns.c @@ -1668,7 +1668,7 @@ evdns_server_request_add_reply(struct evdns_server_request *_req, int section, c /* exported function */ int -evdns_server_request_add_a_reply(struct evdns_server_request *req, const char *name, int n, void *addrs, int ttl) +evdns_server_request_add_a_reply(struct evdns_server_request *req, const char *name, int n, const void *addrs, int ttl) { return evdns_server_request_add_reply( req, EVDNS_ANSWER_SECTION, name, TYPE_A, CLASS_INET, @@ -1677,7 +1677,7 @@ evdns_server_request_add_a_reply(struct evdns_server_request *req, const char *n /* exported function */ int -evdns_server_request_add_aaaa_reply(struct evdns_server_request *req, const char *name, int n, void *addrs, int ttl) +evdns_server_request_add_aaaa_reply(struct evdns_server_request *req, const char *name, int n, const void *addrs, int ttl) { return evdns_server_request_add_reply( req, EVDNS_ANSWER_SECTION, name, TYPE_AAAA, CLASS_INET, diff --git a/src/or/eventdns.h b/src/or/eventdns.h index bf3b64d..2fe4ac9 100644 --- a/src/or/eventdns.h +++ b/src/or/eventdns.h @@ -323,8 +323,8 @@ struct evdns_server_port *evdns_add_server_port(int socket, int is_tcp, evdns_re void evdns_close_server_port(struct evdns_server_port *port); int evdns_server_request_add_reply(struct evdns_server_request *req, int section, const char *name, int type, int class, int ttl, int datalen, int is_name, const char *data); -int evdns_server_request_add_a_reply(struct evdns_server_request *req, const char *name, int n, void *addrs, int ttl); -int evdns_server_request_add_aaaa_reply(struct evdns_server_request *req, const char *name, int n, void *addrs, int ttl); +int evdns_server_request_add_a_reply(struct evdns_server_request *req, const char *name, int n, const void *addrs, int ttl); +int evdns_server_request_add_aaaa_reply(struct evdns_server_request *req, const char *name, int n, const void *addrs, int ttl); int evdns_server_request_add_ptr_reply(struct evdns_server_request *req, struct in_addr *in, const char *inaddr_name, const char *hostname, int ttl); int evdns_server_request_add_cname_reply(struct evdns_server_request *req, const char *name, const char *cname, int ttl);

1 0

[tor/release-0.2.2] Fix compilation in last patch
by arma＠torproject.org 27 Apr '11

27 Apr '11

commit 1cff525973c9e3934a4e1661b721b8a13d20ff72 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 26 11:14:46 2011 -0400 Fix compilation in last patch --- src/or/rephist.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/or/rephist.c b/src/or/rephist.c index 9146fce..524cd1d 100644 --- a/src/or/rephist.c +++ b/src/or/rephist.c @@ -1570,6 +1570,7 @@ rep_hist_update_bwhist_state_section(or_state_t *state, { char *cp; int i,j; + uint64_t maxval; if (*s_values) { SMARTLIST_FOREACH(*s_values, char *, val, tor_free(val)); @@ -1603,7 +1604,6 @@ rep_hist_update_bwhist_state_section(or_state_t *state, /* Set i to first position in circular array */ i = (b->num_maxes_set <= b->next_max_idx) ? 0 : b->next_max_idx; for (j=0; j < b->num_maxes_set; ++j,++i) { - uint64_t maxval; if (i >= NUM_TOTALS) i = 0; tor_asprintf(&cp, U64_FORMAT, U64_PRINTF_ARG(b->totals[i] & ~0x3ff));

1 0

[tor/release-0.2.2] Merge remote-tracking branch 'sebastian/bug2704' into maint-0.2.2
by arma＠torproject.org 27 Apr '11

27 Apr '11

commit f083347adf40164aac3b77d118ec372c89178d5a Merge: 4c789ec 6fde2b4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 26 11:07:48 2011 -0400 Merge remote-tracking branch 'sebastian/bug2704' into maint-0.2.2 changes/bug2704 | 5 +++++ src/or/rephist.c | 3 ++- 2 files changed, 7 insertions(+), 1 deletions(-)

1 0