diff options
| author | João Valverde <joao.valverde@tecnico.ulisboa.pt> | 2017-07-20 19:03:45 +0100 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2017-07-21 08:33:13 +0000 |
| commit | d238160a22ed3e7c9d2235002e3051afe162e662 (patch) | |
| tree | ede156b9cdfe06c52da44cb7544d352eb445616d /epan/addr_resolv.c | |
| parent | 9e419f62bde6c86bc7dd35c71e0a29321f3cb3ea (diff) | |
Require c-ares >= 1.5
Version 1.5 was released on 21-nov-2007. RHEL, Suse, etc supported versions
are all above c-ares v1.5.
We don't bother testing for it at build time for now, because it's non-trivial
(times two build systems).
Change-Id: I9253256d8d905da0c75d80b2b0fa4527df2b1420
Reviewed-on: https://code.wireshark.org/review/22741
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/addr_resolv.c')
| -rw-r--r-- | epan/addr_resolv.c | 33 |
1 files changed, 2 insertions, 31 deletions
diff --git a/epan/addr_resolv.c b/epan/addr_resolv.c index 8ab7ff4fa8..3559e525f9 100644 --- a/epan/addr_resolv.c +++ b/epan/addr_resolv.c @@ -348,13 +348,6 @@ typedef struct _async_hostent { void *addrp; } async_hostent_t; -#if ( ( ARES_VERSION_MAJOR < 1 ) \ - || ( 1 == ARES_VERSION_MAJOR && ARES_VERSION_MINOR < 5 ) ) -static void c_ares_ghba_cb(void *arg, int status, struct hostent *hostent); -#else -static void c_ares_ghba_cb(void *arg, int status, int timeouts _U_, struct hostent *hostent); -#endif - ares_channel ghba_chan; /* ares_gethostbyaddr -- Usually non-interactive, no timeout */ ares_channel ghbn_chan; /* ares_gethostbyname -- Usually interactive, timeout */ @@ -845,18 +838,7 @@ fill_dummy_ip6(hashipv6_t* volatile tp) #ifdef HAVE_C_ARES static void -c_ares_ghba_cb( - void *arg, - int status, -#if ( ( ARES_VERSION_MAJOR < 1 ) \ - || ( 1 == ARES_VERSION_MAJOR && ARES_VERSION_MINOR < 5 ) ) - struct hostent *he -#else - int timeouts _U_, - struct hostent *he -#endif - ) { - +c_ares_ghba_cb(void *arg, int status, int timeouts _U_, struct hostent *he) { async_dns_queue_msg_t *caqm = (async_dns_queue_msg_t *)arg; char **p; @@ -3103,18 +3085,7 @@ eui64_to_display(wmem_allocator_t *allocator, const guint64 addr_eui64) #ifdef HAVE_C_ARES #define GHI_TIMEOUT (250 * 1000) static void -c_ares_ghi_cb( - void *arg, - int status, -#if ( ( ARES_VERSION_MAJOR < 1 ) \ - || ( 1 == ARES_VERSION_MAJOR && ARES_VERSION_MINOR < 5 ) ) - struct hostent *hp -#else - int timeouts _U_, - struct hostent *hp -#endif - ) { - +c_ares_ghi_cb(void *arg, int status, int timeouts _U_, struct hostent *hp) { /* * XXX - If we wanted to be really fancy we could cache results here and * look them up in get_host_ipaddr* below. |