mirror of
https://github.com/moparisthebest/curl
synced 2024-12-21 23:58:49 -05:00
hostip: avoid getaddrinfo when c-ares is used
Some functions using getaddrinfo and gethostbyname were still mistakingly being used/linked even if c-ares was selected as resolver backend. Reported by: Arthur Murray Bug: http://curl.haxx.se/mail/lib-2012-01/0160.html
This commit is contained in:
parent
123c92c904
commit
9f20379fe4
@ -5,7 +5,7 @@
|
|||||||
* | (__| |_| | _ <| |___
|
* | (__| |_| | _ <| |___
|
||||||
* \___|\___/|_| \_\_____|
|
* \___|\___/|_| \_\_____|
|
||||||
*
|
*
|
||||||
* Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.
|
* Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
|
||||||
*
|
*
|
||||||
* This software is licensed as described in the file COPYING, which
|
* This software is licensed as described in the file COPYING, which
|
||||||
* you should have received as part of this distribution. The terms
|
* you should have received as part of this distribution. The terms
|
||||||
@ -119,6 +119,8 @@ Curl_addrinfo *Curl_getaddrinfo(struct connectdata *conn,
|
|||||||
#endif /* CURLRES_SYNCH */
|
#endif /* CURLRES_SYNCH */
|
||||||
#endif /* CURLRES_IPV4 */
|
#endif /* CURLRES_IPV4 */
|
||||||
|
|
||||||
|
#if defined(CURLRES_IPV4) && !defined(CURLRES_ARES)
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Curl_ipv4_resolve_r() - ipv4 threadsafe resolver function.
|
* Curl_ipv4_resolve_r() - ipv4 threadsafe resolver function.
|
||||||
*
|
*
|
||||||
@ -311,3 +313,4 @@ Curl_addrinfo *Curl_ipv4_resolve_r(const char *hostname,
|
|||||||
|
|
||||||
return ai;
|
return ai;
|
||||||
}
|
}
|
||||||
|
#endif /* defined(CURLRES_IPV4) && !defined(CURLRES_ARES) */
|
||||||
|
@ -487,6 +487,9 @@
|
|||||||
#ifdef USE_ARES
|
#ifdef USE_ARES
|
||||||
# define CURLRES_ASYNCH
|
# define CURLRES_ASYNCH
|
||||||
# define CURLRES_ARES
|
# define CURLRES_ARES
|
||||||
|
/* now undef the stock libc functions just to avoid them being used */
|
||||||
|
# undef HAVE_GETADDRINFO
|
||||||
|
# undef HAVE_GETHOSTBYNAME
|
||||||
#elif defined(USE_THREADS_POSIX) || defined(USE_THREADS_WIN32)
|
#elif defined(USE_THREADS_POSIX) || defined(USE_THREADS_WIN32)
|
||||||
# define CURLRES_ASYNCH
|
# define CURLRES_ASYNCH
|
||||||
# define CURLRES_THREADED
|
# define CURLRES_THREADED
|
||||||
|
@ -5,7 +5,7 @@
|
|||||||
* | (__| |_| | _ <| |___
|
* | (__| |_| | _ <| |___
|
||||||
* \___|\___/|_| \_\_____|
|
* \___|\___/|_| \_\_____|
|
||||||
*
|
*
|
||||||
* Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.
|
* Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
|
||||||
*
|
*
|
||||||
* This software is licensed as described in the file COPYING, which
|
* This software is licensed as described in the file COPYING, which
|
||||||
* you should have received as part of this distribution. The terms
|
* you should have received as part of this distribution. The terms
|
||||||
@ -727,7 +727,7 @@ static CURLcode tftp_tx(tftp_state_data_t *state, tftp_event_t event)
|
|||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
/* Re-send the data packet */
|
/* Re-send the data packet */
|
||||||
sbytes = sendto(state->sockfd, (void *)&state->spacket.data,
|
sbytes = sendto(state->sockfd, (void *)state->spacket.data,
|
||||||
4+state->sbytes, SEND_4TH_ARG,
|
4+state->sbytes, SEND_4TH_ARG,
|
||||||
(struct sockaddr *)&state->remote_addr,
|
(struct sockaddr *)&state->remote_addr,
|
||||||
state->remote_addrlen);
|
state->remote_addrlen);
|
||||||
|
Loading…
Reference in New Issue
Block a user