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

diff --git a/jbsockets.c b/jbsockets.c
index 8101fd23..b64c1101 100644
--- a/jbsockets.c
+++ b/jbsockets.c
@@ -1,4 +1,4 @@
-const char jbsockets_rcs[] = "$Id: jbsockets.c,v 1.10 2001/06/29 13:29:15 oes 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,27 @@ const char jbsockets_rcs[] = "$Id: jbsockets.c,v 1.10 2001/06/29 13:29:15 oes Ex
  *
  * 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
@@ -140,9 +161,9 @@ int connect_to(const char *host, int portnum, struct client_state *csp)
    int   flags;
 #endif /* !defined(_WIN32) && !defined(__BEOS__) && !defined(AMIGA) */
 
-#ifdef ACL_FILES
+#ifdef FEATURE_ACL
    struct access_control_addr dst[1];
-#endif /* def ACL_FILES */
+#endif /* def FEATURE_ACL */
 
    memset((char *)&inaddr, 0, sizeof inaddr);
 
@@ -152,7 +173,7 @@ int connect_to(const char *host, int portnum, struct client_state *csp)
       return(-1);
    }
 
-#ifdef ACL_FILES
+#ifdef FEATURE_ACL
    dst->addr = ntohl(addr);
    dst->port = portnum;
 
@@ -161,20 +182,24 @@ int connect_to(const char *host, int portnum, struct client_state *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)
    {
@@ -364,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);
 
@@ -438,18 +467,15 @@ int bind_port(const char *hostnam, int portnum)
  *********************************************************************/
 int accept_connection(struct client_state * csp, int fd)
 {
-   struct sockaddr raddr, laddr;
-   struct sockaddr_in *rap = (struct sockaddr_in *) &raddr;
-   struct sockaddr_in *lap = (struct sockaddr_in *) &laddr;
+   struct sockaddr_in client, server;
    struct hostent *host = NULL;
-   int   afd, raddrlen, laddrlen;
-   extern int h_errno;
-   char *p;
+   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)
@@ -461,14 +487,15 @@ int accept_connection(struct client_state * csp, int fd)
     * Determine the IP-Adress that the client used to reach us
     * and the hostname associated with that address
     */
-   if (!getsockname(afd, &laddr, &laddrlen))
+   if (!getsockname(afd, (struct sockaddr *) &server, &s_length))
    {
-      csp->my_ip_addr_str = strdup(inet_ntoa(lap->sin_addr));
+      csp->my_ip_addr_str = strdup(inet_ntoa(server.sin_addr));
 
-      host = gethostbyaddr(laddr.sa_data + 2, 4, AF_INET);
+      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: %s\n", hstrerror(h_errno)); 
+         log_error(LOG_LEVEL_ERROR, "Unable to get my own hostname: %E\n");
       }
       else
       {
@@ -477,8 +504,8 @@ int accept_connection(struct client_state * csp, int fd)
    }
 
    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;