X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=jbsockets.c;h=a38596567a9f290b5d40f94caccbe170891e9606;hp=19bd879f8be02e076c30fac367e280e8b3db180a;hb=71133d0f72356b8de5708edfc453d557039a4410;hpb=1ef0d7f460d552b714536ca35758b4ff7f039ef5 diff --git a/jbsockets.c b/jbsockets.c index 19bd879f..a3859656 100644 --- a/jbsockets.c +++ b/jbsockets.c @@ -1,15 +1,15 @@ -const char jbsockets_rcs[] = "$Id: jbsockets.c,v 1.20 2001/11/16 00:48:48 jongfoster Exp $"; +const char jbsockets_rcs[] = "$Id: jbsockets.c,v 1.34 2002/04/08 20:31:41 swa Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/jbsockets.c,v $ * * Purpose : Contains wrappers for system-specific sockets code, - * so that the rest of JunkBuster can be more + * so that the rest of Junkbuster can be more * OS-independent. Contains #ifdefs to make this work * on many platforms. * * Copyright : Written by and Copyright (C) 2001 the SourceForge - * IJBSWA team. http://ijbswa.sourceforge.net + * Privoxy team. http://www.privoxy.org/ * * Based on the Internet Junkbuster originally written * by and Copyright (C) 1997 Anonymous Coders and @@ -35,6 +35,73 @@ const char jbsockets_rcs[] = "$Id: jbsockets.c,v 1.20 2001/11/16 00:48:48 jongfo * * Revisions : * $Log: jbsockets.c,v $ + * Revision 1.34 2002/04/08 20:31:41 swa + * fixed JB spelling + * + * Revision 1.33 2002/04/03 16:02:18 gliptak + * Correcting compile warning with older gcc + * + * Revision 1.32 2002/03/31 17:18:59 jongfoster + * Win32 only: Enabling STRICT to fix a VC++ compile warning. + * + * Revision 1.31 2002/03/29 03:33:13 david__schmidt + * Fix Mac OSX compiler warnings + * + * Revision 1.30 2002/03/27 14:32:43 david__schmidt + * More compiler warning message maintenance + * + * Revision 1.29 2002/03/26 22:29:54 swa + * we have a new homepage! + * + * Revision 1.28 2002/03/24 13:25:43 swa + * name change related issues + * + * Revision 1.27 2002/03/13 00:27:05 jongfoster + * Killing warnings + * + * Revision 1.26 2002/03/11 22:07:02 david__schmidt + * OS/2 port maintenance: + * - Fixed EMX build - it had decayed a little + * - Fixed inexplicable crash during FD_ZERO - must be due to a bad macro. + * substituted a memset for now. + * + * Revision 1.25 2002/03/09 20:03:52 jongfoster + * - Making various functions return int rather than size_t. + * (Undoing a recent change). Since size_t is unsigned on + * Windows, functions like read_socket that return -1 on + * error cannot return a size_t. + * + * THIS WAS A MAJOR BUG - it caused frequent, unpredictable + * crashes, and also frequently caused JB to jump to 100% + * CPU and stay there. (Because it thought it had just + * read ((unsigned)-1) == 4Gb of data...) + * + * - The signature of write_socket has changed, it now simply + * returns success=0/failure=nonzero. + * + * - Trying to get rid of a few warnings --with-debug on + * Windows, I've introduced a new type "jb_socket". This is + * used for the socket file descriptors. On Windows, this + * is SOCKET (a typedef for unsigned). Everywhere else, it's + * an int. The error value can't be -1 any more, so it's + * now JB_INVALID_SOCKET (which is -1 on UNIX, and in + * Windows it maps to the #define INVALID_SOCKET.) + * + * - The signature of bind_port has changed. + * + * Revision 1.24 2002/03/07 03:51:36 oes + * - Improved handling of failed DNS lookups + * - Fixed compiler warnings etc + * + * Revision 1.23 2002/03/05 00:36:01 jongfoster + * Fixing bug 514988 - unable to restart Junkbuster + * + * Revision 1.22 2002/03/04 02:08:02 david__schmidt + * Enable web editing of actions file on OS/2 (it had been broken all this time!) + * + * Revision 1.21 2002/01/09 14:32:33 oes + * Added support for gethostbyname_r and gethostbyaddr_r. + * * Revision 1.20 2001/11/16 00:48:48 jongfoster * Enabling duplicate-socket detection for all platforms, not * just Win32. @@ -121,6 +188,9 @@ const char jbsockets_rcs[] = "$Id: jbsockets.c,v 1.20 2001/11/16 00:48:48 jongfo #ifdef _WIN32 +#ifndef STRICT +#define STRICT +#endif #include #include #include @@ -147,8 +217,10 @@ const char jbsockets_rcs[] = "$Id: jbsockets.c,v 1.20 2001/11/16 00:48:48 jongfo #if defined(__EMX__) || defined (__OS2__) #include /* OS/2/EMX needs a little help with select */ +#ifdef __OS2__ #include #endif +#endif #endif @@ -173,13 +245,15 @@ const char jbsockets_h_rcs[] = JBSOCKETS_H_VERSION; * 3 : csp = Current client state (buffers, headers, etc...) * Not modified, only used for source IP and ACL. * - * Returns : -1 => failure, else it is the socket file descriptor. + * Returns : JB_INVALID_SOCKET => failure, else it is the socket + * file descriptor. * *********************************************************************/ -int connect_to(const char *host, int portnum, struct client_state *csp) +jb_socket connect_to(const char *host, int portnum, struct client_state *csp) { struct sockaddr_in inaddr; - int fd, addr; + jb_socket fd; + int addr; fd_set wfds; struct timeval tv[1]; #if !defined(_WIN32) && !defined(__BEOS__) && !defined(AMIGA) @@ -192,14 +266,14 @@ int connect_to(const char *host, int portnum, struct client_state *csp) memset((char *)&inaddr, 0, sizeof inaddr); - if ((addr = resolve_hostname_to_ip(host)) == -1) + if ((addr = resolve_hostname_to_ip(host)) == INADDR_NONE) { csp->http->host_ip_addr_str = strdup("unknown"); - return(-1); + return(JB_INVALID_SOCKET); } #ifdef FEATURE_ACL - dst->addr = ntohl(addr); + dst->addr = ntohl((unsigned long) addr); dst->port = portnum; if (block_acl(dst, csp)) @@ -209,7 +283,7 @@ int connect_to(const char *host, int portnum, struct client_state *csp) #else errno = EPERM; #endif - return(-1); + return(JB_INVALID_SOCKET); } #endif /* def FEATURE_ACL */ @@ -221,18 +295,22 @@ int connect_to(const char *host, int portnum, struct client_state *csp) if (sizeof(inaddr.sin_port) == sizeof(short)) #endif /* ndef _WIN32 */ { - inaddr.sin_port = htons((short)portnum); + inaddr.sin_port = htons((unsigned short) portnum); } #ifndef _WIN32 else { - inaddr.sin_port = htonl(portnum); + inaddr.sin_port = htonl((unsigned long)portnum); } #endif /* ndef _WIN32 */ +#ifdef _WIN32 + if ((fd = socket(inaddr.sin_family, SOCK_STREAM, 0)) == JB_INVALID_SOCKET) +#else if ((fd = socket(inaddr.sin_family, SOCK_STREAM, 0)) < 0) +#endif { - return(-1); + return(JB_INVALID_SOCKET); } #ifdef TCP_NODELAY @@ -250,7 +328,7 @@ int connect_to(const char *host, int portnum, struct client_state *csp) } #endif /* !defined(_WIN32) && !defined(__BEOS__) && !defined(AMIGA) && !defined(__OS2__) */ - while (connect(fd, (struct sockaddr *) & inaddr, sizeof inaddr) == -1) + while (connect(fd, (struct sockaddr *) & inaddr, sizeof inaddr) == JB_INVALID_SOCKET) { #ifdef _WIN32 if (errno == WSAEINPROGRESS) @@ -270,7 +348,7 @@ int connect_to(const char *host, int portnum, struct client_state *csp) #endif /* __OS2__ */ { close_socket(fd); - return(-1); + return(JB_INVALID_SOCKET); } } @@ -289,10 +367,11 @@ int connect_to(const char *host, int portnum, struct client_state *csp) tv->tv_sec = 30; tv->tv_usec = 0; - if (select(fd + 1, NULL, &wfds, NULL, tv) <= 0) + /* MS Windows uses int, not SOCKET, for the 1st arg of select(). Wierd! */ + if (select((int)fd + 1, NULL, &wfds, NULL, tv) <= 0) { close_socket(fd); - return(-1); + return(JB_INVALID_SOCKET); } return(fd); @@ -310,24 +389,51 @@ int connect_to(const char *host, int portnum, struct client_state *csp) * 2 : buf = pointer to data to be written. * 3 : len = length of data to be written to the socket "fd". * - * Returns : Win32 & Unix: If no error occurs, returns the total number of - * bytes sent, which can be less than the number - * indicated by len. Otherwise, returns (-1). + * Returns : 0 on success (entire buffer sent). + * nonzero on error. * *********************************************************************/ -int write_socket(int fd, const char *buf, int len) +int write_socket(jb_socket fd, const char *buf, size_t len) { - if (len <= 0) + if (len == 0) { - return(0); + return 0; + } + + if (len < 0) + { + return 1; } log_error(LOG_LEVEL_LOG, "%N", len, buf); -#if defined(_WIN32) || defined(__BEOS__) || defined(AMIGA) || defined(__OS2__) - return( send(fd, buf, len, 0)); +#if defined(_WIN32) + return (send(fd, buf, (int)len, 0) != (int)len); +#elif defined(__BEOS__) || defined(AMIGA) + return (send(fd, buf, len, 0) != len); +#elif defined(__OS2__) + /* + * Break the data up into SOCKET_SEND_MAX chunks for sending... + * OS/2 seemed to complain when the chunks were too large. + */ +#define SOCKET_SEND_MAX 65000 + { + int write_len = 0, send_len, send_rc = 0, i = 0; + while ((i < len) && (send_rc != -1)) + { + if ((i + SOCKET_SEND_MAX) > len) + send_len = len - i; + else + send_len = SOCKET_SEND_MAX; + send_rc = send(fd,(char*)buf + i, send_len, 0); + if (send_rc == -1) + return 1; + i = i + send_len; + } + return 0; + } #else - return( write(fd, buf, len)); + return (write(fd, buf, len) != len); #endif } @@ -351,24 +457,26 @@ int write_socket(int fd, const char *buf, int len) * smaller than the number of bytes requested; this may hap- * pen for example because fewer bytes are actually available * right now (maybe because we were close to end-of-file, or - * because we are reading from a pipe, or from a terminal), - * or because read() was interrupted by a signal. On error, + * because we are reading from a pipe, or from a terminal, + * or because read() was interrupted by a signal). On error, * -1 is returned, and errno is set appropriately. In this * case it is left unspecified whether the file position (if * any) changes. * *********************************************************************/ -int read_socket(int fd, char *buf, int len) +int read_socket(jb_socket fd, char *buf, int len) { if (len <= 0) { return(0); } -#if defined(_WIN32) || defined(__BEOS__) || defined(AMIGA) || defined(__OS2__) - return( recv(fd, buf, len, 0)); +#if defined(_WIN32) + return(recv(fd, buf, len, 0)); +#elif defined(__BEOS__) || defined(AMIGA) || defined(__OS2__) + return(recv(fd, buf, (size_t)len, 0)); #else - return( read(fd, buf, len)); + return(read(fd, buf, (size_t)len)); #endif } @@ -385,7 +493,7 @@ int read_socket(int fd, char *buf, int len) * Returns : void * *********************************************************************/ -void close_socket(int fd) +void close_socket(jb_socket fd) { #if defined(_WIN32) || defined(__BEOS__) closesocket(fd); @@ -410,57 +518,72 @@ void close_socket(int fd) * Parameters : * 1 : hostnam = TCP/IP address to bind/listen to * 2 : portnum = port to listen on + * 3 : pfd = pointer used to return file descriptor. * - * Returns : if success, return file descriptor - * if failure, returns -2 if address is in use, otherwise -1 - * + * Returns : if success, returns 0 and sets *pfd. + * if failure, returns -3 if address is in use, + * -2 if address unresolvable, + * -1 otherwise *********************************************************************/ -int bind_port(const char *hostnam, int portnum) +int bind_port(const char *hostnam, int portnum, jb_socket *pfd) { struct sockaddr_in inaddr; - int fd; -#if 0 + jb_socket fd; #ifndef _WIN32 int one = 1; #endif /* ndef _WIN32 */ -#endif + + *pfd = JB_INVALID_SOCKET; memset((char *)&inaddr, '\0', sizeof inaddr); inaddr.sin_family = AF_INET; inaddr.sin_addr.s_addr = resolve_hostname_to_ip(hostnam); + if (inaddr.sin_addr.s_addr == INADDR_NONE) + { + return(-2); + } + #ifndef _WIN32 if (sizeof(inaddr.sin_port) == sizeof(short)) #endif /* ndef _WIN32 */ { - inaddr.sin_port = htons((short)portnum); + inaddr.sin_port = htons((unsigned short) portnum); } #ifndef _WIN32 else { - inaddr.sin_port = htonl(portnum); + inaddr.sin_port = htonl((unsigned long) portnum); } #endif /* ndef _WIN32 */ fd = socket(AF_INET, SOCK_STREAM, 0); +#ifdef _WIN32 + if (fd == JB_INVALID_SOCKET) +#else if (fd < 0) +#endif { return(-1); } -#if 0 #ifndef _WIN32 /* - * FIXME: This is not needed for Win32 - in fact, it stops - * duplicate instances of JunkBuster from being caught. - * Is this really needed under UNIX, or should it be taked out? - * -- Jon + * This is not needed for Win32 - in fact, it stops + * duplicate instances of Junkbuster from being caught. + * + * On UNIX, we assume the user is sensible enough not + * to start Junkbuster multiple times on the same IP. + * Without this, stopping and restarting Junkbuster + * from a script fails. + * Note: SO_REUSEADDR is meant to only take over + * sockets which are *not* in listen state in Linux, + * e.g. sockets in TIME_WAIT. YMMV. */ setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, (char *)&one, sizeof(one)); #endif /* ndef _WIN32 */ -#endif if (bind (fd, (struct sockaddr *)&inaddr, sizeof(inaddr)) < 0) { @@ -471,7 +594,7 @@ int bind_port(const char *hostnam, int portnum) if (errno == EADDRINUSE) #endif { - return(-2); + return(-3); } else { @@ -487,7 +610,8 @@ int bind_port(const char *hostnam, int portnum) } } - return fd; + *pfd = fd; + return 0; } @@ -508,11 +632,17 @@ int bind_port(const char *hostnam, int portnum) * On an error it returns 0 (FALSE). * *********************************************************************/ -int accept_connection(struct client_state * csp, int fd) +int accept_connection(struct client_state * csp, jb_socket fd) { struct sockaddr_in client, server; struct hostent *host = NULL; - int afd, c_length, s_length; + jb_socket afd; +#if defined(_WIN32) || defined(__OS2__) || defined(__APPLE_CC__) || defined(AMIGA) + /* Wierdness - fix a warning. */ + int c_length, s_length; +#else + socklen_t c_length, s_length; +#endif #if defined(HAVE_GETHOSTBYADDR_R_8_ARGS) || defined(HAVE_GETHOSTBYADDR_R_7_ARGS) || defined(HAVE_GETHOSTBYADDR_R_5_ARGS) struct hostent result; #if defined(HAVE_GETHOSTBYADDR_R_5_ARGS) @@ -525,15 +655,22 @@ int accept_connection(struct client_state * csp, int fd) c_length = s_length = sizeof(client); +#ifdef _WIN32 + afd = accept (fd, (struct sockaddr *) &client, &c_length); + if (afd == JB_INVALID_SOCKET) + { + return 0; + } +#else do { afd = accept (fd, (struct sockaddr *) &client, &c_length); } while (afd < 1 && errno == EINTR); - if (afd < 0) { return 0; } +#endif /* * Determine the IP-Adress that the client used to reach us @@ -595,10 +732,10 @@ int accept_connection(struct client_state * csp, int fd) * Parameters : * 1 : host = hostname to resolve * - * Returns : -1 => failure, INADDR_ANY or tcp/ip address if succesful. + * Returns : INADDR_NONE => failure, INADDR_ANY or tcp/ip address if succesful. * *********************************************************************/ -int resolve_hostname_to_ip(const char *host) +unsigned long resolve_hostname_to_ip(const char *host) { struct sockaddr_in inaddr; struct hostent *hostp; @@ -642,7 +779,8 @@ int resolve_hostname_to_ip(const char *host) if (hostp == NULL) { errno = EINVAL; - return(-1); + log_error(LOG_LEVEL_ERROR, "could not resolve hostname %s", host); + return(INADDR_NONE); } if (hostp->h_addrtype != AF_INET) { @@ -651,7 +789,8 @@ int resolve_hostname_to_ip(const char *host) #else errno = EPROTOTYPE; #endif - return(-1); + log_error(LOG_LEVEL_ERROR, "hostname %s resolves to unknown address type.", host); + return(INADDR_NONE); } memcpy( (char *) &inaddr.sin_addr,