- tor-commits - lists.torproject.org

[tor/master] Correct a comment
by nickm＠torproject.org 05 Jul '11

05 Jul '11

commit 53f87a89f00d075bdc81c2c468e844f3132ef953 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Fri Jun 24 15:12:45 2011 -0700 Correct a comment --- src/or/circuitlist.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c index 8534c38..e9cc9eb 100644 --- a/src/or/circuitlist.c +++ b/src/or/circuitlist.c @@ -866,7 +866,7 @@ circuit_unlink_all_from_or_conn(or_connection_t *conn, int reason) } /** Return a circ such that: - * - circ-\>rend_data-\>query is equal to rend_query, and + * - circ-\>rend_data-\>onion_address is equal to rend_query, and * - circ-\>purpose is equal to purpose. * * Return NULL if no such circuit exists.

1 0

[tor/master] Add BUILDTIMEOUT_SET to the result of GETINFO events/names
by nickm＠torproject.org 05 Jul '11

05 Jul '11

commit 93d52f6739d3bb184575aa53eab1562d2c80ee57 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Sat Jun 25 15:02:11 2011 -0700 Add BUILDTIMEOUT_SET to the result of GETINFO events/names --- changes/bug3465-022 | 6 ++++++ src/or/control.c | 3 ++- 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/changes/bug3465-022 b/changes/bug3465-022 new file mode 100644 index 0000000..2d22616 --- /dev/null +++ b/changes/bug3465-022 @@ -0,0 +1,6 @@ + o Minor bugfixes: + + - Add BUILDTIMEOUT_SET to the list returned by the 'GETINFO + events/names' control-port command. Bugfix on 0.2.2.9-alpha; + fixes part of bug 3465. + diff --git a/src/or/control.c b/src/or/control.c index 82017bd..da0a95d 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -1380,7 +1380,8 @@ getinfo_helper_misc(control_connection_t *conn, const char *question, *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"); + "GUARD STREAM_BW CLIENTS_SEEN NEWCONSENSUS " + "BUILDTIMEOUT_SET"); } else if (!strcmp(question, "features/names")) { *answer = tor_strdup("VERBOSE_NAMES EXTENDED_EVENTS"); } else if (!strcmp(question, "address")) {

1 0

[tor/master] Merge branch 'bug3465-022' into bug3465-023
by nickm＠torproject.org 05 Jul '11

05 Jul '11

commit c780bc4d0b30e05ce2212756d93315f5680035a7 Merge: 0b53646 93d52f6 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Sat Jun 25 15:04:07 2011 -0700 Merge branch 'bug3465-022' into bug3465-023 * bug3465-022: Add BUILDTIMEOUT_SET to the result of GETINFO events/names Correct a comment Fix minor comment issues changes/bug3465-022 | 6 ++++++ src/or/circuitbuild.c | 10 +++++----- src/or/circuitlist.c | 2 +- src/or/control.c | 3 ++- 4 files changed, 14 insertions(+), 7 deletions(-)

1 0

[tor/master] Make handle_control_setevents table-driven
by nickm＠torproject.org 05 Jul '11

05 Jul '11

commit ca6efcf507257f75ad2ddd9e3673d2435e09ff80 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Sat Jun 25 16:59:00 2011 -0700 Make handle_control_setevents table-driven --- changes/bug3465-023 | 6 +++ src/or/control.c | 116 +++++++++++++++++++++++++------------------------- 2 files changed, 64 insertions(+), 58 deletions(-) diff --git a/changes/bug3465-023 b/changes/bug3465-023 new file mode 100644 index 0000000..9fa089b --- /dev/null +++ b/changes/bug3465-023 @@ -0,0 +1,6 @@ + o Minor bugfixes: + + - Add SIGNAL to the list returned by the 'GETINFO events/names' + control-port command. Bugfix on 0.2.3.1-alpha; fixes part of + bug 3465. + diff --git a/src/or/control.c b/src/or/control.c index 33be5a0..6ea9dbe 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -917,13 +917,44 @@ handle_control_loadconf(control_connection_t *conn, uint32_t len, return 0; } +struct control_event_t { + uint16_t event_code; + const char *event_name; +}; +static const struct control_event_t control_event_table[] = { + { EVENT_CIRCUIT_STATUS, "CIRC" }, + { EVENT_STREAM_STATUS, "STREAM" }, + { EVENT_OR_CONN_STATUS, "ORCONN" }, + { EVENT_BANDWIDTH_USED, "BW" }, + { EVENT_DEBUG_MSG, "DEBUG" }, + { EVENT_INFO_MSG, "INFO" }, + { EVENT_NOTICE_MSG, "NOTICE" }, + { EVENT_WARN_MSG, "WARN" }, + { EVENT_ERR_MSG, "ERR" }, + { EVENT_NEW_DESC, "NEWDESC" }, + { EVENT_ADDRMAP, "ADDRMAP" }, + { EVENT_AUTHDIR_NEWDESCS, "AUTHDIR_NEWDESCS" }, + { EVENT_DESCCHANGED, "DESCCHANGED" }, + { EVENT_NS, "NS" }, + { EVENT_STATUS_GENERAL, "STATUS_GENERAL" }, + { EVENT_STATUS_CLIENT, "STATUS_CLIENT" }, + { EVENT_STATUS_SERVER, "STATUS_SERVER" }, + { EVENT_GUARD, "GUARD" }, + { EVENT_STREAM_BANDWIDTH_USED, "STREAM_BW" }, + { EVENT_CLIENTS_SEEN, "CLIENTS_SEEN" }, + { EVENT_NEWCONSENSUS, "NEWCONSENSUS" }, + { EVENT_BUILDTIMEOUT_SET, "BUILDTIMEOUT_SET" }, + { EVENT_SIGNAL, "SIGNAL" }, + { 0, NULL }, +}; + /** Called when we get a SETEVENTS message: update conn->event_mask, * and reply with DONE or ERROR. */ static int handle_control_setevents(control_connection_t *conn, uint32_t len, const char *body) { - uint16_t event_code; + int event_code = -1; uint32_t event_mask = 0; smartlist_t *events = smartlist_create(); @@ -935,58 +966,22 @@ handle_control_setevents(control_connection_t *conn, uint32_t len, { if (!strcasecmp(ev, "EXTENDED")) { continue; - } else if (!strcasecmp(ev, "CIRC")) - event_code = EVENT_CIRCUIT_STATUS; - else if (!strcasecmp(ev, "STREAM")) - event_code = EVENT_STREAM_STATUS; - else if (!strcasecmp(ev, "ORCONN")) - event_code = EVENT_OR_CONN_STATUS; - else if (!strcasecmp(ev, "BW")) - event_code = EVENT_BANDWIDTH_USED; - else if (!strcasecmp(ev, "DEBUG")) - event_code = EVENT_DEBUG_MSG; - else if (!strcasecmp(ev, "INFO")) - event_code = EVENT_INFO_MSG; - else if (!strcasecmp(ev, "NOTICE")) - event_code = EVENT_NOTICE_MSG; - else if (!strcasecmp(ev, "WARN")) - event_code = EVENT_WARN_MSG; - else if (!strcasecmp(ev, "ERR")) - event_code = EVENT_ERR_MSG; - else if (!strcasecmp(ev, "NEWDESC")) - event_code = EVENT_NEW_DESC; - else if (!strcasecmp(ev, "ADDRMAP")) - event_code = EVENT_ADDRMAP; - else if (!strcasecmp(ev, "AUTHDIR_NEWDESCS")) - event_code = EVENT_AUTHDIR_NEWDESCS; - else if (!strcasecmp(ev, "DESCCHANGED")) - event_code = EVENT_DESCCHANGED; - else if (!strcasecmp(ev, "NS")) - event_code = EVENT_NS; - else if (!strcasecmp(ev, "STATUS_GENERAL")) - event_code = EVENT_STATUS_GENERAL; - else if (!strcasecmp(ev, "STATUS_CLIENT")) - event_code = EVENT_STATUS_CLIENT; - else if (!strcasecmp(ev, "STATUS_SERVER")) - event_code = EVENT_STATUS_SERVER; - else if (!strcasecmp(ev, "GUARD")) - event_code = EVENT_GUARD; - else if (!strcasecmp(ev, "STREAM_BW")) - event_code = EVENT_STREAM_BANDWIDTH_USED; - else if (!strcasecmp(ev, "CLIENTS_SEEN")) - event_code = EVENT_CLIENTS_SEEN; - else if (!strcasecmp(ev, "NEWCONSENSUS")) - event_code = EVENT_NEWCONSENSUS; - else if (!strcasecmp(ev, "BUILDTIMEOUT_SET")) - event_code = EVENT_BUILDTIMEOUT_SET; - else if (!strcasecmp(ev, "SIGNAL")) - event_code = EVENT_SIGNAL; - else { - connection_printf_to_buf(conn, "552 Unrecognized event \"%s\"\r\n", - ev); - SMARTLIST_FOREACH(events, char *, e, tor_free(e)); - smartlist_free(events); - return 0; + } else { + int i; + for (i = 0; control_event_table[i].event_name != NULL; ++i) { + if (!strcasecmp(ev, control_event_table[i].event_name)) { + event_code = control_event_table[i].event_code; + break; + } + } + + if (event_code == -1) { + connection_printf_to_buf(conn, "552 Unrecognized event \"%s\"\r\n", + ev); + SMARTLIST_FOREACH(events, char *, e, tor_free(e)); + smartlist_free(events); + return 0; + } } event_mask |= (1 << event_code); } @@ -1386,11 +1381,16 @@ getinfo_helper_misc(control_connection_t *conn, const char *question, } else if (!strcmp(question, "info/names")) { *answer = list_getinfo_options(); } 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_create(); + + 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

[tor/master] Merge remote-tracking branch 'rransom-tor/bug3465-023-v2'
by nickm＠torproject.org 05 Jul '11

05 Jul '11

commit 0be2934186da8683558404fe465407054421dd53 Merge: e273890 ca6efcf Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 5 16:01:07 2011 -0400 Merge remote-tracking branch 'rransom-tor/bug3465-023-v2' changes/bug3465-022 | 6 +++ changes/bug3465-023 | 6 +++ src/or/circuitbuild.c | 10 ++-- src/or/circuitlist.c | 2 +- src/or/control.c | 115 +++++++++++++++++++++++++------------------------ 5 files changed, 76 insertions(+), 63 deletions(-)

1 0

[tor/master] Merge remote-tracking branch 'rransom-tor/bug3465-022' into maint-0.2.2
by nickm＠torproject.org 05 Jul '11

05 Jul '11

commit 335ff915c7a509eb1b76e67f88c7b65d20032035 Merge: 06f0c1a 93d52f6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 5 15:52:11 2011 -0400 Merge remote-tracking branch 'rransom-tor/bug3465-022' into maint-0.2.2 changes/bug3465-022 | 6 ++++++ src/or/circuitbuild.c | 10 +++++----- src/or/circuitlist.c | 2 +- src/or/control.c | 3 ++- 4 files changed, 14 insertions(+), 7 deletions(-)

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.2'
by nickm＠torproject.org 05 Jul '11

05 Jul '11

commit 7295ad18d5c7ca67f6eee6d71823fc071103b795 Merge: 0be2934 335ff91 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 5 16:01:12 2011 -0400 Merge remote-tracking branch 'origin/maint-0.2.2'

1 0

[tor/maint-0.2.2] Fix minor comment issues
by nickm＠torproject.org 05 Jul '11

05 Jul '11

commit cb1b20dbad2ee346a814b30d5dc72a3dc93069e5 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Thu Jun 23 15:10:11 2011 -0700 Fix minor comment issues --- src/or/circuitbuild.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index 6d7e711..1140f33 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -1501,7 +1501,7 @@ get_unique_circ_id_by_conn(or_connection_t *conn) } /** If verbose is false, allocate and return a comma-separated list of - * the currently built elements of circuit_t. If verbose is true, also + * the currently built elements of circ. If verbose is true, also * list information about link status in a more verbose format using spaces. * If verbose_names is false, give nicknames for Named routers and hex * digests for others; if verbose_names is true, use $DIGEST=Name style @@ -1590,7 +1590,7 @@ circuit_list_path_impl(origin_circuit_t *circ, int verbose, int verbose_names) } /** If verbose is false, allocate and return a comma-separated - * list of the currently built elements of circuit_t. If + * list of the currently built elements of circ. If * verbose is true, also list information about link status in * a more verbose format using spaces. */ @@ -1601,7 +1601,7 @@ circuit_list_path(origin_circuit_t *circ, int verbose) } /** Allocate and return a comma-separated list of the currently built elements - * of circuit_t, giving each as a verbose nickname. + * of circ, giving each as a verbose nickname. */ char * circuit_list_path_for_controller(origin_circuit_t *circ) @@ -1610,7 +1610,7 @@ circuit_list_path_for_controller(origin_circuit_t *circ) } /** Log, at severity severity, the nicknames of each router in - * circ's cpath. Also log the length of the cpath, and the intended + * circ's cpath. Also log the length of the cpath, and the intended * exit point. */ void @@ -1622,7 +1622,7 @@ circuit_log_path(int severity, unsigned int domain, origin_circuit_t *circ) } /** Tell the rep(utation)hist(ory) module about the status of the links - * in circ. Hops that have become OPEN are marked as successfully + * in circ. Hops that have become OPEN are marked as successfully * extended; the _first_ hop that isn't open (if any) is marked as * unable to extend. */

1 0

[tor/maint-0.2.2] Add BUILDTIMEOUT_SET to the result of GETINFO events/names
by nickm＠torproject.org 05 Jul '11

05 Jul '11

commit 93d52f6739d3bb184575aa53eab1562d2c80ee57 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Sat Jun 25 15:02:11 2011 -0700 Add BUILDTIMEOUT_SET to the result of GETINFO events/names --- changes/bug3465-022 | 6 ++++++ src/or/control.c | 3 ++- 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/changes/bug3465-022 b/changes/bug3465-022 new file mode 100644 index 0000000..2d22616 --- /dev/null +++ b/changes/bug3465-022 @@ -0,0 +1,6 @@ + o Minor bugfixes: + + - Add BUILDTIMEOUT_SET to the list returned by the 'GETINFO + events/names' control-port command. Bugfix on 0.2.2.9-alpha; + fixes part of bug 3465. + diff --git a/src/or/control.c b/src/or/control.c index 82017bd..da0a95d 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -1380,7 +1380,8 @@ getinfo_helper_misc(control_connection_t *conn, const char *question, *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"); + "GUARD STREAM_BW CLIENTS_SEEN NEWCONSENSUS " + "BUILDTIMEOUT_SET"); } else if (!strcmp(question, "features/names")) { *answer = tor_strdup("VERBOSE_NAMES EXTENDED_EVENTS"); } else if (!strcmp(question, "address")) {

1 0

[tor/maint-0.2.2] Correct a comment
by nickm＠torproject.org 05 Jul '11

05 Jul '11

commit 53f87a89f00d075bdc81c2c468e844f3132ef953 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Fri Jun 24 15:12:45 2011 -0700 Correct a comment --- src/or/circuitlist.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c index 8534c38..e9cc9eb 100644 --- a/src/or/circuitlist.c +++ b/src/or/circuitlist.c @@ -866,7 +866,7 @@ circuit_unlink_all_from_or_conn(or_connection_t *conn, int reason) } /** Return a circ such that: - * - circ-\>rend_data-\>query is equal to rend_query, and + * - circ-\>rend_data-\>onion_address is equal to rend_query, and * - circ-\>purpose is equal to purpose. * * Return NULL if no such circuit exists.

1 0