BIND 10 trac3352, updated. 45b5ff67532605280e2af903263097745c2f5804 [3352] Addressed review comments.
BIND 10 source code commits
bind10-changes at lists.isc.org
Thu Mar 13 16:07:04 UTC 2014
The branch, trac3352 has been updated
via 45b5ff67532605280e2af903263097745c2f5804 (commit)
from 4fc2c2cb250f93809d3287bdf9d50f5cbbc0fd17 (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 45b5ff67532605280e2af903263097745c2f5804
Author: Thomas Markwalder <tmark at isc.org>
Date: Thu Mar 13 11:59:24 2014 -0400
[3352] Addressed review comments.
Added use of boolean structs for fdqn unit tests for clarity.
Minor cosmetics.
-----------------------------------------------------------------------
Summary of changes:
src/bin/dhcp4/tests/fqdn_unittest.cc | 1 -
src/bin/dhcp6/tests/fqdn_unittest.cc | 35 +++++++++++++++++++++++-----------
src/lib/dhcpsrv/d2_client_mgr.h | 4 ++--
3 files changed, 26 insertions(+), 14 deletions(-)
-----------------------------------------------------------------------
diff --git a/src/bin/dhcp4/tests/fqdn_unittest.cc b/src/bin/dhcp4/tests/fqdn_unittest.cc
index 4e72dff..90f95f5 100644
--- a/src/bin/dhcp4/tests/fqdn_unittest.cc
+++ b/src/bin/dhcp4/tests/fqdn_unittest.cc
@@ -544,7 +544,6 @@ TEST_F(NameDhcpv4SrvTest, respectClientDelegation) {
flagVsConfigScenario(Option4ClientFqdn::FLAG_E,
Option4ClientFqdn::FLAG_E);
- // Option4ClientFqdn::FLAG_N));
}
// Tests the following scenario:
diff --git a/src/bin/dhcp6/tests/fqdn_unittest.cc b/src/bin/dhcp6/tests/fqdn_unittest.cc
index fe5542f..b57aa4c 100644
--- a/src/bin/dhcp6/tests/fqdn_unittest.cc
+++ b/src/bin/dhcp6/tests/fqdn_unittest.cc
@@ -40,6 +40,7 @@ using namespace std;
namespace {
+
/// @brief A test fixture class for testing DHCPv6 Client FQDN Option handling.
class FqdnDhcpv6SrvTest : public Dhcpv6SrvTest {
public:
@@ -56,6 +57,18 @@ public:
static const uint16_t OVERRIDE_CLIENT_UPDATE = 4;
static const uint16_t REPLACE_CLIENT_NAME = 8;
+ // Type used to indicate whether or not forward updates are expected
+ struct ExpFwd {
+ ExpFwd(bool exp_fwd) : value_(exp_fwd){};
+ bool value_;
+ };
+
+ // Type used to indicate whether or not reverse updates are expected
+ struct ExpRev {
+ ExpRev(bool exp_rev) : value_(exp_rev){};
+ bool value_;
+ };
+
/// @brief Constructor
FqdnDhcpv6SrvTest()
: Dhcpv6SrvTest(), srv_(new NakedDhcpv6Srv(0)),
@@ -172,7 +185,6 @@ public:
pkt->addOption(oro);
}
- OptionPtr tmp = pkt->getOption(D6O_CLIENTID);
return (pkt);
}
@@ -297,7 +309,8 @@ public:
const uint8_t exp_flags,
const std::string& exp_domain_name,
const bool create_ncr_check,
- const bool exp_fwd = true, const bool exp_rev = true) {
+ const ExpFwd& exp_fwd = ExpFwd(true),
+ const ExpRev& exp_rev = ExpRev(true)) {
Pkt6Ptr question = generateMessage(msg_type,
in_flags,
@@ -345,15 +358,15 @@ public:
if (create_ncr_check) {
// Call createNameChangeRequests
ASSERT_NO_THROW(srv_->createNameChangeRequests(answer));
- if (exp_fwd || exp_rev) {
+ if (exp_fwd.value_ || exp_rev.value_) {
// Should have created 1 NCR.
NameChangeRequestPtr ncr;
ASSERT_EQ(1, d2_mgr_.getQueueSize());
ASSERT_NO_THROW(ncr = d2_mgr_.peekAt(0));
ASSERT_TRUE(ncr);
EXPECT_EQ(dhcp_ddns::CHG_ADD, ncr->getChangeType());
- EXPECT_EQ(exp_fwd, ncr->isForwardChange());
- EXPECT_EQ(exp_rev, ncr->isReverseChange());
+ EXPECT_EQ(exp_fwd.value_, ncr->isForwardChange());
+ EXPECT_EQ(exp_rev.value_, ncr->isReverseChange());
ASSERT_NO_THROW(d2_mgr_.runReadyIO());
} else {
// Should not have created any NCRs.
@@ -503,7 +516,7 @@ TEST_F(FqdnDhcpv6SrvTest, serverAAAAUpdate) {
testFqdn(DHCPV6_SOLICIT, Option6ClientFqdn::FLAG_S,
"myhost.example.com",
Option6ClientFqdn::FULL, Option6ClientFqdn::FLAG_S,
- "myhost.example.com.", true, true, true);
+ "myhost.example.com.", true, ExpFwd(true), ExpRev(true));
}
// Test server's response when client provides partial domain-name and requests
@@ -511,7 +524,7 @@ TEST_F(FqdnDhcpv6SrvTest, serverAAAAUpdate) {
TEST_F(FqdnDhcpv6SrvTest, serverAAAAUpdatePartialName) {
testFqdn(DHCPV6_SOLICIT, Option6ClientFqdn::FLAG_S, "myhost",
Option6ClientFqdn::PARTIAL, Option6ClientFqdn::FLAG_S,
- "myhost.example.com.", true, true, true);
+ "myhost.example.com.", true, ExpFwd(true), ExpRev(true));
}
// Test server's response when client provides empty domain-name and requests
@@ -526,7 +539,7 @@ TEST_F(FqdnDhcpv6SrvTest, noUpdate) {
testFqdn(DHCPV6_SOLICIT, Option6ClientFqdn::FLAG_N,
"myhost.example.com",
Option6ClientFqdn::FULL, Option6ClientFqdn::FLAG_N,
- "myhost.example.com.", true, false, false);
+ "myhost.example.com.", true, ExpFwd(false), ExpRev(false));
}
// Test server's response when client requests no DNS update and
@@ -537,7 +550,7 @@ TEST_F(FqdnDhcpv6SrvTest, overrideNoUpdate) {
"myhost.example.com",
Option6ClientFqdn::FULL,
(Option6ClientFqdn::FLAG_S | Option6ClientFqdn::FLAG_O),
- "myhost.example.com.", true, true, true);
+ "myhost.example.com.", true, ExpFwd(true), ExpRev(true));
}
// Test server's response when client requests that server delegates the AAAA
@@ -546,7 +559,7 @@ TEST_F(FqdnDhcpv6SrvTest, clientAAAAUpdate) {
testFqdn(DHCPV6_SOLICIT, 0, "myhost.example.com.",
Option6ClientFqdn::FULL,
0,
- "myhost.example.com.", true, false, true);
+ "myhost.example.com.", true, ExpFwd(false), ExpRev(true));
}
// Test server's response when client requests that server delegates the AAAA
@@ -556,7 +569,7 @@ TEST_F(FqdnDhcpv6SrvTest, clientAAAAUpdateNotAllowed) {
testFqdn(DHCPV6_SOLICIT, 0, "myhost.example.com.",
Option6ClientFqdn::FULL,
Option6ClientFqdn::FLAG_S | Option6ClientFqdn::FLAG_O,
- "myhost.example.com.", true, true, true);
+ "myhost.example.com.", true, ExpFwd(true), ExpRev(true));
}
// Test that exception is thrown if supplied NULL answer packet when
diff --git a/src/lib/dhcpsrv/d2_client_mgr.h b/src/lib/dhcpsrv/d2_client_mgr.h
index fdbee1f..3086430 100644
--- a/src/lib/dhcpsrv/d2_client_mgr.h
+++ b/src/lib/dhcpsrv/d2_client_mgr.h
@@ -215,9 +215,9 @@ public:
/// * reverse will be true if N_FLAG is false
///
/// @param fqdn FQDN option from which to read server (outbound) flags
- /// @param forward[out] bool value will be set to true if forward udpates
+ /// @param [out] forward bool value will be set to true if forward udpates
/// should be done, false if not.
- /// @param reverse[out] bool value will be set to true if reverse udpates
+ /// @param [out] reverse bool value will be set to true if reverse udpates
/// should be done, false if not.
/// @tparam T FQDN Option class containing the FQDN data such as
/// dhcp::Option4ClientFqdn or dhcp::Option6ClientFqdn
More information about the bind10-changes
mailing list