projects
/
privoxy.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Ditch some dead code in main().
[privoxy.git]
/
jcc.c
diff --git
a/jcc.c
b/jcc.c
index
d15cbf0
..
048a3f4
100644
(file)
--- a/
jcc.c
+++ b/
jcc.c
@@
-1,4
+1,4
@@
-const char jcc_rcs[] = "$Id: jcc.c,v 1.
297 2009/10/03 10:37:49
fabiankeil Exp $";
+const char jcc_rcs[] = "$Id: jcc.c,v 1.
306 2009/12/22 13:04:10
fabiankeil Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/jcc.c,v $
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/jcc.c,v $
@@
-724,19
+724,21
@@
static void send_crunch_response(const struct client_state *csp, struct http_res
status_code[2] = rsp->head[11];
status_code[3] = '\0';
status_code[2] = rsp->head[11];
status_code[3] = '\0';
+ /* Log that the request was crunched and why. */
+ log_error(LOG_LEVEL_CRUNCH, "%s: %s", crunch_reason(rsp), http->url);
+ log_error(LOG_LEVEL_CLF, "%s - - [%T] \"%s\" %s %u",
+ csp->ip_addr_str, http->ocmd, status_code, rsp->content_length);
+
/* Write the answer to the client */
if (write_socket(csp->cfd, rsp->head, rsp->head_length)
|| write_socket(csp->cfd, rsp->body, rsp->content_length))
{
/* There is nothing we can do about it. */
/* Write the answer to the client */
if (write_socket(csp->cfd, rsp->head, rsp->head_length)
|| write_socket(csp->cfd, rsp->body, rsp->content_length))
{
/* There is nothing we can do about it. */
- log_error(LOG_LEVEL_ERROR, "write to: %s failed: %E", csp->http->host);
+ log_error(LOG_LEVEL_ERROR,
+ "Couldn't deliver the error message through client socket %d: %E",
+ csp->cfd);
}
}
- /* Log that the request was crunched and why. */
- log_error(LOG_LEVEL_CRUNCH, "%s: %s", crunch_reason(rsp), http->url);
- log_error(LOG_LEVEL_CLF, "%s - - [%T] \"%s\" %s %u",
- csp->ip_addr_str, http->ocmd, status_code, rsp->content_length);
-
/* Clean up and return */
if (cgi_error_memory() != rsp)
{
/* Clean up and return */
if (cgi_error_memory() != rsp)
{
@@
-1235,7
+1237,8
@@
static void mark_server_socket_tainted(struct client_state *csp)
&& !(csp->flags |= CSP_FLAG_SERVER_SOCKET_TAINTED))
{
log_error(LOG_LEVEL_CONNECT,
&& !(csp->flags |= CSP_FLAG_SERVER_SOCKET_TAINTED))
{
log_error(LOG_LEVEL_CONNECT,
- "Marking the server socket %d tainted.", csp->sfd);
+ "Marking the server socket %d tainted.",
+ csp->server_connection.sfd);
csp->flags |= CSP_FLAG_SERVER_SOCKET_TAINTED;
}
}
csp->flags |= CSP_FLAG_SERVER_SOCKET_TAINTED;
}
}
@@
-1264,8
+1267,9
@@
static char *get_request_line(struct client_state *csp)
{
if (!data_is_available(csp->cfd, csp->config->socket_timeout))
{
{
if (!data_is_available(csp->cfd, csp->config->socket_timeout))
{
- log_error(LOG_LEVEL_ERROR,
- "Stopped waiting for the request line.");
+ log_error(LOG_LEVEL_CONNECT,
+ "Stopped waiting for the request line. Timeout: %d.",
+ csp->config->socket_timeout);
write_socket(csp->cfd, CLIENT_CONNECTION_TIMEOUT_RESPONSE,
strlen(CLIENT_CONNECTION_TIMEOUT_RESPONSE));
return NULL;
write_socket(csp->cfd, CLIENT_CONNECTION_TIMEOUT_RESPONSE,
strlen(CLIENT_CONNECTION_TIMEOUT_RESPONSE));
return NULL;
@@
-1601,7
+1605,9
@@
static void chat(struct client_state *csp)
/* Skeleton for HTTP response, if we should intercept the request */
struct http_response *rsp;
struct timeval timeout;
/* Skeleton for HTTP response, if we should intercept the request */
struct http_response *rsp;
struct timeval timeout;
+#ifdef FEATURE_CONNECTION_KEEP_ALIVE
int watch_client_socket = 1;
int watch_client_socket = 1;
+#endif
memset(buf, 0, sizeof(buf));
memset(buf, 0, sizeof(buf));
@@
-1710,27
+1716,27
@@
static void chat(struct client_state *csp)
/* here we connect to the server, gateway, or the forwarder */
#ifdef FEATURE_CONNECTION_KEEP_ALIVE
/* here we connect to the server, gateway, or the forwarder */
#ifdef FEATURE_CONNECTION_KEEP_ALIVE
- if ((csp->sfd != JB_INVALID_SOCKET)
- && socket_is_still_usable(csp->sfd)
+ if ((csp->s
erver_connection.s
fd != JB_INVALID_SOCKET)
+ && socket_is_still_usable(csp->s
erver_connection.s
fd)
&& connection_destination_matches(&csp->server_connection, http, fwd))
{
log_error(LOG_LEVEL_CONNECT,
"Reusing server socket %u. Opened for %s.",
&& connection_destination_matches(&csp->server_connection, http, fwd))
{
log_error(LOG_LEVEL_CONNECT,
"Reusing server socket %u. Opened for %s.",
- csp->sfd, csp->server_connection.host);
+ csp->s
erver_connection.s
fd, csp->server_connection.host);
}
else
{
}
else
{
- if (csp->sfd != JB_INVALID_SOCKET)
+ if (csp->s
erver_connection.s
fd != JB_INVALID_SOCKET)
{
log_error(LOG_LEVEL_CONNECT,
"Closing server socket %u. Opened for %s.",
{
log_error(LOG_LEVEL_CONNECT,
"Closing server socket %u. Opened for %s.",
- csp->sfd, csp->server_connection.host);
- close_socket(csp->sfd);
+ csp->s
erver_connection.s
fd, csp->server_connection.host);
+ close_socket(csp->s
erver_connection.s
fd);
mark_connection_closed(&csp->server_connection);
}
#endif /* def FEATURE_CONNECTION_KEEP_ALIVE */
mark_connection_closed(&csp->server_connection);
}
#endif /* def FEATURE_CONNECTION_KEEP_ALIVE */
- while ((csp->sfd = forwarded_connect(fwd, http, csp))
+ while ((csp->s
erver_connection.s
fd = forwarded_connect(fwd, http, csp))
&& (errno == EINVAL)
&& (forwarded_connect_retries++ < max_forwarded_connect_retries))
{
&& (errno == EINVAL)
&& (forwarded_connect_retries++ < max_forwarded_connect_retries))
{
@@
-1739,7
+1745,7
@@
static void chat(struct client_state *csp)
forwarded_connect_retries, http->hostport);
}
forwarded_connect_retries, http->hostport);
}
- if (csp->sfd == JB_INVALID_SOCKET)
+ if (csp->s
erver_connection.s
fd == JB_INVALID_SOCKET)
{
if (fwd->type != SOCKS_NONE)
{
{
if (fwd->type != SOCKS_NONE)
{
@@
-1766,8
+1772,10
@@
static void chat(struct client_state *csp)
return;
}
#ifdef FEATURE_CONNECTION_KEEP_ALIVE
return;
}
#ifdef FEATURE_CONNECTION_KEEP_ALIVE
- save_connection_destination(csp->sfd, http, fwd, &csp->server_connection);
- csp->server_connection.keep_alive_timeout = (unsigned)csp->config->keep_alive_timeout;
+ save_connection_destination(csp->server_connection.sfd,
+ http, fwd, &csp->server_connection);
+ csp->server_connection.keep_alive_timeout =
+ (unsigned)csp->config->keep_alive_timeout;
}
#endif /* def FEATURE_CONNECTION_KEEP_ALIVE */
}
#endif /* def FEATURE_CONNECTION_KEEP_ALIVE */
@@
-1785,8
+1793,8
@@
static void chat(struct client_state *csp)
* Write the client's (modified) header to the server
* (along with anything else that may be in the buffer)
*/
* Write the client's (modified) header to the server
* (along with anything else that may be in the buffer)
*/
- if (write_socket(csp->sfd, hdr, strlen(hdr))
- || (flush_socket(csp->sfd, csp->iob) < 0))
+ if (write_socket(csp->s
erver_connection.s
fd, hdr, strlen(hdr))
+ || (flush_socket(csp->s
erver_connection.s
fd, csp->iob) < 0))
{
log_error(LOG_LEVEL_CONNECT,
"write header to: %s failed: %E", http->hostport);
{
log_error(LOG_LEVEL_CONNECT,
"write header to: %s failed: %E", http->hostport);
@@
-1823,7
+1831,8
@@
static void chat(struct client_state *csp)
/* we're finished with the client's header */
freez(hdr);
/* we're finished with the client's header */
freez(hdr);
- maxfd = (csp->cfd > csp->sfd) ? csp->cfd : csp->sfd;
+ maxfd = (csp->cfd > csp->server_connection.sfd) ?
+ csp->cfd : csp->server_connection.sfd;
/* pass data between the client and server
* until one or the other shuts down the connection.
/* pass data between the client and server
* until one or the other shuts down the connection.
@@
-1845,7
+1854,7
@@
static void chat(struct client_state *csp)
#ifdef FEATURE_CONNECTION_KEEP_ALIVE
if (!watch_client_socket)
{
#ifdef FEATURE_CONNECTION_KEEP_ALIVE
if (!watch_client_socket)
{
- maxfd = csp->sfd;
+ maxfd = csp->s
erver_connection.s
fd;
}
else
#endif /* def FEATURE_CONNECTION_KEEP_ALIVE */
}
else
#endif /* def FEATURE_CONNECTION_KEEP_ALIVE */
@@
-1853,7
+1862,7
@@
static void chat(struct client_state *csp)
FD_SET(csp->cfd, &rfds);
}
FD_SET(csp->cfd, &rfds);
}
- FD_SET(csp->sfd, &rfds);
+ FD_SET(csp->s
erver_connection.s
fd, &rfds);
#ifdef FEATURE_CONNECTION_KEEP_ALIVE
if ((csp->flags & CSP_FLAG_CHUNKED)
#ifdef FEATURE_CONNECTION_KEEP_ALIVE
if ((csp->flags & CSP_FLAG_CHUNKED)
@@
-1948,8
+1957,10
@@
static void chat(struct client_state *csp)
* available on the socket, the client went fishing
* and continuing talking to the server makes no sense.
*/
* available on the socket, the client went fishing
* and continuing talking to the server makes no sense.
*/
- log_error(LOG_LEVEL_CONNECT, "The client closed socket %d while "
- "the server socket %d is still open.", csp->cfd, csp->sfd);
+ log_error(LOG_LEVEL_CONNECT,
+ "The client closed socket %d while "
+ "the server socket %d is still open.",
+ csp->cfd, csp->server_connection.sfd);
mark_server_socket_tainted(csp);
break;
}
mark_server_socket_tainted(csp);
break;
}
@@
-1993,7
+2004,7
@@
static void chat(struct client_state *csp)
}
#endif /* def FEATURE_CONNECTION_KEEP_ALIVE */
}
#endif /* def FEATURE_CONNECTION_KEEP_ALIVE */
- if (write_socket(csp->sfd, buf, (size_t)len))
+ if (write_socket(csp->s
erver_connection.s
fd, buf, (size_t)len))
{
log_error(LOG_LEVEL_ERROR, "write to: %s failed: %E", http->host);
mark_server_socket_tainted(csp);
{
log_error(LOG_LEVEL_ERROR, "write to: %s failed: %E", http->host);
mark_server_socket_tainted(csp);
@@
-2007,7
+2018,7
@@
static void chat(struct client_state *csp)
* If `hdr' is null, then it's the header otherwise it's the body.
* FIXME: Does `hdr' really mean `host'? No.
*/
* If `hdr' is null, then it's the header otherwise it's the body.
* FIXME: Does `hdr' really mean `host'? No.
*/
- if (FD_ISSET(csp->sfd, &rfds))
+ if (FD_ISSET(csp->s
erver_connection.s
fd, &rfds))
{
#ifdef FEATURE_CONNECTION_KEEP_ALIVE
if (!socket_is_still_usable(csp->cfd))
{
#ifdef FEATURE_CONNECTION_KEEP_ALIVE
if (!socket_is_still_usable(csp->cfd))
@@
-2025,7
+2036,7
@@
static void chat(struct client_state *csp)
#endif /* def FEATURE_CONNECTION_KEEP_ALIVE */
fflush(NULL);
#endif /* def FEATURE_CONNECTION_KEEP_ALIVE */
fflush(NULL);
- len = read_socket(csp->sfd, buf, sizeof(buf) - 1);
+ len = read_socket(csp->s
erver_connection.s
fd, buf, sizeof(buf) - 1);
if (len < 0)
{
if (len < 0)
{
@@
-2309,13
+2320,13
@@
static void chat(struct client_state *csp)
log_error(LOG_LEVEL_ERROR,
"Empty server or forwarder response received on socket %d. "
"Closing client connection %d without sending data.",
log_error(LOG_LEVEL_ERROR,
"Empty server or forwarder response received on socket %d. "
"Closing client connection %d without sending data.",
- csp->sfd, csp->cfd);
+ csp->s
erver_connection.s
fd, csp->cfd);
}
else
{
log_error(LOG_LEVEL_ERROR,
"Empty server or forwarder response received on socket %d.",
}
else
{
log_error(LOG_LEVEL_ERROR,
"Empty server or forwarder response received on socket %d.",
- csp->sfd);
+ csp->s
erver_connection.s
fd);
send_crunch_response(csp, error_response(csp, "no-server-data"));
}
log_error(LOG_LEVEL_CLF, "%s - - [%T] \"%s\" 502 0", csp->ip_addr_str, http->cmd);
send_crunch_response(csp, error_response(csp, "no-server-data"));
}
log_error(LOG_LEVEL_CLF, "%s - - [%T] \"%s\" 502 0", csp->ip_addr_str, http->cmd);
@@
-2506,34
+2517,38
@@
static void serve(struct client_state *csp)
&& (csp->flags & CSP_FLAG_SERVER_CONNECTION_KEEP_ALIVE)
&& !(csp->flags & CSP_FLAG_SERVER_SOCKET_TAINTED)
&& (csp->cfd != JB_INVALID_SOCKET)
&& (csp->flags & CSP_FLAG_SERVER_CONNECTION_KEEP_ALIVE)
&& !(csp->flags & CSP_FLAG_SERVER_SOCKET_TAINTED)
&& (csp->cfd != JB_INVALID_SOCKET)
- && (csp->sfd != JB_INVALID_SOCKET)
- && socket_is_still_usable(csp->sfd)
- && (latency < csp->server_connection.keep_alive_timeout);
+ && (csp->server_connection.sfd != JB_INVALID_SOCKET)
+ && socket_is_still_usable(csp->server_connection.sfd);
if (continue_chatting)
{
if (continue_chatting)
{
- unsigned int client_timeout;
-
if (!(csp->flags & CSP_FLAG_SERVER_KEEP_ALIVE_TIMEOUT_SET))
{
if (!(csp->flags & CSP_FLAG_SERVER_KEEP_ALIVE_TIMEOUT_SET))
{
- log_error(LOG_LEVEL_CONNECT, "The server didn't specify how long "
- "the connection will stay open. Assume it's only a second.");
- csp->server_connection.keep_alive_timeout = 1;
+ csp->server_connection.keep_alive_timeout = csp->config->default_server_timeout;
+ log_error(LOG_LEVEL_CONNECT,
+ "The server didn't specify how long the connection will stay open. "
+ "Assumed timeout is: %u.", csp->server_connection.keep_alive_timeout);
}
}
+ continue_chatting = (latency < csp->server_connection.keep_alive_timeout);
+ }
+
+ if (continue_chatting)
+ {
+ unsigned int client_timeout;
client_timeout = (unsigned)csp->server_connection.keep_alive_timeout - latency;
log_error(LOG_LEVEL_CONNECT,
client_timeout = (unsigned)csp->server_connection.keep_alive_timeout - latency;
log_error(LOG_LEVEL_CONNECT,
- "Waiting for the next client request. "
+ "Waiting for the next client request
on socket %d
. "
"Keeping the server socket %d to %s open.",
"Keeping the server socket %d to %s open.",
- csp->sfd, csp->server_connection.host);
-
+ csp->cfd, csp->server_connection.sfd, csp->server_connection.host);
if ((csp->flags & CSP_FLAG_CLIENT_CONNECTION_KEEP_ALIVE)
&& data_is_available(csp->cfd, (int)client_timeout)
&& socket_is_still_usable(csp->cfd))
{
log_error(LOG_LEVEL_CONNECT, "Client request arrived in "
if ((csp->flags & CSP_FLAG_CLIENT_CONNECTION_KEEP_ALIVE)
&& data_is_available(csp->cfd, (int)client_timeout)
&& socket_is_still_usable(csp->cfd))
{
log_error(LOG_LEVEL_CONNECT, "Client request arrived in "
- "time or the client closed the connection.");
+ "time or the client closed the connection on socket %d.",
+ csp->cfd);
/*
* Get the csp in a mostly vergin state again.
* XXX: Should be done elsewhere.
/*
* Get the csp in a mostly vergin state again.
* XXX: Should be done elsewhere.
@@
-2563,10
+2578,11
@@
static void serve(struct client_state *csp)
else
{
log_error(LOG_LEVEL_CONNECT,
else
{
log_error(LOG_LEVEL_CONNECT,
- "No additional client request received in time.");
+ "No additional client request received in time on socket %d.",
+ csp->cfd);
#ifdef FEATURE_CONNECTION_SHARING
if ((csp->config->feature_flags & RUNTIME_FEATURE_CONNECTION_SHARING)
#ifdef FEATURE_CONNECTION_SHARING
if ((csp->config->feature_flags & RUNTIME_FEATURE_CONNECTION_SHARING)
- && (socket_is_still_usable(csp->sfd)))
+ && (socket_is_still_usable(csp->s
erver_connection.s
fd)))
{
time_t time_open = time(NULL) - csp->server_connection.timestamp;
{
time_t time_open = time(NULL) - csp->server_connection.timestamp;
@@
-2576,7
+2592,7
@@
static void serve(struct client_state *csp)
}
remember_connection(&csp->server_connection);
}
remember_connection(&csp->server_connection);
- csp->sfd = JB_INVALID_SOCKET;
+ csp->s
erver_connection.s
fd = JB_INVALID_SOCKET;
close_socket(csp->cfd);
csp->cfd = JB_INVALID_SOCKET;
privoxy_mutex_lock(&connection_reuse_mutex);
close_socket(csp->cfd);
csp->cfd = JB_INVALID_SOCKET;
privoxy_mutex_lock(&connection_reuse_mutex);
@@
-2594,27
+2610,33
@@
static void serve(struct client_state *csp)
break;
}
}
break;
}
}
- else if (csp->sfd != JB_INVALID_SOCKET)
+ else if (csp->s
erver_connection.s
fd != JB_INVALID_SOCKET)
{
log_error(LOG_LEVEL_CONNECT,
"The connection on server socket %d to %s isn't reusable. "
{
log_error(LOG_LEVEL_CONNECT,
"The connection on server socket %d to %s isn't reusable. "
- "Closing.", csp->sfd, csp->server_connection.host);
+ "Closing.", csp->s
erver_connection.s
fd, csp->server_connection.host);
}
} while (continue_chatting);
}
} while (continue_chatting);
- mark_connection_closed(&csp->server_connection);
#else
chat(csp);
#endif /* def FEATURE_CONNECTION_KEEP_ALIVE */
#else
chat(csp);
#endif /* def FEATURE_CONNECTION_KEEP_ALIVE */
- if (csp->sfd != JB_INVALID_SOCKET)
+ if (csp->s
erver_connection.s
fd != JB_INVALID_SOCKET)
{
#ifdef FEATURE_CONNECTION_SHARING
{
#ifdef FEATURE_CONNECTION_SHARING
- forget_connection(csp->sfd);
+ if (csp->config->feature_flags & RUNTIME_FEATURE_CONNECTION_SHARING)
+ {
+ forget_connection(csp->server_connection.sfd);
+ }
#endif /* def FEATURE_CONNECTION_SHARING */
#endif /* def FEATURE_CONNECTION_SHARING */
- close_socket(csp->sfd);
+ close_socket(csp->s
erver_connection.s
fd);
}
}
+#ifdef FEATURE_CONNECTION_KEEP_ALIVE
+ mark_connection_closed(&csp->server_connection);
+#endif
+
if (csp->cfd != JB_INVALID_SOCKET)
{
close_socket(csp->cfd);
if (csp->cfd != JB_INVALID_SOCKET)
{
close_socket(csp->cfd);
@@
-3096,9
+3118,6
@@
int main(int argc, char **argv)
#if defined(unix)
{
pid_t pid = 0;
#if defined(unix)
{
pid_t pid = 0;
-#if 0
- int fd;
-#endif
if (!no_daemon)
{
if (!no_daemon)
{
@@
-3126,23
+3145,9
@@
int main(int argc, char **argv)
exit( 0 );
}
/* child */
exit( 0 );
}
/* child */
-#if 1
- /* Should be more portable, but not as well tested */
+
setsid();
setsid();
-#else /* !1 */
-#ifdef __FreeBSD__
- setpgrp(0,0);
-#else /* ndef __FreeBSD__ */
- setpgrp();
-#endif /* ndef __FreeBSD__ */
- fd = open("/dev/tty", O_RDONLY);
- if ( fd )
- {
- /* no error check here */
- ioctl( fd, TIOCNOTTY,0 );
- close ( fd );
- }
-#endif /* 1 */
+
/*
* stderr (fd 2) will be closed later on,
* when the config file has been parsed.
/*
* stderr (fd 2) will be closed later on,
* when the config file has been parsed.
@@
-3410,7
+3415,7
@@
static void listen_loop(void)
}
csp->flags |= CSP_FLAG_ACTIVE;
}
csp->flags |= CSP_FLAG_ACTIVE;
- csp->s
fd
= JB_INVALID_SOCKET;
+ csp->s
erver_connection.sfd
= JB_INVALID_SOCKET;
csp->config = config = load_config();
csp->config = config = load_config();