X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=gateway.c;h=2e36abb3c1abf9d3cc244f866ffda5b2d5c18d74;hp=b7d4e33d92169a3e3963e579747ed5241e6b6064;hb=1dcfd55d00941fa85ecc4ec61b6dd63e918f4d66;hpb=2fa48011f5013479b98f2c61c9d2d9b2a3270fac diff --git a/gateway.c b/gateway.c index b7d4e33d..2e36abb3 100644 --- a/gateway.c +++ b/gateway.c @@ -1,7 +1,7 @@ -const char gateway_rcs[] = "$Id: gateway.c,v 1.3 2001/06/09 10:55:28 jongfoster Exp $"; +const char gateway_rcs[] = "$Id: gateway.c,v 1.8 2001/09/13 20:10:12 jongfoster Exp $"; /********************************************************************* * - * File : $Source: /cvsroot/ijbswa//current/gateway.c,v $ + * File : $Source: /cvsroot/ijbswa/current/gateway.c,v $ * * Purpose : Contains functions to connect to a server, possibly * using a "forwarder" (i.e. HTTP proxy and/or a SOCKS4 @@ -11,10 +11,10 @@ const char gateway_rcs[] = "$Id: gateway.c,v 1.3 2001/06/09 10:55:28 jongfoster * 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,22 @@ const char gateway_rcs[] = "$Id: gateway.c,v 1.3 2001/06/09 10:55:28 jongfoster * * Revisions : * $Log: gateway.c,v $ + * 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 + * + * 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 * @@ -59,7 +75,13 @@ const char gateway_rcs[] = "$Id: gateway.c,v 1.3 2001/06/09 10:55:28 jongfoster #include #include + +#ifndef _WIN32 +#include +#endif + #include +#include #ifdef _WIN32 #include @@ -69,6 +91,11 @@ const char gateway_rcs[] = "$Id: gateway.c,v 1.3 2001/06/09 10:55:28 jongfoster #include #endif /* def __BEOS__ */ +#ifdef __OS2__ +#include +#endif /* def __OS2__ */ + +#include "project.h" #include "jcc.h" #include "errlog.h" #include "jbsockets.h" @@ -76,7 +103,7 @@ const char gateway_rcs[] = "$Id: gateway.c,v 1.3 2001/06/09 10:55:28 jongfoster 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); @@ -123,8 +150,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; @@ -181,7 +208,7 @@ 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)