June 2012 - tor-commits - lists.torproject.org

[tor/master] Merge branch 'maint-0.2.3'
by arma＠torproject.org 23 Jun '12

23 Jun '12

commit 95ad59fa79cba73a6916b5deccee12b541d5f756 Merge: db9ce36 ce44346 Author: Roger Dingledine <arma(a)torproject.org> Date: Sat Jun 23 15:46:29 2012 -0400 Merge branch 'maint-0.2.3' ChangeLog | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)

1 0

[tor/maint-0.2.3] fix broken utf8-ism
by arma＠torproject.org 23 Jun '12

23 Jun '12

commit ce44346aa5b4dddf37aff992755ef472d0d1f5a2 Author: Roger Dingledine <arma(a)torproject.org> Date: Sat Jun 23 15:42:18 2012 -0400 fix broken utf8-ism --- ChangeLog | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 90d6084..e2e9f45 100644 --- a/ChangeLog +++ b/ChangeLog @@ -287,7 +287,7 @@ Changes in version 0.2.3.16-alpha - 2012-06-05 0.2.2.11-alpha. - Correctly handle checking the permissions on the parent directory of a control socket in the root directory. Bug found - by Esteban Manchado VelÃ¡zquez. Fixes bug 5089; bugfix on Tor + by Esteban Manchado Velázquez. Fixes bug 5089; bugfix on Tor 0.2.2.26-beta. - When told to add a bridge with the same digest as a preexisting bridge but a different addr:port, change the addr:port as

1 0

[tor/master] Improve log message issued when a managed proxy fails to launch.
by nickm＠torproject.org 23 Jun '12

23 Jun '12

commit 8c3a4a1d21870254b38327a859bd27026058f3b2 Author: George Kadianakis <desnacked(a)riseup.net> Date: Sat Jun 23 17:36:16 2012 +0300 Improve log message issued when a managed proxy fails to launch. --- changes/bug5099 | 3 +++ src/or/transports.c | 14 +++++++++++++- 2 files changed, 16 insertions(+), 1 deletions(-) diff --git a/changes/bug5099 b/changes/bug5099 new file mode 100644 index 0000000..ddcd03a --- /dev/null +++ b/changes/bug5099 @@ -0,0 +1,3 @@ + o Minor features: + - Improve log message issued when a managed proxy fails to + launch. Resolves ticket 5099. diff --git a/src/or/transports.c b/src/or/transports.c index 1522756..e43ec6c 100644 --- a/src/or/transports.c +++ b/src/or/transports.c @@ -697,7 +697,19 @@ handle_proxy_line(const char *line, managed_proxy_t *mp) return; } else if (!strcmpstart(line, SPAWN_ERROR_MESSAGE)) { - log_warn(LD_GENERAL, "Could not launch managed proxy executable!"); + /* managed proxy launch failed: parse error message to learn why. */ + int retval, child_state, saved_errno; + retval = tor_sscanf(line, SPAWN_ERROR_MESSAGE "%x/%x", + &child_state, &saved_errno); + if (retval == 2) { + log_warn(LD_GENERAL, + "Could not launch managed proxy executable at '%s' ('%s').", + mp->argv[0], strerror(saved_errno)); + } else { /* failed to parse error message */ + log_warn(LD_GENERAL,"Could not launch managed proxy executable at '%s'.", + mp->argv[0]); + } + mp->conf_state = PT_PROTO_FAILED_LAUNCH; return; }

1 0

[tor/master] Tweak bug5099 changes file
by nickm＠torproject.org 23 Jun '12

23 Jun '12

commit f54ac08846b98465c9d29842df0583cea98a923c Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Jun 23 15:10:43 2012 -0400 Tweak bug5099 changes file --- changes/bug5099 | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/changes/bug5099 b/changes/bug5099 index ddcd03a..4c46a39 100644 --- a/changes/bug5099 +++ b/changes/bug5099 @@ -1,3 +1,3 @@ - o Minor features: + o Minor bugfixes: - Improve log message issued when a managed proxy fails to - launch. Resolves ticket 5099. + launch. Fixes bug 5099; bugfix on 0.2.3.6-alpha.

1 0

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

23 Jun '12

commit db9ce36b2576144c0fd2ab48de1915cdb008bd2a Merge: 7761c1d d0243e8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Jun 23 15:37:57 2012 -0400 Merge remote-tracking branch 'origin/maint-0.2.3' changes/bug5099 | 3 +++ src/or/transports.c | 14 +++++++++++++- 2 files changed, 16 insertions(+), 1 deletions(-)

1 0

[tor/master] Merge branch 'bug5099_nm' into maint-0.2.3
by nickm＠torproject.org 23 Jun '12

23 Jun '12

commit d0243e82cfcdf6684283c37f20db2d999740bdf3 Merge: ebda15e f54ac08 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Jun 23 15:10:57 2012 -0400 Merge branch 'bug5099_nm' into maint-0.2.3 changes/bug5099 | 3 +++ src/or/transports.c | 14 +++++++++++++- 2 files changed, 16 insertions(+), 1 deletions(-)

1 0

[torspec/master] ORBindAddress is so 2005 (aka Tor 0.1.1.9-alpha)
by arma＠torproject.org 23 Jun '12

23 Jun '12

commit 8ad517f23802bd9dc7d39e1e24253baaf2711bf3 Author: Roger Dingledine <arma(a)torproject.org> Date: Sat Jun 23 15:30:33 2012 -0400 ORBindAddress is so 2005 (aka Tor 0.1.1.9-alpha) --- control-spec.txt | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/control-spec.txt b/control-spec.txt index 40c88e8..8e13df9 100644 --- a/control-spec.txt +++ b/control-spec.txt @@ -228,8 +228,8 @@ guard lists) form a context-sensitive group where order matters (see GETCONF below). In these cases, setting _any_ of the options in a SETCONF command is taken to reset all of the others. For example, - if two ORBindAddress values are configured, and a SETCONF command - arrives containing a single ORBindAddress value, the new command's + if two ORListenAddress values are configured, and a SETCONF command + arrives containing a single ORListenAddress value, the new command's value replaces the two old values. Sometimes it is not possible to change configuration options solely by

1 0

[tor/maint-0.2.3] Merge branch 'bug5099_nm' into maint-0.2.3
by nickm＠torproject.org 23 Jun '12

23 Jun '12

commit d0243e82cfcdf6684283c37f20db2d999740bdf3 Merge: ebda15e f54ac08 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Jun 23 15:10:57 2012 -0400 Merge branch 'bug5099_nm' into maint-0.2.3 changes/bug5099 | 3 +++ src/or/transports.c | 14 +++++++++++++- 2 files changed, 16 insertions(+), 1 deletions(-)

1 0

[tor/maint-0.2.3] Improve log message issued when a managed proxy fails to launch.
by nickm＠torproject.org 23 Jun '12

23 Jun '12

commit 8c3a4a1d21870254b38327a859bd27026058f3b2 Author: George Kadianakis <desnacked(a)riseup.net> Date: Sat Jun 23 17:36:16 2012 +0300 Improve log message issued when a managed proxy fails to launch. --- changes/bug5099 | 3 +++ src/or/transports.c | 14 +++++++++++++- 2 files changed, 16 insertions(+), 1 deletions(-) diff --git a/changes/bug5099 b/changes/bug5099 new file mode 100644 index 0000000..ddcd03a --- /dev/null +++ b/changes/bug5099 @@ -0,0 +1,3 @@ + o Minor features: + - Improve log message issued when a managed proxy fails to + launch. Resolves ticket 5099. diff --git a/src/or/transports.c b/src/or/transports.c index 1522756..e43ec6c 100644 --- a/src/or/transports.c +++ b/src/or/transports.c @@ -697,7 +697,19 @@ handle_proxy_line(const char *line, managed_proxy_t *mp) return; } else if (!strcmpstart(line, SPAWN_ERROR_MESSAGE)) { - log_warn(LD_GENERAL, "Could not launch managed proxy executable!"); + /* managed proxy launch failed: parse error message to learn why. */ + int retval, child_state, saved_errno; + retval = tor_sscanf(line, SPAWN_ERROR_MESSAGE "%x/%x", + &child_state, &saved_errno); + if (retval == 2) { + log_warn(LD_GENERAL, + "Could not launch managed proxy executable at '%s' ('%s').", + mp->argv[0], strerror(saved_errno)); + } else { /* failed to parse error message */ + log_warn(LD_GENERAL,"Could not launch managed proxy executable at '%s'.", + mp->argv[0]); + } + mp->conf_state = PT_PROTO_FAILED_LAUNCH; return; }

1 0

[tor/maint-0.2.3] Tweak bug5099 changes file
by nickm＠torproject.org 23 Jun '12

23 Jun '12

commit f54ac08846b98465c9d29842df0583cea98a923c Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Jun 23 15:10:43 2012 -0400 Tweak bug5099 changes file --- changes/bug5099 | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/changes/bug5099 b/changes/bug5099 index ddcd03a..4c46a39 100644 --- a/changes/bug5099 +++ b/changes/bug5099 @@ -1,3 +1,3 @@ - o Minor features: + o Minor bugfixes: - Improve log message issued when a managed proxy fails to - launch. Resolves ticket 5099. + launch. Fixes bug 5099; bugfix on 0.2.3.6-alpha.

1 0