* Purpose : Main file. Contains main() method, main loop, and
* the main connection-handling function.
*
- * Copyright : Written by and Copyright (C) 2001-2017 the
+ * Copyright : Written by and Copyright (C) 2001-2018 the
* Privoxy team. http://www.privoxy.org/
*
* Based on the Internet Junkbuster originally written
int g_terminate = 0;
#endif
-#if !defined(_WIN32) && !defined(__OS2__) && !defined(AMIGA)
+#if !defined(_WIN32) && !defined(__OS2__)
static void sig_handler(int the_signal);
#endif
static int client_protocol_is_unsupported(const struct client_state *csp, char *req);
static void bind_ports_helper(struct configuration_spec *config, jb_socket sockets[]);
static void close_ports_helper(jb_socket sockets[]);
static void listen_loop(void);
-
-#ifdef AMIGA
-void serve(struct client_state *csp);
-#else /* ifndef AMIGA */
static void serve(struct client_state *csp);
-#endif /* def AMIGA */
#ifdef __BEOS__
static int32 server_thread(void *data);
*
* here?
*/
-#if !defined(_WIN32) && !defined(__OS2__) && !defined(AMIGA)
+#if !defined(_WIN32) && !defined(__OS2__)
/*********************************************************************
*
* Function : sig_handler
#endif
+/*********************************************************************
+ *
+ * Function : get_write_delay
+ *
+ * Description : Parse the delay-response parameter.
+ *
+ * Parameters :
+ * 1 : csp = Current client state (buffers, headers, etc...)
+ *
+ * Returns : Number of milliseconds to delay writes.
+ *
+ *********************************************************************/
+static unsigned int get_write_delay(const struct client_state *csp)
+{
+ unsigned int delay;
+ char *endptr;
+ char *newval;
+
+ if ((csp->action->flags & ACTION_DELAY_RESPONSE) == 0)
+ {
+ return 0;
+ }
+ newval = csp->action->string[ACTION_STRING_DELAY_RESPONSE];
+
+ delay = (unsigned)strtol(newval, &endptr, 0);
+ if (*endptr != '\0')
+ {
+ log_error(LOG_LEVEL_FATAL,
+ "Invalid delay-response{} parameter: '%s'", newval);
+ }
+
+ return delay;
+
+}
+
+
/*********************************************************************
*
* Function : client_protocol_is_unsupported
log_error(LOG_LEVEL_CLF,
"%s - - [%T] \"%s\" 400 0", csp->ip_addr_str, req);
freez(req);
- write_socket(csp->cfd, response, strlen(response));
+ write_socket_delayed(csp->cfd, response, strlen(response),
+ get_write_delay(csp));
return TRUE;
}
csp->ip_addr_str);
log_error(LOG_LEVEL_CLF,
"%s - - [%T] \"%s\" 417 0", csp->ip_addr_str, csp->http->cmd);
- write_socket(csp->cfd, UNSUPPORTED_CLIENT_EXPECTATION_ERROR_RESPONSE,
- strlen(UNSUPPORTED_CLIENT_EXPECTATION_ERROR_RESPONSE));
+ write_socket_delayed(csp->cfd,
+ UNSUPPORTED_CLIENT_EXPECTATION_ERROR_RESPONSE,
+ strlen(UNSUPPORTED_CLIENT_EXPECTATION_ERROR_RESPONSE),
+ get_write_delay(csp));
return TRUE;
}
log_error(LOG_LEVEL_CLF, "%s - - [%T] \"%s\" 400 0",
csp->ip_addr_str, csp->http->cmd);
- write_socket(csp->cfd, CHEADER, strlen(CHEADER));
+ write_socket_delayed(csp->cfd, CHEADER, strlen(CHEADER),
+ get_write_delay(csp));
destroy_list(headers);
return JB_ERR_PARSE;
csp->ip_addr_str, csp->http->cmd, req);
freez(req);
- write_socket(csp->cfd, MISSING_DESTINATION_RESPONSE, strlen(MISSING_DESTINATION_RESPONSE));
+ write_socket_delayed(csp->cfd, MISSING_DESTINATION_RESPONSE,
+ strlen(MISSING_DESTINATION_RESPONSE), get_write_delay(csp));
destroy_list(headers);
return JB_ERR_PARSE;
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))
+ if (write_socket_delayed(csp->cfd, rsp->head, rsp->head_length, get_write_delay(csp))
+ || write_socket_delayed(csp->cfd, rsp->body, rsp->content_length, get_write_delay(csp)))
{
/* There is nothing we can do about it. */
- log_error(LOG_LEVEL_ERROR,
- "Couldn't deliver the error message through client socket %d: %E",
- csp->cfd);
+ log_error(LOG_LEVEL_CONNECT,
+ "Couldn't deliver the error message for %s through client socket %d: %E",
+ http->url, csp->cfd);
}
/* Clean up and return */
log_error(LOG_LEVEL_CONNECT,
"No request line on socket %d received in time. Timeout: %d.",
csp->cfd, csp->config->socket_timeout);
- write_socket(csp->cfd, CLIENT_CONNECTION_TIMEOUT_RESPONSE,
- strlen(CLIENT_CONNECTION_TIMEOUT_RESPONSE));
+ write_socket_delayed(csp->cfd, CLIENT_CONNECTION_TIMEOUT_RESPONSE,
+ strlen(CLIENT_CONNECTION_TIMEOUT_RESPONSE),
+ get_write_delay(csp));
}
else
{
}
if (status != CHUNK_STATUS_BODY_COMPLETE)
{
- write_socket(csp->cfd, CLIENT_BODY_PARSE_ERROR_RESPONSE,
- strlen(CLIENT_BODY_PARSE_ERROR_RESPONSE));
+ write_socket_delayed(csp->cfd, CLIENT_BODY_PARSE_ERROR_RESPONSE,
+ strlen(CLIENT_BODY_PARSE_ERROR_RESPONSE), get_write_delay(csp));
log_error(LOG_LEVEL_CLF,
"%s - - [%T] \"Failed reading chunked client body\" 400 0", csp->ip_addr_str);
return JB_ERR_PARSE;
freez(req);
if (JB_ERR_OK != err)
{
- write_socket(csp->cfd, CHEADER, strlen(CHEADER));
+ write_socket_delayed(csp->cfd, CHEADER, strlen(CHEADER),
+ get_write_delay(csp));
/* XXX: Use correct size */
log_error(LOG_LEVEL_CLF, "%s - - [%T] \"Invalid request\" 400 0", csp->ip_addr_str);
log_error(LOG_LEVEL_ERROR,
csp->ip_addr_str);
log_error(LOG_LEVEL_CLF, "%s - - [%T] \"%s\" 400 0",
csp->ip_addr_str, csp->http->cmd);
- write_socket(csp->cfd, CHEADER, strlen(CHEADER));
+ write_socket_delayed(csp->cfd, CHEADER, strlen(CHEADER), get_write_delay(csp));
return JB_ERR_PARSE;
}
csp->flags |= CSP_FLAG_CLIENT_HEADER_PARSING_DONE;
/*
* A header filter broke the request line - bail out.
*/
- write_socket(csp->cfd, MESSED_UP_REQUEST_RESPONSE, strlen(MESSED_UP_REQUEST_RESPONSE));
+ write_socket_delayed(csp->cfd, MESSED_UP_REQUEST_RESPONSE,
+ strlen(MESSED_UP_REQUEST_RESPONSE), get_write_delay(csp));
/* XXX: Use correct size */
log_error(LOG_LEVEL_CLF,
"%s - - [%T] \"Invalid request generated\" 500 0", csp->ip_addr_str);
csp->http->hostport);
}
else if (((csp->flags & CSP_FLAG_PIPELINED_REQUEST_WAITING) == 0)
- && (flush_socket(csp->server_connection.sfd, csp->client_iob) < 0))
+ && (flush_iob(csp->server_connection.sfd, csp->client_iob, 0) < 0))
{
write_failure = 1;
log_error(LOG_LEVEL_CONNECT, "Failed sending request body to: %s: %E",
struct http_request *http;
long len = 0; /* for buffer sizes (and negative error codes) */
int buffer_and_filter_content = 0;
+ unsigned int write_delay;
/* Skeleton for HTTP response, if we should intercept the request */
struct http_response *rsp;
#ifdef FEATURE_CONNECTION_KEEP_ALIVE
watch_client_socket = 0 == (csp->flags & CSP_FLAG_PIPELINED_REQUEST_WAITING);
#endif
+ write_delay = get_write_delay(csp);
for (;;)
{
log_error(LOG_LEVEL_FATAL, "Out of memory parsing server header");
}
- if (write_socket(csp->cfd, hdr, strlen(hdr))
- || write_socket(csp->cfd,
- ((p != NULL) ? p : csp->iob->cur), (size_t)csp->content_length))
+ if (write_socket_delayed(csp->cfd, hdr, strlen(hdr), write_delay)
+ || write_socket_delayed(csp->cfd,
+ ((p != NULL) ? p : csp->iob->cur),
+ (size_t)csp->content_length, write_delay))
{
log_error(LOG_LEVEL_ERROR, "write modified content to client failed: %E");
freez(hdr);
}
hdrlen = strlen(hdr);
- if (write_socket(csp->cfd, hdr, hdrlen)
- || ((flushed = flush_socket(csp->cfd, csp->iob)) < 0)
- || (write_socket(csp->cfd, csp->receive_buffer, (size_t)len)))
+ if (write_socket_delayed(csp->cfd, hdr, hdrlen, write_delay)
+ || ((flushed = flush_iob(csp->cfd, csp->iob, write_delay) < 0)
+ || (write_socket_delayed(csp->cfd, csp->receive_buffer,
+ (size_t)len, write_delay))))
{
log_error(LOG_LEVEL_CONNECT,
"Flush header and buffers to client failed: %E");
}
else
{
- if (write_socket(csp->cfd, csp->receive_buffer, (size_t)len))
+ if (write_socket_delayed(csp->cfd, csp->receive_buffer,
+ (size_t)len, write_delay))
{
log_error(LOG_LEVEL_ERROR, "write to client failed: %E");
mark_server_socket_tainted(csp);
"Applying the MS IIS5 hack didn't help.");
log_error(LOG_LEVEL_CLF,
"%s - - [%T] \"%s\" 502 0", csp->ip_addr_str, http->cmd);
- write_socket(csp->cfd, INVALID_SERVER_HEADERS_RESPONSE,
- strlen(INVALID_SERVER_HEADERS_RESPONSE));
+ write_socket_delayed(csp->cfd,
+ INVALID_SERVER_HEADERS_RESPONSE,
+ strlen(INVALID_SERVER_HEADERS_RESPONSE), write_delay);
mark_server_socket_tainted(csp);
return;
}
csp->headers->first->str);
log_error(LOG_LEVEL_CLF,
"%s - - [%T] \"%s\" 502 0", csp->ip_addr_str, http->cmd);
- write_socket(csp->cfd, INVALID_SERVER_HEADERS_RESPONSE,
- strlen(INVALID_SERVER_HEADERS_RESPONSE));
+ write_socket_delayed(csp->cfd, INVALID_SERVER_HEADERS_RESPONSE,
+ strlen(INVALID_SERVER_HEADERS_RESPONSE), write_delay);
free_http_request(http);
mark_server_socket_tainted(csp);
return;
{
log_error(LOG_LEVEL_CLF,
"%s - - [%T] \"%s\" 502 0", csp->ip_addr_str, http->cmd);
- write_socket(csp->cfd, INVALID_SERVER_HEADERS_RESPONSE,
- strlen(INVALID_SERVER_HEADERS_RESPONSE));
+ write_socket_delayed(csp->cfd, INVALID_SERVER_HEADERS_RESPONSE,
+ strlen(INVALID_SERVER_HEADERS_RESPONSE), write_delay);
free_http_request(http);
mark_server_socket_tainted(csp);
return;
* may be in the buffer)
*/
- if (write_socket(csp->cfd, hdr, strlen(hdr))
- || ((len = flush_socket(csp->cfd, csp->iob)) < 0))
+ if (write_socket_delayed(csp->cfd, hdr, strlen(hdr), write_delay)
+ || ((len = flush_iob(csp->cfd, csp->iob, write_delay)) < 0))
{
log_error(LOG_LEVEL_CONNECT, "write header to client failed: %E");
"Applying the MS IIS5 hack didn't help.");
log_error(LOG_LEVEL_CLF,
"%s - - [%T] \"%s\" 502 0", csp->ip_addr_str, http->cmd);
- write_socket(csp->cfd, INVALID_SERVER_HEADERS_RESPONSE,
- strlen(INVALID_SERVER_HEADERS_RESPONSE));
+ write_socket_delayed(csp->cfd, INVALID_SERVER_HEADERS_RESPONSE,
+ strlen(INVALID_SERVER_HEADERS_RESPONSE), write_delay);
mark_server_socket_tainted(csp);
return;
}
* message to the client, flush the rest, and get out of the way.
*/
list_remove_all(csp->headers);
- if (write_socket(csp->cfd, CSUCCEED, strlen(CSUCCEED)))
+ if (write_socket_delayed(csp->cfd, CSUCCEED,
+ strlen(CSUCCEED), get_write_delay(csp)))
{
return;
}
* Returns : N/A
*
*********************************************************************/
-#ifdef AMIGA
-void serve(struct client_state *csp)
-#else /* ifndef AMIGA */
static void serve(struct client_state *csp)
-#endif /* def AMIGA */
{
int config_file_change_detected = 0; /* Only used for debugging */
#ifdef FEATURE_CONNECTION_KEEP_ALIVE
clients->next = NULL;
/* XXX: factor out initialising after the next stable release. */
-#ifdef AMIGA
- InitAmiga();
-#elif defined(_WIN32)
+#ifdef _WIN32
InitWin32();
#endif
* are handled when and where they occur without relying
* on a signal.
*/
-#if !defined(_WIN32) && !defined(__OS2__) && !defined(AMIGA)
+#if !defined(_WIN32) && !defined(__OS2__)
{
int idx;
const int catched_signals[] = { SIGTERM, SIGINT, SIGHUP };
for (;;)
#endif
{
-#if !defined(FEATURE_PTHREAD) && !defined(_WIN32) && !defined(__BEOS__) && !defined(AMIGA) && !defined(__OS2__)
+#if !defined(FEATURE_PTHREAD) && !defined(_WIN32) && !defined(__BEOS__) && !defined(__OS2__)
while (waitpid(-1, NULL, WNOHANG) > 0)
{
/* zombie children */
}
-#endif /* !defined(FEATURE_PTHREAD) && !defined(_WIN32) && !defined(__BEOS__) && !defined(AMIGA) */
+#endif /* !defined(FEATURE_PTHREAD) && !defined(_WIN32) && !defined(__BEOS__) */
/*
* Free data that was used by died threads
if (!accept_connection(csp, bfds))
{
log_error(LOG_LEVEL_CONNECT, "accept failed: %E");
-
-#ifdef AMIGA
- if (!childs)
- {
- exit(1);
- }
-#endif
freez(csp_list);
continue;
}
log_error(LOG_LEVEL_CONNECT,
"Rejecting connection from %s. Maximum number of connections reached.",
csp->ip_addr_str);
- write_socket(csp->cfd, TOO_MANY_CONNECTIONS_RESPONSE,
- strlen(TOO_MANY_CONNECTIONS_RESPONSE));
+ write_socket_delayed(csp->cfd, TOO_MANY_CONNECTIONS_RESPONSE,
+ strlen(TOO_MANY_CONNECTIONS_RESPONSE), get_write_delay(csp));
close_socket(csp->cfd);
freez(csp->ip_addr_str);
freez(csp->listen_addr_str);
}
#endif
-#if defined(AMIGA) && !defined(SELECTED_ONE_OPTION)
-#define SELECTED_ONE_OPTION
- csp->cfd = ReleaseSocket(csp->cfd, -1);
-
-#ifdef __amigaos4__
- child_id = (int)CreateNewProcTags(NP_Entry, (ULONG)server_thread,
- NP_Output, Output(),
- NP_CloseOutput, FALSE,
- NP_Name, (ULONG)"privoxy child",
- NP_Child, TRUE,
- TAG_DONE);
-#else
- child_id = (int)CreateNewProcTags(NP_Entry, (ULONG)server_thread,
- NP_Output, Output(),
- NP_CloseOutput, FALSE,
- NP_Name, (ULONG)"privoxy child",
- NP_StackSize, 200*1024,
- TAG_DONE);
-#endif
- if (0 != child_id)
- {
- childs++;
- ((struct Task *)child_id)->tc_UserData = csp;
- Signal((struct Task *)child_id, SIGF_SINGLE);
- Wait(SIGF_SINGLE);
- }
-#endif
-
#if !defined(SELECTED_ONE_OPTION)
child_id = fork();
log_error(LOG_LEVEL_ERROR,
"Unable to take any additional connections: %E. Active threads: %d",
active_threads);
- write_socket(csp->cfd, TOO_MANY_CONNECTIONS_RESPONSE,
- strlen(TOO_MANY_CONNECTIONS_RESPONSE));
+ write_socket_delayed(csp->cfd, TOO_MANY_CONNECTIONS_RESPONSE,
+ strlen(TOO_MANY_CONNECTIONS_RESPONSE), get_write_delay(csp));
close_socket(csp->cfd);
csp->flags &= ~CSP_FLAG_ACTIVE;
}
projects / privoxy.git / blobdiff