X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=gateway.c;h=28a69f10a93b6b524b1675389dc5529bf7139cfe;hp=8716e16e27143ee6e00d73f11de64c10a8c818a7;hb=3939d3eae875607c76d7bb3314ff6ca6d0590f40;hpb=783be2b9ef40292f3c68391d8ab4b89babe9b8f5 diff --git a/gateway.c b/gateway.c index 8716e16e..28a69f10 100644 --- a/gateway.c +++ b/gateway.c @@ -1,4 +1,4 @@ -const char gateway_rcs[] = "$Id: gateway.c,v 1.1.1.1 2001/05/15 13:58:54 oes Exp $"; +const char gateway_rcs[] = "$Id: gateway.c,v 1.6 2001/09/10 10:41:16 oes Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/gateway.c,v $ @@ -34,6 +34,29 @@ const char gateway_rcs[] = "$Id: gateway.c,v 1.1.1.1 2001/05/15 13:58:54 oes Exp * * Revisions : * $Log: gateway.c,v $ + * Revision 1.6 2001/09/10 10:41:16 oes + * Added #include in.h + * + * Revision 1.5 2001/07/29 18:47:57 jongfoster + * Adding missing #include project.h + * + * Revision 1.4 2001/07/24 12:47:06 oes + * Applied BeOS support update by Eugenia + * + * Revision 1.3 2001/06/09 10:55:28 jongfoster + * Changing BUFSIZ ==> BUFFER_SIZE + * + * Revision 1.2 2001/06/07 23:11:38 jongfoster + * Removing gateways[] list - no longer used. + * Replacing function pointer in struct gateway with a directly + * called function forwarded_connect(), which can do the common + * task of deciding whether to connect to the web server or HTTP + * proxy. + * Replacing struct gateway with struct forward_spec + * Fixing bug with SOCKS4A and HTTP proxy server in combination. + * It was a bug which led to the connection being made to the web + * server rather than the HTTP proxy, and also a buffer overrun. + * * Revision 1.1.1.1 2001/05/15 13:58:54 oes * Initial import of version 2.9.3 source tree * @@ -45,12 +68,19 @@ const char gateway_rcs[] = "$Id: gateway.c,v 1.1.1.1 2001/05/15 13:58:54 oes Exp #include #include +#include #include +#include #ifdef _WIN32 #include #endif /* def _WIN32 */ +#ifdef __BEOS__ +#include +#endif /* def __BEOS__ */ + +#include "project.h" #include "jcc.h" #include "errlog.h" #include "jbsockets.h" @@ -169,8 +199,8 @@ static int socks4_connect(const struct forward_spec * fwd, struct client_state *csp) { int web_server_addr; - unsigned char cbuf[BUFSIZ]; - unsigned char sbuf[BUFSIZ]; + unsigned char cbuf[BUFFER_SIZE]; + unsigned char sbuf[BUFFER_SIZE]; struct socks_op *c = (struct socks_op *)cbuf; struct socks_reply *s = (struct socks_reply *)sbuf; int n;