From: JINMEI Tatuya Date: Fri, 1 Jul 2011 19:08:37 +0000 (-0700) Subject: [trac1069] rename dns::getLoader() to getRequestLoader() as discussed on jabber. X-Git-Tag: perftcpdns_before_epoll~231^2~19^2~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=18dcf1d0ec44f4ddf701d5872f6d5e493d3c4fdb;p=thirdparty%2Fkea.git [trac1069] rename dns::getLoader() to getRequestLoader() as discussed on jabber. I also noticed some of the comments in the tests are stale or not really correct, so I fixed them, too. --- diff --git a/src/bin/resolver/resolver.cc b/src/bin/resolver/resolver.cc index 75e3d52a52..a3a7a69892 100644 --- a/src/bin/resolver/resolver.cc +++ b/src/bin/resolver/resolver.cc @@ -85,7 +85,7 @@ public: retries_(3), // we apply "reject all" (implicit default of the loader) ACL by // default: - query_acl_(acl::dns::getLoader().load(Element::fromJSON("[]"))), + query_acl_(acl::dns::getRequestLoader().load(Element::fromJSON("[]"))), rec_query_(NULL) {} @@ -597,7 +597,7 @@ Resolver::updateConfig(ConstElementPtr config) { "listen_on")); const ConstElementPtr query_acl_cfg(config->get("query_acl")); const shared_ptr query_acl = - query_acl_cfg ? acl::dns::getLoader().load(query_acl_cfg) : + query_acl_cfg ? acl::dns::getRequestLoader().load(query_acl_cfg) : shared_ptr(); bool set_timeouts(false); int qtimeout = impl_->query_timeout_; diff --git a/src/lib/acl/dns.cc b/src/lib/acl/dns.cc index 93b6297c58..0d0b3988f1 100644 --- a/src/lib/acl/dns.cc +++ b/src/lib/acl/dns.cc @@ -86,7 +86,7 @@ internal::RequestCheckCreator::create(const string& name, } RequestLoader& -getLoader() { +getRequestLoader() { static RequestLoader* loader(NULL); if (loader == NULL) { // Creator registration may throw, so we first store the new loader diff --git a/src/lib/acl/dns.h b/src/lib/acl/dns.h index bb0834d7ee..118e5fda24 100644 --- a/src/lib/acl/dns.h +++ b/src/lib/acl/dns.h @@ -103,7 +103,7 @@ typedef acl::Loader RequestLoader; * one is enough, this one will have registered default checks and it * is known one, so any plugins can registrer additional checks as well. */ -RequestLoader& getLoader(); +RequestLoader& getRequestLoader(); // The following is essentially private to the implementation and could // be hidden in the implementation file. But it's visible via this header diff --git a/src/lib/acl/tests/dns_test.cc b/src/lib/acl/tests/dns_test.cc index aa2d342869..87fd8a1569 100644 --- a/src/lib/acl/tests/dns_test.cc +++ b/src/lib/acl/tests/dns_test.cc @@ -37,20 +37,20 @@ using namespace std; using boost::scoped_ptr; using namespace isc::data; using namespace isc::acl; +using namespace isc::acl::dns; using isc::acl::LoaderError; namespace { -// Tests that the getLoader actually returns something, returns the same every -// time and the returned value can be used to anything. It is not much of a -// test, but the getLoader is not much of a function. -TEST(DNSACL, getLoader) { - dns::RequestLoader* l(&dns::getLoader()); +TEST(DNSACL, getRequestLoader) { + dns::RequestLoader* l(&getRequestLoader()); ASSERT_TRUE(l != NULL); - EXPECT_EQ(l, &dns::getLoader()); + EXPECT_EQ(l, &getRequestLoader()); EXPECT_NO_THROW(l->load(Element::fromJSON("[{\"action\": \"DROP\"}]"))); - // Test check rules registered by default, i.e. RequestCheck + // Confirm it can load the ACl syntax acceptable to a default creator. + // Tests to see whether the loaded rules work correctly will be in + // other dedicated tests below. EXPECT_NO_THROW(l->load(Element::fromJSON("[{\"action\": \"DROP\"," " \"from\": \"192.0.2.1\"}]"))); } @@ -77,7 +77,7 @@ TEST_F(RequestCheckCreatorTest, allowListAbbreviation) { // are done in the tests for IPCheck. TEST_F(RequestCheckCreatorTest, createIPv4Check) { check_ = creator_.create("from", Element::fromJSON("\"192.0.2.1\""), - dns::getLoader()); + getRequestLoader()); const dns::internal::RequestIPCheck& ipcheck_ = dynamic_cast(*check_); EXPECT_EQ(AF_INET, ipcheck_.getFamily()); @@ -92,7 +92,7 @@ TEST_F(RequestCheckCreatorTest, createIPv4Check) { TEST_F(RequestCheckCreatorTest, createIPv6Check) { check_ = creator_.create("from", Element::fromJSON("\"2001:db8::5300/120\""), - dns::getLoader()); + getRequestLoader()); const dns::internal::RequestIPCheck& ipcheck_ = dynamic_cast(*check_); EXPECT_EQ(AF_INET6, ipcheck_.getFamily()); @@ -109,23 +109,23 @@ TEST_F(RequestCheckCreatorTest, createIPv6Check) { TEST_F(RequestCheckCreatorTest, badCreate) { // Invalid name EXPECT_THROW(creator_.create("bad", Element::fromJSON("\"192.0.2.1\""), - dns::getLoader()), LoaderError); + getRequestLoader()), LoaderError); // Invalid type of parameter EXPECT_THROW(creator_.create("from", Element::fromJSON("4"), - dns::getLoader()), + getRequestLoader()), isc::data::TypeError); EXPECT_THROW(creator_.create("from", Element::fromJSON("[]"), - dns::getLoader()), + getRequestLoader()), isc::data::TypeError); // Syntax error for IPCheck EXPECT_THROW(creator_.create("from", Element::fromJSON("\"bad\""), - dns::getLoader()), + getRequestLoader()), isc::InvalidParameter); // NULL pointer - EXPECT_THROW(creator_.create("from", ConstElementPtr(), dns::getLoader()), + EXPECT_THROW(creator_.create("from", ConstElementPtr(), getRequestLoader()), LoaderError); } @@ -137,7 +137,7 @@ protected: ConstRequestCheckPtr createIPCheck(const string& prefix) { return (creator_.create("from", Element::fromJSON( string("\"") + prefix + string("\"")), - dns::getLoader())); + getRequestLoader())); } // create a one time request context for a specific test. Note that