February 2014 - tor-commits - lists.torproject.org

[tor/master] Merge the circuit_{free, clear}_cpath functions
by nickm＠torproject.org 07 Feb '14

07 Feb '14

commit ef4eb823f3652cfbf5176c277cb21d30bc20d62a Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Feb 7 10:50:06 2014 -0500 Merge the circuit_{free,clear}_cpath functions (Based on a suggestion by arma at #9777) --- src/or/circuitlist.c | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c index 22224db..9474896 100644 --- a/src/or/circuitlist.c +++ b/src/or/circuitlist.c @@ -43,7 +43,6 @@ struct global_circuitlist_s global_circuitlist = /** A list of all the circuits in CIRCUIT_STATE_CHAN_WAIT. */ static smartlist_t *circuits_pending_chans = NULL; -static void circuit_free_cpath(crypt_path_t *cpath); static void circuit_free_cpath_node(crypt_path_t *victim); static void cpath_ref_decref(crypt_path_reference_t *cpath_ref); @@ -728,7 +727,7 @@ circuit_free(circuit_t *circ) } tor_free(ocirc->build_state); - circuit_free_cpath(ocirc->cpath); + circuit_clear_cpath(ocirc); crypto_pk_free(ocirc->intro_key); rend_data_free(ocirc->rend_data); @@ -787,11 +786,14 @@ circuit_free(circuit_t *circ) tor_free(mem); } -/** Deallocate space associated with the linked list cpath. */ -static void -circuit_free_cpath(crypt_path_t *cpath) +/** Deallocate the linked list circ->cpath, and remove the cpath from + * circ. */ +void +circuit_clear_cpath(origin_circuit_t *circ) { - crypt_path_t *victim, *head=cpath; + crypt_path_t *victim, *head, *cpath; + + head = cpath = circ->cpath; if (!cpath) return; @@ -805,13 +807,7 @@ circuit_free_cpath(crypt_path_t *cpath) } circuit_free_cpath_node(cpath); -} -/** Remove all the items in the cpath on circ.*/ -void -circuit_clear_cpath(origin_circuit_t *circ) -{ - circuit_free_cpath(circ->cpath); circ->cpath = NULL; }

1 0

[translation/torbutton-torbuttonproperties] Update translations for torbutton-torbuttonproperties
by translation＠torproject.org 07 Feb '14

07 Feb '14

commit 7406ebcac3a6d920b446e47f43a5a75063194135 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Feb 7 15:45:46 2014 +0000 Update translations for torbutton-torbuttonproperties --- de/torbutton.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/de/torbutton.properties b/de/torbutton.properties index 6e9dff2..e7b0c03 100644 --- a/de/torbutton.properties +++ b/de/torbutton.properties @@ -2,8 +2,8 @@ torbutton.button.tooltip.disabled = Tor aktivieren torbutton.button.tooltip.enabled = Tor deaktivieren torbutton.panel.tooltip.disabled = Klicken, um Tor zu aktivieren torbutton.panel.tooltip.enabled = Klicken, um Tor zu deaktivieren -torbutton.panel.plugins.disabled = Klicken, um Plugins zu aktivieren -torbutton.panel.plugins.enabled = Klicken, um Plugins zu deaktivieren +torbutton.panel.plugins.disabled = Klicken, um die Erweiterungen zu aktivieren +torbutton.panel.plugins.enabled = Klicken, um die Erweiterungen zu deaktivieren torbutton.panel.label.disabled = Tor deaktiviert torbutton.panel.label.enabled = Tor aktiviert extensions.torbutton(a)torproject.org.description = Torbutton gibt ihnen die Möglichkeit, Einstellungen von Tor schnell und einfach zu verändern und die Browser-Daten zu löschen.

1 0

[tor/master] NULL out conns on tlschans when freeing in case channel_run_cleanup() is late; fixes bug 9602
by nickm＠torproject.org 07 Feb '14

07 Feb '14

commit 707c1e2e263fd34f70a5f780e77820d667ba2931 Author: Andrea Shepard <andrea(a)torproject.org> Date: Thu Feb 6 14:47:34 2014 -0800 NULL out conns on tlschans when freeing in case channel_run_cleanup() is late; fixes bug 9602 --- changes/bug9602 | 4 + src/or/channeltls.c | 193 +++++++++++++++++++++++++++++++----------------- src/or/connection.c | 16 ++++ src/or/connection_or.c | 5 ++ 4 files changed, 149 insertions(+), 69 deletions(-) diff --git a/changes/bug9602 b/changes/bug9602 new file mode 100644 index 0000000..9e9a3ca --- /dev/null +++ b/changes/bug9602 @@ -0,0 +1,4 @@ + o Bugfixes + - Null out orconn->chan->conn when closing orconn in case orconn is freed + before channel_run_cleanup() gets to orconn->chan, and handle the null + conn edge case correctly in channel_tls_t methods. Fixes bug #9602. diff --git a/src/or/channeltls.c b/src/or/channeltls.c index f751c0d..495f856 100644 --- a/src/or/channeltls.c +++ b/src/or/channeltls.c @@ -365,7 +365,7 @@ channel_tls_describe_transport_method(channel_t *chan) tor_assert(chan); - tlschan = BASE_CHAN_TO_TLS(chan); + tlschan = BASE_CHAN_TO_TLS(chan); if (tlschan->conn) { id = TO_CONN(tlschan->conn)->global_identifier; @@ -394,15 +394,18 @@ channel_tls_describe_transport_method(channel_t *chan) static int channel_tls_get_remote_addr_method(channel_t *chan, tor_addr_t *addr_out) { + int rv = 0; channel_tls_t *tlschan = BASE_CHAN_TO_TLS(chan); tor_assert(tlschan); tor_assert(addr_out); - tor_assert(tlschan->conn); - tor_addr_copy(addr_out, &(TO_CONN(tlschan->conn)->addr)); + if (tlschan->conn) { + tor_addr_copy(addr_out, &(TO_CONN(tlschan->conn)->addr)); + rv = 1; + } else tor_addr_make_unspec(addr_out); - return 1; + return rv; } /** @@ -426,41 +429,43 @@ channel_tls_get_remote_descr_method(channel_t *chan, int flags) char *addr_str; tor_assert(tlschan); - tor_assert(tlschan->conn); - - conn = TO_CONN(tlschan->conn); - switch (flags) { - case 0: - /* Canonical address with port*/ - tor_snprintf(buf, MAX_DESCR_LEN + 1, - "%s:%u", conn->address, conn->port); - answer = buf; - break; - case GRD_FLAG_ORIGINAL: - /* Actual address with port */ - addr_str = tor_dup_addr(&(tlschan->conn->real_addr)); - tor_snprintf(buf, MAX_DESCR_LEN + 1, - "%s:%u", addr_str, conn->port); - tor_free(addr_str); - answer = buf; - break; - case GRD_FLAG_ADDR_ONLY: - /* Canonical address, no port */ - strlcpy(buf, conn->address, sizeof(buf)); - answer = buf; - break; - case GRD_FLAG_ORIGINAL|GRD_FLAG_ADDR_ONLY: - /* Actual address, no port */ - addr_str = tor_dup_addr(&(tlschan->conn->real_addr)); - strlcpy(buf, addr_str, sizeof(buf)); - tor_free(addr_str); - answer = buf; - break; - - default: - /* Something's broken in channel.c */ - tor_assert(1); + if (tlschan->conn) { + conn = TO_CONN(tlschan->conn); + switch (flags) { + case 0: + /* Canonical address with port*/ + tor_snprintf(buf, MAX_DESCR_LEN + 1, + "%s:%u", conn->address, conn->port); + answer = buf; + break; + case GRD_FLAG_ORIGINAL: + /* Actual address with port */ + addr_str = tor_dup_addr(&(tlschan->conn->real_addr)); + tor_snprintf(buf, MAX_DESCR_LEN + 1, + "%s:%u", addr_str, conn->port); + tor_free(addr_str); + answer = buf; + break; + case GRD_FLAG_ADDR_ONLY: + /* Canonical address, no port */ + strlcpy(buf, conn->address, sizeof(buf)); + answer = buf; + break; + case GRD_FLAG_ORIGINAL|GRD_FLAG_ADDR_ONLY: + /* Actual address, no port */ + addr_str = tor_dup_addr(&(tlschan->conn->real_addr)); + strlcpy(buf, addr_str, sizeof(buf)); + tor_free(addr_str); + answer = buf; + break; + default: + /* Something's broken in channel.c */ + tor_assert(1); + } + } else { + strlcpy(buf, "(No connection)", sizeof(buf)); + answer = buf; } return answer; @@ -480,9 +485,16 @@ channel_tls_has_queued_writes_method(channel_t *chan) channel_tls_t *tlschan = BASE_CHAN_TO_TLS(chan); tor_assert(tlschan); - tor_assert(tlschan->conn); + if (!(tlschan->conn)) { + log_info(LD_CHANNEL, + "something called has_queued_writes on a tlschan " + "(%p with ID " U64_FORMAT " but no conn", + chan, U64_PRINTF_ARG(chan->global_identifier)); + } - outbuf_len = connection_get_outbuf_len(TO_CONN(tlschan->conn)); + outbuf_len = (tlschan->conn != NULL) ? + connection_get_outbuf_len(TO_CONN(tlschan->conn)) : + 0; return (outbuf_len > 0); } @@ -502,24 +514,26 @@ channel_tls_is_canonical_method(channel_t *chan, int req) channel_tls_t *tlschan = BASE_CHAN_TO_TLS(chan); tor_assert(tlschan); - tor_assert(tlschan->conn); - switch (req) { - case 0: - answer = tlschan->conn->is_canonical; - break; - case 1: - /* - * Is the is_canonical bit reliable? In protocols version 2 and up - * we get the canonical address from a NETINFO cell, but in older - * versions it might be based on an obsolete descriptor. - */ - answer = (tlschan->conn->link_proto >= 2); - break; - default: - /* This shouldn't happen; channel.c is broken if it does */ - tor_assert(1); + if (tlschan->conn) { + switch (req) { + case 0: + answer = tlschan->conn->is_canonical; + break; + case 1: + /* + * Is the is_canonical bit reliable? In protocols version 2 and up + * we get the canonical address from a NETINFO cell, but in older + * versions it might be based on an obsolete descriptor. + */ + answer = (tlschan->conn->link_proto >= 2); + break; + default: + /* This shouldn't happen; channel.c is broken if it does */ + tor_assert(1); + } } + /* else return 0 for tlschan->conn == NULL */ return answer; } @@ -540,6 +554,15 @@ channel_tls_matches_extend_info_method(channel_t *chan, tor_assert(tlschan); tor_assert(extend_info); + /* Never match if we have no conn */ + if (!(tlschan->conn)) { + log_info(LD_CHANNEL, + "something called matches_extend_info on a tlschan " + "(%p with ID " U64_FORMAT " but no conn", + chan, U64_PRINTF_ARG(chan->global_identifier)); + return 0; + } + return (tor_addr_eq(&(extend_info->addr), &(TO_CONN(tlschan->conn)->addr)) && (extend_info->port == TO_CONN(tlschan->conn)->port)); @@ -561,7 +584,15 @@ channel_tls_matches_target_method(channel_t *chan, tor_assert(tlschan); tor_assert(target); - tor_assert(tlschan->conn); + + /* Never match if we have no conn */ + if (!(tlschan->conn)) { + log_info(LD_CHANNEL, + "something called matches_target on a tlschan " + "(%p with ID " U64_FORMAT " but no conn", + chan, U64_PRINTF_ARG(chan->global_identifier)); + return 0; + } return tor_addr_eq(&(tlschan->conn->real_addr), target); } @@ -577,14 +608,22 @@ static int channel_tls_write_cell_method(channel_t *chan, cell_t *cell) { channel_tls_t *tlschan = BASE_CHAN_TO_TLS(chan); + int written = 0; tor_assert(tlschan); tor_assert(cell); - tor_assert(tlschan->conn); - connection_or_write_cell_to_buf(cell, tlschan->conn); + if (tlschan->conn) { + connection_or_write_cell_to_buf(cell, tlschan->conn); + ++written; + } else { + log_info(LD_CHANNEL, + "something called write_cell on a tlschan " + "(%p with ID " U64_FORMAT " but no conn", + chan, U64_PRINTF_ARG(chan->global_identifier)); + } - return 1; + return written; } /** @@ -600,18 +639,26 @@ channel_tls_write_packed_cell_method(channel_t *chan, { channel_tls_t *tlschan = BASE_CHAN_TO_TLS(chan); size_t cell_network_size = get_cell_network_size(chan->wide_circ_ids); + int written = 0; tor_assert(tlschan); tor_assert(packed_cell); - tor_assert(tlschan->conn); - connection_write_to_buf(packed_cell->body, cell_network_size, - TO_CONN(tlschan->conn)); + if (tlschan->conn) { + connection_write_to_buf(packed_cell->body, cell_network_size, + TO_CONN(tlschan->conn)); - /* This is where the cell is finished; used to be done from relay.c */ - packed_cell_free(packed_cell); + /* This is where the cell is finished; used to be done from relay.c */ + packed_cell_free(packed_cell); + ++written; + } else { + log_info(LD_CHANNEL, + "something called write_packed_cell on a tlschan " + "(%p with ID " U64_FORMAT " but no conn", + chan, U64_PRINTF_ARG(chan->global_identifier)); + } - return 1; + return written; } /** @@ -625,14 +672,22 @@ static int channel_tls_write_var_cell_method(channel_t *chan, var_cell_t *var_cell) { channel_tls_t *tlschan = BASE_CHAN_TO_TLS(chan); + int written = 0; tor_assert(tlschan); tor_assert(var_cell); - tor_assert(tlschan->conn); - connection_or_write_var_cell_to_buf(var_cell, tlschan->conn); + if (tlschan->conn) { + connection_or_write_var_cell_to_buf(var_cell, tlschan->conn); + ++written; + } else { + log_info(LD_CHANNEL, + "something called write_var_cell on a tlschan " + "(%p with ID " U64_FORMAT " but no conn", + chan, U64_PRINTF_ARG(chan->global_identifier)); + } - return 1; + return written; } /************************************************* diff --git a/src/or/connection.c b/src/or/connection.c index 062c971..4f74a1d 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -514,6 +514,22 @@ connection_free_(connection_t *conn) or_handshake_state_free(or_conn->handshake_state); or_conn->handshake_state = NULL; tor_free(or_conn->nickname); + if (or_conn->chan) { + /* Owww, this shouldn't happen, but... */ + log_info(LD_CHANNEL, + "Freeing orconn at %p, saw channel %p with ID " + U64_FORMAT " left un-NULLed", + or_conn, TLS_CHAN_TO_BASE(or_conn->chan), + U64_PRINTF_ARG( + TLS_CHAN_TO_BASE(or_conn->chan)->global_identifier)); + if (!(TLS_CHAN_TO_BASE(or_conn->chan)->state == CHANNEL_STATE_CLOSED || + TLS_CHAN_TO_BASE(or_conn->chan)->state == CHANNEL_STATE_ERROR)) { + channel_close_for_error(TLS_CHAN_TO_BASE(or_conn->chan)); + } + + or_conn->chan->conn = NULL; + or_conn->chan = NULL; + } } if (conn->type == CONN_TYPE_AP) { entry_connection_t *entry_conn = TO_ENTRY_CONN(conn); diff --git a/src/or/connection_or.c b/src/or/connection_or.c index 3d16e14..8e7cd9e 100644 --- a/src/or/connection_or.c +++ b/src/or/connection_or.c @@ -622,6 +622,11 @@ connection_or_about_to_close(or_connection_t *or_conn) /* Tell the controlling channel we're closed */ if (or_conn->chan) { channel_closed(TLS_CHAN_TO_BASE(or_conn->chan)); + /* + * NULL this out because the channel might hang around a little + * longer before channel_run_cleanup() gets it. + */ + or_conn->chan->conn = NULL; or_conn->chan = NULL; }

1 0

[tor/master] Attribute bug 9602 to a version.
by nickm＠torproject.org 07 Feb '14

07 Feb '14

commit a7e946596d6da9aca80456141b7fddbc198c217c Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Feb 7 10:38:00 2014 -0500 Attribute bug 9602 to a version. --- changes/bug9602 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/changes/bug9602 b/changes/bug9602 index 9e9a3ca..2dc13c4 100644 --- a/changes/bug9602 +++ b/changes/bug9602 @@ -1,4 +1,5 @@ o Bugfixes - Null out orconn->chan->conn when closing orconn in case orconn is freed before channel_run_cleanup() gets to orconn->chan, and handle the null - conn edge case correctly in channel_tls_t methods. Fixes bug #9602. + conn edge case correctly in channel_tls_t methods. Fixes bug #9602; + bugfix on 0.2.4.4-alpha.

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.4'
by nickm＠torproject.org 07 Feb '14

07 Feb '14

commit 372adfa09a143490dfc058a6e2db78ca27ef9399 Merge: 5990edd a7e9465 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Feb 7 10:38:24 2014 -0500 Merge remote-tracking branch 'origin/maint-0.2.4' changes/bug9602 | 5 ++ src/or/channeltls.c | 193 +++++++++++++++++++++++++++++++----------------- src/or/connection.c | 16 ++++ src/or/connection_or.c | 5 ++ 4 files changed, 150 insertions(+), 69 deletions(-)

1 0

[tor/maint-0.2.4] NULL out conns on tlschans when freeing in case channel_run_cleanup() is late; fixes bug 9602
by nickm＠torproject.org 07 Feb '14

07 Feb '14

commit 707c1e2e263fd34f70a5f780e77820d667ba2931 Author: Andrea Shepard <andrea(a)torproject.org> Date: Thu Feb 6 14:47:34 2014 -0800 NULL out conns on tlschans when freeing in case channel_run_cleanup() is late; fixes bug 9602 --- changes/bug9602 | 4 + src/or/channeltls.c | 193 +++++++++++++++++++++++++++++++----------------- src/or/connection.c | 16 ++++ src/or/connection_or.c | 5 ++ 4 files changed, 149 insertions(+), 69 deletions(-) diff --git a/changes/bug9602 b/changes/bug9602 new file mode 100644 index 0000000..9e9a3ca --- /dev/null +++ b/changes/bug9602 @@ -0,0 +1,4 @@ + o Bugfixes + - Null out orconn->chan->conn when closing orconn in case orconn is freed + before channel_run_cleanup() gets to orconn->chan, and handle the null + conn edge case correctly in channel_tls_t methods. Fixes bug #9602. diff --git a/src/or/channeltls.c b/src/or/channeltls.c index f751c0d..495f856 100644 --- a/src/or/channeltls.c +++ b/src/or/channeltls.c @@ -365,7 +365,7 @@ channel_tls_describe_transport_method(channel_t *chan) tor_assert(chan); - tlschan = BASE_CHAN_TO_TLS(chan); + tlschan = BASE_CHAN_TO_TLS(chan); if (tlschan->conn) { id = TO_CONN(tlschan->conn)->global_identifier; @@ -394,15 +394,18 @@ channel_tls_describe_transport_method(channel_t *chan) static int channel_tls_get_remote_addr_method(channel_t *chan, tor_addr_t *addr_out) { + int rv = 0; channel_tls_t *tlschan = BASE_CHAN_TO_TLS(chan); tor_assert(tlschan); tor_assert(addr_out); - tor_assert(tlschan->conn); - tor_addr_copy(addr_out, &(TO_CONN(tlschan->conn)->addr)); + if (tlschan->conn) { + tor_addr_copy(addr_out, &(TO_CONN(tlschan->conn)->addr)); + rv = 1; + } else tor_addr_make_unspec(addr_out); - return 1; + return rv; } /** @@ -426,41 +429,43 @@ channel_tls_get_remote_descr_method(channel_t *chan, int flags) char *addr_str; tor_assert(tlschan); - tor_assert(tlschan->conn); - - conn = TO_CONN(tlschan->conn); - switch (flags) { - case 0: - /* Canonical address with port*/ - tor_snprintf(buf, MAX_DESCR_LEN + 1, - "%s:%u", conn->address, conn->port); - answer = buf; - break; - case GRD_FLAG_ORIGINAL: - /* Actual address with port */ - addr_str = tor_dup_addr(&(tlschan->conn->real_addr)); - tor_snprintf(buf, MAX_DESCR_LEN + 1, - "%s:%u", addr_str, conn->port); - tor_free(addr_str); - answer = buf; - break; - case GRD_FLAG_ADDR_ONLY: - /* Canonical address, no port */ - strlcpy(buf, conn->address, sizeof(buf)); - answer = buf; - break; - case GRD_FLAG_ORIGINAL|GRD_FLAG_ADDR_ONLY: - /* Actual address, no port */ - addr_str = tor_dup_addr(&(tlschan->conn->real_addr)); - strlcpy(buf, addr_str, sizeof(buf)); - tor_free(addr_str); - answer = buf; - break; - - default: - /* Something's broken in channel.c */ - tor_assert(1); + if (tlschan->conn) { + conn = TO_CONN(tlschan->conn); + switch (flags) { + case 0: + /* Canonical address with port*/ + tor_snprintf(buf, MAX_DESCR_LEN + 1, + "%s:%u", conn->address, conn->port); + answer = buf; + break; + case GRD_FLAG_ORIGINAL: + /* Actual address with port */ + addr_str = tor_dup_addr(&(tlschan->conn->real_addr)); + tor_snprintf(buf, MAX_DESCR_LEN + 1, + "%s:%u", addr_str, conn->port); + tor_free(addr_str); + answer = buf; + break; + case GRD_FLAG_ADDR_ONLY: + /* Canonical address, no port */ + strlcpy(buf, conn->address, sizeof(buf)); + answer = buf; + break; + case GRD_FLAG_ORIGINAL|GRD_FLAG_ADDR_ONLY: + /* Actual address, no port */ + addr_str = tor_dup_addr(&(tlschan->conn->real_addr)); + strlcpy(buf, addr_str, sizeof(buf)); + tor_free(addr_str); + answer = buf; + break; + default: + /* Something's broken in channel.c */ + tor_assert(1); + } + } else { + strlcpy(buf, "(No connection)", sizeof(buf)); + answer = buf; } return answer; @@ -480,9 +485,16 @@ channel_tls_has_queued_writes_method(channel_t *chan) channel_tls_t *tlschan = BASE_CHAN_TO_TLS(chan); tor_assert(tlschan); - tor_assert(tlschan->conn); + if (!(tlschan->conn)) { + log_info(LD_CHANNEL, + "something called has_queued_writes on a tlschan " + "(%p with ID " U64_FORMAT " but no conn", + chan, U64_PRINTF_ARG(chan->global_identifier)); + } - outbuf_len = connection_get_outbuf_len(TO_CONN(tlschan->conn)); + outbuf_len = (tlschan->conn != NULL) ? + connection_get_outbuf_len(TO_CONN(tlschan->conn)) : + 0; return (outbuf_len > 0); } @@ -502,24 +514,26 @@ channel_tls_is_canonical_method(channel_t *chan, int req) channel_tls_t *tlschan = BASE_CHAN_TO_TLS(chan); tor_assert(tlschan); - tor_assert(tlschan->conn); - switch (req) { - case 0: - answer = tlschan->conn->is_canonical; - break; - case 1: - /* - * Is the is_canonical bit reliable? In protocols version 2 and up - * we get the canonical address from a NETINFO cell, but in older - * versions it might be based on an obsolete descriptor. - */ - answer = (tlschan->conn->link_proto >= 2); - break; - default: - /* This shouldn't happen; channel.c is broken if it does */ - tor_assert(1); + if (tlschan->conn) { + switch (req) { + case 0: + answer = tlschan->conn->is_canonical; + break; + case 1: + /* + * Is the is_canonical bit reliable? In protocols version 2 and up + * we get the canonical address from a NETINFO cell, but in older + * versions it might be based on an obsolete descriptor. + */ + answer = (tlschan->conn->link_proto >= 2); + break; + default: + /* This shouldn't happen; channel.c is broken if it does */ + tor_assert(1); + } } + /* else return 0 for tlschan->conn == NULL */ return answer; } @@ -540,6 +554,15 @@ channel_tls_matches_extend_info_method(channel_t *chan, tor_assert(tlschan); tor_assert(extend_info); + /* Never match if we have no conn */ + if (!(tlschan->conn)) { + log_info(LD_CHANNEL, + "something called matches_extend_info on a tlschan " + "(%p with ID " U64_FORMAT " but no conn", + chan, U64_PRINTF_ARG(chan->global_identifier)); + return 0; + } + return (tor_addr_eq(&(extend_info->addr), &(TO_CONN(tlschan->conn)->addr)) && (extend_info->port == TO_CONN(tlschan->conn)->port)); @@ -561,7 +584,15 @@ channel_tls_matches_target_method(channel_t *chan, tor_assert(tlschan); tor_assert(target); - tor_assert(tlschan->conn); + + /* Never match if we have no conn */ + if (!(tlschan->conn)) { + log_info(LD_CHANNEL, + "something called matches_target on a tlschan " + "(%p with ID " U64_FORMAT " but no conn", + chan, U64_PRINTF_ARG(chan->global_identifier)); + return 0; + } return tor_addr_eq(&(tlschan->conn->real_addr), target); } @@ -577,14 +608,22 @@ static int channel_tls_write_cell_method(channel_t *chan, cell_t *cell) { channel_tls_t *tlschan = BASE_CHAN_TO_TLS(chan); + int written = 0; tor_assert(tlschan); tor_assert(cell); - tor_assert(tlschan->conn); - connection_or_write_cell_to_buf(cell, tlschan->conn); + if (tlschan->conn) { + connection_or_write_cell_to_buf(cell, tlschan->conn); + ++written; + } else { + log_info(LD_CHANNEL, + "something called write_cell on a tlschan " + "(%p with ID " U64_FORMAT " but no conn", + chan, U64_PRINTF_ARG(chan->global_identifier)); + } - return 1; + return written; } /** @@ -600,18 +639,26 @@ channel_tls_write_packed_cell_method(channel_t *chan, { channel_tls_t *tlschan = BASE_CHAN_TO_TLS(chan); size_t cell_network_size = get_cell_network_size(chan->wide_circ_ids); + int written = 0; tor_assert(tlschan); tor_assert(packed_cell); - tor_assert(tlschan->conn); - connection_write_to_buf(packed_cell->body, cell_network_size, - TO_CONN(tlschan->conn)); + if (tlschan->conn) { + connection_write_to_buf(packed_cell->body, cell_network_size, + TO_CONN(tlschan->conn)); - /* This is where the cell is finished; used to be done from relay.c */ - packed_cell_free(packed_cell); + /* This is where the cell is finished; used to be done from relay.c */ + packed_cell_free(packed_cell); + ++written; + } else { + log_info(LD_CHANNEL, + "something called write_packed_cell on a tlschan " + "(%p with ID " U64_FORMAT " but no conn", + chan, U64_PRINTF_ARG(chan->global_identifier)); + } - return 1; + return written; } /** @@ -625,14 +672,22 @@ static int channel_tls_write_var_cell_method(channel_t *chan, var_cell_t *var_cell) { channel_tls_t *tlschan = BASE_CHAN_TO_TLS(chan); + int written = 0; tor_assert(tlschan); tor_assert(var_cell); - tor_assert(tlschan->conn); - connection_or_write_var_cell_to_buf(var_cell, tlschan->conn); + if (tlschan->conn) { + connection_or_write_var_cell_to_buf(var_cell, tlschan->conn); + ++written; + } else { + log_info(LD_CHANNEL, + "something called write_var_cell on a tlschan " + "(%p with ID " U64_FORMAT " but no conn", + chan, U64_PRINTF_ARG(chan->global_identifier)); + } - return 1; + return written; } /************************************************* diff --git a/src/or/connection.c b/src/or/connection.c index 062c971..4f74a1d 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -514,6 +514,22 @@ connection_free_(connection_t *conn) or_handshake_state_free(or_conn->handshake_state); or_conn->handshake_state = NULL; tor_free(or_conn->nickname); + if (or_conn->chan) { + /* Owww, this shouldn't happen, but... */ + log_info(LD_CHANNEL, + "Freeing orconn at %p, saw channel %p with ID " + U64_FORMAT " left un-NULLed", + or_conn, TLS_CHAN_TO_BASE(or_conn->chan), + U64_PRINTF_ARG( + TLS_CHAN_TO_BASE(or_conn->chan)->global_identifier)); + if (!(TLS_CHAN_TO_BASE(or_conn->chan)->state == CHANNEL_STATE_CLOSED || + TLS_CHAN_TO_BASE(or_conn->chan)->state == CHANNEL_STATE_ERROR)) { + channel_close_for_error(TLS_CHAN_TO_BASE(or_conn->chan)); + } + + or_conn->chan->conn = NULL; + or_conn->chan = NULL; + } } if (conn->type == CONN_TYPE_AP) { entry_connection_t *entry_conn = TO_ENTRY_CONN(conn); diff --git a/src/or/connection_or.c b/src/or/connection_or.c index 3d16e14..8e7cd9e 100644 --- a/src/or/connection_or.c +++ b/src/or/connection_or.c @@ -622,6 +622,11 @@ connection_or_about_to_close(or_connection_t *or_conn) /* Tell the controlling channel we're closed */ if (or_conn->chan) { channel_closed(TLS_CHAN_TO_BASE(or_conn->chan)); + /* + * NULL this out because the channel might hang around a little + * longer before channel_run_cleanup() gets it. + */ + or_conn->chan->conn = NULL; or_conn->chan = NULL; }

1 0

[tor/maint-0.2.4] Attribute bug 9602 to a version.
by nickm＠torproject.org 07 Feb '14

07 Feb '14

commit a7e946596d6da9aca80456141b7fddbc198c217c Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Feb 7 10:38:00 2014 -0500 Attribute bug 9602 to a version. --- changes/bug9602 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/changes/bug9602 b/changes/bug9602 index 9e9a3ca..2dc13c4 100644 --- a/changes/bug9602 +++ b/changes/bug9602 @@ -1,4 +1,5 @@ o Bugfixes - Null out orconn->chan->conn when closing orconn in case orconn is freed before channel_run_cleanup() gets to orconn->chan, and handle the null - conn edge case correctly in channel_tls_t methods. Fixes bug #9602. + conn edge case correctly in channel_tls_t methods. Fixes bug #9602; + bugfix on 0.2.4.4-alpha.

1 0

[translation/mat-gui] Update translations for mat-gui
by translation＠torproject.org 07 Feb '14

07 Feb '14

commit 23f8832a3bb18afe01fe61a0e722985f1c80a1e2 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Feb 7 11:45:27 2014 +0000 Update translations for mat-gui --- en_GB.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/en_GB.po b/en_GB.po index 9e1653d..e0cf0be 100644 --- a/en_GB.po +++ b/en_GB.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-01-19 14:48+0000\n" -"PO-Revision-Date: 2014-02-07 11:11+0000\n" +"PO-Revision-Date: 2014-02-07 11:20+0000\n" "Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/torproject/language/en_GB/)\n" "MIME-Version: 1.0\n"

1 0

[translation/abouttor-homepage] Update translations for abouttor-homepage
by translation＠torproject.org 07 Feb '14

07 Feb '14

commit 9ee2c9102f5d640f7691d249a5786450d5fa98d6 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Feb 7 11:15:47 2014 +0000 Update translations for abouttor-homepage --- en_GB/aboutTor.dtd | 102 ++++++++++++++++++++++++++-------------------------- 1 file changed, 51 insertions(+), 51 deletions(-) diff --git a/en_GB/aboutTor.dtd b/en_GB/aboutTor.dtd index da2703e..c1483a8 100644 --- a/en_GB/aboutTor.dtd +++ b/en_GB/aboutTor.dtd @@ -4,24 +4,24 @@ - vim: set sw=2 sts=2 ts=8 et syntax=xml: --> -<!ENTITY aboutTor.title ""> +<!ENTITY aboutTor.title "About Tor"> -<!ENTITY aboutTor.outOfDateTorOn.label ""> -<!ENTITY aboutTor.outOfDateTorOff.label ""> -<!ENTITY aboutTor.outOfDate2.label ""> +<!ENTITY aboutTor.outOfDateTorOn.label "HOWEVER, this browser is out of date."> +<!ENTITY aboutTor.outOfDateTorOff.label "ALSO, this browser is out of date."> +<!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Download Tor Browser Bundle Update."> -<!ENTITY aboutTor.check.label ""> +<!ENTITY aboutTor.check.label "Test Tor Network Settings"> -<!ENTITY aboutTor.success.label ""> -<!ENTITY aboutTor.success2.label ""> -<!ENTITY aboutTor.success3.label ""> -<!ENTITY aboutTor.failure.label ""> -<!ENTITY aboutTor.failure2.label ""> -<!ENTITY aboutTor.failure3prefix.label ""> -<!ENTITY aboutTor.failure3Link ""> -<!ENTITY aboutTor.failure3suffix.label ""> +<!ENTITY aboutTor.success.label "Congratulations!"> +<!ENTITY aboutTor.success2.label "This browser is configured to use Tor."> +<!ENTITY aboutTor.success3.label "You are now free to browse the Internet anonymously."> +<!ENTITY aboutTor.failure.label "Something Went Wrong!"> +<!ENTITY aboutTor.failure2.label "Tor is not working in this browser."> +<!ENTITY aboutTor.failure3prefix.label "For assistance, please contact "> +<!ENTITY aboutTor.failure3Link "help(a)rt.torproject.org"> +<!ENTITY aboutTor.failure3suffix.label "."> -<!ENTITY aboutTor.search.label ""> +<!ENTITY aboutTor.search.label "Search">  -<!ENTITY aboutTor.searchSPPost.link ""> -<!ENTITY aboutTor.searchDDGPost.link ""> -<!ENTITY aboutTor.searchSP.privacy.beforeLink.label ""> -<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label ""> -<!ENTITY aboutTor.searchSP.privacy.label ""> -<!ENTITY aboutTor.searchDDG.privacy.label ""> -<!ENTITY aboutTor.searchSP.privacy.link ""> -<!ENTITY aboutTor.searchDDG.privacy.link ""> -<!ENTITY aboutTor.searchSP.privacy.afterLink.label ""> -<!ENTITY aboutTor.searchDDG.privacy.afterLink.label ""> -<!ENTITY aboutTor.searchSP.search.beforeLink.label ""> -<!ENTITY aboutTor.searchDDG.search.beforeLink.label ""> -<!ENTITY aboutTor.searchSP.search.label ""> -<!ENTITY aboutTor.searchDDG.search.label ""> -<!ENTITY aboutTor.searchSP.search.link ""> -<!ENTITY aboutTor.searchDDG.search.link ""> -<!ENTITY aboutTor.searchSP.search.afterLink.label ""> -<!ENTITY aboutTor.searchDDG.search.afterLink.label ""> +<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search"> +<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> +<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search "> +<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search "> +<!ENTITY aboutTor.searchSP.privacy.label "securely"> +<!ENTITY aboutTor.searchDDG.privacy.label "securely"> +<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html"> +<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html"> +<!ENTITY aboutTor.searchSP.privacy.afterLink.label "&nbsp;"> +<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&nbsp;"> +<!ENTITY aboutTor.searchSP.search.beforeLink.label "with "> +<!ENTITY aboutTor.searchDDG.search.beforeLink.label "with "> +<!ENTITY aboutTor.searchSP.search.label "Startpage"> +<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo"> +<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/"> +<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/"> +<!ENTITY aboutTor.searchSP.search.afterLink.label "."> +<!ENTITY aboutTor.searchDDG.search.afterLink.label "."> -<!ENTITY aboutTor.torInfo1.label ""> -<!ENTITY aboutTor.torInfo2.label ""> -<!ENTITY aboutTor.torInfo3.label ""> -<!ENTITY aboutTor.torInfo4.label ""> -<!ENTITY aboutTor.whatnextQuestion.label ""> -<!ENTITY aboutTor.whatnextAnswer.label ""> -<!ENTITY aboutTor.whatnext.label ""> -<!ENTITY aboutTor.whatnext.link ""> -<!ENTITY aboutTor.helpInfo1.label ""> -<!ENTITY aboutTor.helpInfo2.label ""> -<!ENTITY aboutTor.helpInfo3.label ""> -<!ENTITY aboutTor.helpInfo3.link ""> -<!ENTITY aboutTor.helpInfo4.label ""> -<!ENTITY aboutTor.helpInfo4.link ""> -<!ENTITY aboutTor.helpInfo5.label ""> -<!ENTITY aboutTor.helpInfo5.link ""> +<!ENTITY aboutTor.torInfo1.label "Additional Info:"> +<!ENTITY aboutTor.torInfo2.label "Country & IP Address:"> +<!ENTITY aboutTor.torInfo3.label "Exit Node:"> +<!ENTITY aboutTor.torInfo4.label "This server does not log any information about visitors."> +<!ENTITY aboutTor.whatnextQuestion.label "What Next?"> +<!ENTITY aboutTor.whatnextAnswer.label "Tor is NOT all you need to browse anonymously! You may need to change some of your browsing habits to ensure your identity stays safe."> +<!ENTITY aboutTor.whatnext.label "Tips On Staying Anonymous »"> +<!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning"> +<!ENTITY aboutTor.helpInfo1.label "You Can Help!"> +<!ENTITY aboutTor.helpInfo2.label "There are many ways you can help make the Tor Network faster and stronger:"> +<!ENTITY aboutTor.helpInfo3.label "Run a Tor Relay Node »"> +<!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en"> +<!ENTITY aboutTor.helpInfo4.label "Volunteer Your Services »"> +<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en"> +<!ENTITY aboutTor.helpInfo5.label "Make a Donation »"> +<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en"> -<!ENTITY aboutTor.footer.label ""> -<!ENTITY aboutTor.learnMore.label ""> -<!ENTITY aboutTor.learnMore.link ""> +<!ENTITY aboutTor.footer.label "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, development, and education of online anonymity and privacy."> +<!ENTITY aboutTor.learnMore.label "Learn more about The Tor Project »"> +<!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en">

1 0

[translation/mat-gui] Update translations for mat-gui
by translation＠torproject.org 07 Feb '14

07 Feb '14

commit 602f515e9d7c0178c3085c15fde132542c65c4ed Author: Translation commit bot <translation(a)torproject.org> Date: Fri Feb 7 11:15:36 2014 +0000 Update translations for mat-gui --- en_GB.po | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/en_GB.po b/en_GB.po index 0c3968d..9e1653d 100644 --- a/en_GB.po +++ b/en_GB.po @@ -3,12 +3,13 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Translators: msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-01-19 14:48+0000\n" -"PO-Revision-Date: 2014-01-21 09:26+0000\n" +"PO-Revision-Date: 2014-02-07 11:11+0000\n" "Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/torproject/language/en_GB/)\n" "MIME-Version: 1.0\n" @@ -100,7 +101,7 @@ msgstr "" #: mat-gui:334 mat-gui:363 data/mat.ui:292 msgid "Filename" -msgstr "" +msgstr "Filename" #: mat-gui:336 msgid "Reason"

1 0