/*
- * 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
#include "acl/Arp.h"
#include "acl/FilledChecklist.h"
+#include "cache_cf.h"
+#include "Debug.h"
#include "eui/Eui48.h"
+#include "globals.h"
#include "ip/Address.h"
-#include "wordlist.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
ACLARP::~ACLARP()
{
- if (data)
- data->destroy(SplayNode<Eui::Eui48*>::DefaultFree);
+ if (data) {
+ data->destroy();
+ delete data;
+ }
}
char const *
debugs(28, 5, "aclParseArpData: " << t);
if (sscanf(t, "%[0-9a-fA-F:]", buf) != 1) {
- debugs(28, 0, "aclParseArpData: Bad ethernet address: '" << t << "'");
+ debugs(28, DBG_CRITICAL, "aclParseArpData: Bad ethernet address: '" << t << "'");
safe_free(q);
return NULL;
}
if (!q->decode(buf)) {
- debugs(28, 0, "" << cfg_filename << " line " << config_lineno << ": " << config_input_line);
- debugs(28, 0, "aclParseArpData: Ignoring invalid ARP acl entry: can't parse '" << buf << "'");
+ debugs(28, DBG_CRITICAL, "" << cfg_filename << " line " << config_lineno << ": " << config_input_line);
+ debugs(28, DBG_CRITICAL, "aclParseArpData: Ignoring invalid ARP acl entry: can't parse '" << buf << "'");
safe_free(q);
return NULL;
}
return q;
}
-
/*******************/
/* aclParseArpList */
/*******************/
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);
}
}
ACLFilledChecklist *checklist = Filled(cl);
/* IPv6 does not do ARP */
- if (!checklist->src_addr.IsIPv4()) {
+ if (!checklist->src_addr.isIPv4()) {
debugs(14, 3, "ACLARP::match: IPv4 Required for ARP Lookups. Skipping " << checklist->src_addr );
return 0;
}
/* 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;
}
return memcmp(a, b, sizeof(Eui::Eui48));
}
-static void
-aclDumpArpListWalkee(Eui::Eui48 * const &node, void *state)
-{
- static char buf[48];
- node->encode(buf, 48);
- wordlistAdd((wordlist **)state, 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));
+ }
+};
-wordlist *
+SBufList
ACLARP::dump() const
{
- wordlist *w = NULL;
- data->walk(aclDumpArpListWalkee, &w);
- return w;
+ ArpAclDumpVisitor visitor;
+ data->visit(visitor);
+ return visitor.contents;
}
/* ==== END ARP ACL SUPPORT =============================================== */
#endif /* USE_SQUID_EUI */
+
projects / thirdparty / squid.git / blobdiff