Commit 14fb8fd9 authored by Mickaël Turnel's avatar Mickaël Turnel

Merge branch 'master' into bc

parents 2a34c524 39fc0cc9
......@@ -184,6 +184,16 @@ if test x$enable_memleak_log = xyes ; then
AC_DEFINE([HAVE_MEMLEAK_LOG], 1, [Define to 1 for memory-leak-related logging])
fi
# Enable mdns
AC_ARG_ENABLE(mdns,
[AC_HELP_STRING([--enable-mdns],[build with mdns support])],[enable_mdns="yes"],[enable_mdns="no"])
if test x$enable_mdns = xyes ; then
AC_SEARCH_LIBS([DNSServiceBrowse], [dns_sd], [
AC_DEFINE([HAVE_MDNS], 1, [Define to 1 if dnssd library is available])
])
fi
### checks for header files
### -----------------------
AC_HEADER_STDC
......
......@@ -10099,7 +10099,10 @@ outgoing_try_another(nta_outgoing_t *orq)
sq->sq_grayish = 1;
}
else {
outgoing_graylist(orq, sr->sr_done);
#if HAVE_MDNS
if (!sres_resolver_is_resolving_mdns(orq->orq_agent->sa_resolver))
outgoing_graylist(orq, sr->sr_done);
#endif
}
}
......
......@@ -142,6 +142,12 @@ void *sres_resolver_set_userdata(sres_resolver_t *res, void *userdata);
SRESPUBFUN
void *sres_resolver_get_userdata(sres_resolver_t const *res);
#ifdef HAVE_MDNS
/** Set mDNS socket */
SRESPUBFUN
void sres_resolver_mdns_set_socket(sres_resolver_t *resolver, int socket);
#endif
/** Prototype for callback function.
*
* This kind of function is called when a query is completed. The called
......
This diff is collapsed.
......@@ -315,6 +315,7 @@ su_socket_t sres_resolver_root_socket(sres_resolver_t *res)
su_socket_t socket;
if (sres_resolver_sockets(res, &socket, 1) < 0)
return INVALID_SOCKET;
srs->srs_socket = socket;
}
return srs->srs_socket;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment