- tor-commits - lists.torproject.org

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.3'
by nickm＠torproject.org 28 Jun '12

28 Jun '12

commit 2f8a9e3502d6f97fa3ffaa27afa552db7f8773e4 Merge: 19a81ef 64f8e68 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 28 15:53:14 2012 -0400 Merge remote-tracking branch 'origin/maint-0.2.3'

1 0

[tor/master] oops; forgot the changes file for bug3842
by nickm＠torproject.org 28 Jun '12

28 Jun '12

commit e62ea8fd1e1e1704d299bf27a4b507b38b071c76 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 28 15:48:49 2012 -0400 oops; forgot the changes file for bug3842 --- changes/bug3842 | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/changes/bug3842 b/changes/bug3842 new file mode 100644 index 0000000..9a67b0d --- /dev/null +++ b/changes/bug3842 @@ -0,0 +1,3 @@ + o Minor feature: + - Add a "GETINFO signal/names" command to control port. +

1 0

[torspec/master] Tor 0.1.2.5 is dead. Long live Tor 0.1.2.5.
by nickm＠torproject.org 28 Jun '12

28 Jun '12

commit 4eb029b965adbcb407da5518047dc7536ab7ca2d Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Mar 16 09:52:21 2012 -0700 Tor 0.1.2.5 is dead. Long live Tor 0.1.2.5. The spec cited several caveats that would no longer be relevant when 0.1.2.5 was obsolete. Clearing out this cruft. --- dir-spec-v2.txt | 38 +++++++++----------------------------- dir-spec.txt | 35 +++-------------------------------- 2 files changed, 12 insertions(+), 61 deletions(-) diff --git a/dir-spec-v2.txt b/dir-spec-v2.txt index 7b06b02..a2dacd3 100644 --- a/dir-spec-v2.txt +++ b/dir-spec-v2.txt @@ -113,17 +113,6 @@ require current clients to understand any KeywordLine not currently described. - The "opt" keyword was used until Tor 0.1.2.5-alpha for non-critical future - extensions. All implementations MUST ignore any item of the form "opt - keyword ....." when they would not recognize "keyword ....."; and MUST - treat "opt keyword ....." as synonymous with "keyword ......" when keyword - is recognized. - - Implementations before 0.1.2.5-alpha rejected any document with a - KeywordLine that started with a keyword that they didn't recognize. - Implementations MUST prefix items not recognized by older versions of Tor - with an "opt" until those versions of Tor are obsolete. - Other implementations that want to extend Tor's directory format MAY introduce their own items. The keywords for extension items SHOULD start with the characters "x-" or "X-", to guarantee that they will not conflict @@ -162,6 +151,10 @@ "hibernating", "read-history", "write-history", "eventdns", "platform", "family". + For historical reasons some options are prefixed with "opt ", for instance + "opt fingerprint". This "opt " prefix should be ignored with the second word + used as the keyword instead. + Additionally, a router descriptor MAY contain any number of "accept", "reject", and "opt" Items. Other than "router" and "router-signature", the items may appear in any order. @@ -206,17 +199,11 @@ identity key. A descriptor is considered invalid (and MUST be rejected) if the fingerprint line does not match the public key. - [We didn't start parsing this line until Tor 0.1.0.6-rc; it should - be marked with "opt" until earlier versions of Tor are obsolete.] - "hibernating" 0|1 If the value is 1, then the Tor server was hibernating when the descriptor was published, and shouldn't be used to build circuits. - [We didn't start parsing this line until Tor 0.1.0.6-rc; it should be - marked with "opt" until earlier versions of Tor are obsolete.] - "uptime" The number of seconds that this OR process has been running. @@ -273,9 +260,6 @@ number of bytes used in the most recent intervals, ordered from oldest to newest. - [We didn't start parsing these lines until Tor 0.1.0.6-rc; they should - be marked with "opt" until earlier versions of Tor are obsolete.] - "eventdns" bool NL Declare whether this version of Tor is using the newer enhanced @@ -286,10 +270,9 @@ this option set to 0 if it is not present. All Tor versions at 0.1.2.2-alpha or later should be assumed to have this option set to 1 if it is not present. Until 0.1.2.1-alpha-dev, this option was - not generated, even when eventdns was in use. Versions of Tor - before 0.1.2.1-alpha-dev did not parse this option, so it should be - marked "opt". With 0.2.0.1-alpha, the old 'dnsworker' logic has - been removed, rendering this option of historical interest only.] + not generated, even when eventdns was in use. With 0.2.0.1-alpha, the + old 'dnsworker' logic has been removed, rendering this option of + historical interest only.] 2.2. Nonterminals in router descriptors @@ -414,9 +397,7 @@ The "r" entry for each router must appear first and is required. The "s" entry is optional (see Section 3.1 below for how the flags are decided). Unrecognized flags on the "s" line and extra elements - on the "r" line must be ignored. The "v" line is optional; it was not - supported until 0.1.2.5-alpha, and it must be preceded with an "opt" - until all earlier versions of Tor are obsolete. + on the "r" line must be ignored. The "v" line is optional. The signature section contains: @@ -882,8 +863,7 @@ apparent IP address of the client connecting to them (as a dotted quad). For directory connections tunneled over a BEGIN_DIR stream, servers SHOULD report the IP from which the circuit carrying the BEGIN_DIR stream reached - them. [Servers before version 0.1.2.5-alpha reported 127.0.0.1 for all - BEGIN_DIR-tunneled connections.] + them. Servers SHOULD disable caching of multiple network statuses or multiple router descriptors. Servers MAY enable caching of single descriptors, diff --git a/dir-spec.txt b/dir-spec.txt index ab8b064..08952b0 100644 --- a/dir-spec.txt +++ b/dir-spec.txt @@ -234,20 +234,6 @@ require current clients to understand any KeywordLine not currently described. - The "opt" keyword was used until Tor 0.1.2.5-alpha for non-critical future - extensions. All implementations MUST ignore any item of the form "opt - keyword ....." when they would not recognize "keyword ....."; and MUST - treat "opt keyword ....." as synonymous with "keyword ......" when keyword - is recognized. - - Implementations before 0.1.2.5-alpha rejected any document with a - KeywordLine that started with a keyword that they didn't recognize. - When generating documents that need to be read by older versions of Tor, - implementations MUST prefix items not recognized by older versions of - Tor with an "opt" until those versions of Tor are obsolete. [Note that - key certificates, status vote documents, extra info documents, and - status consensus documents will never be read by older versions of Tor.] - Other implementations that want to extend Tor's directory format MAY introduce their own items. The keywords for extension items SHOULD start with the characters "x-" or "X-", to guarantee that they will not conflict @@ -540,10 +526,7 @@ Present only if this router is a directory cache that provides extra-info documents. - [Versions before 0.2.0.1-alpha don't recognize this, and versions - before 0.1.2.5-alpha will reject descriptors containing it unless - it is prefixed with "opt"; it should be so prefixed until these - versions are obsolete.] + [Versions before 0.2.0.1-alpha don't recognize this] "extra-info-digest" digest NL @@ -554,10 +537,7 @@ (that is, not including the signature). (If this field is absent, the router is not uploading a corresponding extra-info document.) - [Versions before 0.2.0.1-alpha don't recognize this, and versions - before 0.1.2.5-alpha will reject descriptors containing it unless - it is prefixed with "opt"; it should be so prefixed until these - versions are obsolete.] + [Versions before 0.2.0.1-alpha don't recognize this] "hidden-service-dir" *(SP VersionNum) NL @@ -568,10 +548,6 @@ supports those descriptor versions. If none are specified, it defaults to version 2 descriptors. - [Versions of Tor before 0.1.2.5-alpha rejected router descriptors - with unrecognized items; the protocols line should be preceded with - an "opt" until these Tors are obsolete.] - "protocols" SP "Link" SP LINK-VERSION-LIST SP "Circuit" SP CIRCUIT-VERSION-LIST NL @@ -582,10 +558,6 @@ protocols are "Link 1 2 Circuit 1". See section 4.1 of tor-spec.txt for more information about link protocol versions. - [Versions of Tor before 0.1.2.5-alpha rejected router descriptors - with unrecognized items; the protocols line should be preceded with - an "opt" until these Tors are obsolete.] - "allow-single-hop-exits" NL [At most once.] @@ -2396,8 +2368,7 @@ apparent IP address of the client connecting to them (as a dotted quad). For directory connections tunneled over a BEGIN_DIR stream, servers SHOULD report the IP from which the circuit carrying the BEGIN_DIR stream reached - them. [Servers before version 0.1.2.5-alpha reported 127.0.0.1 for all - BEGIN_DIR-tunneled connections.] + them. Servers SHOULD disable caching of multiple network statuses or multiple router descriptors. Servers MAY enable caching of single descriptors,

1 0

[torspec/master] Merge remote-tracking branch 'atagar/5419'
by nickm＠torproject.org 28 Jun '12

28 Jun '12

commit eb389f3b88f47fb81aa85f4130c27c4b4cda07e1 Merge: 41a353e 4eb029b Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 28 15:42:28 2012 -0400 Merge remote-tracking branch 'atagar/5419' dir-spec-v2.txt | 38 +++++++++----------------------------- dir-spec.txt | 35 +++-------------------------------- 2 files changed, 12 insertions(+), 61 deletions(-)

1 0

[tor/master] Fix bug 3842: add a GETINFO signal/names
by nickm＠torproject.org 28 Jun '12

28 Jun '12

commit a6169800f831013745df183c31d6ec83b3c5e0e3 Author: Brendan C <temurion(a)gmail.com> Date: Thu Jun 28 15:36:52 2012 -0400 Fix bug 3842: add a GETINFO signal/names Also refactor SIGNAL so that it and signal/names use the same table. (commit message by nickm) --- src/or/control.c | 63 +++++++++++++++++++++++++++++++++++++---------------- 1 files changed, 44 insertions(+), 19 deletions(-) diff --git a/src/or/control.c b/src/or/control.c index 0387f4b..f71f677 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -1244,6 +1244,27 @@ handle_control_saveconf(control_connection_t *conn, uint32_t len, return 0; } +struct signal_t { + int sig; + const char *signal_name; +}; + +static const struct signal_t signal_table[] = { + { SIGHUP, "RELOAD" }, + { SIGHUP, "HUP" }, + { SIGINT, "SHUTDOWN" }, + { SIGUSR1, "DUMP" }, + { SIGUSR1, "USR1" }, + { SIGUSR2, "DEBUG" }, + { SIGUSR2, "USR2" }, + { SIGTERM, "HALT" }, + { SIGTERM, "TERM" }, + { SIGTERM, "INT" }, + { SIGNEWNYM, "NEWNYM" }, + { SIGCLEARDNSCACHE, "CLEARDNSCACHE"}, + { 0, NULL }, +}; + /** Called when we get a SIGNAL command. React to the provided signal, and * report success or failure. (If the signal results in a shutdown, success * may not be reported.) */ @@ -1251,7 +1272,8 @@ static int handle_control_signal(control_connection_t *conn, uint32_t len, const char *body) { - int sig; + int sig = -1; + int i; int n = 0; char *s; @@ -1260,27 +1282,19 @@ handle_control_signal(control_connection_t *conn, uint32_t len, while (body[n] && ! TOR_ISSPACE(body[n])) ++n; s = tor_strndup(body, n); - if (!strcasecmp(s, "RELOAD") || !strcasecmp(s, "HUP")) - sig = SIGHUP; - else if (!strcasecmp(s, "SHUTDOWN") || !strcasecmp(s, "INT")) - sig = SIGINT; - else if (!strcasecmp(s, "DUMP") || !strcasecmp(s, "USR1")) - sig = SIGUSR1; - else if (!strcasecmp(s, "DEBUG") || !strcasecmp(s, "USR2")) - sig = SIGUSR2; - else if (!strcasecmp(s, "HALT") || !strcasecmp(s, "TERM")) - sig = SIGTERM; - else if (!strcasecmp(s, "NEWNYM")) - sig = SIGNEWNYM; - else if (!strcasecmp(s, "CLEARDNSCACHE")) - sig = SIGCLEARDNSCACHE; - else { + + for (i = 0; signal_table[i].signal_name != NULL; ++i) { + if (!strcasecmp(s, signal_table[i].signal_name)) { + sig = signal_table[i].sig; + break; + } + } + + if (sig < 0) connection_printf_to_buf(conn, "552 Unrecognized signal code \"%s\"\r\n", s); - sig = -1; - } tor_free(s); - if (sig<0) + if (sig < 0) return 0; send_control_done(conn); @@ -1432,6 +1446,16 @@ getinfo_helper_misc(control_connection_t *conn, const char *question, *answer = smartlist_join_strings(event_names, " ", 0, NULL); smartlist_free(event_names); + } else if (!strcmp(question, "signal/names")) { + smartlist_t *signal_names = smartlist_new(); + int j; + for (j = 0; signal_table[j].signal_name != NULL; ++j) { + smartlist_add(signal_names, (char*)signal_table[j].signal_name); + } + + *answer = smartlist_join_strings(signal_names, " ", 0, NULL); + + smartlist_free(signal_names); } else if (!strcmp(question, "features/names")) { *answer = tor_strdup("VERBOSE_NAMES EXTENDED_EVENTS"); } else if (!strcmp(question, "address")) { @@ -2130,6 +2154,7 @@ static const getinfo_item_t getinfo_items[] = { "List of GETINFO options, types, and documentation."), ITEM("events/names", misc, "Events that the controller can ask for with SETEVENTS."), + ITEM("signal/names", misc, "Signal names recognized by the SIGNAL command"), ITEM("features/names", misc, "What arguments can USEFEATURE take?"), PREFIX("desc/id/", dir, "Router descriptors by ID."), PREFIX("desc/name/", dir, "Router descriptors by nickname."),

1 0

[tor/master] Make check-spaces happy again
by nickm＠torproject.org 28 Jun '12

28 Jun '12

commit 1e008e98767fb1b98142a4099a837bbb2ce818f4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 28 15:40:08 2012 -0400 Make check-spaces happy again --- src/test/test_util.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/test/test_util.c b/src/test/test_util.c index b07fa3b..8877444 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -1472,7 +1472,7 @@ test_util_control_formats(void) } else { \ TT_FAIL(("%s ~~ %s: %f != %f",#value1,#value2,v1,v2)); \ } \ - } while(0) + } while (0) static void test_util_sscanf(void)

1 0

[tor/maint-0.2.3] bump to 0.2.3.18-rc
by arma＠torproject.org 28 Jun '12

28 Jun '12

commit 64f8e68e65f32c742eab85d993da2a838f90dcf3 Author: Roger Dingledine <arma(a)torproject.org> Date: Thu Jun 28 15:34:33 2012 -0400 bump to 0.2.3.18-rc --- configure.in | 2 +- contrib/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.in b/configure.in index 556bb66..e9ef4f8 100644 --- a/configure.in +++ b/configure.in @@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2012, The Tor Project, Inc. dnl See LICENSE for licensing information AC_INIT -AM_INIT_AUTOMAKE(tor, 0.2.3.17-beta-dev) +AM_INIT_AUTOMAKE(tor, 0.2.3.18-rc) AM_CONFIG_HEADER(orconfig.h) AC_CANONICAL_HOST diff --git a/contrib/tor-mingw.nsi.in b/contrib/tor-mingw.nsi.in index 6643925..75b2567 100644 --- a/contrib/tor-mingw.nsi.in +++ b/contrib/tor-mingw.nsi.in @@ -8,7 +8,7 @@ !include "LogicLib.nsh" !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.2.3.17-beta-dev" +!define VERSION "0.2.3.18-rc" !define INSTALLER "tor-${VERSION}-win32.exe" !define WEBSITE "https://www.torproject.org/" !define LICENSE "LICENSE" diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index 3449277..a5bd2ee 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -232,7 +232,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.2.3.17-beta-dev" +#define VERSION "0.2.3.18-rc"

1 0

[tor/maint-0.2.3] add a blurb for 0.2.3.18-rc, other minor cleanups
by arma＠torproject.org 28 Jun '12

28 Jun '12

commit 81cd3d7ad641a8dbf1076e011d209cfc3d6af2b0 Author: Roger Dingledine <arma(a)torproject.org> Date: Thu Jun 28 15:32:36 2012 -0400 add a blurb for 0.2.3.18-rc, other minor cleanups --- ChangeLog | 29 +++++++++++++++++------------ src/common/util.c | 2 +- 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8eb082c..3d666a6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,7 @@ Changes in version 0.2.3.18-rc - 2012-06-28 + Tor 0.2.3.18-rc is the first release candidate for the Tor 0.2.3.x + series. It fixes a few smaller bugs, but generally appears stable. + Please test it and let us know whether it is! o Major bugfixes: - Allow wildcarded mapaddress targets to be specified on the @@ -15,6 +18,10 @@ Changes in version 0.2.3.18-rc - 2012-06-28 upload", so that they no longer confusingly imply that we're sending something to a directory we might not even be connected to yet. Fixes bug 3311; bugfix on 0.2.0.10-alpha. + - Make sure to set *socket_error in all error cases in + connection_connect(), so it can't produce a warning about + errno being zero from errno_to_orconn_end_reason(). Bugfix on + 0.2.1.1-alpha; resolves ticket 6028. - Downgrade "Got a certificate, but we already have it" log messages from warning to info, except when we're a dirauth. Fixes bug 5238; bugfix on 0.2.1.7-alpha. @@ -25,10 +32,16 @@ Changes in version 0.2.3.18-rc - 2012-06-28 Fixes bug 5932; bugfix on 0.2.2.7-alpha. o Minor bugfixes (on 0.2.3.x): + - Make format_helper_exit_status() avoid unnecessary space padding + and stop confusing log_from_pipe(). Fixes ticket 5557; bugfix + on 0.2.3.1-alpha. - Downgrade a message about cleaning the microdescriptor cache to "info" from "notice". Fixes bug 6238; bugfix on 0.2.3.1-alpha. - - Improve log message issued when a managed proxy fails to - launch. Fixes bug 5099; bugfix on 0.2.3.6-alpha. + - Log a BUG message at severity INFO if we have a networkstatus with + a missing entry for some microdescriptor. Continues on a patch + to 0.2.3.2-alpha. + - Improve the log message when a managed proxy fails to launch. Fixes + bug 5099; bugfix on 0.2.3.6-alpha. - Don't do DNS lookups when parsing corrupted managed proxy protocol messages. Fixes bug 6226; bugfix on 0.2.3.6-alpha. - When formatting wildcarded address mappings for the controller, @@ -36,22 +49,14 @@ Changes in version 0.2.3.18-rc - 2012-06-28 bugfix on 0.2.3.9-alpha. - Avoid a warning caused by using strcspn() from glibc with clang 3.0. Bugfix on 0.2.3.13-alpha. - - Make format_helper_exit_status() avoid unnecessary space padding and - stop confusing log_from_pipe(). Fixes ticket 5557. - - Make sure to set *socket_error in all error cases in - connection_connect(), so it can't produce a warning about errno - being zero from errno_to_orconn_end_reason(). Resolves ticket 6028. - - Remove non-bug log messages about running with circuit timeout - learning enabled from LD_BUG. Fixes bug 6169; bugfix on - 0.2.3.17-beta. + - Stop logging messages about running with circuit timeout learning + enabled at severity LD_BUG. Fixes bug 6169; bugfix on 0.2.3.17-beta. - Disable a spurious warning about reading on a marked and flushing connection. We shouldn't be doing that, but apparently we sometimes do. Fixes bug 6203; bugfix on 0.2.3.17-beta. - Fix a bug that stopped AllowDotExit from working on addresses that had an entry in the DNS cache. Fixes bug 6211; bugfix on 0.2.3.17-beta. - - Log a BUG message at INFO if we have a networkstatus with a missing - entry for some microdescriptor. o Code simplification, refactoring, unit tests: - Move tor_gettimeofday_cached() into compat_libevent.c, and use diff --git a/src/common/util.c b/src/common/util.c index 51d9321..a0dff2e 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -3888,7 +3888,7 @@ tor_get_exit_code(const process_handle_t *process_handle, } /** Helper: return the number of characters in s preceding the first - * occurence of ch. If ch does not occur in s, return + * occurrence of ch. If ch does not occur in s, return * the length of s. Should be equivalent to strspn(s, "ch"). */ static INLINE size_t str_num_before(const char *s, char ch)

1 0

[torspec/master] Change extra-info prefix of 180 from "method" to "transport".
by nickm＠torproject.org 28 Jun '12

28 Jun '12

commit 989b4a68a2639d14b7b96f63a65fcf6619cb239a Author: George Kadianakis <desnacked(a)riseup.net> Date: Thu Mar 15 14:31:23 2012 -0700 Change extra-info prefix of 180 from "method" to "transport". --- proposals/180-pluggable-transport.txt | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/proposals/180-pluggable-transport.txt b/proposals/180-pluggable-transport.txt index eb180dc..433cad1 100644 --- a/proposals/180-pluggable-transport.txt +++ b/proposals/180-pluggable-transport.txt @@ -478,7 +478,7 @@ Advertising bridge methods Bridges put the 'method' lines in their extra-info documents. - method SP <methodname> SP <address:port> [SP arglist] NL + transport SP <transportname> SP <address:port> [SP arglist] NL The address:port are as returned from an SMETHOD line (unless they are replaced by the FORWARD: directive). The arglist is a K=V,... list as @@ -487,7 +487,7 @@ Advertising bridge methods If the SMETHOD line includes a DECLARE: part, the router descriptor gets a new line: - method-info SP <methodname> [SP arglist] NL + transport-info SP <transportname> [SP arglist] NL Bridge authority behavior

1 0

[torspec/master] Update dir-spec wrt to pluggable transports in extra-info.
by nickm＠torproject.org 28 Jun '12

28 Jun '12

commit 8b725914cac69c5a4d208e0835a1404e40e41970 Author: George Kadianakis <desnacked(a)riseup.net> Date: Thu Mar 15 14:31:45 2012 -0700 Update dir-spec wrt to pluggable transports in extra-info. --- dir-spec.txt | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dir-spec.txt b/dir-spec.txt index ab8b064..b7cbefd 100644 --- a/dir-spec.txt +++ b/dir-spec.txt @@ -888,6 +888,12 @@ List of mappings from ports to the number of opened exit streams to that port, rounded up to the nearest multiple of 4. + "transport" transportname address:port [arglist] NL + [Any number.] + + Signals that the router supports the 'transportname' pluggable + transport in IP address 'address' and TCP port 'port'. + "router-signature" NL Signature NL [At end, exactly once.]

1 0