X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=jbsockets.c;h=a90cf50d8da8d15fc5ab462b3bad0eb2e9bde672;hp=c5f73c9c918e1278a683f7147f20da88a82828d3;hb=17a4adbc25915207272d167eccea36c5172fb348;hpb=c75584ebcc79f939fb4ec9c8f842cef6692640c7 diff --git a/jbsockets.c b/jbsockets.c index c5f73c9c..a90cf50d 100644 --- a/jbsockets.c +++ b/jbsockets.c @@ -1,7 +1,7 @@ -const char jbsockets_rcs[] = "$Id: jbsockets.c,v 1.1 2001/05/13 21:57:06 administrator Exp $"; +const char jbsockets_rcs[] = "$Id: jbsockets.c,v 1.19 2001/10/25 03:40:47 david__schmidt Exp $"; /********************************************************************* * - * File : $Source: /home/administrator/cvs/ijb/jbsockets.c,v $ + * 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 @@ -35,6 +35,73 @@ const char jbsockets_rcs[] = "$Id: jbsockets.c,v 1.1 2001/05/13 21:57:06 adminis * * Revisions : * $Log: jbsockets.c,v $ + * Revision 1.19 2001/10/25 03:40:47 david__schmidt + * Change in porting tactics: OS/2's EMX porting layer doesn't allow multiple + * threads to call select() simultaneously. So, it's time to do a real, live, + * native OS/2 port. See defines for __EMX__ (the porting layer) vs. __OS2__ + * (native). Both versions will work, but using __OS2__ offers multi-threading. + * + * Revision 1.18 2001/09/21 23:02:02 david__schmidt + * Cleaning up 2 compiler warnings on OS/2. + * + * Revision 1.17 2001/09/13 20:11:46 jongfoster + * Fixing 2 compiler warnings under Win32 + * + * Revision 1.16 2001/07/30 22:08:36 jongfoster + * Tidying up #defines: + * - All feature #defines are now of the form FEATURE_xxx + * - Permanently turned off WIN_GUI_EDIT + * - Permanently turned on WEBDAV and SPLIT_PROXY_ARGS + * + * Revision 1.15 2001/07/29 17:40:43 jongfoster + * Fixed compiler warning by adding a cast + * + * Revision 1.14 2001/07/18 13:47:59 oes + * Eliminated dirty hack for getsockbyname() + * + * Revision 1.13 2001/07/15 13:56:57 jongfoster + * Removing unused local variable. + * + * Revision 1.12 2001/07/01 17:04:11 oes + * Bugfix: accept_connection no longer uses the obsolete hstrerror() function + * + * Revision 1.11 2001/06/29 21:45:41 oes + * Indentation, CRLF->LF, Tab-> Space + * + * Revision 1.10 2001/06/29 13:29:15 oes + * - Added remote (server) host IP to csp->http->host_ip_addr_str + * - Added detection of local socket IP and fqdn + * - Removed logentry from cancelled commit + * + * Revision 1.9 2001/06/07 23:06:09 jongfoster + * The host parameter to connect_to() is now const. + * + * Revision 1.8 2001/06/03 19:12:07 oes + * filled comment + * + * Revision 1.7 2001/05/28 16:14:00 jongfoster + * Fixing bug in LOG_LEVEL_LOG + * + * Revision 1.6 2001/05/26 17:28:32 jongfoster + * Fixed LOG_LEVEL_LOG + * + * Revision 1.5 2001/05/26 15:26:15 jongfoster + * ACL feature now provides more security by immediately dropping + * connections from untrusted hosts. + * + * Revision 1.4 2001/05/26 00:37:42 jongfoster + * Cosmetic indentation correction. + * + * Revision 1.3 2001/05/25 21:57:54 jongfoster + * Now gives a warning under Windows if you try to bind + * it to a port that's already in use. + * + * Revision 1.2 2001/05/17 23:01:01 oes + * - Cleaned CRLF's from the sources and related files + * + * Revision 1.1.1.1 2001/05/15 13:58:54 oes + * Initial import of version 2.9.3 source tree + * * *********************************************************************/ @@ -56,7 +123,9 @@ const char jbsockets_rcs[] = "$Id: jbsockets.c,v 1.1 2001/05/13 21:57:06 adminis #else +#ifndef __OS2__ #include +#endif #include #include #include @@ -65,16 +134,24 @@ const char jbsockets_rcs[] = "$Id: jbsockets.c,v 1.1 2001/05/13 21:57:06 adminis #ifndef __BEOS__ #include +#ifndef __OS2__ #include +#endif #else #include #endif +#if defined(__EMX__) || defined (__OS2__) +#include /* OS/2/EMX needs a little help with select */ +#include +#endif + #endif #include "project.h" #include "jbsockets.h" #include "filters.h" +#include "errlog.h" const char jbsockets_h_rcs[] = JBSOCKETS_H_VERSION; @@ -95,7 +172,7 @@ const char jbsockets_h_rcs[] = JBSOCKETS_H_VERSION; * Returns : -1 => failure, else it is the socket file descriptor. * *********************************************************************/ -int connect_to(char *host, int portnum, struct client_state *csp) +int connect_to(const char *host, int portnum, struct client_state *csp) { struct sockaddr_in inaddr; int fd, addr; @@ -105,42 +182,49 @@ int connect_to(char *host, int portnum, struct client_state *csp) int flags; #endif /* !defined(_WIN32) && !defined(__BEOS__) && !defined(AMIGA) */ -#ifdef ACL_FILES - struct access_control_addr src[1], dst[1]; -#endif /* def ACL_FILES */ +#ifdef FEATURE_ACL + struct access_control_addr dst[1]; +#endif /* def FEATURE_ACL */ memset((char *)&inaddr, 0, sizeof inaddr); if ((addr = resolve_hostname_to_ip(host)) == -1) { + csp->http->host_ip_addr_str = strdup("unknown"); return(-1); } -#ifdef ACL_FILES - src->addr = csp->ip_addr_long; - src->port = 0; - +#ifdef FEATURE_ACL dst->addr = ntohl(addr); dst->port = portnum; - if (block_acl(src, dst, csp)) + if (block_acl(dst, csp)) { +#ifdef __OS2__ + errno = SOCEPERM; +#else errno = EPERM; +#endif return(-1); } -#endif /* def ACL_FILES */ +#endif /* def FEATURE_ACL */ inaddr.sin_addr.s_addr = addr; inaddr.sin_family = AF_INET; + csp->http->host_ip_addr_str = strdup(inet_ntoa(inaddr.sin_addr)); +#ifndef _WIN32 if (sizeof(inaddr.sin_port) == sizeof(short)) +#endif /* ndef _WIN32 */ { inaddr.sin_port = htons((short)portnum); } +#ifndef _WIN32 else { inaddr.sin_port = htonl(portnum); } +#endif /* ndef _WIN32 */ if ((fd = socket(inaddr.sin_family, SOCK_STREAM, 0)) < 0) { @@ -154,39 +238,45 @@ int connect_to(char *host, int portnum, struct client_state *csp) } #endif /* def TCP_NODELAY */ -#if !defined(_WIN32) && !defined(__BEOS__) && !defined(AMIGA) +#if !defined(_WIN32) && !defined(__BEOS__) && !defined(AMIGA) && !defined(__OS2__) if ((flags = fcntl(fd, F_GETFL, 0)) != -1) { flags |= O_NDELAY; fcntl(fd, F_SETFL, flags); } -#endif /* !defined(_WIN32) && !defined(__BEOS__) && !defined(AMIGA) */ +#endif /* !defined(_WIN32) && !defined(__BEOS__) && !defined(AMIGA) && !defined(__OS2__) */ while (connect(fd, (struct sockaddr *) & inaddr, sizeof inaddr) == -1) { #ifdef _WIN32 if (errno == WSAEINPROGRESS) +#elif __OS2__ + if (sock_errno() == EINPROGRESS) #else /* ifndef _WIN32 */ if (errno == EINPROGRESS) -#endif /* ndef _WIN32 */ +#endif /* ndef _WIN32 || __OS2__ */ { break; } +#ifdef __OS2__ + if (sock_errno() != EINTR) +#else if (errno != EINTR) +#endif /* __OS2__ */ { close_socket(fd); return(-1); } } -#if !defined(_WIN32) && !defined(__BEOS__) && !defined(AMIGA) +#if !defined(_WIN32) && !defined(__BEOS__) && !defined(AMIGA) && !defined(__OS2__) if (flags != -1) { flags &= ~O_NDELAY; fcntl(fd, F_SETFL, flags); } -#endif /* !defined(_WIN32) && !defined(__BEOS__) && !defined(AMIGA) */ +#endif /* !defined(_WIN32) && !defined(__BEOS__) && !defined(AMIGA) && !defined(__OS2__) */ /* wait for connection to complete */ FD_ZERO(&wfds); @@ -216,19 +306,21 @@ int connect_to(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: If no error occurs, returns the total number of + * 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). - * Unix: ??? (Please fill me in!) * *********************************************************************/ int write_socket(int fd, const char *buf, int len) { - if (len <= 0) return(0); + if (len <= 0) + { + return(0); + } - /* if (DEBUG(LOG)) fwrite(buf, n, 1, logfp); */ + log_error(LOG_LEVEL_LOG, "%N", len, buf); -#if defined(_WIN32) || defined(__BEOS__) || defined(AMIGA) +#if defined(_WIN32) || defined(__BEOS__) || defined(AMIGA) || defined(__OS2__) return( send(fd, buf, len, 0)); #else return( write(fd, buf, len)); @@ -269,7 +361,7 @@ int read_socket(int fd, char *buf, int len) return(0); } -#if defined(_WIN32) || defined(__BEOS__) || defined(AMIGA) +#if defined(_WIN32) || defined(__BEOS__) || defined(AMIGA) || defined(__OS2__) return( recv(fd, buf, len, 0)); #else return( read(fd, buf, len)); @@ -293,8 +385,10 @@ void close_socket(int fd) { #if defined(_WIN32) || defined(__BEOS__) closesocket(fd); -#elif defined(AMIGA) - CloseSocket(fd); +#elif defined(AMIGA) + CloseSocket(fd); +#elif defined(__OS2__) + soclose(fd); #else close(fd); #endif @@ -321,21 +415,29 @@ int bind_port(const char *hostnam, int portnum) { struct sockaddr_in inaddr; int fd; +#if 0 +#ifndef _WIN32 int one = 1; +#endif /* ndef _WIN32 */ +#endif memset((char *)&inaddr, '\0', sizeof inaddr); inaddr.sin_family = AF_INET; inaddr.sin_addr.s_addr = resolve_hostname_to_ip(hostnam); +#ifndef _WIN32 if (sizeof(inaddr.sin_port) == sizeof(short)) +#endif /* ndef _WIN32 */ { inaddr.sin_port = htons((short)portnum); } +#ifndef _WIN32 else { inaddr.sin_port = htonl(portnum); } +#endif /* ndef _WIN32 */ fd = socket(AF_INET, SOCK_STREAM, 0); @@ -344,7 +446,17 @@ int bind_port(const char *hostnam, int portnum) 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 + */ setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, (char *)&one, sizeof(one)); +#endif /* ndef _WIN32 */ +#endif if (bind (fd, (struct sockaddr *)&inaddr, sizeof(inaddr)) < 0) { @@ -394,14 +506,15 @@ int bind_port(const char *hostnam, int portnum) *********************************************************************/ int accept_connection(struct client_state * csp, int fd) { - struct sockaddr raddr; - struct sockaddr_in *rap = (struct sockaddr_in *) &raddr; - int afd, raddrlen; + struct sockaddr_in client, server; + struct hostent *host = NULL; + int afd, c_length, s_length; + + c_length = s_length = sizeof(client); - raddrlen = sizeof raddr; do { - afd = accept (fd, &raddr, &raddrlen); + afd = accept (fd, (struct sockaddr *) &client, &c_length); } while (afd < 1 && errno == EINTR); if (afd < 0) @@ -409,11 +522,32 @@ int accept_connection(struct client_state * csp, int fd) return 0; } + /* + * Determine the IP-Adress that the client used to reach us + * and the hostname associated with that address + */ + if (!getsockname(afd, (struct sockaddr *) &server, &s_length)) + { + csp->my_ip_addr_str = strdup(inet_ntoa(server.sin_addr)); + + host = gethostbyaddr((const char *)&server.sin_addr, + sizeof(server.sin_addr), AF_INET); + if (host == NULL) + { + log_error(LOG_LEVEL_ERROR, "Unable to get my own hostname: %E\n"); + } + else + { + csp->my_hostname = strdup(host->h_name); + } + } + csp->cfd = afd; - csp->ip_addr_str = strdup(inet_ntoa(rap->sin_addr)); - csp->ip_addr_long = ntohl(rap->sin_addr.s_addr); + csp->ip_addr_str = strdup(inet_ntoa(client.sin_addr)); + csp->ip_addr_long = ntohl(client.sin_addr.s_addr); return 1; + }