March 2016 - tor-commits - lists.torproject.org

[translation/tor-launcher-properties_completed] Update translations for tor-launcher-properties_completed
by translation＠torproject.org 29 Mar '16

29 Mar '16

commit 13d492a329714dedf70eedb062bd790202a31f12 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Mar 28 21:15:39 2016 +0000 Update translations for tor-launcher-properties_completed --- sv/torlauncher.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sv/torlauncher.properties b/sv/torlauncher.properties index 095d0b7..cb7b8f5 100644 --- a/sv/torlauncher.properties +++ b/sv/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S misslyckades (%2$S). torlauncher.unable_to_start_tor=Kan inte starta Tor.\n\n%S torlauncher.tor_missing=Tors körbara programfil saknas. -torlauncher.torrc_missing=Filen torrc saknas. -torlauncher.datadir_missing=Tors data-katalog saknas. +torlauncher.torrc_missing=Torrc-fil saknas och kunde inte skapas. +torlauncher.datadir_missing=Tor datakatalog finns inte och kunde inte skapas. torlauncher.password_hash_missing=Misslyckades med att hämta hashat lösenord. torlauncher.failed_to_get_settings=Kunde inte läsa in inställningar för Tor.\n\n%S

1 0

[translation/tor-launcher-properties] Update translations for tor-launcher-properties
by translation＠torproject.org 29 Mar '16

29 Mar '16

commit 4eef881fc08b1fed424cd5448958d53b3130bad5 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Mar 28 21:15:35 2016 +0000 Update translations for tor-launcher-properties --- sv/torlauncher.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sv/torlauncher.properties b/sv/torlauncher.properties index fae9b96..cb7b8f5 100644 --- a/sv/torlauncher.properties +++ b/sv/torlauncher.properties @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S misslyckades (%2$S). torlauncher.unable_to_start_tor=Kan inte starta Tor.\n\n%S torlauncher.tor_missing=Tors körbara programfil saknas. -torlauncher.torrc_missing=The torrc file is missing and could not be created. -torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. +torlauncher.torrc_missing=Torrc-fil saknas och kunde inte skapas. +torlauncher.datadir_missing=Tor datakatalog finns inte och kunde inte skapas. torlauncher.password_hash_missing=Misslyckades med att hämta hashat lösenord. torlauncher.failed_to_get_settings=Kunde inte läsa in inställningar för Tor.\n\n%S

1 0

[tor/master] Rename tor_dup_addr to tor_addr_to_str_dup.
by nickm＠torproject.org 29 Mar '16

29 Mar '16

commit 055a7a198a1517a6d1d37c4dac9ac8e925d7aa7d Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 28 16:36:51 2016 -0400 Rename tor_dup_addr to tor_addr_to_str_dup. Patch from icanhasaccount; closes 18462. --- changes/ticket18462 | 3 +++ src/common/address.c | 2 +- src/common/address.h | 2 +- src/or/channel.c | 2 +- src/or/channeltls.c | 4 ++-- src/or/connection.c | 4 ++-- src/or/connection_edge.c | 2 +- src/or/connection_or.c | 4 ++-- src/or/directory.c | 2 +- src/or/dnsserv.c | 8 ++++---- src/or/ext_orport.c | 6 +++--- src/or/rendcommon.c | 2 +- src/or/routerlist.c | 2 +- 13 files changed, 23 insertions(+), 20 deletions(-) diff --git a/changes/ticket18462 b/changes/ticket18462 new file mode 100644 index 0000000..04e7e60 --- /dev/null +++ b/changes/ticket18462 @@ -0,0 +1,3 @@ + o Code simplification and refactoring: + - Rename tor_dup_addr() to tor_addr_to_str_dup() to avoid confusion. + Closes ticket #18462; patch from "icanhasaccount". diff --git a/src/common/address.c b/src/common/address.c index 793a40e..a6e0f3f 100644 --- a/src/common/address.c +++ b/src/common/address.c @@ -1172,7 +1172,7 @@ tor_addr_hash(const tor_addr_t *addr) /** Return a newly allocated string with a representation of <b>addr</b>. */ char * -tor_dup_addr(const tor_addr_t *addr) +tor_addr_to_str_dup(const tor_addr_t *addr) { char buf[TOR_ADDR_BUF_LEN]; if (tor_addr_to_str(buf, addr, sizeof(buf), 0)) { diff --git a/src/common/address.h b/src/common/address.h index 53712bd..3de67e1 100644 --- a/src/common/address.h +++ b/src/common/address.h @@ -179,7 +179,7 @@ tor_addr_eq_ipv4h(const tor_addr_t *a, uint32_t u) #define TOR_ADDR_BUF_LEN 48 int tor_addr_lookup(const char *name, uint16_t family, tor_addr_t *addr_out); -char *tor_dup_addr(const tor_addr_t *addr) ATTR_MALLOC; +char *tor_addr_to_str_dup(const tor_addr_t *addr) ATTR_MALLOC; /** Wrapper function of fmt_addr_impl(). It does not decorate IPv6 * addresses. */ diff --git a/src/or/channel.c b/src/or/channel.c index 5f69a08..f393939 100644 --- a/src/or/channel.c +++ b/src/or/channel.c @@ -3510,7 +3510,7 @@ channel_dump_statistics, (channel_t *chan, int severity)) have_remote_addr = channel_get_addr_if_possible(chan, &remote_addr); if (have_remote_addr) { char *actual = tor_strdup(channel_get_actual_remote_descr(chan)); - remote_addr_str = tor_dup_addr(&remote_addr); + remote_addr_str = tor_addr_to_str_dup(&remote_addr); tor_log(severity, LD_GENERAL, " * Channel " U64_FORMAT " says its remote address" " is %s, and gives a canonical description of \"%s\" and an " diff --git a/src/or/channeltls.c b/src/or/channeltls.c index c65af5d..2128b09 100644 --- a/src/or/channeltls.c +++ b/src/or/channeltls.c @@ -554,7 +554,7 @@ channel_tls_get_remote_descr_method(channel_t *chan, int flags) break; case GRD_FLAG_ORIGINAL: /* Actual address with port */ - addr_str = tor_dup_addr(&(tlschan->conn->real_addr)); + 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_free(addr_str); @@ -567,7 +567,7 @@ channel_tls_get_remote_descr_method(channel_t *chan, int flags) break; case GRD_FLAG_ORIGINAL|GRD_FLAG_ADDR_ONLY: /* Actual address, no port */ - addr_str = tor_dup_addr(&(tlschan->conn->real_addr)); + addr_str = tor_addr_to_str_dup(&(tlschan->conn->real_addr)); strlcpy(buf, addr_str, sizeof(buf)); tor_free(addr_str); answer = buf; diff --git a/src/or/connection.c b/src/or/connection.c index 118e239..78178f9 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -1564,7 +1564,7 @@ connection_handle_listener_read(connection_t *conn, int new_type) /* remember the remote address */ tor_addr_copy(&newconn->addr, &addr); newconn->port = port; - newconn->address = tor_dup_addr(&addr); + newconn->address = tor_addr_to_str_dup(&addr); if (new_type == CONN_TYPE_AP && conn->socket_family != AF_UNIX) { log_info(LD_NET, "New SOCKS connection opened from %s.", @@ -2538,7 +2538,7 @@ retry_listener_ports(smartlist_t *old_conns, real_port, listensockaddr, sizeof(struct sockaddr_storage)); - address = tor_dup_addr(&port->addr); + address = tor_addr_to_str_dup(&port->addr); } if (listensockaddr) { diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index 754e976..0f523de 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -2433,7 +2433,7 @@ connection_ap_handshake_send_resolve(entry_connection_t *ap_conn) if (!base_conn->address) { /* This might be unnecessary. XXXX */ - base_conn->address = tor_dup_addr(&base_conn->addr); + base_conn->address = tor_addr_to_str_dup(&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 diff --git a/src/or/connection_or.c b/src/or/connection_or.c index ea49bdb..87e7230 100644 --- a/src/or/connection_or.c +++ b/src/or/connection_or.c @@ -934,7 +934,7 @@ connection_or_init_conn_from_address(or_connection_t *conn, } conn->nickname = tor_strdup(node_get_nickname(r)); tor_free(conn->base_.address); - conn->base_.address = tor_dup_addr(&node_ap.addr); + conn->base_.address = tor_addr_to_str_dup(&node_ap.addr); } else { conn->nickname = tor_malloc(HEX_DIGEST_LEN+2); conn->nickname[0] = '$'; @@ -942,7 +942,7 @@ connection_or_init_conn_from_address(or_connection_t *conn, conn->identity_digest, DIGEST_LEN); tor_free(conn->base_.address); - conn->base_.address = tor_dup_addr(addr); + conn->base_.address = tor_addr_to_str_dup(addr); } /* diff --git a/src/or/directory.c b/src/or/directory.c index 9139dbc..1241036 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -1126,7 +1126,7 @@ directory_initiate_command_rend(const tor_addr_port_t *or_addr_port, /* set up conn so it's got all the data we need to remember */ tor_addr_copy(&conn->base_.addr, &addr); conn->base_.port = port; - conn->base_.address = tor_dup_addr(&addr); + conn->base_.address = tor_addr_to_str_dup(&addr); memcpy(conn->identity_digest, digest, DIGEST_LEN); conn->base_.purpose = dir_purpose; diff --git a/src/or/dnsserv.c b/src/or/dnsserv.c index 8ddb414..3b48d80 100644 --- a/src/or/dnsserv.c +++ b/src/or/dnsserv.c @@ -132,7 +132,7 @@ evdns_server_callback(struct evdns_server_request *req, void *data_) tor_addr_copy(&TO_CONN(conn)->addr, &tor_addr); TO_CONN(conn)->port = port; - TO_CONN(conn)->address = tor_dup_addr(&tor_addr); + TO_CONN(conn)->address = tor_addr_to_str_dup(&tor_addr); if (q->type == EVDNS_TYPE_A || q->type == EVDNS_TYPE_AAAA || q->type == EVDNS_QTYPE_ALL) { @@ -207,7 +207,7 @@ dnsserv_launch_request(const char *name, int reverse, tor_addr_copy(&TO_CONN(conn)->addr, &control_conn->base_.addr); #ifdef AF_UNIX /* - * The control connection can be AF_UNIX and if so tor_dup_addr will + * The control connection can be AF_UNIX and if so tor_addr_to_str_dup will * unhelpfully say "<unknown address type>"; say "(Tor_internal)" * instead. */ @@ -216,11 +216,11 @@ dnsserv_launch_request(const char *name, int reverse, TO_CONN(conn)->address = tor_strdup("(Tor_internal)"); } else { TO_CONN(conn)->port = control_conn->base_.port; - TO_CONN(conn)->address = tor_dup_addr(&control_conn->base_.addr); + TO_CONN(conn)->address = tor_addr_to_str_dup(&control_conn->base_.addr); } #else TO_CONN(conn)->port = control_conn->base_.port; - TO_CONN(conn)->address = tor_dup_addr(&control_conn->base_.addr); + TO_CONN(conn)->address = tor_addr_to_str_dup(&control_conn->base_.addr); #endif if (reverse) diff --git a/src/or/ext_orport.c b/src/or/ext_orport.c index aa1b3e2..8ba3c6a 100644 --- a/src/or/ext_orport.c +++ b/src/or/ext_orport.c @@ -461,8 +461,8 @@ connection_ext_or_handle_cmd_useraddr(connection_t *conn, return -1; { /* do some logging */ - char *old_address = tor_dup_addr(&conn->addr); - char *new_address = tor_dup_addr(&addr); + char *old_address = tor_addr_to_str_dup(&conn->addr); + char *new_address = tor_addr_to_str_dup(&addr); log_debug(LD_NET, "Received USERADDR." "We rewrite our address from '%s:%u' to '%s:%u'.", @@ -478,7 +478,7 @@ connection_ext_or_handle_cmd_useraddr(connection_t *conn, if (conn->address) { tor_free(conn->address); } - conn->address = tor_dup_addr(&addr); + conn->address = tor_addr_to_str_dup(&addr); return 0; } diff --git a/src/or/rendcommon.c b/src/or/rendcommon.c index 438fbc4..b927486 100644 --- a/src/or/rendcommon.c +++ b/src/or/rendcommon.c @@ -211,7 +211,7 @@ rend_encode_v2_intro_points(char **encoded, rend_service_descriptor_t *desc) goto done; } /* Assemble everything for this introduction point. */ - address = tor_dup_addr(&info->addr); + address = tor_addr_to_str_dup(&info->addr); res = tor_snprintf(unenc + unenc_written, unenc_len - unenc_written, "introduction-point %s\n" "ip-address %s\n" diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 3c9023e..80d0197 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -4280,7 +4280,7 @@ dir_server_new(int is_authority, return NULL; if (!hostname) - hostname_ = tor_dup_addr(addr); + hostname_ = tor_addr_to_str_dup(addr); else hostname_ = tor_strdup(hostname);

1 0

[tor/master] Remove redundant only in manpage
by nickm＠torproject.org 29 Mar '16

29 Mar '16

commit 7d6e7fdd0343c32a09c926e7094d43f6653baa4f Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Sun Mar 27 22:22:29 2016 +0200 Remove redundant only in manpage --- doc/tor.1.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 6808a80..ac21806 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -30,7 +30,7 @@ Users bounce their TCP streams -- web traffic, ftp, ssh, etc. -- around the network, and recipients, observers, and even the relays themselves have difficulty tracking the source of the stream. -By default, **tor** will only act as a client only. To help the network +By default, **tor** will act as a client only. To help the network by providing bandwidth as a relay, change the **ORPort** configuration option -- see below. Please also consult the documentation on the Tor Project's website.

1 0

[tor/master] Remove a couple of redundant lines from the makefile
by nickm＠torproject.org 29 Mar '16

29 Mar '16

commit c8eb39d67f4ea5f913998ea4aae2d3ba3f3c8258 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 28 16:11:25 2016 -0400 Remove a couple of redundant lines from the makefile Fixes the last case of 17744. --- changes/bug17744_redux | 5 +++++ configure.ac | 2 -- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/changes/bug17744_redux b/changes/bug17744_redux new file mode 100644 index 0000000..d61e17f --- /dev/null +++ b/changes/bug17744_redux @@ -0,0 +1,5 @@ + o Minor bugfixes (build): + - Remove a pair of redundant AM_CONDITIONAL declarations from + configure.ac. Fixes one final case of bug 17744; bugfix on + 0.2.8.2-alpha. + diff --git a/configure.ac b/configure.ac index ad71f7f..e4816fd 100644 --- a/configure.ac +++ b/configure.ac @@ -58,8 +58,6 @@ fi AM_CONDITIONAL(UNITTESTS_ENABLED, test "x$enable_unittests" != "xno") AM_CONDITIONAL(COVERAGE_ENABLED, test "x$enable_coverage" = "xyes") -AM_CONDITIONAL(UNITTESTS_ENABLED, test x$enable_unittests != xno) -AM_CONDITIONAL(COVERAGE_ENABLED, test x$enable_coverage = xyes) AM_CONDITIONAL(DISABLE_ASSERTS_IN_UNIT_TESTS, test "x$enable_asserts_in_tests" = "xno") if test "$enable_static_tor" = "yes"; then

1 0

[tor/master] Fix memory leak in TestingEnableCellStatsEvent
by nickm＠torproject.org 29 Mar '16

29 Mar '16

commit addd18172167e549b28efc8cf1132e1b8f9d3972 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 28 10:37:22 2016 -0400 Fix memory leak in TestingEnableCellStatsEvent Only when we were actually flushing the cell stats to a controller would we free them. Thus, they could stay in RAM even after the circuit was freed (eg if we didn't have any controllers). Fixes bug 18673; bugfix on 0.2.5.1-alpha. --- changes/bug18673 | 4 ++++ src/or/circuitlist.c | 14 ++++++++++++++ src/or/circuitlist.h | 2 ++ src/or/control.c | 6 ++---- 4 files changed, 22 insertions(+), 4 deletions(-) diff --git a/changes/bug18673 b/changes/bug18673 new file mode 100644 index 0000000..5d61617 --- /dev/null +++ b/changes/bug18673 @@ -0,0 +1,4 @@ + o Minor bugfixes (memory leak): + - Fix a small memory leak that would occur when the + TestingEnableCellStatsEvent option was turned on. Fixes bug 18673; + bugfix on 0.2.5.2-alpha. diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c index d6532dd..670c5b3 100644 --- a/src/or/circuitlist.c +++ b/src/or/circuitlist.c @@ -756,6 +756,18 @@ or_circuit_new(circid_t p_circ_id, channel_t *p_chan) return circ; } +/** Free all storage held in circ->testing_cell_stats */ +void +circuit_clear_testing_cell_stats(circuit_t *circ) +{ + if (!circ) + return; + SMARTLIST_FOREACH(circ->testing_cell_stats, testing_cell_stats_entry_t *, + ent, tor_free(ent)); + smartlist_free(circ->testing_cell_stats); + circ->testing_cell_stats = NULL; +} + /** Deallocate space associated with circ. */ STATIC void @@ -767,6 +779,8 @@ circuit_free(circuit_t *circ) if (!circ) return; + circuit_clear_testing_cell_stats(circ); + if (CIRCUIT_IS_ORIGIN(circ)) { origin_circuit_t *ocirc = TO_ORIGIN_CIRCUIT(circ); mem = ocirc; diff --git a/src/or/circuitlist.h b/src/or/circuitlist.h index e4f1f47..2707b42 100644 --- a/src/or/circuitlist.h +++ b/src/or/circuitlist.h @@ -71,6 +71,8 @@ void assert_circuit_ok(const circuit_t *c); void circuit_free_all(void); void circuits_handle_oom(size_t current_allocation); +void circuit_clear_testing_cell_stats(circuit_t *circ); + void channel_note_destroy_pending(channel_t *chan, circid_t id); MOCK_DECL(void, channel_note_destroy_not_pending, (channel_t *chan, circid_t id)); diff --git a/src/or/control.c b/src/or/control.c index 2bec8f9..655b4dd 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -4971,7 +4971,7 @@ sum_up_cell_stats_by_command(circuit_t *circ, cell_stats_t *cell_stats) { memset(cell_stats, 0, sizeof(cell_stats_t)); SMARTLIST_FOREACH_BEGIN(circ->testing_cell_stats, - testing_cell_stats_entry_t *, ent) { + const testing_cell_stats_entry_t *, ent) { tor_assert(ent->command <= CELL_COMMAND_MAX_); if (!ent->removed && !ent->exitward) { cell_stats->added_cells_appward[ent->command] += 1; @@ -4984,10 +4984,8 @@ sum_up_cell_stats_by_command(circuit_t *circ, cell_stats_t *cell_stats) cell_stats->removed_cells_exitward[ent->command] += 1; cell_stats->total_time_exitward[ent->command] += ent->waiting_time * 10; } - tor_free(ent); } SMARTLIST_FOREACH_END(ent); - smartlist_free(circ->testing_cell_stats); - circ->testing_cell_stats = NULL; + circuit_clear_testing_cell_stats(circ); } /** Helper: append a cell statistics string to <code>event_parts</code>,

1 0

[tor/master] Merge remote-tracking branch 'sebastian/onlyonly' into maint-0.2.8
by nickm＠torproject.org 29 Mar '16

29 Mar '16

commit 79e534859b02c97418d9d46f524371defd2417d3 Merge: c8eb39d 7d6e7fd Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 28 16:13:02 2016 -0400 Merge remote-tracking branch 'sebastian/onlyonly' into maint-0.2.8 doc/tor.1.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tor/master] Merge branch 'bug18673_028_v2' into maint-0.2.8
by nickm＠torproject.org 29 Mar '16

29 Mar '16

commit f780d196a91b8c9c5c2581d37326599b4e97b945 Merge: 79e5348 addd181 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 28 16:13:39 2016 -0400 Merge branch 'bug18673_028_v2' into maint-0.2.8 changes/bug18673 | 4 ++++ src/or/circuitlist.c | 14 ++++++++++++++ src/or/circuitlist.h | 2 ++ src/or/control.c | 6 ++---- 4 files changed, 22 insertions(+), 4 deletions(-)

1 0

[tor/master] Merge branch 'maint-0.2.8'
by nickm＠torproject.org 29 Mar '16

29 Mar '16

commit 3220bd816b1a20eeb8bcaf562dc5382439bb00f7 Merge: 1275d92 f780d19 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 28 16:14:21 2016 -0400 Merge branch 'maint-0.2.8' changes/bug17744_redux | 5 +++++ changes/bug18673 | 4 ++++ configure.ac | 2 -- doc/tor.1.txt | 2 +- src/or/circuitlist.c | 14 ++++++++++++++ src/or/circuitlist.h | 2 ++ src/or/control.c | 6 ++---- 7 files changed, 28 insertions(+), 7 deletions(-)

1 0

[tor/release-0.2.8] Merge branch 'bug18673_028_v2' into maint-0.2.8
by nickm＠torproject.org 29 Mar '16

29 Mar '16

commit f780d196a91b8c9c5c2581d37326599b4e97b945 Merge: 79e5348 addd181 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 28 16:13:39 2016 -0400 Merge branch 'bug18673_028_v2' into maint-0.2.8 changes/bug18673 | 4 ++++ src/or/circuitlist.c | 14 ++++++++++++++ src/or/circuitlist.h | 2 ++ src/or/control.c | 6 ++---- 4 files changed, 22 insertions(+), 4 deletions(-)

1 0