X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=jbsockets.c;h=b64c11014f48832859c196543cca634e73a91f70;hp=69f3e3a38edf2014edae9945000f42eb42099889;hb=2465a9102eb7d4f7a53bd454596e61edd16acb85;hpb=88722394d0d63c4b2356a78139653bb0a4c03611

diff --git a/jbsockets.c b/jbsockets.c
index 69f3e3a3..b64c1101 100644
--- a/jbsockets.c
+++ b/jbsockets.c
@@ -1,4 +1,4 @@
-const char jbsockets_rcs[] = "$Id: jbsockets.c,v 1.3 2001/05/25 21:57:54 jongfoster Exp $";
+const char jbsockets_rcs[] = "$Id: jbsockets.c,v 1.16 2001/07/30 22:08:36 jongfoster Exp $";
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/jbsockets.c,v $
@@ -35,6 +35,51 @@ const char jbsockets_rcs[] = "$Id: jbsockets.c,v 1.3 2001/05/25 21:57:54 jongfos
  *
  * Revisions   :
  *    $Log: jbsockets.c,v $
+ *    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.
@@ -85,6 +130,7 @@ const char jbsockets_rcs[] = "$Id: jbsockets.c,v 1.3 2001/05/25 21:57:54 jongfos
 #include "project.h"
 #include "jbsockets.h"
 #include "filters.h"
+#include "errlog.h"
 
 const char jbsockets_h_rcs[] = JBSOCKETS_H_VERSION;
 
@@ -105,7 +151,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;
@@ -115,42 +161,45 @@ 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))
    {
       errno = EPERM;
       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)
    {
@@ -226,10 +275,9 @@ 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)
@@ -239,7 +287,7 @@ int write_socket(int fd, const char *buf, int len)
       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));
@@ -341,14 +389,18 @@ int bind_port(const char *hostnam, int portnum)
    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);
 
@@ -415,14 +467,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)
@@ -430,11 +483,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;
+
 }