-const char gateway_rcs[] = "$Id: gateway.c,v 1.45 2008/12/04 18:17:07 fabiankeil Exp $";
+const char gateway_rcs[] = "$Id: gateway.c,v 1.47 2008/12/24 17:06:19 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
*
* Revisions :
* $Log: gateway.c,v $
+ * 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.
*
{
unsigned int slot = 0;
+#if !defined(HAVE_POLL) && !defined(_WIN32)
log_error(LOG_LEVEL_INFO,
- "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 */
- );
+ "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++)
{
*
* Parameters : none
*
- * Returns : void
+ * Returns : Number of connections that are still alive.
*
*********************************************************************/
-static void close_unusable_connections(void)
+int close_unusable_connections(void)
{
unsigned int slot = 0;
+ int connections_alive = 0;
+
+ privoxy_mutex_lock(&connection_reuse_mutex);
for (slot = 0; slot < SZ(reusable_connection); slot++)
{
reusable_connection[slot].sfd, keep_alive_timeout);
close_socket(reusable_connection[slot].sfd);
mark_connection_closed(&reusable_connection[slot]);
- continue;
}
-
- if (!socket_is_still_usable(reusable_connection[slot].sfd))
+ 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. "
reusable_connection[slot].sfd);
close_socket(reusable_connection[slot].sfd);
mark_connection_closed(&reusable_connection[slot]);
- continue;
+ }
+ else
+ {
+ connections_alive++;
}
}
}
+
+ privoxy_mutex_unlock(&connection_reuse_mutex);
+
+ return connections_alive;
+
}
jb_socket sfd = JB_INVALID_SOCKET;
unsigned int slot = 0;
- privoxy_mutex_lock(&connection_reuse_mutex);
-
close_unusable_connections();
+ privoxy_mutex_lock(&connection_reuse_mutex);
+
for (slot = 0; slot < SZ(reusable_connection); slot++)
{
if (!reusable_connection[slot].in_use