aboutsummaryrefslogtreecommitdiffstats
path: root/epan/addr_resolv.c
diff options
context:
space:
mode:
authorJaap Keuter <jaap.keuter@xs4all.nl>2009-10-30 21:57:43 +0000
committerJaap Keuter <jaap.keuter@xs4all.nl>2009-10-30 21:57:43 +0000
commitb30247cccb02b6ea670f62f6ee6b92143e00d972 (patch)
treeef0a8c30c64799db83df2f665887f24d7a1f7042 /epan/addr_resolv.c
parent1a2f69aa0358b814dca25377c35f468ce0a61123 (diff)
Prepare for c-ares 1.6.1 release.
svn path=/trunk/; revision=30773
Diffstat (limited to 'epan/addr_resolv.c')
-rw-r--r--epan/addr_resolv.c12
1 files changed, 11 insertions, 1 deletions
diff --git a/epan/addr_resolv.c b/epan/addr_resolv.c
index d2fb8235f8..5fd9a416a0 100644
--- a/epan/addr_resolv.c
+++ b/epan/addr_resolv.c
@@ -2279,9 +2279,15 @@ host_name_lookup_init(void) {
g_free(hostspath);
#ifdef HAVE_C_ARES
+#ifdef CARES_HAVE_ARES_LIBRARY_INIT
+ if (ares_library_init(ARES_LIB_INIT_ALL) == ARES_SUCCESS) {
+#endif
if (ares_init(&alchan) == ARES_SUCCESS) {
async_dns_initialized = TRUE;
}
+#ifdef CARES_HAVE_ARES_LIBRARY_INIT
+ }
+#endif
#else
#ifdef HAVE_GNU_ADNS
/*
@@ -2386,8 +2392,12 @@ host_name_lookup_cleanup(void) {
g_list_free(async_dns_queue_head);
- if (async_dns_initialized)
+ if (async_dns_initialized) {
ares_destroy(alchan);
+ }
+#ifdef CARES_HAVE_ARES_LIBRARY_INIT
+ ares_library_cleanup();
+#endif
async_dns_initialized = FALSE;
}