diff options
| author | Sebastian Hahn <sebastian@torproject.org> | 2010-02-19 17:19:33 +0100 |
|---|---|---|
| committer | Sebastian Hahn <sebastian@torproject.org> | 2010-02-19 22:36:53 +0100 |
| commit | 408a828b1f12462f7a31a5d84bcfa38399173b3e (patch) | |
| tree | 21dac2d6ce48e7e36c0bd3034c34806e4f2122bc /src/common/compat_libevent.h | |
| parent | 0bd6cb31edbd33764c8d24dc3e79b8a7ca9eba84 (diff) | |
| download | tor-408a828b1f12462f7a31a5d84bcfa38399173b3e.tar tor-408a828b1f12462f7a31a5d84bcfa38399173b3e.tar.gz | |
Make the DNSPort option work with libevent 2.x
We need to use evdns_add_server_port_with_base() when configuring
our DNS listener, because libevent segfaults otherwise. Add a macro
in compat_libevent.h to pick the correct implementation depending
on the libevent version.
Fixes bug 1143, found by SwissTorExit
Diffstat (limited to 'src/common/compat_libevent.h')
| -rw-r--r-- | src/common/compat_libevent.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/common/compat_libevent.h b/src/common/compat_libevent.h index d2e76ce4e..eedd9da43 100644 --- a/src/common/compat_libevent.h +++ b/src/common/compat_libevent.h @@ -23,6 +23,10 @@ void suppress_libevent_log_msg(const char *msg); #define tor_evtimer_new evtimer_new #define tor_evsignal_new evsignal_new #define tor_event_free event_free +#define tor_evdns_add_server_port(sock, tcp, cb, data) \ + evdns_add_server_port_with_base(tor_libevent_get_base(), \ + (sock),(tcp),(cb),(data)); + #else struct event *tor_event_new(struct event_base * base, evutil_socket_t sock, short what, void (*cb)(evutil_socket_t, short, void *), void *arg); @@ -31,6 +35,7 @@ struct event *tor_evtimer_new(struct event_base * base, struct event *tor_evsignal_new(struct event_base * base, int sig, void (*cb)(evutil_socket_t, short, void *), void *arg); void tor_event_free(struct event *ev); +#define tor_evdns_add_server_port evdns_add_server_port #endif /* XXXX022 If we can drop support for Libevent before 1.1, we can |