BIND 10 master, updated. 670eae890769e6a570cb568f668e9161b9f8c252 Merge branch 'trac2536'
BIND 10 source code commits
bind10-changes at lists.isc.org
Tue Feb 11 06:00:30 UTC 2014
The branch, master has been updated
via 670eae890769e6a570cb568f668e9161b9f8c252 (commit)
via 5b29cdb4be35f2e601a6ea962a9b0c056ff59e4b (commit)
via b0297a13fcbfd7309cdc41b8fe314de7201ed264 (commit)
via 9fcbaef68193a99a142f63b576fdfdd5519192c0 (commit)
from e200b6ca369bd2b49e7dd444c7845e06e66e4e94 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 670eae890769e6a570cb568f668e9161b9f8c252
Merge: e200b6c 5b29cdb
Author: Mukund Sivaraman <muks at isc.org>
Date: Tue Feb 11 11:18:09 2014 +0530
Merge branch 'trac2536'
-----------------------------------------------------------------------
Summary of changes:
src/bin/dhcp4/tests/callout_library_common.h | 7 +-
src/bin/dhcp6/tests/callout_library_common.h | 7 +-
src/bin/dhcp6/tests/dhcp6_srv_unittest.cc | 2 +
src/bin/dhcp6/tests/dhcp6_test_utils.cc | 3 +
src/bin/dhcp6/tests/dhcp6_test_utils.h | 260 +++++++++++---------
src/bin/dhcp6/tests/hooks_unittest.cc | 2 +
src/bin/dhcp6/tests/wireshark.cc | 2 +
src/hooks/dhcp/user_chk/user_chk.h | 5 +-
src/hooks/dhcp/user_chk/user_file.cc | 2 +-
src/hooks/dhcp/user_chk/user_file.h | 10 +-
src/hooks/dhcp/user_chk/user_registry.h | 8 +-
src/lib/cache/message_cache.h | 5 +-
src/lib/cache/message_entry.cc | 1 +
src/lib/cache/message_entry.h | 8 +-
src/lib/cache/rrset_cache.h | 2 -
src/lib/cache/rrset_entry.cc | 1 +
src/lib/cache/rrset_entry.h | 8 +-
src/lib/cache/tests/cache_test_messagefromfile.h | 8 +-
src/lib/cache/tests/cache_test_sectioncount.h | 8 +-
src/lib/cache/tests/message_cache_unittest.cc | 1 +
src/lib/dhcp/std_option_defs.h | 10 +-
.../dns/tests/rdata_nsec3param_like_unittest.cc | 1 +
src/lib/dns/tests/rdata_nsecbitmap_unittest.cc | 1 +
src/lib/dns/tests/rdata_unittest.h | 4 +-
src/lib/nsas/tests/hash_unittest.cc | 1 +
.../tests/nameserver_address_store_unittest.cc | 2 +
src/lib/nsas/tests/nameserver_address_unittest.cc | 7 +-
src/lib/nsas/tests/nameserver_entry_unittest.cc | 2 +-
src/lib/nsas/tests/nsas_entry_compare_unittest.cc | 1 +
src/lib/nsas/tests/nsas_test.h | 124 ++++++----
src/lib/nsas/tests/zone_entry_unittest.cc | 4 +-
src/lib/resolve/recursive_query.cc | 1 +
32 files changed, 279 insertions(+), 229 deletions(-)
-----------------------------------------------------------------------
diff --git a/src/bin/dhcp4/tests/callout_library_common.h b/src/bin/dhcp4/tests/callout_library_common.h
index cbabcda..6db761d 100644
--- a/src/bin/dhcp4/tests/callout_library_common.h
+++ b/src/bin/dhcp4/tests/callout_library_common.h
@@ -34,9 +34,6 @@
#include <fstream>
-using namespace isc::hooks;
-using namespace std;
-
extern "C" {
/// @brief Append digit to marker file
@@ -51,7 +48,7 @@ extern "C" {
int
appendDigit(const char* name) {
// Open the file and check if successful.
- fstream file(name, fstream::out | fstream::app);
+ std::fstream file(name, std::fstream::out | std::fstream::app);
if (!file.good()) {
return (1);
}
@@ -70,7 +67,7 @@ version() {
}
int
-load(LibraryHandle&) {
+load(isc::hooks::LibraryHandle&) {
return (appendDigit(LOAD_MARKER_FILE));
}
diff --git a/src/bin/dhcp6/tests/callout_library_common.h b/src/bin/dhcp6/tests/callout_library_common.h
index cbabcda..6db761d 100644
--- a/src/bin/dhcp6/tests/callout_library_common.h
+++ b/src/bin/dhcp6/tests/callout_library_common.h
@@ -34,9 +34,6 @@
#include <fstream>
-using namespace isc::hooks;
-using namespace std;
-
extern "C" {
/// @brief Append digit to marker file
@@ -51,7 +48,7 @@ extern "C" {
int
appendDigit(const char* name) {
// Open the file and check if successful.
- fstream file(name, fstream::out | fstream::app);
+ std::fstream file(name, std::fstream::out | std::fstream::app);
if (!file.good()) {
return (1);
}
@@ -70,7 +67,7 @@ version() {
}
int
-load(LibraryHandle&) {
+load(isc::hooks::LibraryHandle&) {
return (appendDigit(LOAD_MARKER_FILE));
}
diff --git a/src/bin/dhcp6/tests/dhcp6_srv_unittest.cc b/src/bin/dhcp6/tests/dhcp6_srv_unittest.cc
index 6b19905..ea3692e 100644
--- a/src/bin/dhcp6/tests/dhcp6_srv_unittest.cc
+++ b/src/bin/dhcp6/tests/dhcp6_srv_unittest.cc
@@ -47,6 +47,8 @@
#include <sstream>
using namespace isc;
+using namespace isc::data;
+using namespace isc::config;
using namespace isc::test;
using namespace isc::asiolink;
using namespace isc::dhcp;
diff --git a/src/bin/dhcp6/tests/dhcp6_test_utils.cc b/src/bin/dhcp6/tests/dhcp6_test_utils.cc
index 88dee36..75a2ced 100644
--- a/src/bin/dhcp6/tests/dhcp6_test_utils.cc
+++ b/src/bin/dhcp6/tests/dhcp6_test_utils.cc
@@ -15,6 +15,9 @@
#include <gtest/gtest.h>
#include <dhcp6/tests/dhcp6_test_utils.h>
+using namespace isc::dhcp;
+using namespace isc::asiolink;
+
namespace isc {
namespace test {
diff --git a/src/bin/dhcp6/tests/dhcp6_test_utils.h b/src/bin/dhcp6/tests/dhcp6_test_utils.h
index 17cd9e8..beac1ef 100644
--- a/src/bin/dhcp6/tests/dhcp6_test_utils.h
+++ b/src/bin/dhcp6/tests/dhcp6_test_utils.h
@@ -37,24 +37,16 @@
#include <list>
-using namespace isc::dhcp;
-using namespace isc::config;
-using namespace isc::data;
-using namespace isc::hooks;
-using namespace isc::asiolink;
-using namespace isc::util;
-using namespace isc::hooks;
-
namespace isc {
namespace test {
/// @brief "naked" Dhcpv6Srv class that exposes internal members
class NakedDhcpv6Srv: public isc::dhcp::Dhcpv6Srv {
public:
- NakedDhcpv6Srv(uint16_t port) : Dhcpv6Srv(port) {
+ NakedDhcpv6Srv(uint16_t port) : isc::dhcp::Dhcpv6Srv(port) {
// Open the "memfile" database for leases
std::string memfile = "type=memfile";
- LeaseMgrFactory::create(memfile);
+ isc::dhcp::LeaseMgrFactory::create(memfile);
}
/// @brief fakes packet reception
@@ -70,7 +62,7 @@ public:
// If there is anything prepared as fake incoming
// traffic, use it
if (!fake_received_.empty()) {
- Pkt6Ptr pkt = fake_received_.front();
+ isc::dhcp::Pkt6Ptr pkt = fake_received_.front();
fake_received_.pop_front();
return (pkt);
}
@@ -78,7 +70,7 @@ public:
// If not, just trigger shutdown and
// return immediately
shutdown();
- return (Pkt6Ptr());
+ return (isc::dhcp::Pkt6Ptr());
}
/// @brief fake packet sending
@@ -86,20 +78,20 @@ public:
/// Pretend to send a packet, but instead just store
/// it in fake_send_ list where test can later inspect
/// server's response.
- virtual void sendPacket(const Pkt6Ptr& pkt) {
+ virtual void sendPacket(const isc::dhcp::Pkt6Ptr& pkt) {
fake_sent_.push_back(pkt);
}
/// @brief adds a packet to fake receive queue
///
/// See fake_received_ field for description
- void fakeReceive(const Pkt6Ptr& pkt) {
+ void fakeReceive(const isc::dhcp::Pkt6Ptr& pkt) {
fake_received_.push_back(pkt);
}
virtual ~NakedDhcpv6Srv() {
// Close the lease database
- LeaseMgrFactory::destroy();
+ isc::dhcp::LeaseMgrFactory::destroy();
}
using Dhcpv6Srv::processSolicit;
@@ -121,13 +113,14 @@ public:
/// @brief packets we pretend to receive
///
- /// Instead of setting up sockets on interfaces that change between OSes, it
- /// is much easier to fake packet reception. This is a list of packets that
- /// we pretend to have received. You can schedule new packets to be received
- /// using fakeReceive() and NakedDhcpv6Srv::receivePacket() methods.
- std::list<Pkt6Ptr> fake_received_;
-
- std::list<Pkt6Ptr> fake_sent_;
+ /// Instead of setting up sockets on interfaces that change between
+ /// OSes, it is much easier to fake packet reception. This is a list
+ /// of packets that we pretend to have received. You can schedule
+ /// new packets to be received using fakeReceive() and
+ /// NakedDhcpv6Srv::receivePacket() methods.
+ std::list<isc::dhcp::Pkt6Ptr> fake_received_;
+
+ std::list<isc::dhcp::Pkt6Ptr> fake_sent_;
};
static const char* DUID_FILE = "server-id-test.txt";
@@ -141,7 +134,8 @@ public:
// it's ok if that fails. There should not be such a file anyway
unlink(DUID_FILE);
- const IfaceMgr::IfaceCollection& ifaces = IfaceMgr::instance().getIfaces();
+ const isc::dhcp::IfaceMgr::IfaceCollection& ifaces =
+ isc::dhcp::IfaceMgr::instance().getIfaces();
// There must be some interface detected
if (ifaces.empty()) {
@@ -153,47 +147,56 @@ public:
}
// Generate IA_NA or IA_PD option with specified parameters
- boost::shared_ptr<Option6IA> generateIA(uint16_t type, uint32_t iaid,
- uint32_t t1, uint32_t t2);
+ boost::shared_ptr<isc::dhcp::Option6IA> generateIA
+ (uint16_t type, uint32_t iaid, uint32_t t1, uint32_t t2);
/// @brief generates interface-id option, based on text
///
/// @param iface_id textual representation of the interface-id content
///
/// @return pointer to the option object
- OptionPtr generateInterfaceId(const std::string& iface_id) {
- OptionBuffer tmp(iface_id.begin(), iface_id.end());
- return OptionPtr(new Option(Option::V6, D6O_INTERFACE_ID, tmp));
+ isc::dhcp::OptionPtr generateInterfaceId(const std::string& iface_id) {
+ isc::dhcp::OptionBuffer tmp(iface_id.begin(), iface_id.end());
+ return (isc::dhcp::OptionPtr
+ (new isc::dhcp::Option(isc::dhcp::Option::V6,
+ D6O_INTERFACE_ID, tmp)));
}
// Generate client-id option
- OptionPtr generateClientId(size_t duid_size = 32) {
+ isc::dhcp::OptionPtr generateClientId(size_t duid_size = 32) {
- OptionBuffer clnt_duid(duid_size);
+ isc::dhcp::OptionBuffer clnt_duid(duid_size);
for (int i = 0; i < duid_size; i++) {
clnt_duid[i] = 100 + i;
}
- duid_ = DuidPtr(new DUID(clnt_duid));
+ duid_ = isc::dhcp::DuidPtr(new isc::dhcp::DUID(clnt_duid));
- return (OptionPtr(new Option(Option::V6, D6O_CLIENTID,
- clnt_duid.begin(),
- clnt_duid.begin() + duid_size)));
+ return (isc::dhcp::OptionPtr
+ (new isc::dhcp::Option(isc::dhcp::Option::V6, D6O_CLIENTID,
+ clnt_duid.begin(),
+ clnt_duid.begin() + duid_size)));
}
- // Checks if server response (ADVERTISE or REPLY) includes proper server-id.
- void checkServerId(const Pkt6Ptr& rsp, const OptionPtr& expected_srvid) {
+ // Checks if server response (ADVERTISE or REPLY) includes proper
+ // server-id.
+ void checkServerId(const isc::dhcp::Pkt6Ptr& rsp,
+ const isc::dhcp::OptionPtr& expected_srvid)
+ {
// check that server included its server-id
- OptionPtr tmp = rsp->getOption(D6O_SERVERID);
+ isc::dhcp::OptionPtr tmp = rsp->getOption(D6O_SERVERID);
EXPECT_EQ(tmp->getType(), expected_srvid->getType() );
ASSERT_EQ(tmp->len(), expected_srvid->len() );
EXPECT_TRUE(tmp->getData() == expected_srvid->getData());
}
- // Checks if server response (ADVERTISE or REPLY) includes proper client-id.
- void checkClientId(const Pkt6Ptr& rsp, const OptionPtr& expected_clientid) {
+ // Checks if server response (ADVERTISE or REPLY) includes proper
+ // client-id.
+ void checkClientId(const isc::dhcp::Pkt6Ptr& rsp,
+ const isc::dhcp::OptionPtr& expected_clientid)
+ {
// check that server included our own client-id
- OptionPtr tmp = rsp->getOption(D6O_CLIENTID);
+ isc::dhcp::OptionPtr tmp = rsp->getOption(D6O_CLIENTID);
ASSERT_TRUE(tmp);
EXPECT_EQ(expected_clientid->getType(), tmp->getType());
ASSERT_EQ(expected_clientid->len(), tmp->len());
@@ -203,18 +206,21 @@ public:
}
// Checks if server response is a NAK
- void checkNakResponse(const Pkt6Ptr& rsp, uint8_t expected_message_type,
+ void checkNakResponse(const isc::dhcp::Pkt6Ptr& rsp,
+ uint8_t expected_message_type,
uint32_t expected_transid,
- uint16_t expected_status_code) {
+ uint16_t expected_status_code)
+ {
// Check if we get response at all
checkResponse(rsp, expected_message_type, expected_transid);
// Check that IA_NA was returned
- OptionPtr option_ia_na = rsp->getOption(D6O_IA_NA);
+ isc::dhcp::OptionPtr option_ia_na = rsp->getOption(D6O_IA_NA);
ASSERT_TRUE(option_ia_na);
// check that the status is no address available
- boost::shared_ptr<Option6IA> ia = boost::dynamic_pointer_cast<Option6IA>(option_ia_na);
+ boost::shared_ptr<isc::dhcp::Option6IA> ia =
+ boost::dynamic_pointer_cast<isc::dhcp::Option6IA>(option_ia_na);
ASSERT_TRUE(ia);
checkIA_NAStatusCode(ia, expected_status_code);
@@ -228,8 +234,10 @@ public:
// Status code indicates type of error encountered (in theory it can also
// indicate success, but servers typically don't send success status
// as this is the default result and it saves bandwidth)
- void checkIA_NAStatusCode(const boost::shared_ptr<Option6IA>& ia,
- uint16_t expected_status_code) {
+ void checkIA_NAStatusCode
+ (const boost::shared_ptr<isc::dhcp::Option6IA>& ia,
+ uint16_t expected_status_code)
+ {
// Make sure there is no address assigned.
EXPECT_FALSE(ia->getOption(D6O_IAADDR));
@@ -237,10 +245,12 @@ public:
EXPECT_EQ(0, ia->getT1());
EXPECT_EQ(0, ia->getT2());
- OptionCustomPtr status =
- boost::dynamic_pointer_cast<OptionCustom>(ia->getOption(D6O_STATUS_CODE));
+ isc::dhcp::OptionCustomPtr status =
+ boost::dynamic_pointer_cast<isc::dhcp::OptionCustom>
+ (ia->getOption(D6O_STATUS_CODE));
- // It is ok to not include status success as this is the default behavior
+ // It is ok to not include status success as this is the default
+ // behavior
if (expected_status_code == STATUS_Success && !status) {
return;
}
@@ -248,35 +258,42 @@ public:
EXPECT_TRUE(status);
if (status) {
- // We don't have dedicated class for status code, so let's just interpret
- // first 2 bytes as status. Remainder of the status code option content is
- // just a text explanation what went wrong.
+ // We don't have dedicated class for status code, so let's
+ // just interpret first 2 bytes as status. Remainder of the
+ // status code option content is just a text explanation
+ // what went wrong.
EXPECT_EQ(static_cast<uint16_t>(expected_status_code),
status->readInteger<uint16_t>(0));
}
}
- void checkMsgStatusCode(const Pkt6Ptr& msg, uint16_t expected_status) {
- OptionCustomPtr status =
- boost::dynamic_pointer_cast<OptionCustom>(msg->getOption(D6O_STATUS_CODE));
+ void checkMsgStatusCode(const isc::dhcp::Pkt6Ptr& msg,
+ uint16_t expected_status)
+ {
+ isc::dhcp::OptionCustomPtr status =
+ boost::dynamic_pointer_cast<isc::dhcp::OptionCustom>
+ (msg->getOption(D6O_STATUS_CODE));
- // It is ok to not include status success as this is the default behavior
+ // It is ok to not include status success as this is the default
+ // behavior
if (expected_status == STATUS_Success && !status) {
return;
}
EXPECT_TRUE(status);
if (status) {
- // We don't have dedicated class for status code, so let's just interpret
- // first 2 bytes as status. Remainder of the status code option content is
- // just a text explanation what went wrong.
+ // We don't have dedicated class for status code, so let's
+ // just interpret first 2 bytes as status. Remainder of the
+ // status code option content is just a text explanation
+ // what went wrong.
EXPECT_EQ(static_cast<uint16_t>(expected_status),
status->readInteger<uint16_t>(0));
}
}
// Basic checks for generated response (message type and transaction-id).
- void checkResponse(const Pkt6Ptr& rsp, uint8_t expected_message_type,
+ void checkResponse(const isc::dhcp::Pkt6Ptr& rsp,
+ uint8_t expected_message_type,
uint32_t expected_transid) {
ASSERT_TRUE(rsp);
EXPECT_EQ(expected_message_type, rsp->getType());
@@ -286,28 +303,27 @@ public:
virtual ~NakedDhcpv6SrvTest() {
// Let's clean up if there is such a file.
unlink(DUID_FILE);
- HooksManager::preCalloutsLibraryHandle().deregisterAllCallouts(
- "buffer6_receive");
- HooksManager::preCalloutsLibraryHandle().deregisterAllCallouts(
- "buffer6_send");
- HooksManager::preCalloutsLibraryHandle().deregisterAllCallouts(
- "lease6_renew");
- HooksManager::preCalloutsLibraryHandle().deregisterAllCallouts(
- "lease6_release");
- HooksManager::preCalloutsLibraryHandle().deregisterAllCallouts(
- "pkt6_receive");
- HooksManager::preCalloutsLibraryHandle().deregisterAllCallouts(
- "pkt6_send");
- HooksManager::preCalloutsLibraryHandle().deregisterAllCallouts(
- "subnet6_select");
-
+ isc::hooks::HooksManager::preCalloutsLibraryHandle()
+ .deregisterAllCallouts("buffer6_receive");
+ isc::hooks::HooksManager::preCalloutsLibraryHandle()
+ .deregisterAllCallouts("buffer6_send");
+ isc::hooks::HooksManager::preCalloutsLibraryHandle()
+ .deregisterAllCallouts("lease6_renew");
+ isc::hooks::HooksManager::preCalloutsLibraryHandle()
+ .deregisterAllCallouts("lease6_release");
+ isc::hooks::HooksManager::preCalloutsLibraryHandle()
+ .deregisterAllCallouts("pkt6_receive");
+ isc::hooks::HooksManager::preCalloutsLibraryHandle()
+ .deregisterAllCallouts("pkt6_send");
+ isc::hooks::HooksManager::preCalloutsLibraryHandle()
+ .deregisterAllCallouts("subnet6_select");
};
// A DUID used in most tests (typically as client-id)
- DuidPtr duid_;
+ isc::dhcp::DuidPtr duid_;
int rcode_;
- ConstElementPtr comment_;
+ isc::data::ConstElementPtr comment_;
// Name of a valid network interface
std::string valid_iface_;
@@ -324,18 +340,23 @@ public:
/// Sets up a single subnet6 with one pool for addresses and second
/// pool for prefixes.
Dhcpv6SrvTest() {
- subnet_ = Subnet6Ptr(new Subnet6(IOAddress("2001:db8:1::"), 48, 1000,
- 2000, 3000, 4000));
- pool_ = Pool6Ptr(new Pool6(Lease::TYPE_NA, IOAddress("2001:db8:1:1::"),
- 64));
+ subnet_ = isc::dhcp::Subnet6Ptr
+ (new isc::dhcp::Subnet6(isc::asiolink::IOAddress("2001:db8:1::"),
+ 48, 1000, 2000, 3000, 4000));
+ pool_ = isc::dhcp::Pool6Ptr
+ (new isc::dhcp::Pool6(isc::dhcp::Lease::TYPE_NA,
+ isc::asiolink::IOAddress("2001:db8:1:1::"),
+ 64));
subnet_->addPool(pool_);
- CfgMgr::instance().deleteSubnets6();
- CfgMgr::instance().addSubnet6(subnet_);
+ isc::dhcp::CfgMgr::instance().deleteSubnets6();
+ isc::dhcp::CfgMgr::instance().addSubnet6(subnet_);
// configure PD pool
- pd_pool_ = Pool6Ptr(new Pool6(Lease::TYPE_PD,
- IOAddress("2001:db8:1:2::"), 64, 80));
+ pd_pool_ = isc::dhcp::Pool6Ptr
+ (new isc::dhcp::Pool6(isc::dhcp::Lease::TYPE_PD,
+ isc::asiolink::IOAddress("2001:db8:1:2::"),
+ 64, 80));
subnet_->addPool(pd_pool_);
}
@@ -343,7 +364,7 @@ public:
///
/// Removes existing configuration.
~Dhcpv6SrvTest() {
- CfgMgr::instance().deleteSubnets6();
+ isc::dhcp::CfgMgr::instance().deleteSubnets6();
};
/// @brief Checks that server response (ADVERTISE or REPLY) contains proper
@@ -354,8 +375,8 @@ public:
/// @param expected_t1 expected T1 value
/// @param expected_t2 expected T2 value
/// @return IAADDR option for easy chaining with checkIAAddr method
- boost::shared_ptr<Option6IAAddr>
- checkIA_NA(const Pkt6Ptr& rsp, uint32_t expected_iaid,
+ boost::shared_ptr<isc::dhcp::Option6IAAddr>
+ checkIA_NA(const isc::dhcp::Pkt6Ptr& rsp, uint32_t expected_iaid,
uint32_t expected_t1, uint32_t expected_t2);
/// @brief Checks that server response (ADVERTISE or REPLY) contains proper
@@ -366,15 +387,15 @@ public:
/// @param expected_t1 expected T1 value
/// @param expected_t2 expected T2 value
/// @return IAPREFIX option for easy chaining with checkIAAddr method
- boost::shared_ptr<Option6IAPrefix>
- checkIA_PD(const Pkt6Ptr& rsp, uint32_t expected_iaid,
+ boost::shared_ptr<isc::dhcp::Option6IAPrefix>
+ checkIA_PD(const isc::dhcp::Pkt6Ptr& rsp, uint32_t expected_iaid,
uint32_t expected_t1, uint32_t expected_t2);
// Check that generated IAADDR option contains expected address
// and lifetime values match the configured subnet
- void checkIAAddr(const boost::shared_ptr<Option6IAAddr>& addr,
- const IOAddress& expected_addr,
- Lease::Type type) {
+ void checkIAAddr(const boost::shared_ptr<isc::dhcp::Option6IAAddr>& addr,
+ const isc::asiolink::IOAddress& expected_addr,
+ isc::dhcp::Lease::Type type) {
// Check that the assigned address is indeed from the configured pool.
// Note that when comparing addresses, we compare the textual
@@ -388,8 +409,9 @@ public:
// Checks if the lease sent to client is present in the database
// and is valid when checked agasint the configured subnet
- Lease6Ptr checkLease(const DuidPtr& duid, const OptionPtr& ia_na,
- boost::shared_ptr<Option6IAAddr> addr);
+ isc::dhcp::Lease6Ptr checkLease
+ (const isc::dhcp::DuidPtr& duid, const isc::dhcp::OptionPtr& ia_na,
+ boost::shared_ptr<isc::dhcp::Option6IAAddr> addr);
/// @brief Verifies received IAPrefix option
///
@@ -400,8 +422,9 @@ public:
/// @param ia_pd IA_PD option that contains the IAPRefix option
/// @param prefix pointer to the IAPREFIX option
/// @return corresponding IPv6 lease (if found)
- Lease6Ptr checkPdLease(const DuidPtr& duid, const OptionPtr& ia_pd,
- boost::shared_ptr<Option6IAPrefix> prefix);
+ isc::dhcp::Lease6Ptr checkPdLease
+ (const isc::dhcp::DuidPtr& duid, const isc::dhcp::OptionPtr& ia_pd,
+ boost::shared_ptr<isc::dhcp::Option6IAPrefix> prefix);
/// @brief Creates a message with specified IA
///
@@ -415,10 +438,10 @@ public:
/// @param prefix_len length of the prefix (used for prefixes only)
/// @param iaid IA identifier (used in IA_XX option)
/// @return created message
- Pkt6Ptr
- createMessage(uint8_t message_type, Lease::Type lease_type,
- const IOAddress& addr, const uint8_t prefix_len,
- uint32_t iaid);
+ isc::dhcp::Pkt6Ptr
+ createMessage(uint8_t message_type, isc::dhcp::Lease::Type lease_type,
+ const isc::asiolink::IOAddress& addr,
+ const uint8_t prefix_len, uint32_t iaid);
/// @brief Performs basic (positive) RENEW test
///
@@ -432,7 +455,8 @@ public:
/// @param renew_addr address being sent in RENEW
/// @param prefix_len length of the prefix (128 for addresses)
void
- testRenewBasic(Lease::Type type, const std::string& existing_addr,
+ testRenewBasic(isc::dhcp::Lease::Type type,
+ const std::string& existing_addr,
const std::string& renew_addr, const uint8_t prefix_len);
/// @brief Performs negative RENEW test
@@ -445,7 +469,8 @@ public:
/// @param type type (TYPE_NA or TYPE_PD)
/// @param addr address being sent in RENEW
void
- testRenewReject(Lease::Type type, const IOAddress& addr);
+ testRenewReject(isc::dhcp::Lease::Type type,
+ const isc::asiolink::IOAddress& addr);
/// @brief Performs basic (positive) RELEASE test
///
@@ -458,44 +483,47 @@ public:
/// @param existing address to be preinserted into the database
/// @param release_addr address being sent in RELEASE
void
- testReleaseBasic(Lease::Type type, const IOAddress& existing,
- const IOAddress& release_addr);
+ testReleaseBasic(isc::dhcp::Lease::Type type,
+ const isc::asiolink::IOAddress& existing,
+ const isc::asiolink::IOAddress& release_addr);
/// @brief Performs negative RELEASE test
///
- /// See releaseReject and pdReleaseReject tests for detailed explanation.
- /// In essence the test attempts to perform couple failed RELEASE scenarios.
+ /// See releaseReject and pdReleaseReject tests for detailed
+ /// explanation. In essence the test attempts to perform couple
+ /// failed RELEASE scenarios.
///
/// This method does not throw, but uses gtest macros to signify failures.
///
/// @param type type (TYPE_NA or TYPE_PD)
/// @param addr address being sent in RELEASE
void
- testReleaseReject(Lease::Type type, const IOAddress& addr);
+ testReleaseReject(isc::dhcp::Lease::Type type,
+ const isc::asiolink::IOAddress& addr);
// see wireshark.cc for descriptions
// The descriptions are too large and too closely related to the
// code, so it is kept in .cc rather than traditionally in .h
- Pkt6Ptr captureSimpleSolicit();
- Pkt6Ptr captureRelayedSolicit();
- Pkt6Ptr captureDocsisRelayedSolicit();
- Pkt6Ptr captureeRouterRelayedSolicit();
+ isc::dhcp::Pkt6Ptr captureSimpleSolicit();
+ isc::dhcp::Pkt6Ptr captureRelayedSolicit();
+ isc::dhcp::Pkt6Ptr captureDocsisRelayedSolicit();
+ isc::dhcp::Pkt6Ptr captureeRouterRelayedSolicit();
/// @brief Auxiliary method that sets Pkt6 fields
///
/// Used to reconstruct captured packets. Sets UDP ports, interface names,
/// and other fields to some believable values.
/// @param pkt packet that will have its fields set
- void captureSetDefaultFields(const Pkt6Ptr& pkt);
+ void captureSetDefaultFields(const isc::dhcp::Pkt6Ptr& pkt);
/// A subnet used in most tests
- Subnet6Ptr subnet_;
+ isc::dhcp::Subnet6Ptr subnet_;
/// A normal, non-temporary pool used in most tests
- Pool6Ptr pool_;
+ isc::dhcp::Pool6Ptr pool_;
/// A prefix pool used in most tests
- Pool6Ptr pd_pool_;
+ isc::dhcp::Pool6Ptr pd_pool_;
};
}; // end of isc::test namespace
diff --git a/src/bin/dhcp6/tests/hooks_unittest.cc b/src/bin/dhcp6/tests/hooks_unittest.cc
index d4e8e5e..d13ebb4 100644
--- a/src/bin/dhcp6/tests/hooks_unittest.cc
+++ b/src/bin/dhcp6/tests/hooks_unittest.cc
@@ -36,6 +36,8 @@
#include <sstream>
using namespace isc;
+using namespace isc::data;
+using namespace isc::config;
using namespace isc::test;
using namespace isc::asiolink;
using namespace isc::dhcp;
diff --git a/src/bin/dhcp6/tests/wireshark.cc b/src/bin/dhcp6/tests/wireshark.cc
index cd29096..5185e05 100644
--- a/src/bin/dhcp6/tests/wireshark.cc
+++ b/src/bin/dhcp6/tests/wireshark.cc
@@ -38,6 +38,8 @@
/// (Make sure that the packet is expanded in the view. The text file will
/// contain whatever expansion level you have in the graphical tree.)
+using namespace isc::dhcp;
+using namespace isc::asiolink;
using namespace std;
namespace isc {
diff --git a/src/hooks/dhcp/user_chk/user_chk.h b/src/hooks/dhcp/user_chk/user_chk.h
index 1bc2fc3..9f40c40 100644
--- a/src/hooks/dhcp/user_chk/user_chk.h
+++ b/src/hooks/dhcp/user_chk/user_chk.h
@@ -18,14 +18,11 @@
#include <fstream>
#include <string>
-using namespace std;
-using namespace user_chk;
-
// The following constants are used throughout the library. They are defined
// in load_unload.cc
/// @brief Pointer to the registry instance.
-extern UserRegistryPtr user_registry;
+extern user_chk::UserRegistryPtr user_registry;
/// @brief Output filestream for recording user check outcomes.
extern std::fstream user_chk_output;
diff --git a/src/hooks/dhcp/user_chk/user_file.cc b/src/hooks/dhcp/user_chk/user_file.cc
index 3ffc99e..45b62fe 100644
--- a/src/hooks/dhcp/user_chk/user_file.cc
+++ b/src/hooks/dhcp/user_chk/user_file.cc
@@ -35,7 +35,7 @@ UserFile::~UserFile(){
void
UserFile::open() {
if (isOpen()) {
- isc_throw (UserFileError, "file is already open");
+ isc_throw(UserFileError, "file is already open");
}
file_.open(fname_.c_str(), std::ifstream::in);
diff --git a/src/hooks/dhcp/user_chk/user_file.h b/src/hooks/dhcp/user_chk/user_file.h
index 873dddf..e394b47 100644
--- a/src/hooks/dhcp/user_chk/user_file.h
+++ b/src/hooks/dhcp/user_chk/user_file.h
@@ -23,17 +23,15 @@
#include <fstream>
#include <string>
-using namespace std;
-
namespace user_chk {
/// @brief Thrown a UserFile encounters an error.
/// Note that it derives from UserDataSourceError to comply with the interface.
class UserFileError : public UserDataSourceError {
public:
- UserFileError(const char* file, size_t line,
- const char* what) :
- UserDataSourceError(file, line, what) { };
+ UserFileError(const char* file, size_t line, const char* what) :
+ UserDataSourceError(file, line, what)
+ {}
};
/// @brief Provides a UserDataSource implementation for JSON text files.
@@ -125,7 +123,7 @@ public:
private:
/// @brief Pathname of the input text file.
- string fname_;
+ std::string fname_;
/// @brief Input file stream.
std::ifstream file_;
diff --git a/src/hooks/dhcp/user_chk/user_registry.h b/src/hooks/dhcp/user_chk/user_registry.h
index 48dc32c..3c8ee4c 100644
--- a/src/hooks/dhcp/user_chk/user_registry.h
+++ b/src/hooks/dhcp/user_chk/user_registry.h
@@ -24,16 +24,14 @@
#include <string>
-using namespace std;
-
namespace user_chk {
/// @brief Thrown UserRegistry encounters an error
class UserRegistryError : public isc::Exception {
public:
- UserRegistryError(const char* file, size_t line,
- const char* what) :
- isc::Exception(file, line, what) { };
+ UserRegistryError(const char* file, size_t line, const char* what) :
+ isc::Exception(file, line, what)
+ {}
};
/// @brief Defines a map of unique Users keyed by UserId.
diff --git a/src/lib/cache/message_cache.h b/src/lib/cache/message_cache.h
index 0c19139..0df23ed 100644
--- a/src/lib/cache/message_cache.h
+++ b/src/lib/cache/message_cache.h
@@ -73,8 +73,8 @@ protected:
/// \param name query name of the message.
/// \param type query type of the message.
/// \return return the hash key.
- HashKey getEntryHashKey(const isc::dns::Name& name,
- const isc::dns::RRType& type) const;
+ isc::nsas::HashKey getEntryHashKey(const isc::dns::Name& name,
+ const isc::dns::RRType& type) const;
// Make these variants be protected for easy unittest.
protected:
@@ -91,4 +91,3 @@ typedef boost::shared_ptr<MessageCache> MessageCachePtr;
} // namespace isc
#endif // MESSAGE_CACHE_H
-
diff --git a/src/lib/cache/message_entry.cc b/src/lib/cache/message_entry.cc
index b6af869..36e7691 100644
--- a/src/lib/cache/message_entry.cc
+++ b/src/lib/cache/message_entry.cc
@@ -23,6 +23,7 @@
#include "logger.h"
using namespace isc::dns;
+using namespace isc::nsas;
using namespace std;
// Put file scope functions in unnamed namespace.
diff --git a/src/lib/cache/message_entry.h b/src/lib/cache/message_entry.h
index 206e601..5b55fbb 100644
--- a/src/lib/cache/message_entry.h
+++ b/src/lib/cache/message_entry.h
@@ -22,8 +22,6 @@
#include "rrset_cache.h"
#include "rrset_entry.h"
-using namespace isc::nsas;
-
namespace isc {
namespace cache {
@@ -33,7 +31,7 @@ class RRsetEntry;
///
/// The object of MessageEntry represents one response message
/// answered to the resolver client.
-class MessageEntry : public NsasEntry<MessageEntry> {
+class MessageEntry : public isc::nsas::NsasEntry<MessageEntry> {
// Noncopyable
private:
MessageEntry(const MessageEntry& source);
@@ -92,7 +90,7 @@ public:
/// \brief Get the hash key of the message entry.
///
/// \return return hash key
- virtual HashKey hashKey() const {
+ virtual isc::nsas::HashKey hashKey() const {
return (*hash_key_ptr_);
}
@@ -173,7 +171,7 @@ protected:
private:
std::string entry_name_; // The name for this entry(name + type)
- HashKey* hash_key_ptr_; // the key for messag entry in hash table.
+ isc::nsas::HashKey* hash_key_ptr_; // the key for messag entry in hash table.
std::vector<RRsetRef> rrsets_;
RRsetCachePtr rrset_cache_; //Normal rrset cache
diff --git a/src/lib/cache/rrset_cache.h b/src/lib/cache/rrset_cache.h
index 304c6e8..8587ec7 100644
--- a/src/lib/cache/rrset_cache.h
+++ b/src/lib/cache/rrset_cache.h
@@ -20,8 +20,6 @@
#include <util/lru_list.h>
-using namespace isc::nsas;
-
namespace isc {
namespace cache {
diff --git a/src/lib/cache/rrset_entry.cc b/src/lib/cache/rrset_entry.cc
index 359fd68..2e5bf93 100644
--- a/src/lib/cache/rrset_entry.cc
+++ b/src/lib/cache/rrset_entry.cc
@@ -21,6 +21,7 @@
#include "rrset_copy.h"
using namespace isc::dns;
+using namespace isc::nsas;
namespace isc {
namespace cache {
diff --git a/src/lib/cache/rrset_entry.h b/src/lib/cache/rrset_entry.h
index 0efda36..71b5e4b 100644
--- a/src/lib/cache/rrset_entry.h
+++ b/src/lib/cache/rrset_entry.h
@@ -22,8 +22,6 @@
#include <nsas/fetchable.h>
#include "cache_entry_key.h"
-using namespace isc::nsas;
-
namespace isc {
namespace cache {
@@ -60,7 +58,7 @@ enum RRsetTrustLevel {
/// The object of RRsetEntry represents one cached RRset.
/// Each RRset entry may be refered using shared_ptr by several message
/// entries.
-class RRsetEntry : public NsasEntry<RRsetEntry>
+class RRsetEntry : public isc::nsas::NsasEntry<RRsetEntry>
{
///
/// \name Constructors and Destructor
@@ -105,7 +103,7 @@ public:
/// \brief Get the hash key
///
/// \return return hash key
- HashKey hashKey() const {
+ isc::nsas::HashKey hashKey() const {
return (hash_key_);
}
@@ -124,7 +122,7 @@ private:
time_t expire_time_; // Expiration time of rrset.
RRsetTrustLevel trust_level_; // RRset trustworthiness.
boost::shared_ptr<isc::dns::RRset> rrset_;
- HashKey hash_key_; // RRsetEntry hash key
+ isc::nsas::HashKey hash_key_; // RRsetEntry hash key
};
typedef boost::shared_ptr<RRsetEntry> RRsetEntryPtr;
diff --git a/src/lib/cache/tests/cache_test_messagefromfile.h b/src/lib/cache/tests/cache_test_messagefromfile.h
index 7d55f08..85bc0d9 100644
--- a/src/lib/cache/tests/cache_test_messagefromfile.h
+++ b/src/lib/cache/tests/cache_test_messagefromfile.h
@@ -17,9 +17,6 @@
#include <util/buffer.h>
#include <dns/message.h>
-using namespace isc;
-using namespace isc::dns;
-
namespace {
/// \brief Reads a Message from a data file
@@ -27,13 +24,12 @@ namespace {
/// \param message Message to put the read data in
/// \param datafile The file to read from
void
-messageFromFile(Message& message, const char* datafile) {
+messageFromFile(isc::dns::Message& message, const char* datafile) {
std::vector<unsigned char> data;
- UnitTestUtil::readWireData(datafile, data);
+ isc::UnitTestUtil::readWireData(datafile, data);
isc::util::InputBuffer buffer(&data[0], data.size());
message.fromWire(buffer);
}
} // namespace
-
diff --git a/src/lib/cache/tests/cache_test_sectioncount.h b/src/lib/cache/tests/cache_test_sectioncount.h
index df7cb52..0dcdaee 100644
--- a/src/lib/cache/tests/cache_test_sectioncount.h
+++ b/src/lib/cache/tests/cache_test_sectioncount.h
@@ -17,9 +17,6 @@
#include <util/buffer.h>
#include <dns/message.h>
-using namespace isc;
-using namespace isc::dns;
-
namespace {
/// \brief Counts the number of rrsets in the given section
@@ -29,9 +26,9 @@ namespace {
///
/// \return The number of RRsets in the given section
int
-sectionRRsetCount(Message& msg, Message::Section section) {
+sectionRRsetCount(isc::dns::Message& msg, isc::dns::Message::Section section) {
int count = 0;
- for (RRsetIterator rrset_iter = msg.beginSection(section);
+ for (isc::dns::RRsetIterator rrset_iter = msg.beginSection(section);
rrset_iter != msg.endSection(section);
++rrset_iter) {
++count;
@@ -41,4 +38,3 @@ sectionRRsetCount(Message& msg, Message::Section section) {
}
} // namespace
-
diff --git a/src/lib/cache/tests/message_cache_unittest.cc b/src/lib/cache/tests/message_cache_unittest.cc
index 60ae037..c26b3cb 100644
--- a/src/lib/cache/tests/message_cache_unittest.cc
+++ b/src/lib/cache/tests/message_cache_unittest.cc
@@ -23,6 +23,7 @@
#include "cache_test_messagefromfile.h"
using namespace isc::cache;
+using namespace isc::nsas;
using namespace isc;
using namespace isc::dns;
using namespace isc::util;
diff --git a/src/lib/dhcp/std_option_defs.h b/src/lib/dhcp/std_option_defs.h
index 6611f19..31723c1 100644
--- a/src/lib/dhcp/std_option_defs.h
+++ b/src/lib/dhcp/std_option_defs.h
@@ -19,6 +19,9 @@
#include <dhcp/dhcp4.h>
#include <dhcp/dhcp6.h>
+namespace isc {
+namespace dhcp {
+
namespace {
/// @brief Declare an array holding parameters used to create instance
@@ -42,8 +45,6 @@ namespace {
#define NO_RECORD_DEF 0, 0
#endif
-using namespace isc::dhcp;
-
/// @brief Parameters being used to make up an option definition.
struct OptionDefParams {
const char* name; // option name
@@ -332,6 +333,9 @@ const OptionDefParams OPTION_DEF_PARAMS6[] = {
const int OPTION_DEF_PARAMS_SIZE6 =
sizeof(OPTION_DEF_PARAMS6) / sizeof(OPTION_DEF_PARAMS6[0]);
-}; // anonymous namespace
+} // unnamed namespace
+
+} // namespace dhcp
+} // namespace isc
#endif // STD_OPTION_DEFS_H
diff --git a/src/lib/dns/tests/rdata_nsec3param_like_unittest.cc b/src/lib/dns/tests/rdata_nsec3param_like_unittest.cc
index 23d6d0e..2346180 100644
--- a/src/lib/dns/tests/rdata_nsec3param_like_unittest.cc
+++ b/src/lib/dns/tests/rdata_nsec3param_like_unittest.cc
@@ -30,6 +30,7 @@ using namespace std;
using isc::UnitTestUtil;
using namespace isc::dns;
using namespace isc::dns::rdata;
+using namespace isc::util;
namespace {
diff --git a/src/lib/dns/tests/rdata_nsecbitmap_unittest.cc b/src/lib/dns/tests/rdata_nsecbitmap_unittest.cc
index fbb256a..0af1a12 100644
--- a/src/lib/dns/tests/rdata_nsecbitmap_unittest.cc
+++ b/src/lib/dns/tests/rdata_nsecbitmap_unittest.cc
@@ -34,6 +34,7 @@ using boost::lexical_cast;
using isc::UnitTestUtil;
using namespace isc::dns;
using namespace isc::dns::rdata;
+using namespace isc::util;
namespace {
diff --git a/src/lib/dns/tests/rdata_unittest.h b/src/lib/dns/tests/rdata_unittest.h
index 04af07c..8c7f954 100644
--- a/src/lib/dns/tests/rdata_unittest.h
+++ b/src/lib/dns/tests/rdata_unittest.h
@@ -27,8 +27,6 @@
#include <string>
#include <sstream>
-using namespace isc::util;
-
namespace isc {
namespace dns {
namespace rdata {
@@ -77,7 +75,7 @@ protected:
}
}
- OutputBuffer obuffer;
+ isc::util::OutputBuffer obuffer;
MessageRenderer renderer;
/// This is an RDATA object of some "unknown" RR type so that it can be
/// used to test the compare() method against a well-known RR type.
diff --git a/src/lib/nsas/tests/hash_unittest.cc b/src/lib/nsas/tests/hash_unittest.cc
index f71d4b3..fe43bfa 100644
--- a/src/lib/nsas/tests/hash_unittest.cc
+++ b/src/lib/nsas/tests/hash_unittest.cc
@@ -26,6 +26,7 @@
#include "nsas_test.h"
using namespace std;
+using namespace isc::dns;
namespace isc {
namespace nsas {
diff --git a/src/lib/nsas/tests/nameserver_address_store_unittest.cc b/src/lib/nsas/tests/nameserver_address_store_unittest.cc
index a606f26..3bde33b 100644
--- a/src/lib/nsas/tests/nameserver_address_store_unittest.cc
+++ b/src/lib/nsas/tests/nameserver_address_store_unittest.cc
@@ -41,8 +41,10 @@
#include "nsas_test.h"
using namespace isc::dns;
+using namespace isc::dns::rdata;
using namespace isc::util;
using namespace std;
+using isc::util::unittests::TestResolver;
namespace isc {
namespace nsas {
diff --git a/src/lib/nsas/tests/nameserver_address_unittest.cc b/src/lib/nsas/tests/nameserver_address_unittest.cc
index 1b211e9..f8512bf 100644
--- a/src/lib/nsas/tests/nameserver_address_unittest.cc
+++ b/src/lib/nsas/tests/nameserver_address_unittest.cc
@@ -26,12 +26,13 @@
#include "../nameserver_entry.h"
#include "nsas_test.h"
+using namespace isc::dns;
+using namespace isc::dns::rdata;
+using isc::util::unittests::TestResolver;
+
namespace isc {
namespace nsas {
-using namespace dns;
-using namespace rdata;
-
#define TEST_ADDRESS_INDEX 1
/// \brief NameserverEntry sample class for testing
diff --git a/src/lib/nsas/tests/nameserver_entry_unittest.cc b/src/lib/nsas/tests/nameserver_entry_unittest.cc
index 10f0c20..dd7f3b9 100644
--- a/src/lib/nsas/tests/nameserver_entry_unittest.cc
+++ b/src/lib/nsas/tests/nameserver_entry_unittest.cc
@@ -41,7 +41,7 @@ using namespace isc::nsas;
using namespace isc::asiolink;
using namespace std;
using namespace isc::dns;
-using namespace rdata;
+using isc::util::unittests::TestResolver;
namespace {
diff --git a/src/lib/nsas/tests/nsas_entry_compare_unittest.cc b/src/lib/nsas/tests/nsas_entry_compare_unittest.cc
index 33e41b8..9bc5b9c 100644
--- a/src/lib/nsas/tests/nsas_entry_compare_unittest.cc
+++ b/src/lib/nsas/tests/nsas_entry_compare_unittest.cc
@@ -25,6 +25,7 @@
#include "../nsas_entry_compare.h"
#include "nsas_test.h"
+using namespace isc::dns;
using namespace std;
namespace isc {
diff --git a/src/lib/nsas/tests/nsas_test.h b/src/lib/nsas/tests/nsas_test.h
index 9f92149..54e5d45 100644
--- a/src/lib/nsas/tests/nsas_test.h
+++ b/src/lib/nsas/tests/nsas_test.h
@@ -38,11 +38,6 @@
#include <dns/rdataclass.h>
#include "../nsas_entry.h"
-using namespace isc::dns::rdata;
-using namespace isc::dns;
-using namespace isc::util;
-using isc::util::unittests::TestResolver;
-
namespace isc {
namespace dns {
@@ -77,15 +72,15 @@ public:
/// For this reason, a single class definition
template <typename T>
-class RdataTest: public Rdata {
+class RdataTest: public rdata::Rdata {
public:
/// \brief Constructor
///
/// Set the data in the object.
///
- /// \param v4address IPV4 address to store. (The format of this address is
- /// not checked.)
+ /// \param v4address IPV4 address to store. (The format of this
+ /// address is not checked.)
RdataTest(const std::string& data) : data_(data)
{}
@@ -99,8 +94,9 @@ public:
/// \brief Return type of Rdata
///
- /// Returns the type of the data. May be useful in the tests, although this
- /// will not appear in the main code as this interface is not defined.
+ /// Returns the type of the data. May be useful in the tests,
+ /// although this will not appear in the main code as this interface
+ /// is not defined.
virtual uint16_t getType() const {
return (type_.getType());
}
@@ -111,13 +107,13 @@ public:
///
//@{
/// \brief Render the \c Rdata in the wire format to a buffer
- virtual void toWire(OutputBuffer& buffer) const;
+ virtual void toWire(isc::util::OutputBuffer& buffer) const;
/// \brief render the \Rdata in the wire format to a \c MessageRenderer
virtual void toWire(AbstractMessageRenderer& renderer) const;
/// \brief Comparison Method
- virtual int compare(const Rdata& other) const;
+ virtual int compare(const rdata::Rdata& other) const;
//@}
private:
@@ -126,7 +122,7 @@ private:
};
template <typename T>
-void RdataTest<T>::toWire(OutputBuffer&) const {
+void RdataTest<T>::toWire(isc::util::OutputBuffer&) const {
}
template <typename T>
@@ -134,7 +130,7 @@ void RdataTest<T>::toWire(AbstractMessageRenderer&) const {
}
template <typename T>
-int RdataTest<T>::compare(const Rdata&) const {
+int RdataTest<T>::compare(const rdata::Rdata&) const {
return 0;
}
@@ -210,7 +206,8 @@ private:
///
/// Some constants used in the various tests.
-static const uint32_t HASHTABLE_DEFAULT_SIZE = 1009; ///< First prime above 1000
+static const uint32_t HASHTABLE_DEFAULT_SIZE = 1009; ///< First prime
+ ///above 1000
// String constants. These should end in a dot.
static const std::string EXAMPLE_CO_UK("example.co.uk.");
@@ -219,63 +216,92 @@ static const std::string MIXED_EXAMPLE_CO_UK("EXAmple.co.uk.");
class TestWithRdata : public ::testing::Test {
protected:
- typedef boost::shared_ptr<RRset> RRsetPtr;
+ typedef boost::shared_ptr<isc::dns::RRset> RRsetPtr;
/// \brief Constructor
///
- /// Initializes the RRsets used in the tests. The RRsets themselves have to
- /// be initialized with the basic data on their construction. The Rdata for
- /// them is added in SetUp().
+ /// Initializes the RRsets used in the tests. The RRsets themselves
+ /// have to be initialized with the basic data on their
+ /// construction. The Rdata for them is added in SetUp().
TestWithRdata() :
- rrv4_(new RRset(Name(EXAMPLE_CO_UK), RRClass::IN(), RRType::A(),
- RRTTL(1200))),
- rrcase_(new RRset(Name(MIXED_EXAMPLE_CO_UK), RRClass::IN(),
- RRType::A(), RRTTL(1200))),
- rrch_(new RRset(Name(EXAMPLE_CO_UK), RRClass::CH(), RRType::A(),
- RRTTL(1200))),
- rrns_(new RRset(Name(EXAMPLE_CO_UK), RRClass::IN(), RRType::NS(),
- RRTTL(1200))),
- rr_single_(new RRset(Name(EXAMPLE_CO_UK), RRClass::IN(),
- RRType::NS(), RRTTL(600))),
- rr_empty_(new RRset(Name(EXAMPLE_CO_UK), RRClass::IN(),
- RRType::NS(), RRTTL(600))),
- rrv6_(new RRset(Name(EXAMPLE_CO_UK), RRClass::IN(),
- RRType::AAAA(), RRTTL(900))),
- rrnet_(new RRset(Name(EXAMPLE_NET), RRClass::IN(), RRType::A(),
- RRTTL(600))),
+ rrv4_(new isc::dns::RRset(isc::dns::Name(EXAMPLE_CO_UK),
+ isc::dns::RRClass::IN(),
+ isc::dns::RRType::A(),
+ isc::dns::RRTTL(1200))),
+ rrcase_(new isc::dns::RRset(isc::dns::Name(MIXED_EXAMPLE_CO_UK),
+ isc::dns::RRClass::IN(),
+ isc::dns::RRType::A(),
+ isc::dns::RRTTL(1200))),
+ rrch_(new isc::dns::RRset(isc::dns::Name(EXAMPLE_CO_UK),
+ isc::dns::RRClass::CH(),
+ isc::dns::RRType::A(),
+ isc::dns::RRTTL(1200))),
+ rrns_(new isc::dns::RRset(isc::dns::Name(EXAMPLE_CO_UK),
+ isc::dns::RRClass::IN(),
+ isc::dns::RRType::NS(),
+ isc::dns::RRTTL(1200))),
+ rr_single_(new isc::dns::RRset(isc::dns::Name(EXAMPLE_CO_UK),
+ isc::dns::RRClass::IN(),
+ isc::dns::RRType::NS(),
+ isc::dns::RRTTL(600))),
+ rr_empty_(new isc::dns::RRset(isc::dns::Name(EXAMPLE_CO_UK),
+ isc::dns::RRClass::IN(),
+ isc::dns::RRType::NS(),
+ isc::dns::RRTTL(600))),
+ rrv6_(new isc::dns::RRset(isc::dns::Name(EXAMPLE_CO_UK),
+ isc::dns::RRClass::IN(),
+ isc::dns::RRType::AAAA(),
+ isc::dns::RRTTL(900))),
+ rrnet_(new isc::dns::RRset(isc::dns::Name(EXAMPLE_NET),
+ isc::dns::RRClass::IN(),
+ isc::dns::RRType::A(),
+ isc::dns::RRTTL(600))),
ns_name_("ns.example.net.")
{}
/// \brief Add Rdata to RRsets
///
- /// The data are added as const pointers to avoid the stricter type checking
- /// applied by the Rdata code. There is no need for it in these tests.
+ /// The data are added as const pointers to avoid the stricter type
+ /// checking applied by the Rdata code. There is no need for it in
+ /// these tests.
virtual void SetUp() {
// A records
- rrv4_->addRdata(ConstRdataPtr(new RdataTest<A>("1.2.3.4")));
- rrv4_->addRdata(ConstRdataPtr(new RdataTest<A>("5.6.7.8")));
- rrv4_->addRdata(ConstRdataPtr(new RdataTest<A>("9.10.11.12")));
+ rrv4_->addRdata(isc::dns::rdata::ConstRdataPtr
+ (new isc::dns::RdataTest<isc::dns::A>("1.2.3.4")));
+ rrv4_->addRdata(isc::dns::rdata::ConstRdataPtr
+ (new isc::dns::RdataTest<isc::dns::A>("5.6.7.8")));
+ rrv4_->addRdata(isc::dns::rdata::ConstRdataPtr
+ (new isc::dns::RdataTest<isc::dns::A>("9.10.11.12")));
// A records
- rrcase_->addRdata(ConstRdataPtr(new RdataTest<A>("13.14.15.16")));
+ rrcase_->addRdata(isc::dns::rdata::ConstRdataPtr
+ (new isc::dns::RdataTest<isc::dns::A>
+ ("13.14.15.16")));
// No idea what Chaosnet address look like other than they are 16 bits
// The fact that they are type A is probably also incorrect.
- rrch_->addRdata(ConstRdataPtr(new RdataTest<A>("1324")));
+ rrch_->addRdata(isc::dns::rdata::ConstRdataPtr
+ (new isc::dns::RdataTest<isc::dns::A>("1324")));
// NS records take a single name
- rrns_->addRdata(rdata::generic::NS("example.fr."));
- rrns_->addRdata(rdata::generic::NS("example.de."));
+ rrns_->addRdata(isc::dns::rdata::generic::NS("example.fr."));
+ rrns_->addRdata(isc::dns::rdata::generic::NS("example.de."));
// Single NS record with 0 TTL
- rr_single_->addRdata(rdata::generic::NS(ns_name_));
+ rr_single_->addRdata(isc::dns::rdata::generic::NS(ns_name_));
// AAAA records
- rrv6_->addRdata(ConstRdataPtr(new RdataTest<AAAA>("2001::1002")));
- rrv6_->addRdata(ConstRdataPtr(new RdataTest<AAAA>("dead:beef:feed::")));
+ rrv6_->addRdata(isc::dns::rdata::ConstRdataPtr
+ (new isc::dns::RdataTest<isc::dns::AAAA>
+ ("2001::1002")));
+ rrv6_->addRdata(isc::dns::rdata::ConstRdataPtr
+ (new isc::dns::RdataTest<isc::dns::AAAA>
+ ("dead:beef:feed::")));
// A record for example.net
- rrnet_->addRdata(ConstRdataPtr(new RdataTest<A>("17.18.18.20")));
+ rrnet_->addRdata(isc::dns::rdata::ConstRdataPtr
+ (new isc::dns::RdataTest<isc::dns::A>
+ ("17.18.18.20")));
}
/// \brief Data for the tests
@@ -287,7 +313,7 @@ protected:
RRsetPtr rr_empty_; ///< NS RRset without any nameservers
RRsetPtr rrv6_; ///< Standard RRset, IN, AAAA, lowercase name
RRsetPtr rrnet_; ///< example.net A RRset
- Name ns_name_; ///< Nameserver name of ns.example.net
+ isc::dns::Name ns_name_; ///< Nameserver name of ns.example.net
};
} // namespace nsas
diff --git a/src/lib/nsas/tests/zone_entry_unittest.cc b/src/lib/nsas/tests/zone_entry_unittest.cc
index d685fbb..04a6d4d 100644
--- a/src/lib/nsas/tests/zone_entry_unittest.cc
+++ b/src/lib/nsas/tests/zone_entry_unittest.cc
@@ -33,9 +33,11 @@
using namespace isc::nsas;
using namespace isc::asiolink;
-using namespace std;
using namespace isc::dns;
+using namespace isc::dns::rdata;
using namespace isc::util;
+using namespace std;
+using isc::util::unittests::TestResolver;
namespace {
diff --git a/src/lib/resolve/recursive_query.cc b/src/lib/resolve/recursive_query.cc
index 3c54a78..e0c5a30 100644
--- a/src/lib/resolve/recursive_query.cc
+++ b/src/lib/resolve/recursive_query.cc
@@ -43,6 +43,7 @@
#include <resolve/recursive_query.h>
using namespace isc::dns;
+using namespace isc::nsas;
using namespace isc::util;
using namespace isc::asiolink;
using namespace isc::resolve;
More information about the bind10-changes
mailing list