One more banner path to filter:

[privoxy.git] / gateway.c

diff --git a/gateway.c b/gateway.c
index 4236ca5..2e4cbe2 100644 (file)
--- a/gateway.c
+++ b/gateway.c
@@ -1,4 +1,4 @@
-const char gateway_rcs[] = "$Id: gateway.c,v 1.7 2001/09/12 17:58:26 steudten Exp $";
+const char gateway_rcs[] = "$Id: gateway.c,v 1.10 2002/03/07 03:50:19 oes Exp $";
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/gateway.c,v $
@@ -11,10 +11,10 @@ const char gateway_rcs[] = "$Id: gateway.c,v 1.7 2001/09/12 17:58:26 steudten Ex
  *                IJBSWA team.  http://ijbswa.sourceforge.net
  *
  *                Based on the Internet Junkbuster originally written
- *                by and Copyright (C) 1997 Anonymous Coders and 
+ *                by and Copyright (C) 1997 Anonymous Coders and
  *                Junkbusters Corporation.  http://www.junkbusters.com
  *
- *                This program is free software; you can redistribute it 
+ *                This program is free software; you can redistribute it
  *                and/or modify it under the terms of the GNU General
  *                Public License as published by the Free Software
  *                Foundation; either version 2 of the License, or (at
@@ -34,6 +34,19 @@ const char gateway_rcs[] = "$Id: gateway.c,v 1.7 2001/09/12 17:58:26 steudten Ex
  *
  * Revisions   :
  *    $Log: gateway.c,v $
+ *    Revision 1.10  2002/03/07 03:50:19  oes
+ *     - Improved handling of failed DNS lookups
+ *     - Fixed compiler warnings
+ *
+ *    Revision 1.9  2001/10/25 03:40:48  david__schmidt
+ *    Change in porting tactics: OS/2's EMX porting layer doesn't allow multiple
+ *    threads to call select() simultaneously.  So, it's time to do a real, live,
+ *    native OS/2 port.  See defines for __EMX__ (the porting layer) vs. __OS2__
+ *    (native). Both versions will work, but using __OS2__ offers multi-threading.
+ *
+ *    Revision 1.8  2001/09/13 20:10:12  jongfoster
+ *    Fixing missing #include under Windows
+ *
  *    Revision 1.7  2001/09/12 17:58:26  steudten
  *
  *    add #include <string.h>
@@ -88,6 +101,10 @@ const char gateway_rcs[] = "$Id: gateway.c,v 1.7 2001/09/12 17:58:26 steudten Ex
 #include <netdb.h>
 #endif /* def __BEOS__ */
 
+#ifdef __OS2__
+#include <utils.h>
+#endif /* def __OS2__ */
+
 #include "project.h"
 #include "jcc.h"
 #include "errlog.h"
@@ -96,7 +113,7 @@ const char gateway_rcs[] = "$Id: gateway.c,v 1.7 2001/09/12 17:58:26 steudten Ex
 
 const char gateway_h_rcs[] = GATEWAY_H_VERSION;
 
-static int socks4_connect(const struct forward_spec * fwd, 
+static int socks4_connect(const struct forward_spec * fwd,
                           const char * target_host,
                           int target_port,
                           struct client_state *csp);
@@ -143,8 +160,8 @@ static const char socks_userid[] = "anonymous";
  * Returns     :  -1 => failure, else it is the socket file descriptor.
  *
  *********************************************************************/
-int forwarded_connect(const struct forward_spec * fwd, 
-                      struct http_request *http, 
+int forwarded_connect(const struct forward_spec * fwd,
+                      struct http_request *http,
                       struct client_state *csp)
 {
    const char * dest_host;
@@ -201,18 +218,18 @@ int forwarded_connect(const struct forward_spec * fwd,
  * Returns     :  -1 => failure, else a socket file descriptor.
  *
  *********************************************************************/
-static int socks4_connect(const struct forward_spec * fwd, 
+static int socks4_connect(const struct forward_spec * fwd,
                           const char * target_host,
                           int target_port,
                           struct client_state *csp)
 {
    int web_server_addr;
-   unsigned char cbuf[BUFFER_SIZE];
-   unsigned char sbuf[BUFFER_SIZE];
+   char cbuf[BUFFER_SIZE];
+   char sbuf[BUFFER_SIZE];
    struct socks_op    *c = (struct socks_op    *)cbuf;
    struct socks_reply *s = (struct socks_reply *)sbuf;
-   int n;
-   int csiz;
+   size_t n;
+   size_t csiz;
    int sfd;
    int err = 0;
    char *errstr;
@@ -245,6 +262,11 @@ static int socks4_connect(const struct forward_spec * fwd,
    {
       case SOCKS_4:
          web_server_addr = htonl(resolve_hostname_to_ip(target_host));
+         if (web_server_addr == INADDR_NONE)
+         {
+            log_error(LOG_LEVEL_CONNECT, "socks4_connect: could not resolve target host %s", target_host);
+            return(-1);
+         }
          break;
       case SOCKS_4A:
          web_server_addr = 0x00000001;
@@ -254,7 +276,7 @@ static int socks4_connect(const struct forward_spec * fwd,
             errno = EINVAL;
             return(-1);
          }
-         strcpy(((char *)cbuf) + csiz, target_host);
+         strcpy(cbuf + csiz, target_host);
          csiz = n;
          break;
       default:
@@ -281,14 +303,14 @@ static int socks4_connect(const struct forward_spec * fwd,
       return(-1);
    }
 
-   if ((n = write_socket(sfd, (char *)c, csiz)) != csiz)
+   if (write_socket(sfd, (char *)c, csiz) != csiz)
    {
       log_error(LOG_LEVEL_CONNECT, "SOCKS4 negotiation write failed...");
       close_socket(sfd);
       return(-1);
    }
 
-   if ((n = read_socket(sfd, sbuf, sizeof(sbuf))) != sizeof(*s))
+   if (read_socket(sfd, sbuf, sizeof(sbuf)) != sizeof(*s))
    {
       log_error(LOG_LEVEL_CONNECT, "SOCKS4 negotiation read failed...");
       close_socket(sfd);
@@ -316,7 +338,7 @@ static int socks4_connect(const struct forward_spec * fwd,
          errno = EACCES;
          break;
       default:
-         errstr = (char *) cbuf;
+         errstr = cbuf;
          errno = ENOENT;
          sprintf(errstr,
                  "SOCKS request rejected for reason code %d\n", s->cd);