-const char gateway_rcs[] = "$Id: gateway.c,v 1.34 2008/10/17 17:07:13 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 $
*
* 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.
*
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);
+
/*********************************************************************
*
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++)
{
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);
}
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;
}
}
+/*********************************************************************
+ *
+ * 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
int socket_is_alive = 0;
memset(&timeout, '\0', sizeof(timeout));
- /* timeout.tv_usec = 150;*/
FD_ZERO(&readable_fds);
FD_SET(sfd, &readable_fds);
*/
socket_is_alive = !FD_ISSET(sfd, &readable_fds);
- log_error(LOG_LEVEL_INFO,
- "Detecting already dead sockets might not work correctly "
- "on your platform. Anyway, socket %d appears to be %s.",
- sfd, (socket_is_alive ? "still alive" : "already dead"));
-
return socket_is_alive;
#endif /* def HAVE_POLL */
}
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))
{
- 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);
- 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);
- mark_connection_closed(&reusable_connection[slot]);
- continue;
- }
-
if (connection_destination_matches(&reusable_connection[slot], http, fwd))
{
reusable_connection[slot].in_use = TRUE;
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;
- reusable_connection[slot].timestamp = time(NULL);
- }
-
privoxy_mutex_unlock(&connection_reuse_mutex);
return socket_found;
projects / privoxy.git / blobdiff