projects
/
privoxy.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
generate correct html - no chars
[privoxy.git]
/
gateway.c
diff --git
a/gateway.c
b/gateway.c
index
a526067
..
c84e3b2
100644
(file)
--- 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 $
/*********************************************************************
*
* 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 */
#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,
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
/*********************************************************************
*
* 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);
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
+1017,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
+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);
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";