- tor-commits - lists.torproject.org

[tor/master] what's up with this trailing whitespace
by arma＠torproject.org 21 May '11

21 May '11

commit a2851d303414bbbdff97a02d142275c3e7c71841 Author: Roger Dingledine <arma(a)torproject.org> Date: Fri May 20 23:30:37 2011 -0400 what's up with this trailing whitespace --- src/common/util.c | 2 +- src/or/circuitbuild.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/common/util.c b/src/common/util.c index 1bb116b..7ffe0a9 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -2092,7 +2092,7 @@ read_file_to_str(const char *filename, int flags, struct stat *stat_out) int save_errno = errno; if (errno == ENOENT && (flags & RFTS_IGNORE_MISSING)) severity = LOG_INFO; - log_fn(severity, LD_FS,"Could not open \"%s\": %s ",filename, + log_fn(severity, LD_FS,"Could not open \"%s\": %s",filename, strerror(errno)); errno = save_errno; return NULL; diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index 2f86e1f..08bfb98 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -1755,7 +1755,7 @@ circuit_handle_first_hop(origin_circuit_t *circ) /* not currently connected in a useful way. */ const char *name = strlen(firsthop->extend_info->nickname) ? firsthop->extend_info->nickname : fmt_addr(&firsthop->extend_info->addr); - log_info(LD_CIRC, "Next router is %s: %s ", + log_info(LD_CIRC, "Next router is %s: %s", safe_str_client(name), msg?msg:"???"); circ->_base.n_hop = extend_info_dup(firsthop->extend_info);

1 0

[tor/master] Don't recreate descriptor on sighup
by arma＠torproject.org 21 May '11

21 May '11

commit 3ff7925a7027b81cb9f14b0863972b4d4e5b46a4 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Sat May 21 19:10:11 2011 +0200 Don't recreate descriptor on sighup We used to regenerate our descriptor whenever we'd get a sighup. This was caused by a bug in options_transition_affects_workers() that would return true even if the options were exactly the same. Down the call path we'd call init_keys(), which made us make a new descriptor which the authorities would reject, and the node would subsequently fall out of the consensus. This patch fixes only the first part of this bug: options_transition_affects_workers() behaves correctly now. The second part still wants a fix. --- changes/bug1810 | 6 ++++++ src/or/config.c | 2 +- 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/changes/bug1810 b/changes/bug1810 new file mode 100644 index 0000000..11e561f --- /dev/null +++ b/changes/bug1810 @@ -0,0 +1,6 @@ + o Major bugfixes: + - Don't decide to make a new descriptor when receiving a HUP signal. + This bug has caused a lot of relays to disappear from the consensus + periodically. Fixes the most common case of triggering bug 1810; + bugfix on 0.2.2.7-alpha. + diff --git a/src/or/config.c b/src/or/config.c index 68a6b29..36fb991 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -3809,7 +3809,7 @@ options_transition_affects_workers(or_options_t *old_options, old_options->ORPort != new_options->ORPort || old_options->ServerDNSSearchDomains != new_options->ServerDNSSearchDomains || - old_options->SafeLogging != new_options->SafeLogging || + old_options->_SafeLogging != new_options->_SafeLogging || old_options->ClientOnly != new_options->ClientOnly || public_server_mode(old_options) != public_server_mode(new_options) || !config_lines_eq(old_options->Logs, new_options->Logs) ||

1 0

[tor/release-0.2.2] what's up with this trailing whitespace
by arma＠torproject.org 21 May '11

21 May '11

commit a2851d303414bbbdff97a02d142275c3e7c71841 Author: Roger Dingledine <arma(a)torproject.org> Date: Fri May 20 23:30:37 2011 -0400 what's up with this trailing whitespace --- src/common/util.c | 2 +- src/or/circuitbuild.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/common/util.c b/src/common/util.c index 1bb116b..7ffe0a9 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -2092,7 +2092,7 @@ read_file_to_str(const char *filename, int flags, struct stat *stat_out) int save_errno = errno; if (errno == ENOENT && (flags & RFTS_IGNORE_MISSING)) severity = LOG_INFO; - log_fn(severity, LD_FS,"Could not open \"%s\": %s ",filename, + log_fn(severity, LD_FS,"Could not open \"%s\": %s",filename, strerror(errno)); errno = save_errno; return NULL; diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index 2f86e1f..08bfb98 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -1755,7 +1755,7 @@ circuit_handle_first_hop(origin_circuit_t *circ) /* not currently connected in a useful way. */ const char *name = strlen(firsthop->extend_info->nickname) ? firsthop->extend_info->nickname : fmt_addr(&firsthop->extend_info->addr); - log_info(LD_CIRC, "Next router is %s: %s ", + log_info(LD_CIRC, "Next router is %s: %s", safe_str_client(name), msg?msg:"???"); circ->_base.n_hop = extend_info_dup(firsthop->extend_info);

1 0

[tor/release-0.2.2] remove some (confusing) dead code
by arma＠torproject.org 21 May '11

21 May '11

commit 0e8949a8fae721e856eebbb4fe401484e3acf45f Author: Roger Dingledine <arma(a)torproject.org> Date: Sat May 21 16:12:37 2011 -0400 remove some (confusing) dead code --- src/or/router.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/src/or/router.c b/src/or/router.c index 49a986d..0beb960 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -85,7 +85,6 @@ set_onion_key(crypto_pk_env_t *k) tor_mutex_acquire(key_lock); crypto_free_pk_env(onionkey); onionkey = k; - onionkey_set_at = time(NULL); tor_mutex_release(key_lock); mark_my_descriptor_dirty("set onion key"); }

1 0

[tor/release-0.2.2] Merge branch 'bug1810' into maint-0.2.2
by arma＠torproject.org 21 May '11

21 May '11

commit 0235fe34d2c915f46933ead253192b042c713af0 Merge: a2851d3 3ff7925 Author: Roger Dingledine <arma(a)torproject.org> Date: Sat May 21 16:09:55 2011 -0400 Merge branch 'bug1810' into maint-0.2.2 changes/bug1810 | 6 ++++++ src/or/config.c | 2 +- 2 files changed, 7 insertions(+), 1 deletions(-)

1 0

[tor/release-0.2.2] Don't recreate descriptor on sighup
by arma＠torproject.org 21 May '11

21 May '11

commit 3ff7925a7027b81cb9f14b0863972b4d4e5b46a4 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Sat May 21 19:10:11 2011 +0200 Don't recreate descriptor on sighup We used to regenerate our descriptor whenever we'd get a sighup. This was caused by a bug in options_transition_affects_workers() that would return true even if the options were exactly the same. Down the call path we'd call init_keys(), which made us make a new descriptor which the authorities would reject, and the node would subsequently fall out of the consensus. This patch fixes only the first part of this bug: options_transition_affects_workers() behaves correctly now. The second part still wants a fix. --- changes/bug1810 | 6 ++++++ src/or/config.c | 2 +- 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/changes/bug1810 b/changes/bug1810 new file mode 100644 index 0000000..11e561f --- /dev/null +++ b/changes/bug1810 @@ -0,0 +1,6 @@ + o Major bugfixes: + - Don't decide to make a new descriptor when receiving a HUP signal. + This bug has caused a lot of relays to disappear from the consensus + periodically. Fixes the most common case of triggering bug 1810; + bugfix on 0.2.2.7-alpha. + diff --git a/src/or/config.c b/src/or/config.c index 68a6b29..36fb991 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -3809,7 +3809,7 @@ options_transition_affects_workers(or_options_t *old_options, old_options->ORPort != new_options->ORPort || old_options->ServerDNSSearchDomains != new_options->ServerDNSSearchDomains || - old_options->SafeLogging != new_options->SafeLogging || + old_options->_SafeLogging != new_options->_SafeLogging || old_options->ClientOnly != new_options->ClientOnly || public_server_mode(old_options) != public_server_mode(new_options) || !config_lines_eq(old_options->Logs, new_options->Logs) ||

1 0

[tor/release-0.2.2] Merge branch 'maint-0.2.2' into release-0.2.2
by arma＠torproject.org 21 May '11

21 May '11

commit 5269d106d862810ac000aa8fb1bc0e38b42b5327 Merge: 16bfb4d 0e8949a Author: Roger Dingledine <arma(a)torproject.org> Date: Sat May 21 18:13:46 2011 -0400 Merge branch 'maint-0.2.2' into release-0.2.2 changes/bug1810 | 6 ++++++ src/common/util.c | 2 +- src/or/circuitbuild.c | 2 +- src/or/config.c | 2 +- src/or/router.c | 1 - 5 files changed, 9 insertions(+), 4 deletions(-)

1 0

[tor/maint-0.2.2] remove some (confusing) dead code
by arma＠torproject.org 21 May '11

21 May '11

commit 0e8949a8fae721e856eebbb4fe401484e3acf45f Author: Roger Dingledine <arma(a)torproject.org> Date: Sat May 21 16:12:37 2011 -0400 remove some (confusing) dead code --- src/or/router.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/src/or/router.c b/src/or/router.c index 49a986d..0beb960 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -85,7 +85,6 @@ set_onion_key(crypto_pk_env_t *k) tor_mutex_acquire(key_lock); crypto_free_pk_env(onionkey); onionkey = k; - onionkey_set_at = time(NULL); tor_mutex_release(key_lock); mark_my_descriptor_dirty("set onion key"); }

1 0

[tor/maint-0.2.2] Merge branch 'bug1810' into maint-0.2.2
by arma＠torproject.org 21 May '11

21 May '11

commit 0235fe34d2c915f46933ead253192b042c713af0 Merge: a2851d3 3ff7925 Author: Roger Dingledine <arma(a)torproject.org> Date: Sat May 21 16:09:55 2011 -0400 Merge branch 'bug1810' into maint-0.2.2 changes/bug1810 | 6 ++++++ src/or/config.c | 2 +- 2 files changed, 7 insertions(+), 1 deletions(-)

1 0

[tor/maint-0.2.2] Don't recreate descriptor on sighup
by arma＠torproject.org 21 May '11

21 May '11

commit 3ff7925a7027b81cb9f14b0863972b4d4e5b46a4 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Sat May 21 19:10:11 2011 +0200 Don't recreate descriptor on sighup We used to regenerate our descriptor whenever we'd get a sighup. This was caused by a bug in options_transition_affects_workers() that would return true even if the options were exactly the same. Down the call path we'd call init_keys(), which made us make a new descriptor which the authorities would reject, and the node would subsequently fall out of the consensus. This patch fixes only the first part of this bug: options_transition_affects_workers() behaves correctly now. The second part still wants a fix. --- changes/bug1810 | 6 ++++++ src/or/config.c | 2 +- 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/changes/bug1810 b/changes/bug1810 new file mode 100644 index 0000000..11e561f --- /dev/null +++ b/changes/bug1810 @@ -0,0 +1,6 @@ + o Major bugfixes: + - Don't decide to make a new descriptor when receiving a HUP signal. + This bug has caused a lot of relays to disappear from the consensus + periodically. Fixes the most common case of triggering bug 1810; + bugfix on 0.2.2.7-alpha. + diff --git a/src/or/config.c b/src/or/config.c index 68a6b29..36fb991 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -3809,7 +3809,7 @@ options_transition_affects_workers(or_options_t *old_options, old_options->ORPort != new_options->ORPort || old_options->ServerDNSSearchDomains != new_options->ServerDNSSearchDomains || - old_options->SafeLogging != new_options->SafeLogging || + old_options->_SafeLogging != new_options->_SafeLogging || old_options->ClientOnly != new_options->ClientOnly || public_server_mode(old_options) != public_server_mode(new_options) || !config_lines_eq(old_options->Logs, new_options->Logs) ||

1 0