Renamed squid.h to squid-old.h and config.h to squid.h

[thirdparty/squid.git] / src / DelayId.cc

diff --git a/src/DelayId.cc b/src/DelayId.cc
index 28fc96146e7d2431cebb2e848c33ee108315c6a3..66f52ca4d6f3cbd1bd2bbc04955af7625c731953 100644 (file)
--- a/src/DelayId.cc
+++ b/src/DelayId.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: DelayId.cc,v 1.20 2007/04/20 22:24:07 wessels Exp $
+ * $Id$
  *
  * DEBUG: section 77    Delay Pools
  * AUTHOR: Robert Collins <robertc@squid-cache.org>
@@ -23,12 +23,12 @@
  *  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 your option) any later version.
- *  
+ *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
- *  
+ *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
@@ -37,15 +37,17 @@
  * Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
  */
 
-#include "config.h"
-
-#if !DELAY_POOLS
-#error DELAY_POOLS not enabled
-#endif
 #include "squid.h"
+
+/* MS Visual Studio Projects are monolithic, so we need the following
+ * #if to exclude the delay pools code from compile process when not needed.
+ */
+#if USE_DELAY_POOLS
+
+#include "squid-old.h"
 #include "DelayId.h"
 #include "client_side_request.h"
-#include "ACLChecklist.h"
+#include "acl/FilledChecklist.h"
 #include "DelayPools.h"
 #include "DelayPool.h"
 #include "HttpRequest.h"
@@ -57,7 +59,7 @@ DelayId::DelayId () : pool_ (0), compositeId(NULL), markedAsNoDelay(false)
 DelayId::DelayId (unsigned short aPool) :
         pool_ (aPool), compositeId (NULL), markedAsNoDelay (false)
 {
-    debug (77,3)("DelayId::DelayId: Pool %du\n", aPool);
+    debugs(77, 3, "DelayId::DelayId: Pool " << aPool << "u");
 }
 
 DelayId::~DelayId ()
@@ -79,7 +81,7 @@ bool
 DelayId::operator == (DelayId const &rhs) const
 {
     /* Doesn't compare composites properly....
-     * only use to test against default ID's 
+     * only use to test against default ID's
      */
     return pool_ == rhs.pool_ && compositeId == rhs.compositeId;
 }
@@ -98,39 +100,46 @@ DelayId::DelayClient(ClientHttpRequest * http)
     assert(http);
     r = http->request;
 
-    if (r->client_addr.s_addr == INADDR_BROADCAST) {
-        debug(77, 2) ("delayClient: WARNING: Called with 'allones' address, ignoring\n");
+    if (r->client_addr.IsNoAddr()) {
+        debugs(77, 2, "delayClient: WARNING: Called with 'NO_ADDR' address, ignoring");
         return DelayId();
     }
 
     for (pool = 0; pool < DelayPools::pools(); pool++) {
-        ACLChecklist ch;
-        ch.src_addr = r->client_addr;
+
+        /* pools require explicit 'allow' to assign a client into them */
+        if (!DelayPools::delay_data[pool].access) {
+            debugs(77, DBG_IMPORTANT, "delay_pool " << pool <<
+                   " has no delay_access configured. This means that no clients will ever use it.");
+            continue;
+        }
+
+        ACLFilledChecklist ch(DelayPools::delay_data[pool].access, r, NULL);
+#if FOLLOW_X_FORWARDED_FOR
+        if (Config.onoff.delay_pool_uses_indirect_client)
+            ch.src_addr = r->indirect_client_addr;
+        else
+#endif /* FOLLOW_X_FORWARDED_FOR */
+            ch.src_addr = r->client_addr;
         ch.my_addr = r->my_addr;
-        ch.my_port = r->my_port;
 
         if (http->getConn() != NULL)
             ch.conn(http->getConn());
 
-        ch.request = HTTPMSGLOCK(r);
-
-        ch.accessList = cbdataReference(DelayPools::delay_data[pool].access);
-
-        /* cbdataReferenceDone() happens in either fastCheck() or ~ACLCheckList */
+        if (DelayPools::delay_data[pool].theComposite().getRaw() && ch.fastCheck() == ACCESS_ALLOWED) {
 
-        if (DelayPools::delay_data[pool].theComposite().getRaw() &&
-                ch.fastCheck()) {
             DelayId result (pool + 1);
             CompositePoolNode::CompositeSelectionDetails details;
             details.src_addr = ch.src_addr;
+#if USE_AUTH
             details.user = r->auth_user_request;
+#endif
             details.tag = r->tag;
             result.compositePosition(DelayPools::delay_data[pool].theComposite()->id(details));
             return result;
         }
     }
 
-
     return DelayId();
 }
 
@@ -162,7 +171,7 @@ DelayId::bytesWanted(int minimum, int maximum) const
 }
 
 /*
- * this records actual bytes recieved.  always recorded, even if the
+ * this records actual bytes received.  always recorded, even if the
  * class is disabled - it's more efficient to just do it than to do all
  * the checks.
  */
@@ -188,3 +197,5 @@ DelayId::delayRead(DeferredRead const &aRead)
     compositeId->delayRead(aRead);
 
 }
+
+#endif /* USE_DELAY_POOLS */