X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=gateway.h;h=4694a5bd43d13e73a775ef3df9c381074947da56;hp=7e39178334b57dd29e306059f9bfc942eac3d151;hb=c100c19882b5374a2733d34a1d99596cbe0eb355;hpb=d68b67d85e08f5cb0d5d915c38aa6a5481e10219 diff --git a/gateway.h b/gateway.h index 7e391783..4694a5bd 100644 --- a/gateway.h +++ b/gateway.h @@ -1,6 +1,6 @@ #ifndef GATEWAY_H_INCLUDED #define GATEWAY_H_INCLUDED -#define GATEWAY_H_VERSION "$Id: gateway.h,v 1.17 2009/07/11 14:49:09 fabiankeil Exp $" +#define GATEWAY_H_VERSION "$Id: gateway.h,v 1.21 2011/09/04 11:10:56 fabiankeil Exp $" /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/gateway.h,v $ @@ -9,14 +9,14 @@ * using a "gateway" (i.e. HTTP proxy and/or SOCKS4 * proxy). Also contains the list of gateway types. * - * Copyright : Written by and Copyright (C) 2001 the SourceForge + * Copyright : Written by and Copyright (C) 2001-2009 the * Privoxy team. http://www.privoxy.org/ * * Based on the Internet Junkbuster originally written - * by and Copyright (C) 1997 Anonymous Coders and + * by and Copyright (C) 1997 Anonymous Coders and * Junkbusters Corporation. http://www.junkbusters.com * - * This program is free software; you can redistribute it + * This program is free software; you can redistribute it * and/or modify it under the terms of the GNU General * Public License as published by the Free Software * Foundation; either version 2 of the License, or (at @@ -45,8 +45,8 @@ struct forward_spec; struct http_request; struct client_state; -extern jb_socket forwarded_connect(const struct forward_spec * fwd, - struct http_request *http, +extern jb_socket forwarded_connect(const struct forward_spec * fwd, + struct http_request *http, struct client_state *csp); /* @@ -59,25 +59,17 @@ extern jb_socket forwarded_connect(const struct forward_spec * fwd, extern void set_keep_alive_timeout(unsigned int timeout); extern void initialize_reusable_connections(void); extern void forget_connection(jb_socket sfd); -extern void remember_connection(const struct client_state *csp, - const struct forward_spec *fwd); +extern void remember_connection(const struct reusable_connection *connection); extern int close_unusable_connections(void); #endif /* FEATURE_CONNECTION_SHARING */ -#ifdef FEATURE_CONNECTION_KEEP_ALIVE extern void mark_connection_closed(struct reusable_connection *closed_connection); +#ifdef FEATURE_CONNECTION_KEEP_ALIVE extern int connection_destination_matches(const struct reusable_connection *connection, const struct http_request *http, const struct forward_spec *fwd); #endif /* def FEATURE_CONNECTION_KEEP_ALIVE */ -/* - * Solaris fix - */ -#ifndef INADDR_NONE -#define INADDR_NONE -1 -#endif - /* * Revision control strings from this header and associated .c file */