diff options
| author | Yang Tse <yangsita@gmail.com> | 2008-10-30 13:45:25 +0000 |
|---|---|---|
| committer | Yang Tse <yangsita@gmail.com> | 2008-10-30 13:45:25 +0000 |
| commit | 0ce97f77e02acd2de15970270834a7011ce6cb38 (patch) | |
| tree | f4126643e401db6323a14eba48d4611e9d95d4f6 /lib/hostthre.c | |
| parent | 197ad60d219e33efcbf0ad28618ce88cfd4b9713 (diff) | |
Use our Curl_addrinfo definition even when an addrinfo struct is available.
Use a wrapper function to call system's getaddrinfo().
Diffstat (limited to 'lib/hostthre.c')
| -rw-r--r-- | lib/hostthre.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/lib/hostthre.c b/lib/hostthre.c index dc8eead92..fcc0bb32c 100644 --- a/lib/hostthre.c +++ b/lib/hostthre.c @@ -288,7 +288,7 @@ static unsigned __stdcall getaddrinfo_thread (void *arg) { struct connectdata *conn = (struct connectdata*) arg; struct thread_data *td = (struct thread_data*) conn->async.os_specific; - struct addrinfo *res; + Curl_addrinfo *res; char service [NI_MAXSERV]; int rc; struct addrinfo hints = td->hints; @@ -313,7 +313,7 @@ static unsigned __stdcall getaddrinfo_thread (void *arg) need */ SetEvent(td->event_thread_started); - rc = getaddrinfo(tsd.hostname, service, &hints, &res); + rc = Curl_getaddrinfo_ex(tsd.hostname, service, &hints, &res); /* is parent thread waiting for us and are we able to access conn members? */ if(acquire_thread_sync(&tsd)) { @@ -703,7 +703,8 @@ Curl_addrinfo *Curl_getaddrinfo(struct connectdata *conn, int port, int *waitp) { - struct addrinfo hints, *res; + struct addrinfo hints; + Curl_addrinfo *res; int error; char sbuf[NI_MAXSERV]; int pf; @@ -762,7 +763,7 @@ Curl_addrinfo *Curl_getaddrinfo(struct connectdata *conn, infof(data, "init_resolve_thread() failed for %s; %s\n", hostname, Curl_strerror(conn, ERRNO)); - error = getaddrinfo(hostname, sbuf, &hints, &res); + error = Curl_getaddrinfo_ex(hostname, sbuf, &hints, &res); if(error) { infof(data, "getaddrinfo() failed for %s:%d; %s\n", hostname, port, Curl_strerror(conn, SOCKERRNO)); |