- tor-commits - lists.torproject.org

[tor/master] Add a little documentation for the bug5604 fix
by nickm＠torproject.org 30 May '12

30 May '12

commit d7e4777791bbaa93f82b98c2529450794b9e8a3f Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 30 16:53:31 2012 -0400 Add a little documentation for the bug5604 fix --- src/or/connection.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/or/connection.c b/src/or/connection.c index 642ee6e..2422765 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -1807,18 +1807,21 @@ connection_read_proxy_handshake(connection_t *conn) * entry in ports. Add to new_conns new every connection we * launch. * + * If control_listeners_only is true, then we only open control + * listeners, and we do not remove any noncontrol listeners from old_conns. + * * Return 0 on success, -1 on failure. **/ static int retry_listener_ports(smartlist_t *old_conns, const smartlist_t *ports, smartlist_t *new_conns, - int close_all_noncontrol) + int control_listeners_only) { smartlist_t *launch = smartlist_new(); int r = 0; - if (close_all_noncontrol) { + if (control_listeners_only) { SMARTLIST_FOREACH(ports, port_cfg_t *, p, { if (p->type == CONN_TYPE_CONTROL_LISTENER) smartlist_add(launch, p); @@ -1925,6 +1928,9 @@ retry_listener_ports(smartlist_t *old_conns, * * Add all old conns that should be closed to replaced_conns. * Add all new connections to new_conns. + * + * If close_all_noncontrol is true, then we only open control + * listeners, and we close all other listeners. */ int retry_all_listeners(smartlist_t *replaced_conns,

1 0

[tor/master] If DisableNetwork, don't even try to open non-controller listeners
by nickm＠torproject.org 30 May '12

30 May '12

commit 074bf72a2cb9e641468b9ef92a8b16c7f0e2f00a Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Apr 18 23:32:02 2012 -0400 If DisableNetwork, don't even try to open non-controller listeners Fix for 5604; bugfix on 0.2.3.9-alpha, which introduced DisableNetwork. --- changes/bug5604 | 4 ++++ src/or/config.c | 3 ++- src/or/connection.c | 17 +++++++++++++---- src/or/connection.h | 3 ++- src/or/main.c | 2 +- 5 files changed, 22 insertions(+), 7 deletions(-) diff --git a/changes/bug5604 b/changes/bug5604 new file mode 100644 index 0000000..4c72f3c --- /dev/null +++ b/changes/bug5604 @@ -0,0 +1,4 @@ + o Minor bugfixes: + - Don't try to open non-control listeners when DisableNetwork is set. + Previousy, we'd open all listeners, then immediately close them. + Fixes bug 5604; bugfix on 0.2.3.9-alpha. diff --git a/src/or/config.c b/src/or/config.c index 696bbd0..8c44a71 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -1119,7 +1119,8 @@ options_act_reversible(const or_options_t *old_options, char **msg) * networking is disabled, this will close all but the control listeners, * but disable those. */ if (!we_are_hibernating()) { - if (retry_all_listeners(replaced_listeners, new_listeners) < 0) { + if (retry_all_listeners(replaced_listeners, new_listeners, + options->DisableNetwork) < 0) { *msg = tor_strdup("Failed to bind one of the listener ports."); goto rollback; } diff --git a/src/or/connection.c b/src/or/connection.c index 1c034c6..642ee6e 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -1812,12 +1812,20 @@ connection_read_proxy_handshake(connection_t *conn) static int retry_listener_ports(smartlist_t *old_conns, const smartlist_t *ports, - smartlist_t *new_conns) + smartlist_t *new_conns, + int close_all_noncontrol) { smartlist_t *launch = smartlist_new(); int r = 0; - smartlist_add_all(launch, ports); + if (close_all_noncontrol) { + SMARTLIST_FOREACH(ports, port_cfg_t *, p, { + if (p->type == CONN_TYPE_CONTROL_LISTENER) + smartlist_add(launch, p); + }); + } else { + smartlist_add_all(launch, ports); + } /* Iterate through old_conns, comparing it to launch: remove from both lists * each pair of elements that corresponds to the same port. */ @@ -1920,7 +1928,7 @@ retry_listener_ports(smartlist_t *old_conns, */ int retry_all_listeners(smartlist_t *replaced_conns, - smartlist_t *new_conns) + smartlist_t *new_conns, int close_all_noncontrol) { smartlist_t *listeners = smartlist_new(); const or_options_t *options = get_options(); @@ -1935,7 +1943,8 @@ retry_all_listeners(smartlist_t *replaced_conns, if (retry_listener_ports(listeners, get_configured_ports(), - new_conns) < 0) + new_conns, + close_all_noncontrol) < 0) retval = -1; /* Any members that were still in 'listeners' don't correspond to diff --git a/src/or/connection.h b/src/or/connection.h index c4b8bf8..bdeefa2 100644 --- a/src/or/connection.h +++ b/src/or/connection.h @@ -64,7 +64,8 @@ int get_proxy_addrport(tor_addr_t *addr, uint16_t *port, int *proxy_type, const connection_t *conn); int retry_all_listeners(smartlist_t *replaced_conns, - smartlist_t *new_conns); + smartlist_t *new_conns, + int close_all_noncontrol); void connection_mark_all_noncontrol_listeners(void); void connection_mark_all_noncontrol_connections(void); diff --git a/src/or/main.c b/src/or/main.c index 9022f2e..f104b66 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -1428,7 +1428,7 @@ run_scheduled_events(time_t now) /** 3d. And every 60 seconds, we relaunch listeners if any died. */ if (!net_is_disabled() && time_to_check_listeners < now) { - retry_all_listeners(NULL, NULL); + retry_all_listeners(NULL, NULL, 0); time_to_check_listeners = now+60; }

1 0

[tor/master] Merge branch 'bug5604'
by nickm＠torproject.org 30 May '12

30 May '12

commit fe68a80f8f1e687d9e3dcdf6dfc5d0a8f3524335 Merge: 37f42c2 d7e4777 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 30 17:00:36 2012 -0400 Merge branch 'bug5604' changes/bug5604 | 4 ++++ src/or/config.c | 3 ++- src/or/connection.c | 23 +++++++++++++++++++---- src/or/connection.h | 3 ++- src/or/main.c | 2 +- 5 files changed, 28 insertions(+), 7 deletions(-)

1 0

[torspec/master] Document "GETINFO dormant".
by nickm＠torproject.org 30 May '12

30 May '12

commit d7fe6a2f6e851362a255b8cde348ff23210bf253 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 30 16:47:35 2012 -0400 Document "GETINFO dormant". --- control-spec.txt | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/control-spec.txt b/control-spec.txt index 15970e5..7e7e37e 100644 --- a/control-spec.txt +++ b/control-spec.txt @@ -475,6 +475,10 @@ microdescriptor for a given OR. [First implemented in 0.2.3.8-alpha.] + "dormant" -- A nonnegative integer: zero if Tor is currently active and + building circuits, and nonzero if Tor has gone idle due to lack of use + or some similar reason. [First implemented in 0.2.3.16-alpha] + "desc-annotations/id/<OR identity>" -- outputs the annotations string (source, timestamp of arrival, purpose, etc) for the corresponding descriptor. [First implemented in 0.2.0.13-alpha.]

1 0

[tor/master] New "GETINFO dormant" to report whether Tor has gone idle
by nickm＠torproject.org 30 May '12

30 May '12

commit 2418bc95946bd568e960f6ed42b0cd4dce3b835b Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 24 10:42:55 2012 -0400 New "GETINFO dormant" to report whether Tor has gone idle Torbutton needs this; see bug 5954 and 4718. --- changes/bug5954 | 5 +++++ src/or/control.c | 7 ++++++- 2 files changed, 11 insertions(+), 1 deletions(-) diff --git a/changes/bug5954 b/changes/bug5954 new file mode 100644 index 0000000..28c5a9c --- /dev/null +++ b/changes/bug5954 @@ -0,0 +1,5 @@ + o Minor features (controller): + - Expose our view of whether we have gone dormant to the + controller, via a new "GETINFO dormant" value. Due to bug 4718, + torbutton needs this to avoid excessive version checking. Fixes + bug 5954. diff --git a/src/or/control.c b/src/or/control.c index d6e6932..57dd0f1 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -28,6 +28,7 @@ #include "networkstatus.h" #include "policies.h" #include "reasons.h" +#include "rephist.h" #include "router.h" #include "routerlist.h" #include "routerparse.h" @@ -1408,6 +1409,9 @@ getinfo_helper_misc(control_connection_t *conn, const char *question, *answer = options_dump(get_options(), 1); } else if (!strcmp(question, "info/names")) { *answer = list_getinfo_options(); + } else if (!strcmp(question, "dormant")) { + int dormant = rep_hist_circbuilding_dormant(time(NULL)); + *answer = tor_strdup(dormant ? "1" : "0"); } else if (!strcmp(question, "events/names")) { *answer = tor_strdup("CIRC STREAM ORCONN BW DEBUG INFO NOTICE WARN ERR " "NEWDESC ADDRMAP AUTHDIR_NEWDESCS DESCCHANGED " @@ -2007,12 +2011,13 @@ static const getinfo_item_t getinfo_items[] = { "Brief summary of router status by nickname (v2 directory format)."), PREFIX("ns/purpose/", networkstatus, "Brief summary of router status by purpose (v2 directory format)."), - ITEM("network-status", dir, "Brief summary of router status (v1 directory format)"), ITEM("circuit-status", events, "List of current circuits originating here."), ITEM("stream-status", events,"List of current streams."), ITEM("orconn-status", events, "A list of current OR connections."), + ITEM("dormant", misc, + "Is Tor dormant (not building circuits because it's idle)?"), PREFIX("address-mappings/", events, NULL), DOC("address-mappings/all", "Current address mappings."), DOC("address-mappings/cache", "Current cached DNS replies."),

1 0

[tor/master] Merge remote-tracking branch 'public/bug5954'
by nickm＠torproject.org 30 May '12

30 May '12

commit 37f42c2f5898dedfb043a760b30081a0c39f1cd1 Merge: 711e4b4 2418bc9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 30 16:38:20 2012 -0400 Merge remote-tracking branch 'public/bug5954' changes/bug5954 | 5 +++++ src/or/control.c | 7 ++++++- 2 files changed, 11 insertions(+), 1 deletions(-) diff --cc src/or/control.c index ec018ff,57dd0f1..1bba2e1 --- a/src/or/control.c +++ b/src/or/control.c @@@ -27,9 -26,9 +27,10 @@@ #include "hibernate.h" #include "main.h" #include "networkstatus.h" +#include "nodelist.h" #include "policies.h" #include "reasons.h" + #include "rephist.h" #include "router.h" #include "routerlist.h" #include "routerparse.h" @@@ -1397,17 -1409,15 +1398,20 @@@ getinfo_helper_misc(control_connection_ *answer = options_dump(get_options(), 1); } else if (!strcmp(question, "info/names")) { *answer = list_getinfo_options(); + } else if (!strcmp(question, "dormant")) { + int dormant = rep_hist_circbuilding_dormant(time(NULL)); + *answer = tor_strdup(dormant ? "1" : "0"); } else if (!strcmp(question, "events/names")) { - *answer = tor_strdup("CIRC STREAM ORCONN BW DEBUG INFO NOTICE WARN ERR " - "NEWDESC ADDRMAP AUTHDIR_NEWDESCS DESCCHANGED " - "NS STATUS_GENERAL STATUS_CLIENT STATUS_SERVER " - "GUARD STREAM_BW CLIENTS_SEEN NEWCONSENSUS " - "BUILDTIMEOUT_SET"); + int i; + smartlist_t *event_names = smartlist_new(); + + for (i = 0; control_event_table[i].event_name != NULL; ++i) { + smartlist_add(event_names, (char *)control_event_table[i].event_name); + } + + *answer = smartlist_join_strings(event_names, " ", 0, NULL); + + smartlist_free(event_names); } else if (!strcmp(question, "features/names")) { *answer = tor_strdup("VERBOSE_NAMES EXTENDED_EVENTS"); } else if (!strcmp(question, "address")) {

1 0

[metrics-web/master] Update sanitized bridge descriptor format description.
by karsten＠torproject.org 30 May '12

30 May '12

commit 07dd4a2817430780933b6c35e9176ea9152d96ed Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed May 30 21:57:13 2012 +0200 Update sanitized bridge descriptor format description. --- web/WEB-INF/formats.jsp | 13 +++---------- 1 files changed, 3 insertions(+), 10 deletions(-) diff --git a/web/WEB-INF/formats.jsp b/web/WEB-INF/formats.jsp index 5740c9f..23e8874 100644 --- a/web/WEB-INF/formats.jsp +++ b/web/WEB-INF/formats.jsp @@ -81,10 +81,9 @@ are recent: <li><tt>@type dir-key-certificate-3 1.0</tt></li> <li><tt>@type network-status-consensus-3 1.0</tt></li> <li><tt>@type network-status-vote-3 1.0</tt></li> -<li><tt>@type bridge-network-status 1.0</tt></li> -<li><tt>@type bridge-server-descriptor -1.0</tt></li> -<li><tt>@type bridge-extra-info 1.0</tt></li> +<li><tt>@type bridge-network-status 1.0</tt></li> +<li><tt>@type bridge-server-descriptor 1.0</tt></li> +<li><tt>@type bridge-extra-info 1.0</tt></li> <li><tt>@type torperf 1.0</tt></li> <li><tt>@type bridge-pool-assignment 1.0</tt></li> @@ -352,12 +351,6 @@ long and the <tt>secret</tt> is only 19 bytes long.</li></ul> <li>Replace contact information: If there is contact information in a descriptor, the contact line is changed to <tt>somebody</tt>.</li> -<li>Replace nickname with Unnamed: The bridge nicknames might -give hints on the location of the bridge if chosen without care; e.g. a -bridge nickname might be very similar to the operators' relay nicknames -which might be located on adjacent IP addresses. -All bridge nicknames are therefore replaced with the string -<tt>Unnamed</tt>.</li> </ol>

1 0

[tor/master] Fix minor typo in warning printout.
by nickm＠torproject.org 30 May '12

30 May '12

commit 2f0c0f92f84f1d29fda234db2bba41d20d5bf952 Author: Linus Nordberg <linus(a)nordberg.se> Date: Tue May 29 15:03:22 2012 +0200 Fix minor typo in warning printout. --- src/or/command.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/or/command.c b/src/or/command.c index 7c4556e..9b14092 100644 --- a/src/or/command.c +++ b/src/or/command.c @@ -161,7 +161,7 @@ command_process_cell(cell_t *cell, or_connection_t *conn) cell->command != CELL_NETINFO) { log_fn(LOG_PROTOCOL_WARN, LD_PROTOCOL, "Received unexpected cell command %d in state %s; closing the " - "connection", + "connection.", (int)cell->command, conn_state_to_string(CONN_TYPE_OR,conn->_base.state)); connection_mark_for_close(TO_CONN(conn));

1 0

[tor/master] Close OR connections that send junk before AUTHORIZE/VERSIONS
by nickm＠torproject.org 30 May '12

30 May '12

commit 9df89aacbd9cac69660a5199ab6eca5ee5fc3ba7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Apr 27 12:02:55 2012 -0400 Close OR connections that send junk before AUTHORIZE/VERSIONS Fix for 4369. --- changes/bug4369 | 3 +++ src/or/command.c | 16 +++++++++++++--- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/changes/bug4369 b/changes/bug4369 new file mode 100644 index 0000000..c444102 --- /dev/null +++ b/changes/bug4369 @@ -0,0 +1,3 @@ + o Minor features: + - Close any connection that sends unrecognized junk before the + handshake. Solves an issue noted in bug 4369. diff --git a/src/or/command.c b/src/or/command.c index fb281a7..7c4556e 100644 --- a/src/or/command.c +++ b/src/or/command.c @@ -160,9 +160,11 @@ command_process_cell(cell_t *cell, or_connection_t *conn) if (handshaking && cell->command != CELL_VERSIONS && cell->command != CELL_NETINFO) { log_fn(LOG_PROTOCOL_WARN, LD_PROTOCOL, - "Received unexpected cell command %d in state %s; ignoring it.", + "Received unexpected cell command %d in state %s; closing the " + "connection", (int)cell->command, conn_state_to_string(CONN_TYPE_OR,conn->_base.state)); + connection_mark_for_close(TO_CONN(conn)); return; } @@ -258,8 +260,15 @@ command_process_var_cell(var_cell_t *cell, or_connection_t *conn) switch (conn->_base.state) { case OR_CONN_STATE_OR_HANDSHAKING_V2: - if (cell->command != CELL_VERSIONS) + if (cell->command != CELL_VERSIONS) { + log_fn(LOG_PROTOCOL_WARN, LD_PROTOCOL, + "Received a cell with command %d in state %s; " + "closing the connection.", + (int)cell->command, + conn_state_to_string(CONN_TYPE_OR,conn->_base.state)); + connection_mark_for_close(TO_CONN(conn)); return; + } break; case OR_CONN_STATE_TLS_HANDSHAKING: /* If we're using bufferevents, it's entirely possible for us to @@ -272,9 +281,10 @@ command_process_var_cell(var_cell_t *cell, or_connection_t *conn) if (! command_allowed_before_handshake(cell->command)) { log_fn(LOG_PROTOCOL_WARN, LD_PROTOCOL, "Received a cell with command %d in state %s; " - "ignoring it.", + "closing the connection.", (int)cell->command, conn_state_to_string(CONN_TYPE_OR,conn->_base.state)); + connection_mark_for_close(TO_CONN(conn)); return; } else { if (enter_v3_handshake_with_cell(cell, conn)<0)

1 0

[tor/master] Merge remote-tracking branch 'linus/bug4369'
by nickm＠torproject.org 30 May '12

30 May '12

commit 711e4b423714de93abff03c4cf740f19f4d4c630 Merge: a5a8296 2f0c0f9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 30 13:05:15 2012 -0400 Merge remote-tracking branch 'linus/bug4369' changes/bug4369 | 3 +++ src/or/command.c | 16 +++++++++++++--- 2 files changed, 16 insertions(+), 3 deletions(-)

1 0