diff options
author | Nick Mathewson <nickm@torproject.org> | 2009-06-04 01:05:23 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2009-06-12 14:27:52 -0400 |
commit | e5b88dc83fb44622f2b0f9c0c242907d1c02311f (patch) | |
tree | 4a3932831da9df966b74ddf59b16aaa2445edb12 /src/or/config.c | |
parent | cfce7d5deab7839c0ac67c3777e70a2264176ca0 (diff) | |
download | tor-e5b88dc83fb44622f2b0f9c0c242907d1c02311f.tar.gz tor-e5b88dc83fb44622f2b0f9c0c242907d1c02311f.zip |
Update Tor to use Libevent 2.0 APIs when available.
This patch adds a new compat_libevent.[ch] set of files, and moves our
Libevent compatibility and utilitity functions there. We build them
into a separate .a so that nothing else in src/commmon depends on
Libevent (partially fixing bug 507).
Also, do not use our own built-in evdns copy when we have Libevent
2.0, whose evdns is finally good enough (thus fixing Bug 920).
Diffstat (limited to 'src/or/config.c')
-rw-r--r-- | src/or/config.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/or/config.c b/src/or/config.c index 9d5fb3b120..e5f27f9acd 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -4903,15 +4903,17 @@ init_libevent(void) /* Your libevent is ancient. */ #endif - event_init(); + tor_libevent_initialize(); + suppress_libevent_log_msg(NULL); #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. */ log(LOG_NOTICE, LD_GENERAL, "Initialized libevent version %s using method %s. Good.", - event_get_version(), event_get_method()); - check_libevent_version(event_get_method(), get_options()->ORPort != 0); + event_get_version(), tor_libevent_get_method()); + check_libevent_version(tor_libevent_get_method(), + get_options()->ORPort != 0); #else log(LOG_NOTICE, LD_GENERAL, "Initialized old libevent (version 1.0b or earlier)."); |