- tor-commits - lists.torproject.org

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

20 Nov '11

commit ca282e53263de564774944a8aa93e88271983461 Merge: 4d8306e 02d89c5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 7 11:47:28 2011 -0500 Merge branch 'bug4424' into maint-0.2.2 changes/bug4424 | 6 ++++++ src/or/rendclient.c | 9 +++++++-- 2 files changed, 13 insertions(+), 2 deletions(-)

1 0

[tor/release-0.2.2] Remove an extraneous "if" in the 4424 fix
by arma＠torproject.org 20 Nov '11

20 Nov '11

commit 02d89c5c663ec5370386de0173accaa66c1e69f5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 7 11:46:51 2011 -0500 Remove an extraneous "if" in the 4424 fix --- src/or/rendclient.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/or/rendclient.c b/src/or/rendclient.c index 3dfca58..f951dad 100644 --- a/src/or/rendclient.c +++ b/src/or/rendclient.c @@ -954,11 +954,10 @@ rend_client_any_intro_points_usable(const rend_cache_entry_t *entry) { extend_info_t *extend_info = rend_client_get_random_intro_impl(entry, get_options()->StrictNodes, 0); - int rv = extend_info != NULL; - if (extend_info != NULL) - extend_info_free(extend_info); + int rv = (extend_info != NULL); + extend_info_free(extend_info); return rv; }

1 0

[tor/release-0.2.2] Robert says that this bug was not in fact one of frosty's
by arma＠torproject.org 20 Nov '11

20 Nov '11

commit 8ba1cf3007fccafa764e8f96e346354dca45f2ed Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 7 11:54:54 2011 -0500 Robert says that this bug was not in fact one of frosty's --- changes/bug4424 | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/changes/bug4424 b/changes/bug4424 index 6928745..443625d 100644 --- a/changes/bug4424 +++ b/changes/bug4424 @@ -2,5 +2,5 @@ - Don't leak memory when we check whether a hidden service descriptor has any usable introduction points left. Fixes bug - 4424. Bugfix on 0.2.2.25-alpha; found by frosty_un. + 4424. Bugfix on 0.2.2.25-alpha.

1 0

[tor/release-0.2.2] Include HiddenServiceDir in some warning messages
by arma＠torproject.org 20 Nov '11

20 Nov '11

commit 565463243c4e019bfd8dff965582f02a2aa05e14 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Mon Nov 7 17:02:50 2011 -0800 Include HiddenServiceDir in some warning messages --- changes/bug4426 | 8 ++++++++ src/or/rendservice.c | 9 ++++++--- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/changes/bug4426 b/changes/bug4426 new file mode 100644 index 0000000..1322243 --- /dev/null +++ b/changes/bug4426 @@ -0,0 +1,8 @@ + o Minor features: + + - When Tor ignores a hidden service specified in its + configuration, include the hidden service's directory in the + warning message. Previously, we would only tell the user that + some hidden service was ignored. Bugfix on 0.0.6; fixes bug + 4426. + diff --git a/src/or/rendservice.c b/src/or/rendservice.c index 0f57319..25695c5 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -171,14 +171,17 @@ rend_add_service(rend_service_t *service) if (service->auth_type != REND_NO_AUTH && smartlist_len(service->clients) == 0) { - log_warn(LD_CONFIG, "Hidden service with client authorization but no " - "clients; ignoring."); + log_warn(LD_CONFIG, "Hidden service (%s) with client authorization but no " + "clients; ignoring.", + esc_for_log(service->directory)); rend_service_free(service); return; } if (!smartlist_len(service->ports)) { - log_warn(LD_CONFIG, "Hidden service with no ports configured; ignoring."); + log_warn(LD_CONFIG, "Hidden service (%s) with no ports configured; " + "ignoring.", + esc_for_log(service->directory)); rend_service_free(service); } else { int dupe = 0;

1 0

[tor/release-0.2.2] Don't warn when compiling with --disable-threads
by arma＠torproject.org 20 Nov '11

20 Nov '11

commit 0cc7a63fc0f8e23e0dc01a36de9a369671bdd4d5 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Tue Nov 8 08:09:40 2011 +0100 Don't warn when compiling with --disable-threads STMT_VOID semantics suggested by nick, thanks! --- changes/bug4437 | 5 +++++ src/common/compat.h | 6 +++++- 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/changes/bug4437 b/changes/bug4437 new file mode 100644 index 0000000..985c670 --- /dev/null +++ b/changes/bug4437 @@ -0,0 +1,5 @@ + o Minor bugfixes: + - Don't warn about unused log_mutex in log.c when building with + --disable-threads using a recent GCC. Fixes bug 4437; bugfix on + 0.1.0.6-rc which introduced --disable-threads. + diff --git a/src/common/compat.h b/src/common/compat.h index eb79b04..7e6058a 100644 --- a/src/common/compat.h +++ b/src/common/compat.h @@ -177,6 +177,10 @@ extern INLINE double U64_TO_DBL(uint64_t x) { /** Expands to a syntactically valid empty statement. */ #define STMT_NIL (void)0 +/** Expands to a syntactically valid empty statement, explicitly (void)ing its + * argument. */ +#define STMT_VOID(a) while (0) { (void)(a); } + #ifdef __GNUC__ /** STMT_BEGIN and STMT_END are used to wrap blocks inside macros so that * the macro can be used as if it were a single C statement. */ @@ -610,7 +614,7 @@ void tor_threads_init(void); #else #define tor_mutex_new() ((tor_mutex_t*)tor_malloc(sizeof(int))) #define tor_mutex_init(m) STMT_NIL -#define tor_mutex_acquire(m) STMT_NIL +#define tor_mutex_acquire(m) STMT_VOID(m) #define tor_mutex_release(m) STMT_NIL #define tor_mutex_free(m) STMT_BEGIN tor_free(m); STMT_END #define tor_mutex_uninit(m) STMT_NIL

1 0

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

20 Nov '11

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

1 0

[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