X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=gateway.c;h=524ccffc5e4e952399070567b1eb4350f6ba44ed;hp=f3e75206888b210f4980b13fc7e9a00b67ffde98;hb=8a5751cc96dd085fcbcc34bef77499306bddc0c0;hpb=4dcb638b066a2fbd3e8ea6832286196bba2d2e5f diff --git a/gateway.c b/gateway.c index f3e75206..524ccffc 100644 --- a/gateway.c +++ b/gateway.c @@ -1,13 +1,13 @@ -const char gateway_rcs[] = "$Id: gateway.c,v 1.31 2008/10/16 07:31:11 fabiankeil Exp $"; +const char gateway_rcs[] = "$Id: gateway.c,v 1.51 2009/05/13 18:20:54 fabiankeil Exp $"; /********************************************************************* * * 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 - * proxy). + * or SOCKS5 proxy). * - * Copyright : Written by and Copyright (C) 2001-2008 the SourceForge + * Copyright : Written by and Copyright (C) 2001-2009 the SourceForge * Privoxy team. http://www.privoxy.org/ * * Based on the Internet Junkbuster originally written @@ -34,6 +34,82 @@ const char gateway_rcs[] = "$Id: gateway.c,v 1.31 2008/10/16 07:31:11 fabiankeil * * Revisions : * $Log: gateway.c,v $ + * Revision 1.51 2009/05/13 18:20:54 fabiankeil + * There's no reason for keep_alive_timeout to be signed. + * + * Revision 1.50 2009/05/10 10:19:23 fabiankeil + * Reenable server-side-only keep-alive support, but only share + * outgoing connections if the connection-sharing option is set. + * + * Revision 1.49 2009/05/10 10:12:30 fabiankeil + * Initial keep-alive support for the client socket. + * Temporarily disable the server-side-only keep-alive code. + * + * Revision 1.48 2009/02/13 17:20:36 fabiankeil + * Reword keep-alive support warning and only show + * it #if !defined(HAVE_POLL) && !defined(_WIN32). + * + * Revision 1.47 2008/12/24 17:06:19 fabiankeil + * Keep a thread around to timeout alive connections + * even if no new requests are coming in. + * + * Revision 1.46 2008/12/13 11:07:23 fabiankeil + * Remove duplicated debugging checks + * in connection_destination_matches(). + * + * Revision 1.45 2008/12/04 18:17:07 fabiankeil + * Fix some cparser warnings. + * + * Revision 1.44 2008/11/22 11:54:04 fabiankeil + * Move log message around to include the socket number. + * + * Revision 1.43 2008/11/13 09:15:51 fabiankeil + * Make keep_alive_timeout static. + * + * Revision 1.42 2008/11/13 09:08:42 fabiankeil + * Add new config option: keep-alive-timeout. + * + * Revision 1.41 2008/11/08 15:29:58 fabiankeil + * Unify two debug messages. + * + * Revision 1.40 2008/11/08 15:14:05 fabiankeil + * Fix duplicated debugging check. + * + * Revision 1.39 2008/10/25 11:33:01 fabiankeil + * Remove already out-commented line left over from debugging. + * + * Revision 1.38 2008/10/24 17:33:00 fabiankeil + * - Tone the "keep-alive support is experimental" warning + * down a bit as hackish 0-chunk detection has been + * implemented recently. + * - Only show the "ndef HAVE_POLL" warning once on start-up. + * + * Revision 1.37 2008/10/23 17:40:53 fabiankeil + * Fix forget_connection() and mark_connection_unused(), + * which would both under certain circumstances access + * reusable_connection[MAX_REUSABLE_CONNECTIONS]. Oops. + * + * Revision 1.36 2008/10/18 19:49:15 fabiankeil + * - Factor close_unusable_connections() out of + * get_reusable_connection() to make sure we really check + * all the remembered connections, not just the ones before + * the next reusable one. + * - Plug two file descriptor leaks. Internally marking + * connections as closed doesn't cut it. + * + * Revision 1.35 2008/10/17 17:12:01 fabiankeil + * In socket_is_still_usable(), use select() + * and FD_ISSET() if poll() isn't available. + * + * Revision 1.34 2008/10/17 17:07:13 fabiankeil + * Add preliminary timeout support. + * + * Revision 1.33 2008/10/16 16:34:21 fabiankeil + * Fix two gcc44 warnings. + * + * Revision 1.32 2008/10/16 16:27:22 fabiankeil + * Fix compiler warning. + * * Revision 1.31 2008/10/16 07:31:11 fabiankeil * - Factor socket_is_still_usable() out of get_reusable_connection(). * - If poll() isn't available, show a warning and assume the socket @@ -272,25 +348,10 @@ static const char socks_userid[] = "anonymous"; #ifdef FEATURE_CONNECTION_KEEP_ALIVE #define MAX_REUSABLE_CONNECTIONS 100 - -struct reusable_connection -{ - jb_socket sfd; - int in_use; - char *host; - int port; - - int forwarder_type; - char *gateway_host; - int gateway_port; - char *forward_host; - int forward_port; -}; +static unsigned int keep_alive_timeout = DEFAULT_KEEP_ALIVE_TIMEOUT; static struct reusable_connection reusable_connection[MAX_REUSABLE_CONNECTIONS]; - static int mark_connection_unused(jb_socket sfd); -static void mark_connection_closed(struct reusable_connection *closed_connection); /********************************************************************* * @@ -308,9 +369,12 @@ extern void initialize_reusable_connections(void) { unsigned int slot = 0; +#if !defined(HAVE_POLL) && !defined(_WIN32) log_error(LOG_LEVEL_INFO, - "Support for 'Connection: keep-alive' is experimental, " - "incomplete and known not to work properly in some situations."); + "Detecting already dead connections might not work " + "correctly on your platform. In case of problems, " + "unset the keep-alive-timeout option."); +#endif for (slot = 0; slot < SZ(reusable_connection); slot++) { @@ -331,12 +395,16 @@ extern void initialize_reusable_connections(void) * 1 : sfd = Open socket to remember. * 2 : http = The destination for the connection. * 3 : fwd = The forwarder settings used. + * 4 : timeout = Number of seconds after which the + * connection shouldn't be reused. * * Returns : void * *********************************************************************/ -void remember_connection(jb_socket sfd, const struct http_request *http, - const struct forward_spec *fwd) +void remember_connection(jb_socket sfd, + const struct http_request *http, + const struct forward_spec *fwd, + unsigned int timeout) { unsigned int slot = 0; int free_slot_found = FALSE; @@ -383,6 +451,8 @@ void remember_connection(jb_socket sfd, const struct http_request *http, reusable_connection[slot].sfd = sfd; reusable_connection[slot].port = http->port; reusable_connection[slot].in_use = 0; + reusable_connection[slot].timestamp = time(NULL); + reusable_connection[slot].keep_alive_timeout = timeout; assert(NULL != fwd); assert(reusable_connection[slot].gateway_host == NULL); @@ -429,7 +499,6 @@ void remember_connection(jb_socket sfd, const struct http_request *http, * Function : mark_connection_closed * * Description : Marks a reused connection closed. - * Must be called with connection_reuse_mutex locked. * * Parameters : * 1 : closed_connection = The connection to mark as closed. @@ -437,12 +506,14 @@ void remember_connection(jb_socket sfd, const struct http_request *http, * Returns : void * *********************************************************************/ -static void mark_connection_closed(struct reusable_connection *closed_connection) +void mark_connection_closed(struct reusable_connection *closed_connection) { closed_connection->in_use = FALSE; closed_connection->sfd = JB_INVALID_SOCKET; freez(closed_connection->host); closed_connection->port = 0; + closed_connection->timestamp = 0; + closed_connection->keep_alive_timeout = 0; closed_connection->forwarder_type = SOCKS_NONE; freez(closed_connection->gateway_host); closed_connection->gateway_port = 0; @@ -477,23 +548,20 @@ void forget_connection(jb_socket sfd) if (reusable_connection[slot].sfd == sfd) { assert(reusable_connection[slot].in_use); - break; - } - } - if (reusable_connection[slot].sfd != sfd) - { - log_error(LOG_LEVEL_CONNECT, - "Socket %d already forgotten or never remembered.", sfd); - privoxy_mutex_unlock(&connection_reuse_mutex); - return; + log_error(LOG_LEVEL_CONNECT, + "Forgetting socket %d for %s:%d in slot %d.", + sfd, reusable_connection[slot].host, + reusable_connection[slot].port, slot); + mark_connection_closed(&reusable_connection[slot]); + privoxy_mutex_unlock(&connection_reuse_mutex); + + return; + } } log_error(LOG_LEVEL_CONNECT, - "Forgetting socket %d for %s:%d in slot %d.", - sfd, reusable_connection[slot].host, reusable_connection[slot].port, slot); - - mark_connection_closed(&reusable_connection[slot]); + "Socket %d already forgotten or never remembered.", sfd); privoxy_mutex_unlock(&connection_reuse_mutex); } @@ -504,7 +572,7 @@ void forget_connection(jb_socket sfd) * Function : connection_destination_matches * * Description : Determines whether a remembered connection can - * be reused. That is whether the destination and + * be reused. That is, whether the destination and * the forwarding settings match. * * Parameters : @@ -515,43 +583,10 @@ void forget_connection(jb_socket sfd) * Returns : TRUE for yes, FALSE otherwise. * *********************************************************************/ -static int connection_destination_matches(const struct reusable_connection *connection, - const struct http_request *http, - const struct forward_spec *fwd) +int connection_destination_matches(const struct reusable_connection *connection, + const struct http_request *http, + const struct forward_spec *fwd) { - /* XXX: Start of duplicated checks for debugging purposes. */ - if (strcmpic(connection->host, http->host)) - { - return FALSE; - } - - if (connection->forwarder_type != fwd->type) - { - log_error(LOG_LEVEL_CONNECT, "Type mismatch: %d %d (%s)", - connection->forwarder_type, fwd->type, http->host); - return FALSE; - } - if (connection->gateway_port != fwd->gateway_port) - { - log_error(LOG_LEVEL_CONNECT, "Gateway port mismatch: %d %d (%s)", - connection->gateway_port, fwd->gateway_port, http->host); - return FALSE; - } - if (connection->forward_port != fwd->forward_port) - { - log_error(LOG_LEVEL_CONNECT, "Forward port mismatch: %d %d (%s)", - connection->forward_port, fwd->forward_port, http->host); - return FALSE; - } - if (connection->forward_port != fwd->forward_port) - { - log_error(LOG_LEVEL_CONNECT, "Server port mismatch: %d %d (%s)", - connection->forward_port, fwd->forward_port, http->host); - return FALSE; - } - - /* XXX: End of duplicated checks for debugging purposes. */ - if ((connection->forwarder_type != fwd->type) || (connection->gateway_port != fwd->gateway_port) || (connection->forward_port != fwd->forward_port) @@ -585,43 +620,63 @@ static int connection_destination_matches(const struct reusable_connection *conn /********************************************************************* * - * Function : socket_is_still_usable + * Function : close_unusable_connections * - * Description : Decides whether or not an open socket is still usable. + * Description : Closes remembered connections that have timed + * out or have been closed on the other side. * - * Parameters : - * 1 : sfd = The socket to check. + * Parameters : none * - * Returns : TRUE for yes, otherwise FALSE. + * Returns : Number of connections that are still alive. * *********************************************************************/ -static int socket_is_still_usable(jb_socket sfd) +int close_unusable_connections(void) { -#ifdef HAVE_POLL - int poll_result; - struct pollfd poll_fd[1]; - memset(poll_fd, 0, sizeof(poll_fd)); - poll_fd[0].fd = sfd; - poll_fd[0].events = POLLIN; + unsigned int slot = 0; + int connections_alive = 0; - poll_result = poll(poll_fd, 1, 0); + privoxy_mutex_lock(&connection_reuse_mutex); - if (-1 != poll_result) - { - return !(poll_fd[0].revents & POLLIN); - } - else + for (slot = 0; slot < SZ(reusable_connection); slot++) { - log_error(LOG_LEVEL_CONNECT, "Polling socket %d failed.", sfd); - return FALSE; + if (!reusable_connection[slot].in_use + && (JB_INVALID_SOCKET != reusable_connection[slot].sfd)) + { + time_t time_open = time(NULL) - reusable_connection[slot].timestamp; + + if (reusable_connection[slot].keep_alive_timeout < time_open) + { + log_error(LOG_LEVEL_CONNECT, + "The connection to %s:%d in slot %d timed out. " + "Closing socket %d. Timeout is: %d.", + reusable_connection[slot].host, + reusable_connection[slot].port, slot, + reusable_connection[slot].sfd, + reusable_connection[slot].keep_alive_timeout); + close_socket(reusable_connection[slot].sfd); + mark_connection_closed(&reusable_connection[slot]); + } + else if (!socket_is_still_usable(reusable_connection[slot].sfd)) + { + log_error(LOG_LEVEL_CONNECT, + "The connection to %s:%d in slot %d is no longer usable. " + "Closing socket %d.", reusable_connection[slot].host, + reusable_connection[slot].port, slot, + reusable_connection[slot].sfd); + close_socket(reusable_connection[slot].sfd); + mark_connection_closed(&reusable_connection[slot]); + } + else + { + connections_alive++; + } + } } -#else - log_error(LOG_LEVEL_INFO, - "Detecting already dead sockets isn't implemented for your " - "platform yet. Assuming sockets stay alive forever, expect " - "an increase in connection problems."); - return TRUE; -#endif /* def HAVE_POLL */ + + privoxy_mutex_unlock(&connection_reuse_mutex); + + return connections_alive; + } @@ -646,6 +701,8 @@ static jb_socket get_reusable_connection(const struct http_request *http, jb_socket sfd = JB_INVALID_SOCKET; unsigned int slot = 0; + close_unusable_connections(); + privoxy_mutex_lock(&connection_reuse_mutex); for (slot = 0; slot < SZ(reusable_connection); slot++) @@ -653,16 +710,6 @@ static jb_socket get_reusable_connection(const struct http_request *http, if (!reusable_connection[slot].in_use && (JB_INVALID_SOCKET != reusable_connection[slot].sfd)) { - if (!socket_is_still_usable(reusable_connection[slot].sfd)) - { - log_error(LOG_LEVEL_CONNECT, - "Socket %d for %s:%d in slot %d is no longer usable. Closing.", - reusable_connection[slot].sfd, reusable_connection[slot].host, - reusable_connection[slot].port, slot); - mark_connection_closed(&reusable_connection[slot]); - continue; - } - if (connection_destination_matches(&reusable_connection[slot], http, fwd)) { reusable_connection[slot].in_use = TRUE; @@ -709,24 +756,41 @@ static int mark_connection_unused(jb_socket sfd) if (reusable_connection[slot].sfd == sfd) { assert(reusable_connection[slot].in_use); + socket_found = TRUE; + log_error(LOG_LEVEL_CONNECT, + "Marking open socket %d for %s:%d in slot %d as unused.", + sfd, reusable_connection[slot].host, + reusable_connection[slot].port, slot); + reusable_connection[slot].in_use = 0; + reusable_connection[slot].timestamp = time(NULL); break; } } - if (reusable_connection[slot].sfd == sfd) - { - socket_found = TRUE; - log_error(LOG_LEVEL_CONNECT, - "Marking open socket %d for %s:%d in slot %d as unused.", - sfd, reusable_connection[slot].host, reusable_connection[slot].port, slot); - reusable_connection[slot].in_use = 0; - } - privoxy_mutex_unlock(&connection_reuse_mutex); return socket_found; } + + +/********************************************************************* + * + * Function : set_keep_alive_timeout + * + * Description : Sets the timeout after which open + * connections will no longer be reused. + * + * Parameters : + * 1 : timeout = The timeout in seconds. + * + * Returns : void + * + *********************************************************************/ +void set_keep_alive_timeout(unsigned int timeout) +{ + keep_alive_timeout = timeout; +} #endif /* def FEATURE_CONNECTION_KEEP_ALIVE */ @@ -754,16 +818,13 @@ jb_socket forwarded_connect(const struct forward_spec * fwd, jb_socket sfd = JB_INVALID_SOCKET; #ifdef FEATURE_CONNECTION_KEEP_ALIVE - sfd = get_reusable_connection(http, fwd); - if (JB_INVALID_SOCKET == sfd) - { - log_error(LOG_LEVEL_CONNECT, - "No reusable socket for %s:%d found. Opening a new one.", - http->host, http->port); - } - else + if ((csp->config->feature_flags & RUNTIME_FEATURE_CONNECTION_SHARING)) { - return sfd; + sfd = get_reusable_connection(http, fwd); + if (JB_INVALID_SOCKET != sfd) + { + return sfd; + } } #endif /* def FEATURE_CONNECTION_KEEP_ALIVE */ @@ -800,6 +861,13 @@ jb_socket forwarded_connect(const struct forward_spec * fwd, "SOCKS4 impossible internal error - bad SOCKS type."); } + if (JB_INVALID_SOCKET != sfd) + { + log_error(LOG_LEVEL_CONNECT, + "Created new connection to %s:%d on socket %d.", + http->host, http->port, sfd); + } + return sfd; } @@ -972,7 +1040,6 @@ static jb_socket socks4_connect(const struct forward_spec * fwd, { case SOCKS_REQUEST_GRANTED: return(sfd); - break; case SOCKS_REQUEST_REJECT: errstr = "SOCKS request rejected or failed."; errno = EINVAL; @@ -1095,7 +1162,7 @@ static jb_socket socks5_connect(const struct forward_spec *fwd, } hostlen = strlen(target_host); - if (hostlen > 255) + if (hostlen > (size_t)255) { errstr = "target host name is longer than 255 characters"; err = 1; @@ -1183,12 +1250,12 @@ static jb_socket socks5_connect(const struct forward_spec *fwd, cbuf[client_pos++] = '\x00'; /* Reserved, must be 0x00 */ cbuf[client_pos++] = '\x03'; /* Address is domain name */ cbuf[client_pos++] = (char)(hostlen & 0xffu); - assert(sizeof(cbuf) - client_pos > 255); + assert(sizeof(cbuf) - client_pos > (size_t)255); /* Using strncpy because we really want the nul byte padding. */ strncpy(cbuf + client_pos, target_host, sizeof(cbuf) - client_pos); client_pos += (hostlen & 0xffu); - cbuf[client_pos++] = (char)((target_port >> 8) & 0xffu); - cbuf[client_pos++] = (char)((target_port ) & 0xffu); + cbuf[client_pos++] = (char)((target_port >> 8) & 0xff); + cbuf[client_pos++] = (char)((target_port ) & 0xff); if (write_socket(sfd, cbuf, client_pos)) {