diff options
author | Daniel Stenberg <daniel@haxx.se> | 2004-07-01 13:54:24 +0000 |
---|---|---|
committer | Daniel Stenberg <daniel@haxx.se> | 2004-07-01 13:54:24 +0000 |
commit | 5c1ec168f69ca713fc5a2250ffffe7c8d8b5990b (patch) | |
tree | af28cf9a16a1a976cda41e98a4d4cffbf01ad8c4 /ares_process.c | |
parent | 6aa773d81086aab1a498e01b0a58912e85fb0d8e (diff) | |
download | c-ares-5c1ec168f69ca713fc5a2250ffffe7c8d8b5990b.tar.gz c-ares-5c1ec168f69ca713fc5a2250ffffe7c8d8b5990b.tar.bz2 c-ares-5c1ec168f69ca713fc5a2250ffffe7c8d8b5990b.zip |
Gisle's win32-fix. 'errno' is not used for errors when socket() fails on
Windows.
Diffstat (limited to 'ares_process.c')
-rw-r--r-- | ares_process.c | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/ares_process.c b/ares_process.c index a8dd0c7..121c449 100644 --- a/ares_process.c +++ b/ares_process.c @@ -35,6 +35,12 @@ #include "ares_dns.h" #include "ares_private.h" +#ifdef WIN32 +#define GET_ERRNO() WSAGetLastError() +#else +#define GET_ERRNO() errno +#endif + static void write_tcp_data(ares_channel channel, fd_set *write_fds, time_t now); static void read_tcp_data(ares_channel channel, fd_set *read_fds, time_t now); @@ -476,18 +482,20 @@ static int open_tcp_socket(ares_channel channel, struct server_state *server) return -1; } #endif - + /* Connect to the server. */ memset(&sockin, 0, sizeof(sockin)); sockin.sin_family = AF_INET; sockin.sin_addr = server->addr; sockin.sin_port = channel->tcp_port; - if (connect(s, (struct sockaddr *) &sockin, sizeof(sockin)) == -1 - && errno != EINPROGRESS) - { + if (connect(s, (struct sockaddr *) &sockin, sizeof(sockin)) == -1) { + int err = GET_ERRNO(); + + if (err != EINPROGRESS && err != EWOULDBLOCK) { closesocket(s); return -1; } + } server->tcp_socket = s; return 0; |