SourceFormat Enforcement

[thirdparty/squid.git] / src / acl / Arp.cc

diff --git a/src/acl/Arp.cc b/src/acl/Arp.cc
index 0867cb99b220e96ed90ace9d748e16e055525b39..89d197d2a24c43e01524cebea5f3dc1ea6ba1b1d 100644 (file)
--- a/src/acl/Arp.cc
+++ b/src/acl/Arp.cc
@@ -1,37 +1,13 @@
 /*
- * DEBUG: section 28    Access Control
- * AUTHOR: Duane Wessels
+ * Copyright (C) 1996-2015 The Squid Software Foundation and contributors
  *
- * SQUID Web Proxy Cache          http://www.squid-cache.org/
- * ----------------------------------------------------------
- *
- *  Squid is the result of efforts by numerous individuals from
- *  the Internet community; see the CONTRIBUTORS file for full
- *  details.   Many organizations have provided support for Squid's
- *  development; see the SPONSORS file for full details.  Squid is
- *  Copyrighted (C) 2001 by the Regents of the University of
- *  California; see the COPYRIGHT file for full details.  Squid
- *  incorporates software developed and/or copyrighted by other
- *  sources; see the CREDITS file for full details.
- *
- *  This program is free software; you can redistribute it and/or modify
- *  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>
+ * Squid software is distributed under GPLv2+ license and includes
+ * contributions from numerous individuals and organizations.
+ * Please see the COPYING and CONTRIBUTORS files for details.
  */
 
+/* DEBUG: section 28    Access Control */
+
 #include "squid.h"
 
 #if USE_SQUID_EUI
@@ -44,10 +20,9 @@
 #include "globals.h"
 #include "ip/Address.h"
 
-static void aclParseArpList(SplayNode<Eui::Eui48 *> **curlist);
-static int aclMatchArp(SplayNode<Eui::Eui48 *> **dataptr, Ip::Address &c);
-static SplayNode<Eui::Eui48 *>::SPLAYCMP aclArpCompare;
-static SplayNode<Eui::Eui48 *>::SPLAYWALKEE aclDumpArpListWalkee;
+static void aclParseArpList(Splay<Eui::Eui48 *> **curlist);
+static int aclMatchArp(Splay<Eui::Eui48 *> **dataptr, Ip::Address &c);
+static Splay<Eui::Eui48 *>::SPLAYCMP aclArpCompare;
 
 ACL *
 ACLARP::clone() const
@@ -66,8 +41,10 @@ ACLARP::ACLARP (ACLARP const & old) : data (NULL), class_ (old.class_)
 
 ACLARP::~ACLARP()
 {
-    if (data)
-        data->destroy(SplayNode<Eui::Eui48*>::DefaultFree);
+    if (data) {
+        data->destroy();
+        delete data;
+    }
 }
 
 char const *
@@ -137,21 +114,22 @@ aclParseArpData(const char *t)
 void
 ACLARP::parse()
 {
+    if (!data)
+        data = new Splay<Eui::Eui48 *>();
     aclParseArpList(&data);
 }
 
 void
-aclParseArpList(SplayNode<Eui::Eui48 *> **curlist)
+aclParseArpList(Splay<Eui::Eui48 *> **curlist)
 {
     char *t = NULL;
-    SplayNode<Eui::Eui48*> **Top = curlist;
     Eui::Eui48 *q = NULL;
 
     while ((t = strtokFile())) {
         if ((q = aclParseArpData(t)) == NULL)
             continue;
 
-        *Top = (*Top)->insert(q, aclArpCompare);
+        (*curlist)->insert(q, aclArpCompare);
     }
 }
 
@@ -173,21 +151,14 @@ ACLARP::match(ACLChecklist *cl)
 /* aclMatchArp */
 /***************/
 int
-aclMatchArp(SplayNode<Eui::Eui48 *> **dataptr, Ip::Address &c)
+aclMatchArp(Splay<Eui::Eui48 *> **dataptr, Ip::Address &c)
 {
-    Eui::Eui48 result;
-    SplayNode<Eui::Eui48 *> **Top = dataptr;
-
-    if (result.lookup(c)) {
-        /* Do ACL match lookup */
-        *Top = (*Top)->splay(&result, aclArpCompare);
-        debugs(28, 3, "aclMatchArp: '" << c << "' " << (splayLastResult ? "NOT found" : "found"));
-        return (0 == splayLastResult);
+    Eui::Eui48 lookingFor;
+    if (lookingFor.lookup(c)) {
+        Eui::Eui48 * const* lookupResult = (*dataptr)->find(&lookingFor,aclArpCompare);
+        debugs(28, 3, "aclMatchArp: '" << c << "' " << (lookupResult ? "found" : "NOT found"));
+        return (lookupResult != NULL);
     }
-
-    /*
-     * Address was not found on any interface
-     */
     debugs(28, 3, "aclMatchArp: " << c << " NOT found");
     return 0;
 }
@@ -198,22 +169,25 @@ aclArpCompare(Eui::Eui48 * const &a, Eui::Eui48 * const &b)
     return memcmp(a, b, sizeof(Eui::Eui48));
 }
 
-static void
-aclDumpArpListWalkee(Eui::Eui48 * const &node, void *state)
-{
-    static char buf[48];
-    node->encode(buf, 48);
-    static_cast<SBufList *>(state)->push_back(SBuf(buf));
-}
+// visitor functor to collect the contents of the Arp Acl
+struct ArpAclDumpVisitor {
+    SBufList contents;
+    void operator() (const Eui::Eui48 * v) {
+        static char buf[48];
+        v->encode(buf,48);
+        contents.push_back(SBuf(buf));
+    }
+};
 
 SBufList
 ACLARP::dump() const
 {
-    SBufList sl;
-    data->walk(aclDumpArpListWalkee, &sl);
-    return sl;
+    ArpAclDumpVisitor visitor;
+    data->visit(visitor);
+    return visitor.contents;
 }
 
 /* ==== END ARP ACL SUPPORT =============================================== */
 
 #endif /* USE_SQUID_EUI */
+