empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(tcp_connect, hostconnect) [_WIN32]: Replace close() with

Browse source 
closesocket() as Windows close() does not support closing
socket connections.
This commit is contained in:
Ron Koenderink 2007-08-20 19:59:12 +00:00
parent b5c4250099
commit d9ddf9b24a
1 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/client/host.c
View file

@ -48,7 +48,7 @@
#include <netdb.h> #include <netdb.h>
#include <unistd.h> #include <unistd.h>
#else #else
#include <io.h> #include <winsock2.h>
#endif #endif
#include "misc.h" #include "misc.h"
@ -82,8 +82,11 @@ tcp_connect(char *host, char *serv)
if (connect(sockfd, res->ai_addr, res->ai_addrlen) == 0) if (connect(sockfd, res->ai_addr, res->ai_addrlen) == 0)
break; /* success */ break; /* success */
#ifdef _WIN32
closesocket(sockfd); /* ignore this one */
#else
close(sockfd); /* ignore this one */ close(sockfd); /* ignore this one */
#endif
} while ((res = res->ai_next) != NULL); } while ((res = res->ai_next) != NULL);
if (res == NULL) { /* errno set from final connect() */ if (res == NULL) { /* errno set from final connect() */
@ -152,8 +155,10 @@ hostconnect(struct sockaddr_in *addr)
if (connect(s, (struct sockaddr *)addr, sizeof(*addr)) < 0) { if (connect(s, (struct sockaddr *)addr, sizeof(*addr)) < 0) {
#ifdef _WIN32 #ifdef _WIN32
errno = WSAGetLastError(); errno = WSAGetLastError();
#endif (void)closesocket(s);
#else
(void)close(s); (void)close(s);
#endif
return -1; return -1;
} }
return s; return s;