-const char gateway_rcs[] = "$Id: gateway.c,v 1.47 2008/12/24 17:06:19 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 $
*
* 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.
#ifdef FEATURE_CONNECTION_KEEP_ALIVE
#define MAX_REUSABLE_CONNECTIONS 100
-static int keep_alive_timeout = DEFAULT_KEEP_ALIVE_TIMEOUT;
-
-struct reusable_connection
-{
- jb_socket sfd;
- int in_use;
- char *host;
- int port;
- time_t timestamp;
-
- 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);
-static int socket_is_still_usable(jb_socket sfd);
-
/*********************************************************************
*
* 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;
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);
* 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.
* 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;
* 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)
{
if ((connection->forwarder_type != fwd->type)
|| (connection->gateway_port != fwd->gateway_port)
{
time_t time_open = time(NULL) - reusable_connection[slot].timestamp;
- if (keep_alive_timeout < time_open)
+ 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, keep_alive_timeout);
+ reusable_connection[slot].sfd,
+ reusable_connection[slot].keep_alive_timeout);
close_socket(reusable_connection[slot].sfd);
mark_connection_closed(&reusable_connection[slot]);
}
}
-/*********************************************************************
- *
- * Function : socket_is_still_usable
- *
- * Description : Decides whether or not an open socket is still usable.
- *
- * Parameters :
- * 1 : sfd = The socket to check.
- *
- * Returns : TRUE for yes, otherwise FALSE.
- *
- *********************************************************************/
-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;
-
- poll_result = poll(poll_fd, 1, 0);
-
- if (-1 != poll_result)
- {
- return !(poll_fd[0].revents & POLLIN);
- }
- else
- {
- log_error(LOG_LEVEL_CONNECT, "Polling socket %d failed.", sfd);
- return FALSE;
- }
-#else
- 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 */
-}
-
-
/*********************************************************************
*
* Function : get_reusable_connection
* Returns : void
*
*********************************************************************/
-void set_keep_alive_timeout(int timeout)
+void set_keep_alive_timeout(unsigned int timeout)
{
keep_alive_timeout = timeout;
}
jb_socket sfd = JB_INVALID_SOCKET;
#ifdef FEATURE_CONNECTION_KEEP_ALIVE
- sfd = get_reusable_connection(http, fwd);
- if (JB_INVALID_SOCKET != sfd)
+ 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 */