BIND 10 trac3036, updated. c322cadf5a251ee14444a059e6ae66611db97488 [3036] Minor: spell check and copyright dates.
BIND 10 source code commits
bind10-changes at lists.isc.org
Fri Aug 2 16:38:19 UTC 2013
The branch, trac3036 has been updated
via c322cadf5a251ee14444a059e6ae66611db97488 (commit)
via 943e416451f87977b7aa8ab63c99ccf05865436b (commit)
from 87e43d5dfdb2b3c470e6f3c81e786b49a9a621c5 (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 c322cadf5a251ee14444a059e6ae66611db97488
Author: Marcin Siodelski <marcin at isc.org>
Date: Fri Aug 2 18:23:51 2013 +0200
[3036] Minor: spell check and copyright dates.
commit 943e416451f87977b7aa8ab63c99ccf05865436b
Author: Marcin Siodelski <marcin at isc.org>
Date: Sat Jul 27 13:12:14 2013 +0200
[3036] Added a few logging messages concerning changes to DNS mapping.
-----------------------------------------------------------------------
Summary of changes:
src/bin/d2/ncr_msg.h | 2 +-
src/bin/dhcp6/dhcp6_messages.mes | 25 +++++++++++++++++++++++++
src/bin/dhcp6/dhcp6_srv.cc | 27 +++++++++++++++++++++++++++
src/bin/dhcp6/dhcp6_srv.h | 8 ++++----
src/lib/dhcpsrv/alloc_engine.h | 2 +-
5 files changed, 58 insertions(+), 6 deletions(-)
-----------------------------------------------------------------------
diff --git a/src/bin/d2/ncr_msg.h b/src/bin/d2/ncr_msg.h
index 42a5ea4..f9e3c62 100644
--- a/src/bin/d2/ncr_msg.h
+++ b/src/bin/d2/ncr_msg.h
@@ -101,7 +101,7 @@ public:
/// or there is an odd number of digits.
void fromStr(const std::string& data);
- /// @brief Sets the DHCID value based on the DUID.
+ /// @brief Sets the DHCID value based on the DUID and FQDN.
///
/// @param duid A @c isc::dhcp::DUID object encapsulating DUID.
/// @param wire_fqdn A on-wire canonical representation of the FQDN.
diff --git a/src/bin/dhcp6/dhcp6_messages.mes b/src/bin/dhcp6/dhcp6_messages.mes
index 91fea72..bd50d5c 100644
--- a/src/bin/dhcp6/dhcp6_messages.mes
+++ b/src/bin/dhcp6/dhcp6_messages.mes
@@ -65,6 +65,31 @@ This informational message is printed every time the IPv6 DHCP server
is started. It indicates what database backend type is being to store
lease and other information.
+% DHCP6_DDNS_CREATE_ADD_NAME_CHANGE_REQUEST created name change request: %1
+This debug message is logged when the new Name Change Request has been created
+to perform the DNS Update, which adds new RRs.
+
+% DHCP6_DDNS_CREATE_REMOVE_NAME_CHANGE_REQUEST created name change request: %1
+This debug message is logged when the new Name Change Request has been created
+to perform the DNS Update, which removes RRs from the DNS.
+
+% DHCP6_DDNS_LEASE_ASSIGN_FQDN_CHANGE FQDN for the allocated lease: %1 has changed. New values: hostname = %2, reverse mapping = %3, forward mapping = %4
+This debug message is logged when FQDN mapping for a particular lease has
+been changed by the recent Request message. This mapping will be changed in DNS.
+
+% DHCP6_DDNS_LEASE_RENEW_FQDN_CHANGE FQDN for the renewed lease: %1 has changed.
+New values: hostname = %2, reverse mapping = %3, forward mapping = %4
+This debug message is logged when FQDN mapping for a particular lease has been
+changed by the recent Renew message. This mapping will be changed in DNS.
+
+% DHCP6_DDNS_SEND_FQDN sending DHCPv6 Client FQDN Option to the client: %1
+This debug message is logged when server includes an DHCPv6 Client FQDN Option
+in its response to the client.
+
+% DHCP6_DDNS_RECEIVE_FQDN received DHCPv6 Client FQDN Option: %1
+This debug message is logged when server has found the DHCPv6 Client FQDN Option
+sent by a client and started processing it.
+
% DHCP6_DDNS_REMOVE_EMPTY_HOSTNAME FQDN for the lease being deleted is empty: %1
This error message is issued when a lease being deleted contains an indication
that the DNS Update has been performed for it, but the FQDN is missing for this
diff --git a/src/bin/dhcp6/dhcp6_srv.cc b/src/bin/dhcp6/dhcp6_srv.cc
index 879cade..7885f23 100644
--- a/src/bin/dhcp6/dhcp6_srv.cc
+++ b/src/bin/dhcp6/dhcp6_srv.cc
@@ -677,6 +677,10 @@ Dhcpv6Srv::processClientFqdn(const Pkt6Ptr& question) {
return (fqdn);
}
+ LOG_DEBUG(dhcp6_logger, DBG_DHCP6_DETAIL,
+ DHCP6_DDNS_RECEIVE_FQDN).arg(fqdn->toText());
+
+
// Prepare the FQDN option which will be included in the response to
// the client.
Option6ClientFqdnPtr fqdn_resp(new Option6ClientFqdn(*fqdn));
@@ -775,6 +779,8 @@ Dhcpv6Srv::appendClientFqdn(const Pkt6Ptr& question,
}
if (include_fqdn) {
+ LOG_DEBUG(dhcp6_logger, DBG_DHCP6_DETAIL,
+ DHCP6_DDNS_SEND_FQDN).arg(fqdn->toText());
answer->addOption(fqdn);
}
@@ -849,6 +855,9 @@ Dhcpv6Srv::createNameChangeRequests(const Pkt6Ptr& answer,
// the code and all requests from this queue will be sent to the
// D2 module.
name_change_reqs_.push(ncr);
+
+ LOG_DEBUG(dhcp6_logger, DBG_DHCP6_DETAIL,
+ DHCP6_DDNS_CREATE_ADD_NAME_CHANGE_REQUEST).arg(ncr.toText());
}
}
@@ -899,6 +908,10 @@ Dhcpv6Srv::createRemovalNameChangeRequest(const Lease6Ptr& lease) {
lease->addr_.toText(),
dhcid, 0, lease->valid_lft_);
name_change_reqs_.push(ncr);
+
+ LOG_DEBUG(dhcp6_logger, DBG_DHCP6_DETAIL,
+ DHCP6_DDNS_CREATE_REMOVE_NAME_CHANGE_REQUEST).arg(ncr.toText());
+
}
@@ -1019,6 +1032,13 @@ Dhcpv6Srv::assignIA_NA(const Subnet6Ptr& subnet, const DuidPtr& duid,
// DNS records and update the lease with the new settings.
if ((lease->hostname_ != hostname) || (lease->fqdn_fwd_ != do_fwd) ||
(lease->fqdn_rev_ != do_rev)) {
+ LOG_DEBUG(dhcp6_logger, DBG_DHCP6_DETAIL,
+ DHCP6_DDNS_LEASE_ASSIGN_FQDN_CHANGE)
+ .arg(lease->toText())
+ .arg(hostname)
+ .arg(do_rev ? "true" : "false")
+ .arg(do_fwd ? "true" : "false");
+
// Schedule removal of the existing lease.
createRemovalNameChangeRequest(lease);
// Set the new lease properties and update.
@@ -1110,6 +1130,13 @@ Dhcpv6Srv::renewIA_NA(const Subnet6Ptr& subnet, const DuidPtr& duid,
// delete any existing FQDN records for this lease.
if ((lease->hostname_ != hostname) || (lease->fqdn_fwd_ != do_fwd) ||
(lease->fqdn_rev_ != do_rev)) {
+ LOG_DEBUG(dhcp6_logger, DBG_DHCP6_DETAIL,
+ DHCP6_DDNS_LEASE_RENEW_FQDN_CHANGE)
+ .arg(lease->toText())
+ .arg(hostname)
+ .arg(do_rev ? "true" : "false")
+ .arg(do_fwd ? "true" : "false");
+
createRemovalNameChangeRequest(lease);
}
diff --git a/src/bin/dhcp6/dhcp6_srv.h b/src/bin/dhcp6/dhcp6_srv.h
index c94328a..d1359fc 100644
--- a/src/bin/dhcp6/dhcp6_srv.h
+++ b/src/bin/dhcp6/dhcp6_srv.h
@@ -81,7 +81,7 @@ public:
///
/// Main server processing loop. Receives incoming packets, verifies
/// their correctness, generates appropriate answer (if needed) and
- /// transmits respones.
+ /// transmits responses.
///
/// @return true, if being shut down gracefully, fail if experienced
/// critical error.
@@ -108,7 +108,7 @@ protected:
///
/// Processes received SOLICIT message and verifies that its sender
/// should be served. In particular IA, TA and PD options are populated
- /// with to-be assinged addresses, temporary addresses and delegated
+ /// with to-be assigned addresses, temporary addresses and delegated
/// prefixes, respectively. In the usual 4 message exchange, server is
/// expected to respond with ADVERTISE message. However, if client
/// requests rapid-commit and server supports it, REPLY will be sent
@@ -124,7 +124,7 @@ protected:
///
/// Processes incoming REQUEST message and verifies that its sender
/// should be served. In particular IA, TA and PD options are populated
- /// with assinged addresses, temporary addresses and delegated
+ /// with assigned addresses, temporary addresses and delegated
/// prefixes, respectively. Uses LeaseMgr to allocate or update existing
/// leases.
///
@@ -340,7 +340,7 @@ protected:
/// 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.
///
- /// @param lease A lease for which the the removal of correponding DNS
+ /// @param lease A lease for which the the removal of corresponding DNS
/// records will be performed.
void createRemovalNameChangeRequest(const Lease6Ptr& lease);
diff --git a/src/lib/dhcpsrv/alloc_engine.h b/src/lib/dhcpsrv/alloc_engine.h
index 40f1d3d..fb10f23 100644
--- a/src/lib/dhcpsrv/alloc_engine.h
+++ b/src/lib/dhcpsrv/alloc_engine.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2012 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2013 Internet Systems Consortium, Inc. ("ISC")
//
// Permission to use, copy, modify, and/or distribute this software for any
// purpose with or without fee is hereby granted, provided that the above
More information about the bind10-changes
mailing list