From: Amos Jeffries Date: Mon, 13 Aug 2012 07:24:50 +0000 (-0600) Subject: Bug 3610: peername_regex ACL X-Git-Tag: sourceformat-review-1~110 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=16bdd4c024cdc1c6bc6d0d6225b155d3956c2ba6;p=thirdparty%2Fsquid.git Bug 3610: peername_regex ACL --- diff --git a/src/AclRegs.cc b/src/AclRegs.cc index a4a5eb934b..8953c736f1 100644 --- a/src/AclRegs.cc +++ b/src/AclRegs.cc @@ -109,6 +109,8 @@ ACL::Prototype ACLMyPortName::RegistryProtoype(&ACLMyPortName::RegistryEntry_, " ACLStrategised ACLMyPortName::RegistryEntry_(new ACLStringData, ACLMyPortNameStrategy::Instance(), "myportname"); ACL::Prototype ACLPeerName::RegistryProtoype(&ACLPeerName::RegistryEntry_, "peername"); ACLStrategised ACLPeerName::RegistryEntry_(new ACLStringData, ACLPeerNameStrategy::Instance(), "peername"); +ACL::Prototype ACLPeerName::RegexRegistryProtoype(&ACLPeerName::RegexRegistryEntry_, "peername_regex"); +ACLStrategised ACLPeerName::RegexRegistryEntry_(new ACLRegexData, ACLPeerNameStrategy::Instance(), "peername_regex"); ACL::Prototype ACLProtocol::RegistryProtoype(&ACLProtocol::RegistryEntry_, "proto"); ACLStrategised ACLProtocol::RegistryEntry_(new ACLProtocolData, ACLProtocolStrategy::Instance(), "proto"); ACL::Prototype ACLRandom::RegistryProtoype(&ACLRandom::RegistryEntry_, "random"); diff --git a/src/acl/PeerName.cc b/src/acl/PeerName.cc index 91f496229c..314636b61c 100644 --- a/src/acl/PeerName.cc +++ b/src/acl/PeerName.cc @@ -1,5 +1,6 @@ #include "squid-old.h" #include "acl/PeerName.h" +#include "acl/RegexData.h" #include "acl/StringData.h" #include "acl/Checklist.h" diff --git a/src/acl/PeerName.h b/src/acl/PeerName.h index cc69e7a025..3e646c1955 100644 --- a/src/acl/PeerName.h +++ b/src/acl/PeerName.h @@ -28,6 +28,8 @@ class ACLPeerName private: static ACL::Prototype RegistryProtoype; static ACLStrategised RegistryEntry_; + static ACL::Prototype RegexRegistryProtoype; + static ACLStrategised RegexRegistryEntry_; }; #endif /* SQUID_ACLPEERNAME_H */