X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=jbsockets.c;h=5651d485897bb18832d0113ee41cff8a6facbba4;hp=ee4f58394d23c22b4731dc2550dc6f1d61cb91f3;hb=5511418f4b6874b99a6b3d57e46aea61c507bd9e;hpb=1df3ac22a584579c66453e938809929e8e20e160 diff --git a/jbsockets.c b/jbsockets.c index ee4f5839..5651d485 100644 --- a/jbsockets.c +++ b/jbsockets.c @@ -1,4 +1,4 @@ -const char jbsockets_rcs[] = "$Id: jbsockets.c,v 1.1.1.1 2001/05/15 13:58:54 oes Exp $"; +const char jbsockets_rcs[] = "$Id: jbsockets.c,v 1.11 2001/06/29 21:45:41 oes Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/jbsockets.c,v $ @@ -35,6 +35,40 @@ const char jbsockets_rcs[] = "$Id: jbsockets.c,v 1.1.1.1 2001/05/15 13:58:54 oes * * Revisions : * $Log: jbsockets.c,v $ + * 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 * @@ -78,6 +112,7 @@ const char jbsockets_rcs[] = "$Id: jbsockets.c,v 1.1.1.1 2001/05/15 13:58:54 oes #include "project.h" #include "jbsockets.h" #include "filters.h" +#include "errlog.h" const char jbsockets_h_rcs[] = JBSOCKETS_H_VERSION; @@ -98,7 +133,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; @@ -109,24 +144,22 @@ int connect_to(char *host, int portnum, struct client_state *csp) #endif /* !defined(_WIN32) && !defined(__BEOS__) && !defined(AMIGA) */ #ifdef ACL_FILES - struct access_control_addr src[1], dst[1]; + struct access_control_addr dst[1]; #endif /* def ACL_FILES */ 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; - dst->addr = ntohl(addr); dst->port = portnum; - if (block_acl(src, dst, csp)) + if (block_acl(dst, csp)) { errno = EPERM; return(-1); @@ -135,6 +168,7 @@ int connect_to(char *host, int portnum, struct client_state *csp) inaddr.sin_addr.s_addr = addr; inaddr.sin_family = AF_INET; + csp->http->host_ip_addr_str = strdup(inet_ntoa(inaddr.sin_addr)); if (sizeof(inaddr.sin_port) == sizeof(short)) { @@ -219,17 +253,19 @@ 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) return( send(fd, buf, len, 0)); @@ -347,7 +383,15 @@ int bind_port(const char *hostnam, int portnum) return(-1); } +#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 */ if (bind (fd, (struct sockaddr *)&inaddr, sizeof(inaddr)) < 0) { @@ -397,9 +441,12 @@ int bind_port(const char *hostnam, int portnum) *********************************************************************/ int accept_connection(struct client_state * csp, int fd) { - struct sockaddr raddr; + struct sockaddr raddr, laddr; struct sockaddr_in *rap = (struct sockaddr_in *) &raddr; - int afd, raddrlen; + struct sockaddr_in *lap = (struct sockaddr_in *) &laddr; + struct hostent *host = NULL; + int afd, raddrlen, laddrlen; + char *p; raddrlen = sizeof raddr; do @@ -412,11 +459,31 @@ 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, &laddr, &laddrlen)) + { + csp->my_ip_addr_str = strdup(inet_ntoa(lap->sin_addr)); + + host = gethostbyaddr(laddr.sa_data + 2, 4, 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); return 1; + }