From: robertc <>
Date: Sun, 21 Sep 2003 18:06:06 +0000 (+0000)
Subject: Summary: Fix outgoing_address and tos.
X-Git-Tag: SQUID_3_0_PRE4~1202
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c35e260d21b8d9eca45501971f0c7972099ceedf;p=thirdparty%2Fsquid.git

Summary: Fix outgoing_address and tos.
Keywords:

Fix outgoing_address and tos.
---

diff --git a/src/ACLChecklist.cc b/src/ACLChecklist.cc
index bde58fae93..ee579fb4ae 100644
--- a/src/ACLChecklist.cc
+++ b/src/ACLChecklist.cc
@@ -1,5 +1,5 @@
 /*
- * $Id: ACLChecklist.cc,v 1.15 2003/09/21 00:30:48 robertc Exp $
+ * $Id: ACLChecklist.cc,v 1.16 2003/09/21 12:06:06 robertc Exp $
  *
  * DEBUG: section 28    Access Control
  * AUTHOR: Duane Wessels
@@ -191,9 +191,18 @@ ACLChecklist::markFinished()
     debug (28,3)("ACLChecklist::markFinished: %p checklist processing finished\n", this);
 }
 
+void
+ACLChecklist::preCheck()
+{
+    debug(28, 3) ("ACLChecklist::preCheck: %p checking '%s'\n", this, accessList->cfgline);
+    /* what is our result on a match? */
+    currentAnswer(accessList->allow);
+}
+
 void
 ACLChecklist::checkAccessList()
 {
+    preCheck();
     /* does the current AND clause match */
     matchAclListSlow(accessList->aclList);
 }
@@ -236,9 +245,6 @@ void
 ACLChecklist::matchAclList(const acl_list * head, bool const fast)
 {
     PROF_start(aclMatchAclList);
-    debug(28, 3) ("ACLChecklist::matchAclList: %p checking '%s'\n", this, accessList->cfgline);
-    /* what is our result on a match? */
-    currentAnswer(accessList->allow);
     const acl_list *node = head;
 
     while (node) {
@@ -399,6 +405,7 @@ ACLChecklist::fastCheck()
     debug(28, 5) ("aclCheckFast: list: %p\n", accessList);
 
     while (accessList) {
+        preCheck();
         matchAclListFast(accessList->aclList);
 
         if (finished()) {
diff --git a/src/ACLChecklist.h b/src/ACLChecklist.h
index 544411e02f..0e06f3a468 100644
--- a/src/ACLChecklist.h
+++ b/src/ACLChecklist.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: ACLChecklist.h,v 1.18 2003/09/21 00:30:48 robertc Exp $
+ * $Id: ACLChecklist.h,v 1.19 2003/09/21 12:06:06 robertc Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -93,6 +93,7 @@ class NullState : public AsyncState
     void nonBlockingCheck(PF * callback, void *callback_data);
     int fastCheck();
     void checkCallback(allow_t answer);
+    void preCheck();
     _SQUID_INLINE_ bool matchAclListFast(const acl_list * list);
     _SQUID_INLINE_ void matchAclListSlow(const acl_list * list);
     ConnStateData::Pointer conn();