April 2013 - tor-commits - lists.torproject.org

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.4'
by nickm＠torproject.org 25 Apr '13

25 Apr '13

commit ef83db4fe85f2c73b5891d5b8e53ca776dc230f8 Merge: 68ea7d2 f8bb006 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Apr 24 22:16:07 2013 -0400 Merge remote-tracking branch 'origin/maint-0.2.4' changes/bug6026 | 4 ++++ src/or/config.c | 3 ++- src/or/connection.c | 5 ++++- src/or/router.c | 31 ++++++++++++++++++++++++------- src/or/router.h | 5 ++++- 5 files changed, 38 insertions(+), 10 deletions(-)

1 0

[tor/maint-0.2.4] Merge remote-tracking branch 'public/bug6026' into maint-0.2.4
by nickm＠torproject.org 25 Apr '13

25 Apr '13

commit f8bb0064d6a06770e6187ba57a2f4a764336aa84 Merge: cab5f82 07e2600 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Apr 24 22:15:47 2013 -0400 Merge remote-tracking branch 'public/bug6026' into maint-0.2.4 changes/bug6026 | 4 ++++ src/or/config.c | 3 ++- src/or/connection.c | 5 ++++- src/or/router.c | 31 ++++++++++++++++++++++++------- src/or/router.h | 5 ++++- 5 files changed, 38 insertions(+), 10 deletions(-)

1 0

[tor/maint-0.2.4] Treat a changed IPv6 ORPort like an IPv4 one in retry_all_listeners()
by nickm＠torproject.org 25 Apr '13

25 Apr '13

commit 07e26005a6cb7e47f1f90fcf6a377dfaaaa56789 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 11 17:20:43 2013 -0400 Treat a changed IPv6 ORPort like an IPv4 one in retry_all_listeners() Fix for bug 6026 --- changes/bug6026 | 4 ++++ src/or/config.c | 3 ++- src/or/connection.c | 5 ++++- src/or/router.c | 31 ++++++++++++++++++++++++------- src/or/router.h | 5 ++++- 5 files changed, 38 insertions(+), 10 deletions(-) diff --git a/changes/bug6026 b/changes/bug6026 new file mode 100644 index 0000000..de5d6ea --- /dev/null +++ b/changes/bug6026 @@ -0,0 +1,4 @@ + o Minor bugfixes: + - Relays now treat a changed IPv6 ORPort as sufficient reason to + publish an updated descriptor. Fix for bug 6026; bugfix for + 0.2.4.1-alpha. diff --git a/src/or/config.c b/src/or/config.c index 15138f9..1c48c66 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -5561,7 +5561,8 @@ get_first_listener_addrport_string(int listener_type) to iterate all listener connections and find out in which port it ended up listening: */ if (cfg->port == CFG_AUTO_PORT) { - port = router_get_active_listener_port_by_type(listener_type); + port = router_get_active_listener_port_by_type_af(listener_type, + tor_addr_family(&cfg->addr)); if (!port) return NULL; } else { diff --git a/src/or/connection.c b/src/or/connection.c index c659e65..5812d83 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -2054,6 +2054,8 @@ retry_all_listeners(smartlist_t *replaced_conns, const or_options_t *options = get_options(); int retval = 0; const uint16_t old_or_port = router_get_advertised_or_port(options); + const uint16_t old_or_port_ipv6 = + router_get_advertised_or_port_by_af(options,AF_INET6); const uint16_t old_dir_port = router_get_advertised_dir_port(options, 0); SMARTLIST_FOREACH_BEGIN(get_connection_array(), connection_t *, conn) { @@ -2082,8 +2084,9 @@ retry_all_listeners(smartlist_t *replaced_conns, smartlist_free(listeners); - /* XXXprop186 should take all advertised ports into account */ if (old_or_port != router_get_advertised_or_port(options) || + old_or_port_ipv6 != router_get_advertised_or_port_by_af(options, + AF_INET6) || old_dir_port != router_get_advertised_dir_port(options, 0)) { /* Our chosen ORPort or DirPort is not what it used to be: the * descriptor we had (if any) should be regenerated. (We won't diff --git a/src/or/router.c b/src/or/router.c index 422fe5d..91de221 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -1459,13 +1459,18 @@ consider_publishable_server(int force) /** XXX not a very good interface. it's not reliable when there are multiple listeners. */ uint16_t -router_get_active_listener_port_by_type(int listener_type) +router_get_active_listener_port_by_type_af(int listener_type, + sa_family_t family) { /* Iterate all connections, find one of the right kind and return the port. Not very sophisticated or fast, but effective. */ - const connection_t *c = connection_get_by_type(listener_type); - if (c) - return c->port; + smartlist_t *conns = get_connection_array(); + SMARTLIST_FOREACH_BEGIN(conns, connection_t *, conn) { + if (conn->type == listener_type && !conn->marked_for_close && + conn->socket_family == family) { + return conn->port; + } + } SMARTLIST_FOREACH_END(conn); return 0; } @@ -1477,13 +1482,24 @@ router_get_active_listener_port_by_type(int listener_type) uint16_t router_get_advertised_or_port(const or_options_t *options) { - int port = get_primary_or_port(); + return router_get_advertised_or_port_by_af(options, AF_INET); +} + +/** As router_get_advertised_or_port(), but allows an address family argument. + */ +uint16_t +router_get_advertised_or_port_by_af(const or_options_t *options, + sa_family_t family) +{ + int port = get_first_advertised_port_by_type_af(CONN_TYPE_OR_LISTENER, + family); (void)options; /* If the port is in 'auto' mode, we have to use router_get_listener_port_by_type(). */ if (port == CFG_AUTO_PORT) - return router_get_active_listener_port_by_type(CONN_TYPE_OR_LISTENER); + return router_get_active_listener_port_by_type_af(CONN_TYPE_OR_LISTENER, + family); return port; } @@ -1503,7 +1519,8 @@ router_get_advertised_dir_port(const or_options_t *options, uint16_t dirport) return dirport; if (dirport_configured == CFG_AUTO_PORT) - return router_get_active_listener_port_by_type(CONN_TYPE_DIR_LISTENER); + return router_get_active_listener_port_by_type_af(CONN_TYPE_DIR_LISTENER, + AF_INET); return dirport_configured; } diff --git a/src/or/router.h b/src/or/router.h index fd2076a..dc894d1 100644 --- a/src/or/router.h +++ b/src/or/router.h @@ -58,8 +58,11 @@ int authdir_mode_publishes_statuses(const or_options_t *options); int authdir_mode_tests_reachability(const or_options_t *options); int authdir_mode_bridge(const or_options_t *options); -uint16_t router_get_active_listener_port_by_type(int listener_type); +uint16_t router_get_active_listener_port_by_type_af(int listener_type, + sa_family_t family); uint16_t router_get_advertised_or_port(const or_options_t *options); +uint16_t router_get_advertised_or_port_by_af(const or_options_t *options, + sa_family_t family); uint16_t router_get_advertised_dir_port(const or_options_t *options, uint16_t dirport);

1 0

[tor/master] Merge branch 'bug8235-fix-rebased' into maint-0.2.4
by nickm＠torproject.org 25 Apr '13

25 Apr '13

commit cab5f82d125d721fa4b73568323ac1b6009002c3 Merge: b933360 ac22bf2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Apr 24 22:04:15 2013 -0400 Merge branch 'bug8235-fix-rebased' into maint-0.2.4 changes/bug8253-fix | 6 ++++++ src/or/circuitbuild.c | 4 ++-- src/or/entrynodes.c | 4 ++-- 3 files changed, 10 insertions(+), 4 deletions(-)

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.4'
by nickm＠torproject.org 25 Apr '13

25 Apr '13

commit 68ea7d24d8e1ceb594ae5a63a3d433bd78a079cd Merge: 6e89d29 cab5f82 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Apr 24 22:05:41 2013 -0400 Merge remote-tracking branch 'origin/maint-0.2.4' changes/bug8253-fix | 6 ++++++ src/or/circuitbuild.c | 4 ++-- src/or/entrynodes.c | 4 ++-- 3 files changed, 10 insertions(+), 4 deletions(-)

1 0

[tor/master] Bug 8235: Fix scaling adjustments.
by nickm＠torproject.org 25 Apr '13

25 Apr '13

commit 2170f89a93a268588a50a7e754157c1f6e03b15f Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Tue Apr 23 14:43:38 2013 -0700 Bug 8235: Fix scaling adjustments. We need to subtract both the current built circuits *and* the attempted circuits from the attempt count during scaling, since *both* have already been counted there. --- src/or/circuitbuild.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index 31242f6..43d2ffe 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -2491,7 +2491,7 @@ pathbias_scale_close_rates(entry_guard_t *guard) /* Verify that the counts are sane before and after scaling */ int counts_are_sane = (guard->circ_attempts >= guard->circ_successes); - guard->circ_attempts -= opened_attempts; + guard->circ_attempts -= (opened_attempts+opened_built); guard->circ_successes -= opened_built; guard->circ_attempts *= scale_ratio; @@ -2501,7 +2501,7 @@ pathbias_scale_close_rates(entry_guard_t *guard) guard->collapsed_circuits *= scale_ratio; guard->unusable_circuits *= scale_ratio; - guard->circ_attempts += opened_attempts; + guard->circ_attempts += (opened_attempts+opened_built); guard->circ_successes += opened_built; entry_guards_changed();

1 0

[tor/master] Changes file for 8235.
by nickm＠torproject.org 25 Apr '13

25 Apr '13

commit c72558f396b35bb42281162198ddbd652f2155fd Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Tue Apr 23 14:44:40 2013 -0700 Changes file for 8235. --- changes/bug8253-fix | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/changes/bug8253-fix b/changes/bug8253-fix new file mode 100644 index 0000000..3d36d06 --- /dev/null +++ b/changes/bug8253-fix @@ -0,0 +1,6 @@ + o Minor bugfixes (log messages) + - Fix a scaling issue in the path bias accounting code that resulted in + "Bug:" log messages from either pathbias_scale_close_rates() or + pathbias_count_build_success(). This represents a bugfix on a previous + bugfix: The original fix attempted in 0.2.4.10-alpha was incomplete. + Fixes bug 8235; bugfix on 0.2.4.1-alpha.

1 0

[tor/master] Increase the pathbias state file miscounting version check.
by nickm＠torproject.org 25 Apr '13

25 Apr '13

commit ac22bf27d73c51ce6da5afbd2ec29a5403eea2d1 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Tue Apr 23 17:53:53 2013 -0700 Increase the pathbias state file miscounting version check. We now know the bug is present in 0.2.4.12-alpha too. It should be fixed in 0.2.4.13-alpha, though. --- src/or/entrynodes.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c index 3234f4f..7a1f67d 100644 --- a/src/or/entrynodes.c +++ b/src/or/entrynodes.c @@ -1215,7 +1215,7 @@ entry_guards_parse_state(or_state_t *state, int set, char **msg) int severity = LOG_INFO; /* If this state file was written by a Tor that would have * already fixed it, then the overcounting bug is still there.. */ - if (tor_version_as_new_as(state_version, "0.2.4.12-alpha")) { + if (tor_version_as_new_as(state_version, "0.2.4.13-alpha")) { severity = LOG_NOTICE; } log_fn(severity, LD_BUG, @@ -1280,7 +1280,7 @@ entry_guards_parse_state(or_state_t *state, int set, char **msg) int severity = LOG_INFO; /* If this state file was written by a Tor that would have * already fixed it, then the overcounting bug is still there.. */ - if (tor_version_as_new_as(state_version, "0.2.4.12-alpha")) { + if (tor_version_as_new_as(state_version, "0.2.4.13-alpha")) { severity = LOG_NOTICE; } log_fn(severity, LD_BUG,

1 0

[tor/maint-0.2.4] Increase the pathbias state file miscounting version check.
by nickm＠torproject.org 25 Apr '13

25 Apr '13

commit ac22bf27d73c51ce6da5afbd2ec29a5403eea2d1 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Tue Apr 23 17:53:53 2013 -0700 Increase the pathbias state file miscounting version check. We now know the bug is present in 0.2.4.12-alpha too. It should be fixed in 0.2.4.13-alpha, though. --- src/or/entrynodes.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c index 3234f4f..7a1f67d 100644 --- a/src/or/entrynodes.c +++ b/src/or/entrynodes.c @@ -1215,7 +1215,7 @@ entry_guards_parse_state(or_state_t *state, int set, char **msg) int severity = LOG_INFO; /* If this state file was written by a Tor that would have * already fixed it, then the overcounting bug is still there.. */ - if (tor_version_as_new_as(state_version, "0.2.4.12-alpha")) { + if (tor_version_as_new_as(state_version, "0.2.4.13-alpha")) { severity = LOG_NOTICE; } log_fn(severity, LD_BUG, @@ -1280,7 +1280,7 @@ entry_guards_parse_state(or_state_t *state, int set, char **msg) int severity = LOG_INFO; /* If this state file was written by a Tor that would have * already fixed it, then the overcounting bug is still there.. */ - if (tor_version_as_new_as(state_version, "0.2.4.12-alpha")) { + if (tor_version_as_new_as(state_version, "0.2.4.13-alpha")) { severity = LOG_NOTICE; } log_fn(severity, LD_BUG,

1 0

[tor/maint-0.2.4] Changes file for 8235.
by nickm＠torproject.org 25 Apr '13

25 Apr '13

commit c72558f396b35bb42281162198ddbd652f2155fd Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Tue Apr 23 14:44:40 2013 -0700 Changes file for 8235. --- changes/bug8253-fix | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/changes/bug8253-fix b/changes/bug8253-fix new file mode 100644 index 0000000..3d36d06 --- /dev/null +++ b/changes/bug8253-fix @@ -0,0 +1,6 @@ + o Minor bugfixes (log messages) + - Fix a scaling issue in the path bias accounting code that resulted in + "Bug:" log messages from either pathbias_scale_close_rates() or + pathbias_count_build_success(). This represents a bugfix on a previous + bugfix: The original fix attempted in 0.2.4.10-alpha was incomplete. + Fixes bug 8235; bugfix on 0.2.4.1-alpha.

1 0