Synthetic commit for tag v_2_9_7

[privoxy.git] / jbsockets.c

diff --git a/jbsockets.c b/jbsockets.c
index b64c110..3f54271 100644 (file)
--- a/jbsockets.c
+++ b/jbsockets.c
@@ -1,4 +1,4 @@
-const char jbsockets_rcs[] = "$Id: jbsockets.c,v 1.16 2001/07/30 22:08:36 jongfoster Exp $";
+const char jbsockets_rcs[] = "$Id: jbsockets.c,v 1.13 2001/07/15 13:56:57 jongfoster Exp $";
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/jbsockets.c,v $
@@ -35,18 +35,6 @@ const char jbsockets_rcs[] = "$Id: jbsockets.c,v 1.16 2001/07/30 22:08:36 jongfo
  *
  * 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.
  *
@@ -161,9 +149,9 @@ int connect_to(const char *host, int portnum, struct client_state *csp)
    int   flags;
 #endif /* !defined(_WIN32) && !defined(__BEOS__) && !defined(AMIGA) */
 
-#ifdef FEATURE_ACL
+#ifdef ACL_FILES
    struct access_control_addr dst[1];
-#endif /* def FEATURE_ACL */
+#endif /* def ACL_FILES */
 
    memset((char *)&inaddr, 0, sizeof inaddr);
 
@@ -173,7 +161,7 @@ int connect_to(const char *host, int portnum, struct client_state *csp)
       return(-1);
    }
 
-#ifdef FEATURE_ACL
+#ifdef ACL_FILES
    dst->addr = ntohl(addr);
    dst->port = portnum;
 
@@ -182,24 +170,20 @@ int connect_to(const char *host, int portnum, struct client_state *csp)
       errno = EPERM;
       return(-1);
    }
-#endif /* def FEATURE_ACL */
+#endif /* def ACL_FILES */
 
    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)
    {
@@ -389,18 +373,14 @@ 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);
 
@@ -491,8 +471,7 @@ int accept_connection(struct client_state * csp, int fd)
    {
       csp->my_ip_addr_str = strdup(inet_ntoa(server.sin_addr));
 
-      host = gethostbyaddr((const char *)&server.sin_addr, 
-                           sizeof(server.sin_addr), AF_INET);
+      host = gethostbyaddr(&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");