devs/libstrophe-gh
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolver: don't build legacy win32 code with c-ares

Browse Source 
Fix ifdef macros to exclude legacy win32 code when it is not needed.
This commit is contained in:
Dmitry Podgorny
2020-05-31 21:43:09 +03:00
parent 7c83eb0efa
commit a65dd1059d
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/resolver.c
View File

@@ -16,8 +16,8 @@
#if !defined(_WIN32) && !defined(HAVE_CARES) #if !defined(_WIN32) && !defined(HAVE_CARES)
#include <netinet/in.h> #include <netinet/in.h>
#include <arpa/nameser.h> #include <arpa/nameser.h>
#include <resolv.h> /* res_query */ #include <resolv.h>
#endif /* _WIN32 && HAVE_CARES */ #endif /* _WIN32 && HAVE_CARES */
#ifdef HAVE_CARES #ifdef HAVE_CARES
#include <ares.h> #include <ares.h>
@@ -64,14 +64,14 @@ static int resolver_raw_srv_lookup_buf(xmpp_ctx_t *ctx,
resolver_srv_rr_t **srv_rr_list); resolver_srv_rr_t **srv_rr_list);
#endif /* !HAVE_CARES */ #endif /* !HAVE_CARES */
#ifdef _WIN32 #if defined(_WIN32) && !defined(HAVE_CARES)
static int resolver_win32_srv_lookup(xmpp_ctx_t *ctx, static int resolver_win32_srv_lookup(xmpp_ctx_t *ctx,
const char *fulldomain, const char *fulldomain,
resolver_srv_rr_t **srv_rr_list); resolver_srv_rr_t **srv_rr_list);
static int resolver_win32_srv_query(const char *fulldomain, static int resolver_win32_srv_query(const char *fulldomain,
unsigned char *buf, unsigned char *buf,
size_t len); size_t len);
#endif /* _WIN32 */ #endif /* _WIN32 && !HAVE_CARES */
/******************************************************************************* /*******************************************************************************
* Implementation. * Implementation.
@@ -185,7 +185,9 @@ int resolver_srv_lookup(xmpp_ctx_t *ctx,
*srv_rr_list = NULL; *srv_rr_list = NULL;
#ifdef HAVE_CARES #ifdef HAVE_CARES
set = resolver_ares_srv_lookup(ctx, fulldomain, srv_rr_list); set = resolver_ares_srv_lookup(ctx, fulldomain, srv_rr_list);
#else /* HAVE_CARES */ #else /* HAVE_CARES */
#ifdef _WIN32 #ifdef _WIN32
@@ -549,7 +551,7 @@ static int resolver_ares_srv_lookup(xmpp_ctx_t *ctx,
#endif /* HAVE_CARES */ #endif /* HAVE_CARES */
#ifdef _WIN32 #if defined(_WIN32) && !defined(HAVE_CARES)
/******************************************************************************* /*******************************************************************************
* Next part was copied from sock.c and contains old win32 code. * Next part was copied from sock.c and contains old win32 code.
* *
@@ -928,8 +930,8 @@ resolver_win32_srv_query(const char *fulldomain, unsigned char *buf, size_t len)
memset(&question, 0, sizeof(question)); memset(&question, 0, sizeof(question));
strncpy(question.qname, fulldomain, 1024); strncpy(question.qname, fulldomain, 1024);
question.qtype = 33; /* SRV */ question.qtype = MESSAGE_T_SRV; /* SRV */
question.qclass = 1; /* INTERNET! */ question.qclass = MESSAGE_C_IN; /* INTERNET! */
netbuf_add_dnsquery_question(buf, (int)len, &offset, &question); netbuf_add_dnsquery_question(buf, (int)len, &offset, &question);
@@ -970,4 +972,4 @@ resolver_win32_srv_query(const char *fulldomain, unsigned char *buf, size_t len)
return set ? insize : -1; return set ? insize : -1;
} }
#endif /* _WIN32 */ #endif /* _WIN32 && !HAVE_CARES */