From d29764f4cada6315b9f8208c7c266c5728d8e706 Mon Sep 17 00:00:00 2001 From: snowdrop Date: Wed, 1 Sep 2004 07:58:00 +0000 Subject: migrating to win32 platform --- nanohttp/nanohttp-socket.c | 656 +++++++++++++++++++++++++-------------------- 1 file changed, 362 insertions(+), 294 deletions(-) (limited to 'nanohttp/nanohttp-socket.c') diff --git a/nanohttp/nanohttp-socket.c b/nanohttp/nanohttp-socket.c index 844a5ef..a7882b1 100644 --- a/nanohttp/nanohttp-socket.c +++ b/nanohttp/nanohttp-socket.c @@ -1,5 +1,5 @@ /****************************************************************** -* $Id: nanohttp-socket.c,v 1.13 2004/08/31 16:34:08 rans Exp $ +* $Id: nanohttp-socket.c,v 1.14 2004/09/01 07:58:08 snowdrop Exp $ * * CSOAP Project: A http client/server library in C * Copyright (C) 2003 Ferhat Ayaz @@ -18,7 +18,7 @@ * License along with this library; if not, write to the * Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Boston, MA 02111-1307, USA. -* +* * Email: ayaz@jprogrammer.net ******************************************************************/ #include @@ -35,27 +35,27 @@ typedef int ssize_t; #endif #ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" +#endif #ifdef HAVE_SYS_TYPES_H -# include +#include #endif #ifdef HAVE_SYS_SOCKET_H -# include +#include #endif #ifdef HAVE_ARPA_INET_H -# include +#include #endif #ifdef HAVE_NETDB_H -# include +#include #endif #ifdef HAVE_UNISTD_H -# include +#include #endif #include @@ -63,327 +63,383 @@ typedef int ssize_t; /*-------------------------------------------------- FUNCTION: hsocket_module_init -NOTE: This will be called from httpd_init() - for server and from httpc_init() for client +NOTE: This will be called from httpd_init() + for server and from httpc_init() for client ----------------------------------------------------*/ -int hsocket_module_init() +int +hsocket_module_init () { -#ifdef WIN32 - // WSACleanup(); - struct WSAData info; - WSAStartup(MAKEWORD(2,2), &info); -#else - /* nothing to init for unix sockets */ -#endif - return 0; +#ifdef WIN32 + //WSACleanup(); + struct WSAData info; + WSAStartup (MAKEWORD (2, 2), &info); + +#else /* */ + /* nothing to init for unix sockets */ +#endif /* */ + return 0; } /*-------------------------------------------------- -FUNCTION: hsocket_module_destroy +FUNCTION: hsocket_module_destroy ----------------------------------------------------*/ -void hsocket_module_destroy() +void +hsocket_module_destroy () { -#ifdef WIN32 - WSACleanup(); -#else - /* nothing to destroy for unix sockets */ -#endif +#ifdef WIN32 + WSACleanup (); + +#else /* */ + /* nothing to destroy for unix sockets */ +#endif /* */ } /*-------------------------------------------------- FUNCTION: hsocket_init ----------------------------------------------------*/ -int hsocket_init(hsocket_t *sock) +int +hsocket_init (hsocket_t * sock) { - /* just set the descriptor to -1 */ - *sock = -1; - return 0; + /* just set the descriptor to -1 */ + *sock = -1; + return 0; } /*-------------------------------------------------- FUNCTION: hsocket_free ----------------------------------------------------*/ -void hsocket_free(hsocket_t sock) +void +hsocket_free (hsocket_t sock) { - /* nothing to free for unix sockets */ + /* nothing to free for unix sockets */ } /*-------------------------------------------------- FUNCTION: hsocket_open ----------------------------------------------------*/ -int hsocket_open(hsocket_t *dsock, const char* hostname, int port) +int +hsocket_open (hsocket_t * dsock, const char *hostname, int port) { - hsocket_t sock; - char *ip; - struct sockaddr_in address; - struct hostent* host; - - sock = socket(AF_INET, SOCK_STREAM, 0); - if (sock <= 0) return HSOCKET_CAN_NOT_CREATE; - - /* Get host data */ - host = gethostbyname(hostname); - if (host == NULL) return HSOCKET_CAN_NOT_GET_HOSTNAME; - - ip = inet_ntoa (*(struct in_addr *)*host->h_addr_list); - address.sin_addr.s_addr = inet_addr(ip); - - /* set server addresss */ - address.sin_family = host->h_addrtype; - address.sin_port = htons(port); - /* connect to the server */ - if (connect(sock, (struct sockaddr*) &address, sizeof(address)) != 0) - return HSOCKET_CAN_NOT_CONNECT; - - *dsock = sock; - return HSOCKET_OK; + hsocket_t sock; + char *ip; + struct sockaddr_in address; + struct hostent *host; + + sock = socket (AF_INET, SOCK_STREAM, 0); + if (sock <= 0) + return HSOCKET_CAN_NOT_CREATE; + + /* Get host data */ + host = gethostbyname (hostname); + if (host == NULL) + return HSOCKET_CAN_NOT_GET_HOSTNAME; + + ip = inet_ntoa (*(struct in_addr *) *host->h_addr_list); + address.sin_addr.s_addr = inet_addr (ip); + + /* set server addresss */ + address.sin_family = host->h_addrtype; + address.sin_port = htons (port); + /* connect to the server */ + if (connect (sock, (struct sockaddr *) &address, sizeof (address)) != 0) + return HSOCKET_CAN_NOT_CONNECT; + + *dsock = sock; + return HSOCKET_OK; } /*-------------------------------------------------- FUNCTION: hsocket_bind ----------------------------------------------------*/ -int hsocket_bind(hsocket_t *dsock, int port) +int +hsocket_bind (hsocket_t * dsock, int port) { - hsocket_t sock; - struct sockaddr_in addr; - - /* create socket */ - sock = socket(AF_INET, SOCK_STREAM, 0); - if (sock == -1) { - log_error2("Can not create socket: '%s'", strerror(errno)); - return HSOCKET_CAN_NOT_CREATE; - } - - /* bind socket */ - addr.sin_family = AF_INET; - addr.sin_port = htons(port); /* short, network byte order */ - addr.sin_addr.s_addr = INADDR_ANY; - memset(&(addr.sin_zero), '\0', 8); /* zero the rest of the struct */ - - if (bind(sock, (struct sockaddr *)&addr, - sizeof(struct sockaddr)) == -1) { - log_error2("Can not bind: '%s'", strerror(errno)); - return HSOCKET_CAN_NOT_BIND; - } - - *dsock = sock; + hsocket_t sock; + struct sockaddr_in addr; + + /* create socket */ + sock = socket (AF_INET, SOCK_STREAM, 0); + if (sock == -1) + { + log_error2 ("Can not create socket: '%s'", strerror (errno)); + return HSOCKET_CAN_NOT_CREATE; + } + /* bind socket */ + addr.sin_family = AF_INET; + addr.sin_port = htons (port); /* short, network byte order */ + addr.sin_addr.s_addr = INADDR_ANY; + memset (&(addr.sin_zero), '\0', 8); /* zero the rest of the + * struct */ + + if (bind (sock, (struct sockaddr *) &addr, sizeof (struct sockaddr)) == -1) + { + log_error2 ("Can not bind: '%s'", strerror (errno)); + return HSOCKET_CAN_NOT_BIND; + } + *dsock = sock; #ifdef WIN32 - // setsockopt(sock, SOL_SOCKET, SO_KEEPALIVE, (char*)true, sizeof(BOOL)); - // setsockopt(sock, SOL_SOCKET, SO_CONDITIONAL_ACCEPT, (char*)true, sizeof(BOOL)); + //setsockopt(sock, SOL_SOCKET, SO_KEEPALIVE, (char *) true, sizeof(BOOL)); + //setsockopt(sock, SOL_SOCKET, SO_CONDITIONAL_ACCEPT, (char *) true, sizeof(BOOL)); #endif - return HSOCKET_OK; + return HSOCKET_OK; } #ifdef WIN32 -int hsocket_accept(hsocket_t sock, unsigned ( __stdcall *func )( void * ), conndata_t *conns, - int max_conn) +int +hsocket_accept (hsocket_t sock, unsigned (__stdcall * func) (void *), + conndata_t * conns, int max_conn) #else -int hsocket_accept(hsocket_t sock, void(*func) (void *), conndata_t *conns, int max_conn) +int +hsocket_accept (hsocket_t sock, void (*func) (void *), conndata_t * conns, + int max_conn) #endif { - int i; - int err; - socklen_t asize; - struct sockaddr_in addr; - - asize = sizeof(struct sockaddr_in); - while(1) + int i; + int err; + socklen_t asize; + struct sockaddr_in addr; + + asize = sizeof (struct sockaddr_in); + while (1) + { + for (i = 0;; i++) { - for (i=0;;i++) { - if (i>=max_conn) { - Sleep(1000); - i=0; - continue; - } - if (conns[i].sock==0) break; - } - conns[i].sock = accept(sock, (struct sockaddr *)&addr, &asize); + if (i >= max_conn) + { +#ifdef WIN32 + Sleep (1000); +#else + log_verbose2 ("max connection i=%d", i); + sleep (1); +#endif + i = 0; + continue; + } + if (conns[i].sock == 0) + break; + } + conns[i].sock = accept (sock, (struct sockaddr *) &addr, &asize); #ifndef WIN32 - if (conns[i].sock == -1) { - conns[i].sock=0; - continue; - } + if (conns[i].sock == -1) + { + conns[i].sock = 0; + continue; + } #else - if (conns[i].sock == INVALID_SOCKET) - { - if(WSAGetLastError()!=WSAEWOULDBLOCK) - { - log_error1("accept() died... restarting..."); - closesocket(sock); - WSACleanup(); - return INVALID_SOCKET; - } - else - { - conns[i].sock=0; - continue; - } - } + if (conns[i].sock == INVALID_SOCKET) + { + if (WSAGetLastError () != WSAEWOULDBLOCK) + { + log_error1 ("accept() died... restarting..."); + closesocket (sock); + WSACleanup (); + return INVALID_SOCKET; + } + else + { + conns[i].sock = 0; + continue; + } + } #endif - else - { - log_verbose3("accept new socket (%d) from '%s'", conns[i].sock, - SAVE_STR(((char*)inet_ntoa(addr.sin_addr))) ); + else + { + log_verbose3 ("accept new socket (%d) from '%s'", conns[i].sock, + SAVE_STR (((char *) inet_ntoa (addr.sin_addr)))); #ifdef WIN32 - conns[i].tid=(HANDLE)_beginthreadex(NULL, 65535, func, &conns[i], 0, &err); + conns[i].tid = + (HANDLE) _beginthreadex (NULL, 65535, func, &conns[i], 0, &err); #else - err = pthread_create(&(conns[i].tid), &(conns[i].attr), func, &conns[i]); + pthread_attr_init (&(conns[i].attr)); +#ifdef PTHREAD_CREATE_DETACHED + pthread_attr_setdetachstate (&(conns[i].attr), + PTHREAD_CREATE_DETACHED); +#endif + + err = + pthread_create (&(conns[i].tid), &(conns[i].attr), func, + &conns[i]); #endif - if (err) { - log_error2("Error creating thread: ('%d')", err); - } - } + if (err) + { + log_error2 ("Error creating thread: ('%d')", err); + } } - return 0; + } + return 0; } /*-------------------------------------------------- FUNCTION: hsocket_listen ----------------------------------------------------*/ -int hsocket_listen(hsocket_t sock, int n) +int +hsocket_listen (hsocket_t sock, int n) { - if (listen(sock, n) == -1) { - log_error2("Can not listen: '%s'", strerror(errno)); - return HSOCKET_CAN_NOT_LISTEN; - } - return HSOCKET_OK; + if (listen (sock, n) == -1) + { + log_error2 ("Can not listen: '%s'", strerror (errno)); + return HSOCKET_CAN_NOT_LISTEN; + } + return HSOCKET_OK; } /*-------------------------------------------------- FUNCTION: hsocket_close ----------------------------------------------------*/ -void hsocket_close(hsocket_t sock) +void +hsocket_close (hsocket_t sock) { - close(sock); + close (sock); } /*-------------------------------------------------- FUNCTION: hsocket_send ----------------------------------------------------*/ -int hsocket_nsend(hsocket_t sock, const char* buffer, int n) +int +hsocket_nsend (hsocket_t sock, const char *buffer, int n) { - int size; + int size; - size = send((int)sock, buffer, n, 0); - if (size == -1) - return HSOCKET_CAN_NOT_SEND; + size = send ((int) sock, buffer, n, 0); + if (size == -1) + return HSOCKET_CAN_NOT_SEND; - return HSOCKET_OK; + return HSOCKET_OK; } /*-------------------------------------------------- FUNCTION: hsocket_send ----------------------------------------------------*/ -int hsocket_send(hsocket_t sock, const char* buffer) +int +hsocket_send (hsocket_t sock, const char *buffer) { - int size; - size = send((int)sock, buffer, strlen(buffer), 0); - if (size == -1) - return HSOCKET_CAN_NOT_SEND; + int size; + size = send ((int) sock, buffer, strlen (buffer), 0); + if (size == -1) + return HSOCKET_CAN_NOT_SEND; - return HSOCKET_OK; + return HSOCKET_OK; } -int hsocket_read(hsocket_t sock, char* buffer, int total, int force) +int +hsocket_read (hsocket_t sock, char *buffer, int total, int force) { - int status; - int totalRead; + int status; + int totalRead; - totalRead = 0; + totalRead = 0; - do { - status = recv(sock, &buffer[totalRead], total - totalRead, 0); - if (!force) - { + do + { + status = recv (sock, &buffer[totalRead], total - totalRead, 0); + if (!force) + { #ifdef WIN32 - if(WSAGetLastError()!=WSAEWOULDBLOCK) - { - return status; - } + if (WSAGetLastError () != WSAEWOULDBLOCK) + { + return status; + } #else - return status; + return status; #endif - } - if (status > 0) { - totalRead += status; - } else { + } + if (status > 0) + { + totalRead += status; + } + else + { #ifdef WIN32 - if(WSAGetLastError()!=WSAEWOULDBLOCK) - { - return status; - } + if (WSAGetLastError () != WSAEWOULDBLOCK) + { + return status; + } #else - return status; + return status; #endif - } - if (totalRead >= total) - return 0; - } while (1); + } + if (totalRead >= total) + return 0; + } + while (1); } /*-------------------------------------------------- FUNCTION: hsocket_recv ----------------------------------------------------*/ -int hsocket_recv(hsocket_t sock, char** buffer, int *totalSize) +int +hsocket_recv (hsocket_t sock, char **buffer, int *totalSize) { - ssize_t size; - int chunk=1; - char tmp[HSOCKET_MAX_BUFSIZE+1]; - int fsize; - int bufSize; - - if (*totalSize > 0) { - bufSize = *totalSize; - } else { - bufSize = HSOCKET_MAX_BUFSIZE; + ssize_t size; + int chunk = 1; + char tmp[HSOCKET_MAX_BUFSIZE + 1]; + int fsize; + int bufSize; + + if (*totalSize > 0) + { + bufSize = *totalSize; + } + else + { + bufSize = HSOCKET_MAX_BUFSIZE; + } + + *totalSize = 0; + + /* calculate first size for realloc */ + if (*buffer) + { + fsize = strlen (*buffer); + } + else + { + fsize = 0; + } + + do + { + + size = recv (sock, tmp, bufSize, 0); + bufSize = HSOCKET_MAX_BUFSIZE; + + if (size == -1) + { + log_error1 ("Error reading from socket"); + return HSOCKET_CAN_NOT_RECEIVE; } - - *totalSize = 0; - - /* calculate first size for realloc */ - if (*buffer) { - fsize = strlen(*buffer); - } else { - fsize = 0; + if (size == 0) + { + break; + } + *totalSize += size; + if (*buffer) + { + log_verbose2 ("reallocation %d bytes", *totalSize + fsize + 1); + *buffer = (char *) realloc ((char *) *buffer, + (*totalSize) + fsize + + HSOCKET_MAX_BUFSIZE); + strcat (*buffer, tmp); + } + else + { + *buffer = (char *) realloc (NULL, *totalSize + 1); + strcpy (*buffer, tmp); } - do { - - size = recv(sock, tmp, bufSize, 0); - bufSize = HSOCKET_MAX_BUFSIZE; - - if (size == -1) { - log_error1("Error reading from socket"); - return HSOCKET_CAN_NOT_RECEIVE; - } - - if (size == 0) { - break; - } - - *totalSize += size; - if (*buffer) { - log_verbose2("reallocation %d bytes",*totalSize+fsize+1); - *buffer = (char*)realloc((char*)*buffer, - (*totalSize)+fsize+HSOCKET_MAX_BUFSIZE); - strcat(*buffer, tmp); - } else { - *buffer = (char*)realloc(NULL, *totalSize+1); - strcpy(*buffer, tmp); - } - - (*buffer)[*totalSize+fsize] = '\0'; - chunk++; - } while (size > 0); + (*buffer)[*totalSize + fsize] = '\0'; + chunk++; + } + while (size > 0); - return HSOCKET_OK; + return HSOCKET_OK; } @@ -391,33 +447,35 @@ int hsocket_recv(hsocket_t sock, char** buffer, int *totalSize) /*-------------------------------------------------- FUNCTION: hsocket_recv ----------------------------------------------------*/ -int hsocket_recv_cb(hsocket_t sock, - hsocket_recv_callback cb, void *userdata) +int +hsocket_recv_cb (hsocket_t sock, hsocket_recv_callback cb, void *userdata) { - ssize_t size; - char tmp[HSOCKET_MAX_BUFSIZE+1]; - - do { + ssize_t size; + char tmp[HSOCKET_MAX_BUFSIZE + 1]; - size = recv(sock, tmp, HSOCKET_MAX_BUFSIZE, 0); + do + { - if (size == -1) { - log_error1("Error reading from socket"); - return HSOCKET_CAN_NOT_RECEIVE; - } + size = recv (sock, tmp, HSOCKET_MAX_BUFSIZE, 0); - if (size == 0) { - break; - } - - tmp[size]='\0'; - if (!cb(sock, tmp, size, userdata)) { - break; - } - - } while (size > 0); + if (size == -1) + { + log_error1 ("Error reading from socket"); + return HSOCKET_CAN_NOT_RECEIVE; + } + if (size == 0) + { + break; + } + tmp[size] = '\0'; + if (!cb (sock, tmp, size, userdata)) + { + break; + } + } + while (size > 0); - return HSOCKET_OK; + return HSOCKET_OK; } @@ -425,69 +483,79 @@ int hsocket_recv_cb(hsocket_t sock, /*-------------------------------------------------- FUNCTION: hbufsocket_read ----------------------------------------------------*/ -int hbufsocket_read(hbufsocket_t *bufsock, char *buffer, int size) +int +hbufsocket_read (hbufsocket_t * bufsock, char *buffer, int size) { - int status; - int tmpsize; + int status; + int tmpsize; - if (bufsock->bufsize - bufsock->cur >= size) { + if (bufsock->bufsize - bufsock->cur >= size) + { - log_verbose1("no need to read from socket"); - strncpy(buffer, &(bufsock->buffer[bufsock->cur]), size); - bufsock->cur += size; - return HSOCKET_OK; + log_verbose1 ("no need to read from socket"); + strncpy (buffer, &(bufsock->buffer[bufsock->cur]), size); + bufsock->cur += size; + return HSOCKET_OK; - } else { + } + else + { - tmpsize = bufsock->bufsize - bufsock->cur; - log_verbose2("tmpsize = %d", tmpsize); + tmpsize = bufsock->bufsize - bufsock->cur; + log_verbose2 ("tmpsize = %d", tmpsize); - if (tmpsize > 0) - strncpy(buffer, &(bufsock->buffer[bufsock->cur]), tmpsize); + if (tmpsize > 0) + strncpy (buffer, &(bufsock->buffer[bufsock->cur]), tmpsize); - size -= tmpsize; + size -= tmpsize; - free(bufsock->buffer); + free (bufsock->buffer); - status = hsocket_read(bufsock->sock, &buffer[tmpsize], size, 1); - if (status == size) { - bufsock->buffer = (char*)malloc(size+1); - strncpy(bufsock->buffer, &buffer[tmpsize], size); - bufsock->cur = size; - } else { - return status; - } - - return HSOCKET_OK; + status = hsocket_read (bufsock->sock, &buffer[tmpsize], size, 1); + if (status == size) + { + bufsock->buffer = (char *) malloc (size + 1); + strncpy (bufsock->buffer, &buffer[tmpsize], size); + bufsock->cur = size; + } + else + { + return status; } + + return HSOCKET_OK; + } } -int hsocket_makenonblock(hsocket_t sock) +int +hsocket_makenonblock (hsocket_t sock) { #ifdef WIN32 - unsigned long iMode; - iMode = HSOCKET_NONBLOCKMODE; - if(ioctlsocket(sock, FIONBIO, (u_long FAR*) &iMode) == INVALID_SOCKET) - { - log_error1("ioctlsocket error"); - return -1; - } -#else fcntl(sock, F_SETFL, O_NONBLOCK); + unsigned long iMode; + iMode = HSOCKET_NONBLOCKMODE; + if (ioctlsocket (sock, FIONBIO, (u_long FAR *) & iMode) == INVALID_SOCKET) + { + log_error1 ("ioctlsocket error"); + return -1; + } +#else /* fcntl(sock, F_SETFL, O_NONBLOCK); */ #endif - return HSOCKET_OK; + return HSOCKET_OK; } #ifdef WIN32 -struct tm *localtime_r(const time_t *const timep, struct tm *p_tm) +struct tm * +localtime_r (const time_t * const timep, struct tm *p_tm) { - static struct tm* tmp; - tmp = localtime(timep); - if (tmp) { - memcpy(p_tm, tmp, sizeof(struct tm)); - tmp = p_tm; - } - return tmp; + static struct tm *tmp; + tmp = localtime (timep); + if (tmp) + { + memcpy (p_tm, tmp, sizeof (struct tm)); + tmp = p_tm; + } + return tmp; } -#endif +#endif /* */ -- cgit v1.1-32-gdbae