-#include "squid.h"
-#include "structs.h"
+/*
+ * Copyright (C) 1996-2020 The Squid Software Foundation and contributors
+ *
+ * Squid software is distributed under GPLv2+ license and includes
+ * contributions from numerous individuals and organizations.
+ * Please see the COPYING and CONTRIBUTORS files for details.
+ */
-#include "ConfigParser.h"
+#include "squid.h"
#include "acl/Gadgets.h"
+#include "acl/Tree.h"
#include "adaptation/AccessRule.h"
#include "adaptation/Service.h"
#include "adaptation/ServiceGroups.h"
-
+#include "ConfigParser.h"
+#include "Debug.h"
int Adaptation::AccessRule::LastId = 0;
Adaptation::AccessRule::~AccessRule()
{
- // XXX: leaking acls here?
+ delete acl;
}
void
Adaptation::AccessRule::parse(ConfigParser &parser)
{
- aclParseAccessLine(parser, &acl);
+ aclParseAccessLine("adaptation_access", parser, &acl);
}
void
debugs(93,7, HERE << "no service group: " << groupId);
// try to add a one-service group
if (FindService(groupId) != NULL) {
- ServiceGroup *g = new SingleService(groupId);
+ ServiceGroupPointer g = new SingleService(groupId);
g->finalize(); // explicit groups were finalized before rules
AllGroups().push_back(g);
}
}
if (!group()) {
- debugs(93,0, "ERROR: Unknown adaptation service or group name: '" <<
+ debugs(93, DBG_CRITICAL, "ERROR: Unknown adaptation service or group name: '" <<
groupId << "'"); // TODO: fail on failures
}
}
-Adaptation::ServiceGroup *
+Adaptation::ServiceGroupPointer
Adaptation::AccessRule::group()
{
return FindGroup(groupId);
}
-
Adaptation::AccessRules &
Adaptation::AllRules()
{
- static AccessRules TheRules;
- return TheRules;
+ static AccessRules *TheRules = new AccessRules;
+ return *TheRules;
}
// TODO: make AccessRules::find work
return NULL;
}
+