remove ssl_proxy and passthrough_proxy

diff --git a/src/cache_cf.cc b/src/cache_cf.cc
index d76626d280bd7da1763fb07006184c91428172b9..decb0b935ee676cd64ac5d9ef8b30d115939925a 100644 (file)
--- a/src/cache_cf.cc
+++ b/src/cache_cf.cc
@@ -1,5 +1,5 @@
 /*
- * $Id: cache_cf.cc,v 1.205 1997/07/14 23:44:57 wessels Exp $
+ * $Id: cache_cf.cc,v 1.206 1997/07/15 23:15:34 wessels Exp $
  *
  * DEBUG: section 3     Configuration File Parsing
  * AUTHOR: Harvest Derived
@@ -213,6 +213,7 @@ static void
 configDoConfigure(void)
 {
     LOCAL_ARRAY(char, buf, BUFSIZ);
+    cache_peer *p;
     memset(&Config2, '\0', sizeof(SquidConfig2));
     if (Config.Accel.host) {
         snprintf(buf, BUFSIZ, "http://%s:%d", Config.Accel.host, Config.Accel.port);
@@ -241,6 +242,16 @@ configDoConfigure(void)
        Config.appendDomainLen = 0;
     safe_free(debug_options)
        debug_options = xstrdup(Config.debugOptions);
+    /* ICK */
+    for (p = Config.peers; p; p=p->next) {
+       neighborAdd(p->host,
+               p->type,        
+               p->http,
+               p->icp,
+               p->options,
+               p->weight,
+               p->mcast_ttl);
+    }
 }
 
 /* Parse a time specification from the config file.  Store the

diff --git a/src/cf.data.pre b/src/cf.data.pre
index 25d056c9f1f4c09ab9e14413df5b138c39b28062..dabb47373ae4b50388efb66ff500be7026b31b42 100644 (file)
--- a/src/cf.data.pre
+++ b/src/cf.data.pre
@@ -1461,43 +1461,6 @@ DOC_START
 tcp_recv_bufsize 0 bytes
 DOC_END
 
-
-NAME: ssl_proxy
-TYPE: cache_peer
-LOC: Config.sslProxy
-DEFAULT: none
-DOC_START
-       Specify a hostname and port number where all SSL requests
-       should be forwarded to.
-
-       XXX For now, ssl_proxy has the same format as cache_peer
-       because they share the same data structure.  All files
-       must be present in the config file, but some will be ignored.
-
-       Usage: ssl_proxy hostname type-ignored port icpport-ignored
-
-ssl_proxy
-DOC_END
-
-
-NAME: passthrough_proxy
-TYPE: cache_peer
-LOC: Config.passProxy
-DEFAULT: none
-DOC_START
-       Specify a hostname and port number where all non-GET (i.e.
-       POST, PUT) requests should be forwarded to.
-
-       XXX For now, ssl_proxy has the same format as cache_peer
-       because they share the same data structure.  All files
-       must be present in the config file, but some will be ignored.
-
-       Usage: passthrough_proxy hostname type-ignored port icpport-ignored
-
-passthrough_proxy
-DOC_END
-
-
 NAME: proxy_auth_passwd
 TYPE: string
 LOC: Config.proxyAuth.File

diff --git a/src/enums.h b/src/enums.h
index 339764d940ff0896373aaf603b8d36bc2f2eca18..12706af61e4792191904600d903c72e98ea1371d 100644 (file)
--- a/src/enums.h
+++ b/src/enums.h
@@ -157,8 +157,6 @@ typedef enum {
     SOURCE_FASTEST,
     SIBLING_UDP_HIT_OBJ,
     PARENT_UDP_HIT_OBJ,
-    PASS_PARENT,
-    SSL_PARENT,
     ROUNDROBIN_PARENT,
     HIER_MAX
 } hier_code;

diff --git a/src/neighbors.cc b/src/neighbors.cc
index 9b93093cf494e69579d0257bf8da20fb37252949..6871e649cf33305ef58608dcd7b3142e4ec378e4 100644 (file)
--- a/src/neighbors.cc
+++ b/src/neighbors.cc
@@ -1,5 +1,5 @@
 /*
- * $Id: neighbors.cc,v 1.149 1997/07/07 05:29:49 wessels Exp $
+ * $Id: neighbors.cc,v 1.150 1997/07/15 23:15:36 wessels Exp $
  *
  * DEBUG: section 15    Neighbor Routines
  * AUTHOR: Harvest Derived
@@ -136,8 +136,6 @@ static struct {
     peer *peers_tail;
     peer *first_ping;
     peer *removed;
-    peer *ssl_parent;
-    peer *pass_parent;
 } Peers = {
 
     0, NULL, NULL, NULL
@@ -343,18 +341,6 @@ getDefaultParent(request_t * request)
     return NULL;
 }
 
-peer *
-getSslParent(void)
-{
-       return Peers.ssl_parent;
-}
-
-peer *
-getPassParent(void)
-{
-       return Peers.pass_parent;
-}
-
 peer *
 getNextPeer(peer * p)
 {
@@ -395,9 +381,7 @@ neighborsDestroy(void)
 {
     peer *p = NULL;
     peer *next = NULL;
-
     debug(15, 3) ("neighborsDestroy: called\n");
-
     for (p = Peers.peers_head; p; p = next) {
        next = p->next;
        peerDestroy(p);

diff --git a/src/peer_select.cc b/src/peer_select.cc
index d8229ca0ee72d054efe2302521280a1c70c45e07..cf256e88aa9a6ceef4927e442a414506e82229ac 100644 (file)
--- a/src/peer_select.cc
+++ b/src/peer_select.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: peer_select.cc,v 1.18 1997/07/14 05:57:55 wessels Exp $
+ * $Id: peer_select.cc,v 1.19 1997/07/15 23:15:36 wessels Exp $
  *
  * DEBUG: section 44    Peer Selection Algorithm
  * AUTHOR: Duane Wessels
@@ -102,16 +102,6 @@ peer *
 peerGetSomeParent(request_t * request, hier_code * code)
 {
     peer *p;
-    if (request->method == METHOD_CONNECT)
-       if ((p = getSslParent())) {
-           *code = SSL_PARENT;
-           return p;
-       }
-    if (request->method != METHOD_GET)
-       if ((p = getPassParent())) {
-           *code = PASS_PARENT;
-           return p;
-       }
     if ((p = getDefaultParent(request))) {
        *code = DEFAULT_PARENT;
        return p;

diff --git a/src/protos.h b/src/protos.h
index 196fc080cc737100b776b00156286fd365e3198d..a1d55627eac6383a3a06a83c84090e0c49aabb62 100644 (file)
--- a/src/protos.h
+++ b/src/protos.h
@@ -584,5 +584,3 @@ extern void useragentOpenLog _PARAMS((void));
 extern void useragentRotateLog _PARAMS((void));
 extern void logUserAgent _PARAMS((const char *, const char *));
 extern peer_t parseNeighborType _PARAMS((const char *s));
-extern peer *getSslParent _PARAMS((void));
-extern peer *getPassParent _PARAMS((void));