- tor-commits - lists.torproject.org

[tor/release-0.2.2] Merge remote-tracking branch 'rransom-tor/bug4426' into maint-0.2.2
by arma＠torproject.org 20 Nov '11

20 Nov '11

commit 8adec8705014ef7e788a1dcf5d3a4a2d85a328ed Merge: 0cc7a63 56546324 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Nov 9 11:03:20 2011 -0500 Merge remote-tracking branch 'rransom-tor/bug4426' into maint-0.2.2 changes/bug4426 | 8 ++++++++ src/or/rendservice.c | 9 ++++++--- 2 files changed, 14 insertions(+), 3 deletions(-)

1 0

[tor/release-0.2.2] Detect failure from event_init() or event_base_new_with_config()
by arma＠torproject.org 20 Nov '11

20 Nov '11

commit 0f6c02161793fa1022fe721ed9c1aac3538294b3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 14 17:53:45 2011 -0500 Detect failure from event_init() or event_base_new_with_config() --- changes/bug4457 | 1 + src/common/compat_libevent.c | 6 ++++++ 2 files changed, 7 insertions(+), 0 deletions(-) diff --git a/changes/bug4457 b/changes/bug4457 index d3d9eb3..fe7c95f 100644 --- a/changes/bug4457 +++ b/changes/bug4457 @@ -5,4 +5,5 @@ bug 4457; workaround for Libevent versions 2.0.1-alpha through 2.0.15-stable. + - Detect failure to initialize Libevent. Better detection for bug 4457. diff --git a/src/common/compat_libevent.c b/src/common/compat_libevent.c index 3e35e09..ddb2da6 100644 --- a/src/common/compat_libevent.c +++ b/src/common/compat_libevent.c @@ -179,6 +179,7 @@ tor_libevent_initialize(void) #ifdef HAVE_EVENT2_EVENT_H { struct event_config *cfg = event_config_new(); + tor_assert(cfg); /* In 0.2.2, we don't use locking at all. Telling Libevent not to try to * turn it on can avoid a needless socketpair() attempt. @@ -193,6 +194,11 @@ tor_libevent_initialize(void) the_event_base = event_init(); #endif + if (!the_event_base) { + log_err(LD_GENERAL, "Unable to initialize Libevent: cannot continue."); + exit(1); + } + #if defined(HAVE_EVENT_GET_VERSION) && defined(HAVE_EVENT_GET_METHOD) /* Making this a NOTICE for now so we can link bugs to a libevent versions * or methods better. */

1 0

[tor/release-0.2.2] Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2
by arma＠torproject.org 20 Nov '11

20 Nov '11

commit 2b7bdc295a516df457246fb69f83c8667695c59b Merge: 8adec87 13f02c3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 14 11:10:27 2011 -0500 Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2 changes/geoip-november2011 | 3 + src/config/geoip | 5098 ++++++++++++++++++++++++++++---------------- 2 files changed, 3302 insertions(+), 1799 deletions(-)

1 0

[tor/release-0.2.2] Use the EVENT_BASE_FLAG_NOLOCK flag to prevent socketpair() invocation
by arma＠torproject.org 20 Nov '11

20 Nov '11

commit 7363eae13cb8febd85923957de19e2de7c186cea Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 14 17:46:43 2011 -0500 Use the EVENT_BASE_FLAG_NOLOCK flag to prevent socketpair() invocation In Tor 0.2.2, we never need the event base to be notifiable, since we don't call it from other threads. This is a workaround for bug 4457, which is not actually a Tor bug IMO. --- changes/bug4457 | 8 ++++++++ src/common/compat_libevent.c | 13 ++++++++++++- 2 files changed, 20 insertions(+), 1 deletions(-) diff --git a/changes/bug4457 b/changes/bug4457 new file mode 100644 index 0000000..d3d9eb3 --- /dev/null +++ b/changes/bug4457 @@ -0,0 +1,8 @@ + o Minor bugfixes: + - Initialize Libevent with the EVENT_BASE_FLAG_NOLOCK flag enabled, so + that it doesn't attempt to allocate a socketpair. This could cause + some problems on windows systems with overzealous firewalls. Fix for + bug 4457; workaround for Libevent versions 2.0.1-alpha through + 2.0.15-stable. + + diff --git a/src/common/compat_libevent.c b/src/common/compat_libevent.c index 6d89be8..3e35e09 100644 --- a/src/common/compat_libevent.c +++ b/src/common/compat_libevent.c @@ -177,7 +177,18 @@ tor_libevent_initialize(void) #endif #ifdef HAVE_EVENT2_EVENT_H - the_event_base = event_base_new(); + { + struct event_config *cfg = event_config_new(); + + /* In 0.2.2, we don't use locking at all. Telling Libevent not to try to + * turn it on can avoid a needless socketpair() attempt. + */ + event_config_set_flag(cfg, EVENT_BASE_FLAG_NOLOCK); + + the_event_base = event_base_new_with_config(cfg); + + event_config_free(cfg); + } #else the_event_base = event_init(); #endif

1 0

[tor/release-0.2.2] Use real_addr in send_netinfo
by arma＠torproject.org 20 Nov '11

20 Nov '11

commit 5bea660f8ebf8ec1a78c21ce5e2a6bd5dd681eed Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 14 22:42:10 2011 -0500 Use real_addr in send_netinfo Reported by "troll_un"; bugfix on 0.2.0.10-alpha; fixes bug 4349. --- changes/bug4349 | 4 ++++ src/or/connection_or.c | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/changes/bug4349 b/changes/bug4349 new file mode 100644 index 0000000..633916b --- /dev/null +++ b/changes/bug4349 @@ -0,0 +1,4 @@ + o Minor bugfixes: + - When sending a NETINFO cell, include the original address + received for the other side, not its canonical address. Found + by "troll_un"; fixes bug 4349; bugfix on 0.2.0.10-alpha. diff --git a/src/or/connection_or.c b/src/or/connection_or.c index 27a34d3..1fffba7 100644 --- a/src/or/connection_or.c +++ b/src/or/connection_or.c @@ -1410,7 +1410,7 @@ connection_or_send_netinfo(or_connection_t *conn) /* Their address. */ out = cell.payload + 4; - len = append_address_to_payload(out, &conn->_base.addr); + len = append_address_to_payload(out, &conn->real_addr); if (len<0) return -1; out += len;

1 0

[tor/release-0.2.2] Merge branch 'bug4457_022' into maint-0.2.2
by arma＠torproject.org 20 Nov '11

20 Nov '11

commit 5a02406ae0d8059d3b0bbff51d37fcb92650274b Merge: 5bea660 0f6c021 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Nov 16 16:22:47 2011 -0500 Merge branch 'bug4457_022' into maint-0.2.2 changes/bug4457 | 9 +++++++++ src/common/compat_libevent.c | 19 ++++++++++++++++++- 2 files changed, 27 insertions(+), 1 deletions(-)

1 0

[tor/release-0.2.2] Don't log about stats when running as a client without geoip
by arma＠torproject.org 20 Nov '11

20 Nov '11

commit 6ef44b78495403552ca4f6808656bd95a7813c58 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Sat Nov 19 00:50:03 2011 +0100 Don't log about stats when running as a client without geoip Completely disable stats if we aren't running as a relay. We won't collect any anyway, so setting up the infrastructure for them and logging about them is wrong. This also removes a confusing log message that clients without a geoip db would have seen. Fixes bug 4353. --- changes/bug4353 | 7 +++++++ src/or/config.c | 9 +++++++++ 2 files changed, 16 insertions(+), 0 deletions(-) diff --git a/changes/bug4353 b/changes/bug4353 new file mode 100644 index 0000000..5e80c90 --- /dev/null +++ b/changes/bug4353 @@ -0,0 +1,7 @@ + o Minor bugfixes: + - When running as client without a geoip database, do not print a + misleading (and plain wrong) log message that we're collecting + dirreq statistics - we're not collecting statistics as clients. + Also don't create a useless (because empty) stats file in the + stats/ directory. Fixes bug 4353, bugfix on 0.2.2.34. + diff --git a/src/or/config.c b/src/or/config.c index ca4e71c..ffa763e 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -1414,6 +1414,15 @@ options_act(or_options_t *old_options) options->EntryStatistics || options->ExitPortStatistics) { time_t now = time(NULL); int print_notice = 0; + + /* If we aren't acting as a server, we can't collect stats anyway. */ + if (!server_mode(options)) { + options->CellStatistics = 0; + options->DirReqStatistics = 0; + options->EntryStatistics = 0; + options->ExitPortStatistics = 0; + } + if ((!old_options || !old_options->CellStatistics) && options->CellStatistics) { rep_hist_buffer_stats_init(now);

1 0

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

20 Nov '11

1 0

[tor/release-0.2.2] Fix a memleak when fetching descriptors for bridges in ExcludeNodes.
by arma＠torproject.org 20 Nov '11

20 Nov '11

commit 3ae96845d33b11ded74d0e569a859d8f138b70d9 Author: George Kadianakis <desnacked(a)gmail.com> Date: Thu Nov 3 17:16:31 2011 +0100 Fix a memleak when fetching descriptors for bridges in ExcludeNodes. --- changes/bug4383 | 5 +++++ src/or/circuitbuild.c | 3 ++- 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/changes/bug4383 b/changes/bug4383 new file mode 100644 index 0000000..e618b8c --- /dev/null +++ b/changes/bug4383 @@ -0,0 +1,5 @@ + o Minor bugfixes: + - Fix a memleak in launch_direct_bridge_descriptor_fetch() that + occured when a client tried to fetch a descriptor for a bridge + in ExcludeNodes. Fixes #4383; bugfix on 0.2.2.25-alpha. + diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index c864fd2..72ec9e4 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -4670,7 +4670,6 @@ launch_direct_bridge_descriptor_fetch(bridge_info_t *bridge) DIR_PURPOSE_FETCH_SERVERDESC)) return; /* it's already on the way */ - address = tor_dup_addr(&bridge->addr); if (routerset_contains_bridge(options->ExcludeNodes, bridge)) { download_status_mark_impossible(&bridge->fetch_status); log_warn(LD_APP, "Not using bridge at %s: it is in ExcludeNodes.", @@ -4678,6 +4677,8 @@ launch_direct_bridge_descriptor_fetch(bridge_info_t *bridge) return; } + address = tor_dup_addr(&bridge->addr); + directory_initiate_command(address, &bridge->addr, bridge->port, 0, 0, /* does not matter */

1 0

[tor/release-0.2.2] Merge branch 'bug4383_nm' into maint-0.2.2
by arma＠torproject.org 20 Nov '11

20 Nov '11

commit 972564630e8f85499e611f1eeb7174d0c0230731 Merge: 16dbcaf 3ae9684 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Nov 3 13:23:59 2011 -0400 Merge branch 'bug4383_nm' into maint-0.2.2 changes/bug4383 | 5 +++++ src/or/circuitbuild.c | 3 ++- 2 files changed, 7 insertions(+), 1 deletions(-)

1 0