X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=gateway.h;h=989704432213e12388954031b88f63b124339c3e;hb=276df6c8c87a0b91fe0d22505dbde65f90c7b14b;hp=691455527ebff2362920dc3b5acebde45e67ad45;hpb=c75584ebcc79f939fb4ec9c8f842cef6692640c7;p=privoxy.git

diff --git a/gateway.h b/gateway.h
index 69145552..98970443 100644
--- a/gateway.h
+++ b/gateway.h
@@ -1,9 +1,9 @@
-#ifndef _GATEWAY_H
-#define _GATEWAY_H
-#define GATEWAY_H_VERSION "$Id: gateway.h,v 1.1 2001/05/13 21:57:06 administrator Exp $"
+#ifndef GATEWAY_H_INCLUDED
+#define GATEWAY_H_INCLUDED
+#define GATEWAY_H_VERSION "$Id: gateway.h,v 1.3 2001/07/29 18:58:15 jongfoster Exp $"
 /*********************************************************************
  *
- * File        :  $Source: /home/administrator/cvs/ijb/gateway.h,v $
+ * File        :  $Source: /cvsroot/ijbswa/current/gateway.h,v $
  *
  * Purpose     :  Contains functions to connect to a server, possibly
  *                using a "gateway" (i.e. HTTP proxy and/or SOCKS4
@@ -36,21 +36,36 @@
  *
  * Revisions   :
  *    $Log: gateway.h,v $
+ *    Revision 1.3  2001/07/29 18:58:15  jongfoster
+ *    Removing nested #includes, adding forward declarations for needed
+ *    structures, and changing the #define _FILENAME_H to FILENAME_H_INCLUDED.
+ *
+ *    Revision 1.2  2001/06/07 23:12:14  jongfoster
+ *    Removing gateways[] list - no longer used.
+ *    Replacing function pointer in struct gateway with a directly
+ *    called function forwarded_connect(), which can do the common
+ *    task of deciding whether to connect to the web server or HTTP
+ *    proxy.
+ *    Replacing struct gateway with struct forward_spec
+ *
+ *    Revision 1.1.1.1  2001/05/15 13:58:54  oes
+ *    Initial import of version 2.9.3 source tree
+ *
  *
  *********************************************************************/
 
 
-#include "project.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-extern const struct gateway gateways[];
-extern const struct gateway *gw_default;
+struct forward_spec;
+struct http_request;
+struct client_state;
 
-extern int socks4_connect(const struct gateway *gw, struct http_request *http, struct client_state *csp);
-extern int direct_connect(const struct gateway *gw, struct http_request *http, struct client_state *csp);
+extern jb_socket forwarded_connect(const struct forward_spec * fwd, 
+                                   struct http_request *http, 
+                                   struct client_state *csp);
 
 /* Revision control strings from this header and associated .c file */
 extern const char gateway_rcs[];
@@ -60,7 +75,7 @@ extern const char gateway_h_rcs[];
 } /* extern "C" */
 #endif
 
-#endif /* ndef _GATEWAY_H */
+#endif /* ndef GATEWAY_H_INCLUDED */
 
 /*
   Local Variables: