/*
- * $Id: DelayId.cc,v 1.25 2008/01/20 19:46:35 serassio Exp $
+ * $Id$
*
* DEBUG: section 77 Delay Pools
* AUTHOR: Robert Collins <robertc@squid-cache.org>
* 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.
* Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
*/
-#include "config.h"
+#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 DELAY_POOLS
+#if USE_DELAY_POOLS
-#include "squid.h"
+#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"
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;
}
return DelayId();
}
- for (pool = 0; pool < DelayPools::pools(); pool++)
- {
- ACLChecklist ch;
+ for (pool = 0; pool < DelayPools::pools(); pool++) {
+
+ /* 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;
+ 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;
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;
}
-#endif /* DELAY_POOLS */
+#endif /* USE_DELAY_POOLS */