X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=gateway.h;h=0f28a6336eda3446700e8ece3674ed047d2e1e5a;hp=0782257e9bca7e50d44cad827043997ceda8ce12;hb=f2be4cfb0e98db4cf6fcf33f3f1efadabe399887;hpb=d56efecfe904e791090d0fdce8388bf1b5bb28f5

diff --git a/gateway.h b/gateway.h
index 0782257e..0f28a633 100644
--- a/gateway.h
+++ b/gateway.h
@@ -1,6 +1,5 @@
 #ifndef GATEWAY_H_INCLUDED
 #define GATEWAY_H_INCLUDED
-#define GATEWAY_H_VERSION "$Id: gateway.h,v 1.16 2009/05/16 13:27:20 fabiankeil Exp $"
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/gateway.h,v $
@@ -9,14 +8,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
- *                Privoxy team. http://www.privoxy.org/
+ * Copyright   :  Written by and Copyright (C) 2001-2009 the
+ *                Privoxy team. https://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
@@ -37,53 +36,30 @@
  *********************************************************************/
 
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 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);
-#ifdef FEATURE_CONNECTION_KEEP_ALIVE
 
-/*
- * Default number of seconds after which an
- * open connection will no longer be reused.
- */
-#define DEFAULT_KEEP_ALIVE_TIMEOUT 180
-
-extern void set_keep_alive_timeout(unsigned int timeout);
+#ifdef FEATURE_CONNECTION_SHARING
 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 */
+
 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 /* FEATURE_CONNECTION_KEEP_ALIVE */
-
-
-/*
- * Solaris fix
- */
-#ifndef INADDR_NONE
-#define INADDR_NONE -1
-#endif
-
-/*
- * Revision control strings from this header and associated .c file
- */
-extern const char gateway_rcs[];
-extern const char gateway_h_rcs[];
+#endif /* def FEATURE_CONNECTION_KEEP_ALIVE */
 
-#ifdef __cplusplus
-} /* extern "C" */
+#ifdef FUZZ
+extern jb_err socks_fuzz(struct client_state *csp);
 #endif
 
 #endif /* ndef GATEWAY_H_INCLUDED */