diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-11-16 16:22:47 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-11-16 16:22:47 -0500 |
| commit | 5a02406ae0d8059d3b0bbff51d37fcb92650274b (patch) | |
| tree | 00528f0d4a2b5066a3ac50125ca41e25fdccff89 | |
| parent | 5bea660f8ebf8ec1a78c21ce5e2a6bd5dd681eed (diff) | |
| parent | 0f6c02161793fa1022fe721ed9c1aac3538294b3 (diff) | |
| download | tor-5a02406ae0d8059d3b0bbff51d37fcb92650274b.tar.gz tor-5a02406ae0d8059d3b0bbff51d37fcb92650274b.zip | |
Merge branch 'bug4457_022' into maint-0.2.2
| -rw-r--r-- | changes/bug4457 | 9 | ||||
| -rw-r--r-- | src/common/compat_libevent.c | 19 |
2 files changed, 27 insertions, 1 deletions
diff --git a/changes/bug4457 b/changes/bug4457 new file mode 100644 index 0000000000..fe7c95ff80 --- /dev/null +++ b/changes/bug4457 @@ -0,0 +1,9 @@ + 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. + + - 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 6d89be804b..ddb2da68aa 100644 --- a/src/common/compat_libevent.c +++ b/src/common/compat_libevent.c @@ -177,11 +177,28 @@ tor_libevent_initialize(void) #endif #ifdef HAVE_EVENT2_EVENT_H - the_event_base = event_base_new(); + { + 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. + */ + 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 + 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. */ |