Compile socks fuzzing code depending on FUZZ instead of FUZZ_SOCKS

We no longer allow to use a fuzzing build for non-fuzzing work
so unconditionally including the socks fuzzing code doesn't add
any additional inconvenience.

diff --git a/fuzz.c b/fuzz.c
index 0e59a80..e483ba3 100644 (file)
--- a/fuzz.c
+++ b/fuzz.c
@@ -1,6 +1,6 @@
 /*********************************************************************
  *
 /*********************************************************************
  *

- * File        :  $Source:$
+ * File        :  $Source: /cvsroot/ijbswa/current/fuzz.c,v $

  *
  * Purpose     :  Fuzz-related functions for Privoxy.
  *
  *
  * Purpose     :  Fuzz-related functions for Privoxy.
  *


@@ -59,9 +59,7 @@ static int fuzz_deflate(struct client_state *csp, char *fuzz_input_file);
 static int fuzz_filter(struct client_state *csp, char *fuzz_input_file);
 static int fuzz_gif(struct client_state *csp, char *fuzz_input_file);
 static int fuzz_gzip(struct client_state *csp, char *fuzz_input_file);
 static int fuzz_filter(struct client_state *csp, char *fuzz_input_file);
 static int fuzz_gif(struct client_state *csp, char *fuzz_input_file);
 static int fuzz_gzip(struct client_state *csp, char *fuzz_input_file);

-#ifdef FUZZ_SOCKS

 static int fuzz_socks(struct client_state *csp, char *fuzz_input_file);
 static int fuzz_socks(struct client_state *csp, char *fuzz_input_file);

-#endif

 static int fuzz_pcrs_substitute(struct client_state *csp, char *fuzz_input_file);
 static int fuzz_server_header(struct client_state *csp, char *fuzz_input_file);
 
 static int fuzz_pcrs_substitute(struct client_state *csp, char *fuzz_input_file);
 static int fuzz_server_header(struct client_state *csp, char *fuzz_input_file);
 


@@ -85,9 +83,7 @@ static const struct fuzz_mode fuzz_modes[] = {
    { "pcrs-substitute", "A pcrs-substitute to compile. Not a whole pcrs job! Example: Bla $1 bla \x43 $3 blah.", 1, fuzz_pcrs_substitute },
    { "server-header", "Server header to parse.", 1, fuzz_server_header },
    { "server-response", "Server response to parse.", 1, fuzz_server_response },
    { "pcrs-substitute", "A pcrs-substitute to compile. Not a whole pcrs job! Example: Bla $1 bla \x43 $3 blah.", 1, fuzz_pcrs_substitute },
    { "server-header", "Server header to parse.", 1, fuzz_server_header },
    { "server-response", "Server response to parse.", 1, fuzz_server_response },

-#ifdef FUZZ_SOCKS

    { "socks", "A socks server response. Only reads from stdin!", 1, fuzz_socks },
    { "socks", "A socks server response. Only reads from stdin!", 1, fuzz_socks },

-#endif

 };
 
 /*********************************************************************
 };
 
 /*********************************************************************


@@ -428,7 +424,6 @@ static int fuzz_gzip(struct client_state *csp, char *fuzz_input_file)
 }
 
 
 }
 
 

-#ifdef FUZZ_SOCKS

 /*********************************************************************
  *
  * Function    :  fuzz_socks
 /*********************************************************************
  *
  * Function    :  fuzz_socks


@@ -448,7 +443,6 @@ static int fuzz_socks(struct client_state *csp, char *fuzz_input_file)
 {
    return(JB_ERR_OK == socks_fuzz(csp));
 }
 {
    return(JB_ERR_OK == socks_fuzz(csp));
 }

-#endif

 
 
 /*********************************************************************
 
 
 /*********************************************************************

diff --git a/gateway.c b/gateway.c
index a526067..fd3d33c 100644 (file)
--- a/gateway.c
+++ b/gateway.c
@@ -1,4 +1,4 @@
-const char gateway_rcs[] = "$Id: gateway.c,v 1.102 2017/07/01 17:08:25 ler762 Exp $";
+const char gateway_rcs[] = "$Id: gateway.c,v 1.103 2017/07/01 18:34:07 ler762 Exp $";

 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/gateway.c,v $
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/gateway.c,v $


@@ -644,7 +644,7 @@ jb_socket forwarded_connect(const struct forward_spec * fwd,
 }
 
 
 }
 
 

-#ifdef FUZZ_SOCKS
+#ifdef FUZZ

 /*********************************************************************
  *
  * Function    :  socks_fuzz
 /*********************************************************************
  *
  * Function    :  socks_fuzz


@@ -819,7 +819,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);
 
    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 */
    sfd = 0;
 #else
    /* pass the request to the socks server */


@@ -1020,7 +1020,7 @@ static jb_socket socks5_connect(const struct forward_spec *fwd,
       return(JB_INVALID_SOCKET);
    }
 
       return(JB_INVALID_SOCKET);
    }
 

-#ifdef FUZZ_SOCKS
+#ifdef FUZZ

    sfd = 0;
    if (!err && read_socket(sfd, sbuf, 2) != 2)
 #else
    sfd = 0;
    if (!err && read_socket(sfd, sbuf, 2) != 2)
 #else


@@ -1111,7 +1111,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);
 
    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";
    if (write_socket(sfd, cbuf, client_pos))
    {
       errstr = "SOCKS5 negotiation write failed";