generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

sockfilt.c: fix some compiler warnings

Browse Source
This commit is contained in:
Yang Tse 2013-01-08 19:50:50 +01:00
parent 75fa3542d0
commit fea3a3d569
1 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
tests/server/sockfilt.c
View File

@ -92,10 +92,8 @@
#ifdef HAVE_NETDB_H #ifdef HAVE_NETDB_H
#include <netdb.h> #include <netdb.h>
#endif #endif
#ifdef USE_WINSOCK
#ifdef WIN32 #include <conio.h> /* for _kbhit() used in select_ws() */
#include <conio.h>
#include <fcntl.h>
#endif #endif
#define ENABLE_CURLX_PRINTF #define ENABLE_CURLX_PRINTF
@ -406,13 +404,12 @@ static void lograw(unsigned char *buffer, ssize_t len)
logmsg("'%s'", data); logmsg("'%s'", data);
} }
#ifdef USE_WINSOCK
/* /*
* WinSock select() does not support standard file descriptors, * WinSock select() does not support standard file descriptors,
* it can only check SOCKETs. The following function is an attempt * it can only check SOCKETs. The following function is an attempt
* to re-create a select() function with support for other handle types. * to re-create a select() function with support for other handle types.
*/ *
#ifdef USE_WINSOCK
/*
* select() function with support for WINSOCK2 sockets and all * select() function with support for WINSOCK2 sockets and all
* other handle types supported by WaitForMultipleObjectsEx(). * other handle types supported by WaitForMultipleObjectsEx().
* *
@ -491,7 +488,7 @@ static int select_ws(int nfds, fd_set *readfds, fd_set *writefds,
/* only wait for events for which we actually care */ /* only wait for events for which we actually care */
if(networkevents) { if(networkevents) {
fdarr[nfd] = (curl_socket_t)fds; fdarr[nfd] = (curl_socket_t) LongToHandle(fds);
if(fds == fileno(stdin)) { if(fds == fileno(stdin)) {
handles[nfd] = GetStdHandle(STD_INPUT_HANDLE); handles[nfd] = GetStdHandle(STD_INPUT_HANDLE);
} }
@ -507,12 +504,12 @@ static int select_ws(int nfds, fd_set *readfds, fd_set *writefds,
error = WSAEventSelect(fds, wsaevent, networkevents); error = WSAEventSelect(fds, wsaevent, networkevents);
if(error != SOCKET_ERROR) { if(error != SOCKET_ERROR) {
handles[nfd] = wsaevent; handles[nfd] = wsaevent;
wsasocks[wsa] = (curl_socket_t)fds; wsasocks[wsa] = (curl_socket_t) LongToHandle(fds);
wsaevents[wsa] = wsaevent; wsaevents[wsa] = wsaevent;
wsa++; wsa++;
} }
else { else {
handles[nfd] = (HANDLE)fds; handles[nfd] = LongToHandle(fds);
WSACloseEvent(wsaevent); WSACloseEvent(wsaevent);
} }
} }
@ -534,9 +531,9 @@ static int select_ws(int nfds, fd_set *readfds, fd_set *writefds,
/* loop over the internal handles returned in the descriptors */ /* loop over the internal handles returned in the descriptors */
for(idx = 0; idx < nfd; idx++) { for(idx = 0; idx < nfd; idx++) {
fds = fdarr[idx];
handle = handles[idx]; handle = handles[idx];
sock = (curl_socket_t)fds; sock = fdarr[idx];
fds = HandleToLong(sock);
/* check if the current internal handle was triggered */ /* check if the current internal handle was triggered */
if(wait != WAIT_FAILED && (wait - WAIT_OBJECT_0) >= idx && if(wait != WAIT_FAILED && (wait - WAIT_OBJECT_0) >= idx &&
@ -632,7 +629,7 @@ static int select_ws(int nfds, fd_set *readfds, fd_set *writefds,
return ret; return ret;
} }
#define select(a,b,c,d,e) select_ws(a,b,c,d,e) #define select(a,b,c,d,e) select_ws(a,b,c,d,e)
#endif #endif /* USE_WINSOCK */
/* /*
sockfdp is a pointer to an established stream or CURL_SOCKET_BAD sockfdp is a pointer to an established stream or CURL_SOCKET_BAD
@ -859,21 +856,22 @@ static bool juggle(curl_socket_t *sockfdp,
if((sockfd != CURL_SOCKET_BAD) && (FD_ISSET(sockfd, &fds_read)) ) { if((sockfd != CURL_SOCKET_BAD) && (FD_ISSET(sockfd, &fds_read)) ) {
curl_socket_t newfd = CURL_SOCKET_BAD; /* newly accepted socket */
if(*mode == PASSIVE_LISTEN) { if(*mode == PASSIVE_LISTEN) {
/* there's no stream set up yet, this is an indication that there's a /* there's no stream set up yet, this is an indication that there's a
client connecting. */ client connecting. */
listenfd = sockfd; newfd = accept(sockfd, NULL, NULL);
sockfd = accept(listenfd, NULL, NULL); if(CURL_SOCKET_BAD == newfd) {
if(CURL_SOCKET_BAD == sockfd) {
error = SOCKERRNO; error = SOCKERRNO;
logmsg("accept(%d, NULL, NULL) failed with error: (%d) %s", logmsg("accept(%d, NULL, NULL) failed with error: (%d) %s",
listenfd, error, strerror(error)); sockfd, error, strerror(error));
} }
else { else {
logmsg("====> Client connect"); logmsg("====> Client connect");
if(!write_stdout("CNCT\n", 5)) if(!write_stdout("CNCT\n", 5))
return FALSE; return FALSE;
*sockfdp = sockfd; /* store the new socket */ *sockfdp = newfd; /* store the new socket */
*mode = PASSIVE_CONNECT; /* we have connected */ *mode = PASSIVE_CONNECT; /* we have connected */
} }
return TRUE; return TRUE;