X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=gateway.c;h=07752b00baaf64a0eaba6c8f94043c5953faa36d;hb=74dd41a427727953abd78097f47db07f884568d5;hp=64ba52364dd1010a93ece0b915bd909b106fde5b;hpb=baaf5d0a1efd2eb231a93777019464c5b4cbe7b7;p=privoxy.git diff --git a/gateway.c b/gateway.c index 64ba5236..07752b00 100644 --- a/gateway.c +++ b/gateway.c @@ -78,8 +78,8 @@ #endif /* HAVE_POLL */ #endif /* def FEATURE_CONNECTION_KEEP_ALIVE */ -static jb_socket socks4_connect(const struct forward_spec * fwd, - const char * target_host, +static jb_socket socks4_connect(const struct forward_spec *fwd, + const char *target_host, int target_port, struct client_state *csp); @@ -129,6 +129,9 @@ struct socks_reply { static const char socks_userid[] = "anonymous"; #ifdef FEATURE_CONNECTION_SHARING +#ifndef FEATURE_CONNECTION_KEEP_ALIVE +#error Using FEATURE_CONNECTION_SHARING without FEATURE_CONNECTION_KEEP_ALIVE is impossible +#endif #define MAX_REUSABLE_CONNECTIONS 100 @@ -575,11 +578,11 @@ static int mark_connection_unused(const struct reusable_connection *connection) * Returns : JB_INVALID_SOCKET => failure, else it is the socket file descriptor. * *********************************************************************/ -jb_socket forwarded_connect(const struct forward_spec * fwd, +jb_socket forwarded_connect(const struct forward_spec *fwd, struct http_request *http, struct client_state *csp) { - const char * dest_host; + const char *dest_host; int dest_port; jb_socket sfd = JB_INVALID_SOCKET; @@ -710,8 +713,8 @@ extern jb_err socks_fuzz(struct client_state *csp) * Returns : JB_INVALID_SOCKET => failure, else a socket file descriptor. * *********************************************************************/ -static jb_socket socks4_connect(const struct forward_spec * fwd, - const char * target_host, +static jb_socket socks4_connect(const struct forward_spec *fwd, + const char *target_host, int target_port, struct client_state *csp) {