X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=gateway.c;h=76dc32bedb7eba085db5827371a00a1cfe74d621;hp=ec5b41b1e996c80ebf923817f0631a323832a14e;hb=495e4cffcfd47f3144c5e8d3f060234a92026df1;hpb=d459b591c2a490a3de9d86433bdd351fc5350a5a diff --git a/gateway.c b/gateway.c index ec5b41b1..76dc32be 100644 --- a/gateway.c +++ b/gateway.c @@ -1,4 +1,4 @@ -const char gateway_rcs[] = "$Id: gateway.c,v 1.32 2008/10/16 16:27:22 fabiankeil Exp $"; +const char gateway_rcs[] = "$Id: gateway.c,v 1.39 2008/10/25 11:33:01 fabiankeil Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/gateway.c,v $ @@ -34,6 +34,38 @@ const char gateway_rcs[] = "$Id: gateway.c,v 1.32 2008/10/16 16:27:22 fabiankeil * * Revisions : * $Log: gateway.c,v $ + * 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. * @@ -275,6 +307,8 @@ static const char socks_userid[] = "anonymous"; #ifdef FEATURE_CONNECTION_KEEP_ALIVE #define MAX_REUSABLE_CONNECTIONS 100 +/* XXX: should be a config option. */ +#define CONNECTION_KEEP_ALIVE_TIMEOUT 3 * 60 struct reusable_connection { @@ -282,6 +316,7 @@ struct reusable_connection int in_use; char *host; int port; + time_t timestamp; int forwarder_type; char *gateway_host; @@ -294,6 +329,8 @@ 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); +static int socket_is_still_usable(jb_socket sfd); + /********************************************************************* * @@ -312,8 +349,12 @@ extern void initialize_reusable_connections(void) unsigned int slot = 0; log_error(LOG_LEVEL_INFO, - "Support for 'Connection: keep-alive' is experimental, " - "incomplete and known not to work properly in some situations."); + "Support for 'Connection: keep-alive' is experimental." +#ifndef HAVE_POLL + " Detecting already dead connections might not work" + " correctly on your platform." +#endif /* ndef HAVE_POLL */ + ); for (slot = 0; slot < SZ(reusable_connection); slot++) { @@ -386,6 +427,7 @@ 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); assert(NULL != fwd); assert(reusable_connection[slot].gateway_host == NULL); @@ -446,6 +488,7 @@ static void mark_connection_closed(struct reusable_connection *closed_connection closed_connection->sfd = JB_INVALID_SOCKET; freez(closed_connection->host); closed_connection->port = 0; + closed_connection->timestamp = 0; closed_connection->forwarder_type = SOCKS_NONE; freez(closed_connection->gateway_host); closed_connection->gateway_port = 0; @@ -480,23 +523,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); } @@ -546,10 +586,10 @@ static int connection_destination_matches(const struct reusable_connection *conn connection->forward_port, fwd->forward_port, http->host); return FALSE; } - if (connection->forward_port != fwd->forward_port) + if (connection->port != http->port) { log_error(LOG_LEVEL_CONNECT, "Server port mismatch: %d %d (%s)", - connection->forward_port, fwd->forward_port, http->host); + connection->port, http->port, http->host); return FALSE; } @@ -586,6 +626,55 @@ static int connection_destination_matches(const struct reusable_connection *conn } +/********************************************************************* + * + * Function : close_unusable_connections + * + * Description : Closes remembered connections that have timed + * out or have been closed on the other side. + * + * Parameters : none + * + * Returns : void + * + *********************************************************************/ +static void close_unusable_connections(void) +{ + unsigned int slot = 0; + + for (slot = 0; slot < SZ(reusable_connection); slot++) + { + if (!reusable_connection[slot].in_use + && (JB_INVALID_SOCKET != reusable_connection[slot].sfd)) + { + time_t time_open = time(NULL) - reusable_connection[slot].timestamp; + + if (CONNECTION_KEEP_ALIVE_TIMEOUT < time_open) + { + log_error(LOG_LEVEL_CONNECT, + "The connection to %s:%d in slot %d timed out. Closing.", + reusable_connection[slot].host, reusable_connection[slot].port, + slot); + close_socket(reusable_connection[slot].sfd); + mark_connection_closed(&reusable_connection[slot]); + continue; + } + + 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); + close_socket(reusable_connection[slot].sfd); + mark_connection_closed(&reusable_connection[slot]); + continue; + } + } + } +} + + /********************************************************************* * * Function : socket_is_still_usable @@ -603,6 +692,7 @@ static int socket_is_still_usable(jb_socket sfd) #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; @@ -619,11 +709,28 @@ static int socket_is_still_usable(jb_socket sfd) return FALSE; } #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; + fd_set readable_fds; + struct timeval timeout; + int ret; + int socket_is_alive = 0; + + memset(&timeout, '\0', sizeof(timeout)); + FD_ZERO(&readable_fds); + FD_SET(sfd, &readable_fds); + + ret = select((int)sfd+1, &readable_fds, NULL, NULL, &timeout); + if (ret < 0) + { + log_error(LOG_LEVEL_ERROR, "select() failed!: %E"); + } + + /* + * XXX: I'm not sure why !FD_ISSET() works, + * but apparently it does. + */ + socket_is_alive = !FD_ISSET(sfd, &readable_fds); + + return socket_is_alive; #endif /* def HAVE_POLL */ } @@ -651,21 +758,13 @@ static jb_socket get_reusable_connection(const struct http_request *http, privoxy_mutex_lock(&connection_reuse_mutex); + close_unusable_connections(); + for (slot = 0; slot < SZ(reusable_connection); slot++) { 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; @@ -712,19 +811,17 @@ 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;