From e5b88dc83fb44622f2b0f9c0c242907d1c02311f Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Thu, 4 Jun 2009 01:05:23 -0400 Subject: 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). --- src/or/config.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src/or/config.c') 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)."); -- cgit v1.2.3-54-g00ecf