X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=gateway.c;h=a84ea5e70004701cfa8a016935be472da0b1100b;hp=28a69f10a93b6b524b1675389dc5529bf7139cfe;hb=79cf30489bc336f442d2222561c1eac77b8fc4a6;hpb=14bf6e6f68da1df6e552fe67dfe936dc0faea315 diff --git a/gateway.c b/gateway.c index 28a69f10..a84ea5e7 100644 --- a/gateway.c +++ b/gateway.c @@ -1,4 +1,4 @@ -const char gateway_rcs[] = "$Id: gateway.c,v 1.6 2001/09/10 10:41:16 oes Exp $"; +const char gateway_rcs[] = "$Id: gateway.c,v 1.18 2006/07/18 14:48:46 david__schmidt Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/gateway.c,v $ @@ -7,14 +7,14 @@ const char gateway_rcs[] = "$Id: gateway.c,v 1.6 2001/09/10 10:41:16 oes Exp $"; * using a "forwarder" (i.e. HTTP proxy and/or a SOCKS4 * proxy). * - * Copyright : Written by and Copyright (C) 2001 the SourceForge - * IJBSWA team. http://ijbswa.sourceforge.net + * Copyright : Written by and Copyright (C) 2001-2007 the SourceForge + * Privoxy team. http://www.privoxy.org/ * * 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,66 @@ const char gateway_rcs[] = "$Id: gateway.c,v 1.6 2001/09/10 10:41:16 oes Exp $"; * * Revisions : * $Log: gateway.c,v $ + * Revision 1.18 2006/07/18 14:48:46 david__schmidt + * Reorganizing the repository: swapping out what was HEAD (the old 3.1 branch) + * with what was really the latest development (the v_3_0_branch branch) + * + * Revision 1.16 2002/05/12 21:36:29 jongfoster + * Correcting function comments + * + * Revision 1.15 2002/03/26 22:29:54 swa + * we have a new homepage! + * + * Revision 1.14 2002/03/24 13:25:43 swa + * name change related issues + * + * Revision 1.13 2002/03/13 00:29:59 jongfoster + * Killing warnings + * + * Revision 1.12 2002/03/09 20:03:52 jongfoster + * - Making various functions return int rather than size_t. + * (Undoing a recent change). Since size_t is unsigned on + * Windows, functions like read_socket that return -1 on + * error cannot return a size_t. + * + * THIS WAS A MAJOR BUG - it caused frequent, unpredictable + * crashes, and also frequently caused JB to jump to 100% + * CPU and stay there. (Because it thought it had just + * read ((unsigned)-1) == 4Gb of data...) + * + * - The signature of write_socket has changed, it now simply + * returns success=0/failure=nonzero. + * + * - Trying to get rid of a few warnings --with-debug on + * Windows, I've introduced a new type "jb_socket". This is + * used for the socket file descriptors. On Windows, this + * is SOCKET (a typedef for unsigned). Everywhere else, it's + * an int. The error value can't be -1 any more, so it's + * now JB_INVALID_SOCKET (which is -1 on UNIX, and in + * Windows it maps to the #define INVALID_SOCKET.) + * + * - The signature of bind_port has changed. + * + * Revision 1.11 2002/03/08 17:46:04 jongfoster + * Fixing int/size_t warnings + * + * Revision 1.10 2002/03/07 03:50:19 oes + * - Improved handling of failed DNS lookups + * - Fixed compiler warnings + * + * Revision 1.9 2001/10/25 03:40:48 david__schmidt + * Change in porting tactics: OS/2's EMX porting layer doesn't allow multiple + * threads to call select() simultaneously. So, it's time to do a real, live, + * native OS/2 port. See defines for __EMX__ (the porting layer) vs. __OS2__ + * (native). Both versions will work, but using __OS2__ offers multi-threading. + * + * 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 * @@ -68,7 +128,11 @@ const char gateway_rcs[] = "$Id: gateway.c,v 1.6 2001/09/10 10:41:16 oes Exp $"; #include #include + +#ifndef _WIN32 #include +#endif + #include #include @@ -80,6 +144,10 @@ const char gateway_rcs[] = "$Id: gateway.c,v 1.6 2001/09/10 10:41:16 oes Exp $"; #include #endif /* def __BEOS__ */ +#ifdef __OS2__ +#include +#endif /* def __OS2__ */ + #include "project.h" #include "jcc.h" #include "errlog.h" @@ -88,10 +156,10 @@ const char gateway_rcs[] = "$Id: gateway.c,v 1.6 2001/09/10 10:41:16 oes Exp $"; const char gateway_h_rcs[] = GATEWAY_H_VERSION; -static int socks4_connect(const struct forward_spec * fwd, - const char * target_host, - int target_port, - struct client_state *csp); +static jb_socket socks4_connect(const struct forward_spec * fwd, + const char * target_host, + int target_port, + struct client_state *csp); #define SOCKS_REQUEST_GRANTED 90 @@ -128,16 +196,16 @@ static const char socks_userid[] = "anonymous"; * a HTTP proxy and/or a SOCKS proxy. * * Parameters : - * 1 : gw = pointer to a gateway structure (such as gw_default) + * 1 : fwd = the proxies to use when connecting. * 2 : http = the http request and apropos headers * 3 : csp = Current client state (buffers, headers, etc...) * - * Returns : -1 => failure, else it is the socket file descriptor. + * Returns : JB_INVALID_SOCKET => failure, else it is the socket file descriptor. * *********************************************************************/ -int forwarded_connect(const struct forward_spec * fwd, - struct http_request *http, - struct client_state *csp) +jb_socket forwarded_connect(const struct forward_spec * fwd, + struct http_request *http, + struct client_state *csp) { const char * dest_host; int dest_port; @@ -170,7 +238,7 @@ int forwarded_connect(const struct forward_spec * fwd, /* Should never get here */ log_error(LOG_LEVEL_FATAL, "SOCKS4 impossible internal error - bad SOCKS type."); errno = EINVAL; - return(-1); + return(JB_INVALID_SOCKET); } } @@ -185,46 +253,54 @@ int forwarded_connect(const struct forward_spec * fwd, * descriptor for a socket which can be treated as a * normal (non-SOCKS) socket. * + * Logged error messages are saved to csp->error_message + * and later reused by error_response() for the CGI + * message. strdup allocation failures are handled there. + * * Parameters : - * 1 : gw = pointer to a gateway structure (such as gw_default) - * 2 : http = the http request and apropos headers - * 3 : csp = Current client state (buffers, headers, etc...) + * 1 : fwd = Specifies the SOCKS proxy to use. + * 2 : target_host = The final server to connect to. + * 3 : target_port = The final port to connect to. + * 4 : csp = Current client state (buffers, headers, etc...) * - * Returns : -1 => failure, else a socket file descriptor. + * Returns : JB_INVALID_SOCKET => failure, else a socket file descriptor. * *********************************************************************/ -static int socks4_connect(const struct forward_spec * fwd, - const char * target_host, - int target_port, - struct client_state *csp) +static jb_socket socks4_connect(const struct forward_spec * fwd, + const char * target_host, + int target_port, + struct client_state *csp) { int web_server_addr; - unsigned char cbuf[BUFFER_SIZE]; - unsigned char sbuf[BUFFER_SIZE]; + char cbuf[BUFFER_SIZE]; + char sbuf[BUFFER_SIZE]; struct socks_op *c = (struct socks_op *)cbuf; struct socks_reply *s = (struct socks_reply *)sbuf; - int n; - int csiz; - int sfd; + size_t n; + size_t csiz; + jb_socket sfd; int err = 0; - char *errstr; + char *errstr = NULL; if ((fwd->gateway_host == NULL) || (*fwd->gateway_host == '\0')) { - log_error(LOG_LEVEL_CONNECT, "socks4_connect: NULL gateway host specified"); + /* XXX: Shouldn't the config file parser prevent this? */ + errstr = "NULL gateway host specified."; err = 1; } if (fwd->gateway_port <= 0) { - log_error(LOG_LEVEL_CONNECT, "socks4_connect: invalid gateway port specified"); + errstr = "invalid gateway port specified."; err = 1; } if (err) { + log_error(LOG_LEVEL_CONNECT, "socks4_connect: %s", errstr); + csp->error_message = strdup(errstr); errno = EINVAL; - return(-1); + return(JB_INVALID_SOCKET); } /* build a socks request for connection to the web server */ @@ -237,6 +313,12 @@ static int socks4_connect(const struct forward_spec * fwd, { case SOCKS_4: web_server_addr = htonl(resolve_hostname_to_ip(target_host)); + if (web_server_addr == INADDR_NONE) + { + errstr = "could not resolve target host"; + log_error(LOG_LEVEL_CONNECT, "socks4_connect: %s %s", errstr, target_host); + err = 1; + } break; case SOCKS_4A: web_server_addr = 0x00000001; @@ -244,47 +326,70 @@ static int socks4_connect(const struct forward_spec * fwd, if (n > sizeof(cbuf)) { errno = EINVAL; - return(-1); + errstr = "buffer cbuf too small."; + log_error(LOG_LEVEL_CONNECT, "socks4_connect: %s", errstr); + err = 1; + } + else + { + strcpy(cbuf + csiz, target_host); + csiz = n; } - strcpy(((char *)cbuf) + csiz, target_host); - csiz = n; break; default: /* Should never get here */ - log_error(LOG_LEVEL_FATAL, "SOCKS4 impossible internal error - bad SOCKS type."); - errno = EINVAL; - return(-1); + log_error(LOG_LEVEL_FATAL, + "socks4_connect: SOCKS4 impossible internal error - bad SOCKS type."); + /* Not reached */ + } + + if (err) + { + csp->error_message = strdup(errstr); + return(JB_INVALID_SOCKET); } c->vn = 4; c->cd = 1; - c->dstport[0] = (target_port >> 8 ) & 0xff; - c->dstport[1] = (target_port ) & 0xff; - c->dstip[0] = (web_server_addr >> 24 ) & 0xff; - c->dstip[1] = (web_server_addr >> 16 ) & 0xff; - c->dstip[2] = (web_server_addr >> 8 ) & 0xff; - c->dstip[3] = (web_server_addr ) & 0xff; + /* XXX: these casts surpress gcc43 warnings, but are they correct? */ + c->dstport[0] = (unsigned char)((target_port >> 8 ) & 0xff); + c->dstport[1] = (unsigned char)((target_port ) & 0xff); + c->dstip[0] = (unsigned char)((web_server_addr >> 24 ) & 0xff); + c->dstip[1] = (unsigned char)((web_server_addr >> 16 ) & 0xff); + c->dstip[2] = (unsigned char)((web_server_addr >> 8 ) & 0xff); + c->dstip[3] = (unsigned char)((web_server_addr ) & 0xff); /* pass the request to the socks server */ sfd = connect_to(fwd->gateway_host, fwd->gateway_port, csp); - if (sfd < 0) + if (sfd == JB_INVALID_SOCKET) { - return(-1); + /* + * XXX: connect_to could fill in the exact reason. + * Most likely resolving the IP of the forwarder failed. + */ + errstr = "connect_to failed: see logfile for details"; + err = 1; } - - if ((n = write_socket(sfd, (char *)c, csiz)) != csiz) + else if (write_socket(sfd, (char *)c, csiz)) { - log_error(LOG_LEVEL_CONNECT, "SOCKS4 negotiation write failed..."); + errstr = "SOCKS4 negotiation write failed."; + log_error(LOG_LEVEL_CONNECT, "socks4_connect: %s", errstr); + err = 1; close_socket(sfd); - return(-1); } - - if ((n = read_socket(sfd, sbuf, sizeof(sbuf))) != sizeof(*s)) + else if (read_socket(sfd, sbuf, sizeof(sbuf)) != sizeof(*s)) { - log_error(LOG_LEVEL_CONNECT, "SOCKS4 negotiation read failed..."); + errstr = "SOCKS4 negotiation read failed."; + log_error(LOG_LEVEL_CONNECT, "socks4_connect: %s", errstr); + err = 1; close_socket(sfd); - return(-1); + } + + if (err) + { + csp->error_message = strdup(errstr); + return(JB_INVALID_SOCKET); } switch (s->cd) @@ -293,31 +398,32 @@ static int socks4_connect(const struct forward_spec * fwd, return(sfd); break; case SOCKS_REQUEST_REJECT: - errstr = "SOCKS request rejected or failed"; + errstr = "SOCKS request rejected or failed."; errno = EINVAL; break; case SOCKS_REQUEST_IDENT_FAILED: errstr = "SOCKS request rejected because " - "SOCKS server cannot connect to identd on the client"; + "SOCKS server cannot connect to identd on the client."; errno = EACCES; break; case SOCKS_REQUEST_IDENT_CONFLICT: errstr = "SOCKS request rejected because " "the client program and identd report " - "different user-ids"; + "different user-ids."; errno = EACCES; break; default: - errstr = (char *) cbuf; errno = ENOENT; - sprintf(errstr, - "SOCKS request rejected for reason code %d\n", s->cd); + snprintf(cbuf, sizeof(cbuf), + "SOCKS request rejected for reason code %d.", s->cd); + errstr = cbuf; } - log_error(LOG_LEVEL_CONNECT, "socks4_connect: %s ...", errstr); - + log_error(LOG_LEVEL_CONNECT, "socks4_connect: %s", errstr); + csp->error_message = strdup(errstr); close_socket(sfd); - return(-1); + + return(JB_INVALID_SOCKET); }