BIND 10 trac3034, updated. 7c8bb56f8708151365ceb72e2817346c0c310d8d [3034] Added use of D2ClientMgr method to generate FQDNs in b10-dhcp6
BIND 10 source code commits
bind10-changes at lists.isc.org
Mon Feb 17 17:01:27 UTC 2014
The branch, trac3034 has been updated
via 7c8bb56f8708151365ceb72e2817346c0c310d8d (commit)
from 4ae21182c9657a733b34f6da9371d8962928e5a8 (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 7c8bb56f8708151365ceb72e2817346c0c310d8d
Author: Thomas Markwalder <tmark at isc.org>
Date: Mon Feb 17 12:00:06 2014 -0500
[3034] Added use of D2ClientMgr method to generate FQDNs in b10-dhcp6
Replaced logic in Dhcpv6Srv::generateFqdn() which constructed the
FQDN from the lease address to use D2ClientMgr::generateFqdn() method.
Removed remaining obsolete FQDN_ constants.
-----------------------------------------------------------------------
Summary of changes:
src/bin/dhcp6/dhcp6_srv.cc | 38 +++++-----------------------------
src/bin/dhcp6/dhcp6_srv.h | 2 ++
src/bin/dhcp6/tests/fqdn_unittest.cc | 6 +++---
3 files changed, 10 insertions(+), 36 deletions(-)
-----------------------------------------------------------------------
diff --git a/src/bin/dhcp6/dhcp6_srv.cc b/src/bin/dhcp6/dhcp6_srv.cc
index 5c562e0..1166271 100644
--- a/src/bin/dhcp6/dhcp6_srv.cc
+++ b/src/bin/dhcp6/dhcp6_srv.cc
@@ -98,24 +98,6 @@ Dhcp6Hooks Hooks;
namespace isc {
namespace dhcp {
-namespace {
-
-// The following constants describe server's behavior with respect to the
-// DHCPv6 Client FQDN Option sent by a client. They will be removed
-// when DDNS parameters for DHCPv6 are implemented with the ticket #3034.
-
-// Do update, even if client requested no updates with N flag (Disabled).
-const bool FQDN_OVERRIDE_NO_UPDATE = false;
-// Server performs an update when client requested delegation (Enabled).
-const bool FQDN_OVERRIDE_CLIENT_UPDATE = true;
-// The fully qualified domain-name suffix if partial name provided by
-// a client.
-const char* FQDN_PARTIAL_SUFFIX = "example.com";
-// Should server replace the domain-name supplied by the client (Disabled).
-const bool FQDN_REPLACE_CLIENT_NAME = false;
-
-}
-
/// @brief file name of a server-id file
///
/// Server must store its duid in persistent storage that must not change
@@ -2442,17 +2424,8 @@ Dhcpv6Srv::generateFqdn(const Pkt6Ptr& answer) {
}
// Get the IPv6 address acquired by the client.
IOAddress addr = iaaddr->getAddress();
- std::string hostname = addr.toText();
- // Colons may not be ok for FQDNs so let's replace them with hyphens.
- std::replace(hostname.begin(), hostname.end(), ':', '-');
- std::ostringstream stream;
- // The final FQDN consists of the partial domain name and the suffix.
- // For example, if the acquired address is 2001:db8:1::2, the generated
- // FQDN may be:
- // host-2001-db8:1--2.example.com.
- // where prefix 'host' should be configurable. The domain name suffix
- // should also be configurable.
- stream << "host-" << hostname << "." << FQDN_PARTIAL_SUFFIX << ".";
+ std::string generated_name =
+ CfgMgr::instance().getD2ClientMgr().generateFqdn(addr);
try {
// The lease has been acquired but the FQDN for this lease hasn't
// been updated in the lease database. We now have new FQDN
@@ -2463,7 +2436,7 @@ Dhcpv6Srv::generateFqdn(const Pkt6Ptr& answer) {
Lease6Ptr lease =
LeaseMgrFactory::instance().getLease6(Lease::TYPE_NA, addr);
if (lease) {
- lease->hostname_ = stream.str();
+ lease->hostname_ = generated_name;
LeaseMgrFactory::instance().updateLease6(lease);
} else {
@@ -2474,13 +2447,12 @@ Dhcpv6Srv::generateFqdn(const Pkt6Ptr& answer) {
" client");
}
}
-
// Set the generated FQDN in the Client FQDN option.
- fqdn->setDomainName(stream.str(), Option6ClientFqdn::FULL);
+ fqdn->setDomainName(generated_name, Option6ClientFqdn::FULL);
} catch (const Exception& ex) {
LOG_ERROR(dhcp6_logger, DHCP6_NAME_GEN_UPDATE_FAIL)
- .arg(hostname)
+ .arg(addr.toText())
.arg(ex.what());
}
}
diff --git a/src/bin/dhcp6/dhcp6_srv.h b/src/bin/dhcp6/dhcp6_srv.h
index 3529841..6405574 100644
--- a/src/bin/dhcp6/dhcp6_srv.h
+++ b/src/bin/dhcp6/dhcp6_srv.h
@@ -405,6 +405,7 @@ protected:
/// objects and store them in the internal queue. Requests created by this
/// function are only adding or updating DNS records. In order to generate
/// requests for DNS records removal, use @c createRemovalNameChangeRequest.
+ /// If ddns updates are disabled, this method returns immediately.
///
/// @todo Add support for multiple IAADDR options in the IA_NA.
///
@@ -422,6 +423,7 @@ protected:
/// Note that this function will not remove the entries which server hadn't
/// added. This is the case, when client performs forward DNS update on its
/// own.
+ /// If ddns updates are disabled, this method returns immediately.
///
/// @param lease A lease for which the the removal of corresponding DNS
/// records will be performed.
diff --git a/src/bin/dhcp6/tests/fqdn_unittest.cc b/src/bin/dhcp6/tests/fqdn_unittest.cc
index 0fd5c49..9226285 100644
--- a/src/bin/dhcp6/tests/fqdn_unittest.cc
+++ b/src/bin/dhcp6/tests/fqdn_unittest.cc
@@ -913,13 +913,13 @@ TEST_F(FqdnDhcpv6SrvTest, processRequestEmptyFqdn) {
NakedDhcpv6Srv srv(0);
testProcessMessage(DHCPV6_REQUEST, "",
- "host-2001-db8-1-1--dead-beef.example.com.",
+ "myhost-2001-db8-1-1--dead-beef.example.com.",
srv, false);
ASSERT_EQ(1, srv.name_change_reqs_.size());
verifyNameChangeRequest(srv, isc::dhcp_ddns::CHG_ADD, true, true,
"2001:db8:1:1::dead:beef",
- "0002018D6874B105A5C92DBBD6E4F6C80A93161"
- "BC03996F0CD0EB75800DEF997C29961",
+ "000201C905E54BE12DE6AF92ADE72752B9F362"
+ "13B5A8BC9D217548CD739B4CF31AFB1B",
0, 4000);
}
More information about the bind10-changes
mailing list