X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=jbsockets.c;h=728482038ddee5b15152a02851ba52114824cdb8;hp=35833e28f4f041efd90cf1d4cd10a091578f87eb;hb=3939d3eae875607c76d7bb3314ff6ca6d0590f40;hpb=f7ba9280222e07866b3a91f1cb6e28763c4422c6;ds=sidebyside

diff --git a/jbsockets.c b/jbsockets.c
index 35833e28..72848203 100644
--- a/jbsockets.c
+++ b/jbsockets.c
@@ -1,4 +1,4 @@
-const char jbsockets_rcs[] = "$Id: jbsockets.c,v 1.12 2001/07/01 17:04:11 oes Exp $";
+const char jbsockets_rcs[] = "$Id: jbsockets.c,v 1.15 2001/07/29 17:40:43 jongfoster Exp $";
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/jbsockets.c,v $
@@ -35,6 +35,15 @@ const char jbsockets_rcs[] = "$Id: jbsockets.c,v 1.12 2001/07/01 17:04:11 oes Ex
  *
  * Revisions   :
  *    $Log: jbsockets.c,v $
+ *    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
  *
@@ -146,9 +155,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);
 
@@ -158,7 +167,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;
 
@@ -167,7 +176,7 @@ 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;
@@ -444,16 +453,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;
+   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)
@@ -465,11 +473,12 @@ 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: %E\n");
@@ -481,8 +490,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;