April 2013 - tor-commits - lists.torproject.org

[tor/release-0.2.4] Improve comment for routers_with_measured_bw static var in dirserv.c
by arma＠torproject.org 11 Apr '13

11 Apr '13

commit 0164f16f70d17da202c8085e620e9cf043eda0b3 Author: Andrea Shepard <andrea(a)torproject.org> Date: Mon Mar 18 12:04:41 2013 -0700 Improve comment for routers_with_measured_bw static var in dirserv.c --- src/or/dirserv.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/src/or/dirserv.c b/src/or/dirserv.c index cf11e50..5aed3fb 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -66,7 +66,11 @@ static cached_dir_t *the_directory = NULL; /** For authoritative directories: the current (v1) network status. */ static cached_dir_t the_runningrouters; -/** Total number of routers with measured bandwidth */ +/** Total number of routers with measured bandwidth; this is set by + * dirserv_count_measured_bws() before the loop in + * dirserv_generate_networkstatus_vote_obj() and checked by + * dirserv_get_credible_bandwidth() and + * dirserv_compute_performance_thresholds() */ static int routers_with_measured_bw = 0; static void directory_remove_invalid(void);

1 0

[tor/release-0.2.4] Merge remote-tracking branch 'andrea/bug8435' into maint-0.2.4
by arma＠torproject.org 11 Apr '13

11 Apr '13

commit 5959d1c10581399efb46eeb6c0de66547894ed65 Merge: 3f837d4 0164f16 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 18 15:17:11 2013 -0400 Merge remote-tracking branch 'andrea/bug8435' into maint-0.2.4 changes/bug8273 | 3 + changes/bug8435 | 4 + src/or/config.c | 1 + src/or/dirserv.c | 288 ++++++++++++++++++++++++++++++++++++++++++++++++--- src/or/dirserv.h | 13 +++ src/or/or.h | 4 + src/test/test_dir.c | 78 ++++++++++++++ 7 files changed, 375 insertions(+), 16 deletions(-)

1 0

[tor/release-0.2.4] Make stream events for RESOLVE lookups more consistent
by arma＠torproject.org 11 Apr '13

11 Apr '13

commit 3f837d4826cce0e7917e79d73b81aefc3fefc6bd Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 18 15:13:59 2013 -0400 Make stream events for RESOLVE lookups more consistent Fixes 8203; patch by Desoxy --- changes/bug8203 | 4 ++++ src/or/connection_edge.c | 15 +++++++++------ src/or/control.c | 10 +++------- src/or/dnsserv.c | 10 ++++++++-- src/or/dnsserv.h | 2 +- 5 files changed, 25 insertions(+), 16 deletions(-) diff --git a/changes/bug8203 b/changes/bug8203 new file mode 100644 index 0000000..d26dc0f --- /dev/null +++ b/changes/bug8203 @@ -0,0 +1,4 @@ + o Minor bugfixes: + - Make the format and order of STREAM events for DNS lookups consistent + among the various ways to launch DNS lookups. Fix for bug 8203; + bugfix on 0.2.0.24-rc. Patch by "Desoxy." diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index 84d5565..0660b1f 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -1945,13 +1945,14 @@ connection_ap_handshake_send_resolve(entry_connection_t *ap_conn) string_addr, payload_len) < 0) return -1; /* circuit is closed, don't continue */ - tor_free(base_conn->address); /* Maybe already set by dnsserv. */ - base_conn->address = tor_strdup("(Tor_internal)"); + if (!base_conn->address) { + /* This might be unnecessary. XXXX */ + base_conn->address = tor_dup_addr(&base_conn->addr); + } base_conn->state = AP_CONN_STATE_RESOLVE_WAIT; log_info(LD_APP,"Address sent for resolve, ap socket "TOR_SOCKET_T_FORMAT ", n_circ_id %u", base_conn->s, (unsigned)circ->base_.n_circ_id); - control_event_stream_status(ap_conn, STREAM_EVENT_NEW, 0); control_event_stream_status(ap_conn, STREAM_EVENT_SENT_RESOLVE, 0); return 0; } @@ -2201,9 +2202,11 @@ connection_ap_handshake_socks_reply(entry_connection_t *conn, char *reply, tor_assert(conn->socks_request); /* make sure it's an AP stream */ - control_event_stream_status(conn, - status==SOCKS5_SUCCEEDED ? STREAM_EVENT_SUCCEEDED : STREAM_EVENT_FAILED, - endreason); + if (!SOCKS_COMMAND_IS_RESOLVE(conn->socks_request->command)) { + control_event_stream_status(conn, status==SOCKS5_SUCCEEDED ? + STREAM_EVENT_SUCCEEDED : STREAM_EVENT_FAILED, + endreason); + } /* Flag this stream's circuit as having completed a stream successfully * (for path bias) */ diff --git a/src/or/control.c b/src/or/control.c index 03e5d79..2a68464 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -2939,7 +2939,7 @@ handle_control_resolve(control_connection_t *conn, uint32_t len, failed = smartlist_new(); SMARTLIST_FOREACH(args, const char *, arg, { if (!is_keyval_pair(arg)) { - if (dnsserv_launch_request(arg, is_reverse)<0) + if (dnsserv_launch_request(arg, is_reverse, conn)<0) smartlist_add(failed, (char*)arg); } }); @@ -3742,7 +3742,7 @@ control_event_stream_status(entry_connection_t *conn, stream_status_event_t tp, } } - if (tp == STREAM_EVENT_NEW) { + if (tp == STREAM_EVENT_NEW || tp == STREAM_EVENT_NEW_RESOLVE) { tor_snprintf(addrport_buf,sizeof(addrport_buf), " SOURCE_ADDR=%s:%d", ENTRY_TO_CONN(conn)->address, ENTRY_TO_CONN(conn)->port); } else { @@ -3752,11 +3752,7 @@ control_event_stream_status(entry_connection_t *conn, stream_status_event_t tp, if (tp == STREAM_EVENT_NEW_RESOLVE) { purpose = " PURPOSE=DNS_REQUEST"; } else if (tp == STREAM_EVENT_NEW) { - if (ENTRY_TO_EDGE_CONN(conn)->is_dns_request || - (conn->socks_request && - SOCKS_COMMAND_IS_RESOLVE(conn->socks_request->command))) - purpose = " PURPOSE=DNS_REQUEST"; - else if (conn->use_begindir) { + if (conn->use_begindir) { connection_t *linked = ENTRY_TO_CONN(conn)->linked_conn; int linked_dir_purpose = -1; if (linked && linked->type == CONN_TYPE_DIR) diff --git a/src/or/dnsserv.c b/src/or/dnsserv.c index 7032b58..e877b18 100644 --- a/src/or/dnsserv.c +++ b/src/or/dnsserv.c @@ -147,7 +147,7 @@ evdns_server_callback(struct evdns_server_request *req, void *data_) return; } - control_event_stream_status(entry_conn, STREAM_EVENT_NEW, 0); + control_event_stream_status(entry_conn, STREAM_EVENT_NEW_RESOLVE, 0); /* Now, unless a controller asked us to leave streams unattached, * throw the connection over to get rewritten (which will @@ -170,7 +170,7 @@ evdns_server_callback(struct evdns_server_request *req, void *data_) * response; -1 if we couldn't launch the request. */ int -dnsserv_launch_request(const char *name, int reverse) +dnsserv_launch_request(const char *name, int reverse, control_connection_t *control_conn) { entry_connection_t *entry_conn; edge_connection_t *conn; @@ -181,6 +181,10 @@ dnsserv_launch_request(const char *name, int reverse) conn = ENTRY_TO_EDGE_CONN(entry_conn); conn->base_.state = AP_CONN_STATE_RESOLVE_WAIT; + tor_addr_copy(&TO_CONN(conn)->addr, &control_conn->base_.addr); + TO_CONN(conn)->port = control_conn->base_.port; + TO_CONN(conn)->address = tor_dup_addr(&control_conn->base_.addr); + if (reverse) entry_conn->socks_request->command = SOCKS_COMMAND_RESOLVE_PTR; else @@ -203,6 +207,8 @@ dnsserv_launch_request(const char *name, int reverse) return -1; } + control_event_stream_status(entry_conn, STREAM_EVENT_NEW_RESOLVE, 0); + /* Now, unless a controller asked us to leave streams unattached, * throw the connection over to get rewritten (which will * answer it immediately if it's in the cache, or completely bogus, or diff --git a/src/or/dnsserv.h b/src/or/dnsserv.h index 6bdb98d..8462841 100644 --- a/src/or/dnsserv.h +++ b/src/or/dnsserv.h @@ -20,7 +20,7 @@ void dnsserv_resolved(entry_connection_t *conn, const char *answer, int ttl); void dnsserv_reject_request(entry_connection_t *conn); -int dnsserv_launch_request(const char *name, int is_reverse); +int dnsserv_launch_request(const char *name, int is_reverse, control_connection_t *control_conn); #endif

1 0

[tor/release-0.2.4] Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
by arma＠torproject.org 11 Apr '13

11 Apr '13

commit 2ac66e59f7b32bb7f975803c9d483848e755a08f Merge: 5959d1c ebb95d0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 18 15:28:39 2013 -0400 Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4 Conflicts: src/test/test_addr.c changes/bug8377 | 3 +++ src/common/address.c | 3 ++- src/test/test_addr.c | 36 ++++++++++++++++++++++++++++++++++++ 3 files changed, 41 insertions(+), 1 deletions(-) diff --cc src/test/test_addr.c index 890dfe4,e3f3807..fec85a4 --- a/src/test/test_addr.c +++ b/src/test/test_addr.c @@@ -723,134 -623,48 +723,170 @@@ test_addr_ip6_helpers(void ; } +/** Test tor_addr_port_parse(). */ +static void +test_addr_parse(void) +{ + int r; + tor_addr_t addr; + char buf[TOR_ADDR_BUF_LEN]; + uint16_t port = 0; + + /* Correct call. */ + r= tor_addr_port_parse(LOG_DEBUG, + "192.0.2.1:1234", + &addr, &port); + test_assert(r == 0); + tor_addr_to_str(buf, &addr, sizeof(buf), 0); + test_streq(buf, "192.0.2.1"); + test_eq(port, 1234); + + /* Domain name. */ + r= tor_addr_port_parse(LOG_DEBUG, + "torproject.org:1234", + &addr, &port); + test_assert(r == -1); + + /* Only IP. */ + r= tor_addr_port_parse(LOG_DEBUG, + "192.0.2.2", + &addr, &port); + test_assert(r == -1); + + /* Bad port. */ + r= tor_addr_port_parse(LOG_DEBUG, + "192.0.2.2:66666", + &addr, &port); + test_assert(r == -1); + + /* Only domain name */ + r= tor_addr_port_parse(LOG_DEBUG, + "torproject.org", + &addr, &port); + test_assert(r == -1); + + /* Bad IP address */ + r= tor_addr_port_parse(LOG_DEBUG, + "192.0.2:1234", + &addr, &port); + test_assert(r == -1); + + done: + ; +} + +static void +update_difference(int ipv6, uint8_t *d, + const tor_addr_t *a, const tor_addr_t *b) +{ + const int n_bytes = ipv6 ? 16 : 4; + uint8_t a_tmp[4], b_tmp[4]; + const uint8_t *ba, *bb; + int i; + + if (ipv6) { + ba = tor_addr_to_in6_addr8(a); + bb = tor_addr_to_in6_addr8(b); + } else { + set_uint32(a_tmp, tor_addr_to_ipv4n(a)); + set_uint32(b_tmp, tor_addr_to_ipv4n(b)); + ba = a_tmp; bb = b_tmp; + } + + for (i = 0; i < n_bytes; ++i) { + d[i] |= ba[i] ^ bb[i]; + } +} + +static void +test_virtaddrmap(void *data) +{ + /* Let's start with a bunch of random addresses. */ + int ipv6, bits, iter, b; + virtual_addr_conf_t cfg[2]; + uint8_t bytes[16]; + + (void)data; + + tor_addr_parse(&cfg[0].addr, "64.65.0.0"); + tor_addr_parse(&cfg[1].addr, "3491:c0c0::"); + + for (ipv6 = 0; ipv6 <= 1; ++ipv6) { + for (bits = 0; bits < 18; ++bits) { + tor_addr_t last_a; + cfg[ipv6].bits = bits; + memset(bytes, 0, sizeof(bytes)); + tor_addr_copy(&last_a, &cfg[ipv6].addr); + /* Generate 128 addresses with each addr/bits combination. */ + for (iter = 0; iter < 128; ++iter) { + tor_addr_t a; + + get_random_virtual_addr(&cfg[ipv6], &a); + //printf("%s\n", fmt_addr(&a)); + /* Make sure that the first b bits match the configured network */ + tt_int_op(0, ==, tor_addr_compare_masked(&a, &cfg[ipv6].addr, + bits, CMP_EXACT)); + + /* And track which bits have been different between pairs of + * addresses */ + update_difference(ipv6, bytes, &last_a, &a); + } + + /* Now make sure all but the first 'bits' bits of bytes are true */ + for (b = bits+1; b < (ipv6?128:32); ++b) { + tt_assert(1 & (bytes[b/8] >> (7-(b&7)))); + } + } + } + + done: + ; +} + + static void + test_addr_is_loopback(void *data) + { + static const struct loopback_item { + const char *name; + int is_loopback; + } loopback_items[] = { + { "::1", 1 }, + { "127.0.0.1", 1 }, + { "127.99.100.101", 1 }, + { "128.99.100.101", 0 }, + { "8.8.8.8", 0 }, + { "0.0.0.0", 0 }, + { "::2", 0 }, + { "::", 0 }, + { "::1.0.0.0", 0 }, + { NULL, 0 } + }; + + int i; + tor_addr_t addr; + (void)data; + + for (i=0; loopback_items[i].name; ++i) { + tt_int_op(tor_addr_parse(&addr, loopback_items[i].name), >=, 0); + tt_int_op(tor_addr_is_loopback(&addr), ==, loopback_items[i].is_loopback); + } + + tor_addr_make_unspec(&addr); + tt_int_op(tor_addr_is_loopback(&addr), ==, 0); + + done: + ; + } + #define ADDR_LEGACY(name) \ { #name, legacy_test_helper, 0, &legacy_setup, test_addr_ ## name } struct testcase_t addr_tests[] = { ADDR_LEGACY(basic), ADDR_LEGACY(ip6_helpers), + ADDR_LEGACY(parse), + { "virtaddr", test_virtaddrmap, 0, NULL, NULL }, + { "is_loopback", test_addr_is_loopback, 0, NULL, NULL }, END_OF_TESTCASES };

1 0

[tor/release-0.2.4] Merge remote-tracking branch 'public/bug8377' into maint-0.2.3
by arma＠torproject.org 11 Apr '13

11 Apr '13

commit ebb95d0f781e21a694a8de386ed0b75984b247d4 Merge: c6ca199 165b2c0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 18 15:27:50 2013 -0400 Merge remote-tracking branch 'public/bug8377' into maint-0.2.3 changes/bug8377 | 3 +++ src/common/address.c | 3 ++- src/test/test_addr.c | 36 ++++++++++++++++++++++++++++++++++++ 3 files changed, 41 insertions(+), 1 deletions(-)

1 0

[tor/release-0.2.4] Merge remote-tracking branch 'public/bug6673' into maint-0.2.4
by arma＠torproject.org 11 Apr '13

11 Apr '13

commit eff1cfaaf7bf82aefd16b39922b1297e2f8ce2c9 Merge: ad8a27a fdafe11 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 18 15:40:50 2013 -0400 Merge remote-tracking branch 'public/bug6673' into maint-0.2.4 changes/bug6673 | 4 ++++ src/common/crypto.c | 6 ++++++ 2 files changed, 10 insertions(+), 0 deletions(-)

1 0

[tor/release-0.2.4] Fix some wide lines
by arma＠torproject.org 11 Apr '13

11 Apr '13

commit ad8a27a3939be92e94d95fd7bb0f4e4b1e03382b Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 18 15:39:11 2013 -0400 Fix some wide lines --- src/or/dnsserv.c | 3 ++- src/or/dnsserv.h | 3 ++- src/or/entrynodes.c | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/or/dnsserv.c b/src/or/dnsserv.c index e877b18..a1275cf 100644 --- a/src/or/dnsserv.c +++ b/src/or/dnsserv.c @@ -170,7 +170,8 @@ evdns_server_callback(struct evdns_server_request *req, void *data_) * response; -1 if we couldn't launch the request. */ int -dnsserv_launch_request(const char *name, int reverse, control_connection_t *control_conn) +dnsserv_launch_request(const char *name, int reverse, + control_connection_t *control_conn) { entry_connection_t *entry_conn; edge_connection_t *conn; diff --git a/src/or/dnsserv.h b/src/or/dnsserv.h index 8462841..687a77e 100644 --- a/src/or/dnsserv.h +++ b/src/or/dnsserv.h @@ -20,7 +20,8 @@ void dnsserv_resolved(entry_connection_t *conn, const char *answer, int ttl); void dnsserv_reject_request(entry_connection_t *conn); -int dnsserv_launch_request(const char *name, int is_reverse, control_connection_t *control_conn); +int dnsserv_launch_request(const char *name, int is_reverse, + control_connection_t *control_conn); #endif diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c index de80e88..e92c0c1 100644 --- a/src/or/entrynodes.c +++ b/src/or/entrynodes.c @@ -367,7 +367,7 @@ add_an_entry_guard(const node_t *chosen, int reset_status, int prepend, } else { const routerstatus_t *rs; rs = router_pick_directory_server(MICRODESC_DIRINFO|V3_DIRINFO, - PDS_PREFER_TUNNELED_DIR_CONNS_|PDS_FOR_GUARD); + PDS_PREFER_TUNNELED_DIR_CONNS_|PDS_FOR_GUARD); if (!rs) return NULL; node = node_get_by_id(rs->identity_digest);

1 0

[tor/release-0.2.4] Fix another case of bug 8206; patch from flupzor
by arma＠torproject.org 11 Apr '13

11 Apr '13

commit 0b827cbcb11abece686d402170bd58724a77e365 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 18 15:44:23 2013 -0400 Fix another case of bug 8206; patch from flupzor --- src/common/compat.c | 20 ++++++++++++++++---- 1 files changed, 16 insertions(+), 4 deletions(-) diff --git a/src/common/compat.c b/src/common/compat.c index 25df9a9..4fa9fee 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -1172,10 +1172,22 @@ tor_socketpair(int family, int type, int protocol, tor_socket_t fd[2]) return -errno; #if defined(FD_CLOEXEC) - if (SOCKET_OK(fd[0])) - fcntl(fd[0], F_SETFD, FD_CLOEXEC); - if (SOCKET_OK(fd[1])) - fcntl(fd[1], F_SETFD, FD_CLOEXEC); + if (SOCKET_OK(fd[0])) { + r = fcntl(fd[0], F_SETFD, FD_CLOEXEC); + if (r == -1) { + close(fd[0]); + close(fd[1]); + return -errno; + } + } + if (SOCKET_OK(fd[1])) { + r = fcntl(fd[1], F_SETFD, FD_CLOEXEC); + if (r == -1) { + close(fd[0]); + close(fd[1]); + return -errno; + } + } #endif goto sockets_ok; /* So that sockets_ok will not be unused. */

1 0

[tor/release-0.2.4] Merge remote-tracking branch 'public/bug6164' into maint-0.2.4
by arma＠torproject.org 11 Apr '13

11 Apr '13

commit aa4fcc4f13ecc0959f26ac4c86a8e9b59d9c8783 Merge: 0b827cb 5d2b2b9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 18 15:45:49 2013 -0400 Merge remote-tracking branch 'public/bug6164' into maint-0.2.4 src/or/dirserv.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-)

1 0

[tor/release-0.2.4] Merge remote-tracking branch 'public/bug8062' into maint-0.2.4
by arma＠torproject.org 11 Apr '13

11 Apr '13

commit 01407f9718a7b1eb4e43b46c2799a390551aad29 Merge: dbdc994 fca578d Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 18 16:33:47 2013 -0400 Merge remote-tracking branch 'public/bug8062' into maint-0.2.4 changes/bug8062 | 5 +++++ src/or/or.h | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-)

1 0