X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=gateway.c;h=c84e3b28c7990c978b2b7663edfb0cad5ba404e5;hp=a526067a3cc241b3531b06f4f53a7e295c4cdbce;hb=8917f09d85d51f4332258bdc93792c8d763ff9ee;hpb=9837d840b0b68669eb4186f221686d629424e33b

diff --git a/gateway.c b/gateway.c
index a526067a..c84e3b28 100644
--- a/gateway.c
+++ b/gateway.c
@@ -1,4 +1,3 @@
-const char gateway_rcs[] = "$Id: gateway.c,v 1.102 2017/07/01 17:08:25 ler762 Exp $";
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/gateway.c,v $
@@ -79,8 +78,6 @@ const char gateway_rcs[] = "$Id: gateway.c,v 1.102 2017/07/01 17:08:25 ler762 Ex
 #endif /* HAVE_POLL */
 #endif /* def FEATURE_CONNECTION_KEEP_ALIVE */
 
-const char gateway_h_rcs[] = GATEWAY_H_VERSION;
-
 static jb_socket socks4_connect(const struct forward_spec * fwd,
                                 const char * target_host,
                                 int target_port,
@@ -644,7 +641,7 @@ jb_socket forwarded_connect(const struct forward_spec * fwd,
 }
 
 
-#ifdef FUZZ_SOCKS
+#ifdef FUZZ
 /*********************************************************************
  *
  * Function    :  socks_fuzz
@@ -819,7 +816,7 @@ static jb_socket socks4_connect(const struct forward_spec * fwd,
    c->dstip[2]    = (unsigned char)((web_server_addr   >>  8) & 0xff);
    c->dstip[3]    = (unsigned char)((web_server_addr        ) & 0xff);
 
-#ifdef FUZZ_SOCKS
+#ifdef FUZZ
    sfd = 0;
 #else
    /* pass the request to the socks server */
@@ -1020,7 +1017,7 @@ static jb_socket socks5_connect(const struct forward_spec *fwd,
       return(JB_INVALID_SOCKET);
    }
 
-#ifdef FUZZ_SOCKS
+#ifdef FUZZ
    sfd = 0;
    if (!err && read_socket(sfd, sbuf, 2) != 2)
 #else
@@ -1111,7 +1108,7 @@ static jb_socket socks5_connect(const struct forward_spec *fwd,
    cbuf[client_pos++] = (char)((target_port >> 8) & 0xff);
    cbuf[client_pos++] = (char)((target_port     ) & 0xff);
 
-#ifndef FUZZ_SOCKS
+#ifndef FUZZ
    if (write_socket(sfd, cbuf, client_pos))
    {
       errstr = "SOCKS5 negotiation write failed";