BIND 10 trac3222, updated. 2da25a59d702bfb0548a4018000455b0c4a3b952 [3222] Augmented DNS message IO in b10-dhcp-ddns
BIND 10 source code commits
bind10-changes at lists.isc.org
Thu Feb 20 20:00:34 UTC 2014
The branch, trac3222 has been updated
via 2da25a59d702bfb0548a4018000455b0c4a3b952 (commit)
from 4d63c8c9b34dff6189d6b081ee4d2e0107926190 (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 2da25a59d702bfb0548a4018000455b0c4a3b952
Author: Thomas Markwalder <tmark at isc.org>
Date: Thu Feb 20 14:58:12 2014 -0500
[3222] Augmented DNS message IO in b10-dhcp-ddns
Added descriptive message comment log statement for
to outbound DNS update requests, and conversion of status
and RCODEs for DNS inbound responses to b10-dhcp-ddns log.
-----------------------------------------------------------------------
Summary of changes:
src/bin/d2/d2_messages.mes | 2 +-
src/bin/d2/nc_add.cc | 8 +++---
src/bin/d2/nc_remove.cc | 8 +++---
src/bin/d2/nc_trans.cc | 46 ++++++++++++++++++++++++++++---
src/bin/d2/nc_trans.h | 12 +++++++-
src/bin/d2/tests/nc_add_unittests.cc | 7 +++--
src/bin/d2/tests/nc_remove_unittests.cc | 9 +++---
7 files changed, 71 insertions(+), 21 deletions(-)
-----------------------------------------------------------------------
diff --git a/src/bin/d2/d2_messages.mes b/src/bin/d2/d2_messages.mes
index dc5103d..2c87b4d 100644
--- a/src/bin/d2/d2_messages.mes
+++ b/src/bin/d2/d2_messages.mes
@@ -440,7 +440,7 @@ documented in preceding log entries.
% DHCP_DDNS_STARTING_TRANSACTION Transaction Key: %1
-% DHCP_DDNS_UPDATE_REQUEST_SENT for transaction key: %1 to server: %2
+% DHCP_DDNS_UPDATE_REQUEST_SENT %1 for transaction key: %2 to server: %3
This is a debug message issued when DHCP_DDNS sends a DNS request to a DNS
server.
diff --git a/src/bin/d2/nc_add.cc b/src/bin/d2/nc_add.cc
index f34f45c..14011df 100644
--- a/src/bin/d2/nc_add.cc
+++ b/src/bin/d2/nc_add.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2014 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2013-2014 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
@@ -202,7 +202,7 @@ NameAddTransaction::addingFwdAddrsHandler() {
// Call sendUpdate() to initiate the async send. Note it also sets
// next event to NOP_EVT.
- sendUpdate();
+ sendUpdate("Foward Add");
break;
case IO_COMPLETED_EVT: {
@@ -313,7 +313,7 @@ NameAddTransaction::replacingFwdAddrsHandler() {
// Call sendUpdate() to initiate the async send. Note it also sets
// next event to NOP_EVT.
- sendUpdate();
+ sendUpdate("Forward Replace");
break;
case IO_COMPLETED_EVT: {
@@ -459,7 +459,7 @@ NameAddTransaction::replacingRevPtrsHandler() {
// Call sendUpdate() to initiate the async send. Note it also sets
// next event to NOP_EVT.
- sendUpdate();
+ sendUpdate("Reverse Replace");
break;
case IO_COMPLETED_EVT: {
diff --git a/src/bin/d2/nc_remove.cc b/src/bin/d2/nc_remove.cc
index 770843e..cd6245f 100644
--- a/src/bin/d2/nc_remove.cc
+++ b/src/bin/d2/nc_remove.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2013 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2013-2014 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
@@ -207,7 +207,7 @@ NameRemoveTransaction::removingFwdAddrsHandler() {
// Call sendUpdate() to initiate the async send. Note it also sets
// next event to NOP_EVT.
- sendUpdate();
+ sendUpdate("Forward A/AAAA Remove");
break;
case IO_COMPLETED_EVT: {
@@ -311,7 +311,7 @@ NameRemoveTransaction::removingFwdRRsHandler() {
// Call sendUpdate() to initiate the async send. Note it also sets
// next event to NOP_EVT.
- sendUpdate();
+ sendUpdate("Forward RR Remove");
break;
case IO_COMPLETED_EVT: {
@@ -464,7 +464,7 @@ NameRemoveTransaction::removingRevPtrsHandler() {
// Call sendUpdate() to initiate the async send. Note it also sets
// next event to NOP_EVT.
- sendUpdate();
+ sendUpdate("Reverse Remove");
break;
case IO_COMPLETED_EVT: {
diff --git a/src/bin/d2/nc_trans.cc b/src/bin/d2/nc_trans.cc
index 08e443d..cd1ef84 100644
--- a/src/bin/d2/nc_trans.cc
+++ b/src/bin/d2/nc_trans.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2013 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2013-2014 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
@@ -16,6 +16,8 @@
#include <d2/nc_trans.h>
#include <dns/rdata.h>
+#include <sstream>
+
namespace isc {
namespace d2 {
@@ -94,18 +96,53 @@ NameChangeTransaction::operator()(DNSClient::Status status) {
// set to indicate IO completed.
// runModel is exception safe so we are good to call it here.
// It won't exit until we hit the next IO wait or the state model ends.
+ setDnsUpdateStatus(status);
LOG_DEBUG(dctl_logger, DBGLVL_TRACE_DETAIL,
DHCP_DDNS_UPDATE_RESPONSE_RECEIVED)
.arg(getTransactionKey().toStr())
.arg(current_server_->toText())
- .arg(status);
+ .arg(responseString());
- setDnsUpdateStatus(status);
runModel(IO_COMPLETED_EVT);
}
+std::string
+NameChangeTransaction::responseString() {
+ std::ostringstream stream;
+ switch (getDnsUpdateStatus()) {
+ case DNSClient::SUCCESS:
+ stream << "SUCCESS, rcode: ";
+ if (getDnsUpdateResponse()) {
+ stream << getDnsUpdateResponse()->getRcode().toText();
+ } else {
+ stream << " update response is NULL";
+ }
+ break;
+ case DNSClient::TIMEOUT:
+ stream << "TIMEOUT";
+ break;
+ case DNSClient::IO_STOPPED:
+ stream << "IO_STOPPED";
+ break;
+ case DNSClient::INVALID_RESPONSE:
+ stream << "INVALID_RESPONSE";
+ break;
+ case DNSClient::OTHER:
+ stream << "OTHER";
+ break;
+ default:
+ stream << "UKNOWNN("
+ << static_cast<int>(getDnsUpdateStatus()) << ")";
+ break;
+
+ }
+
+ return (stream.str());
+}
+
void
-NameChangeTransaction::sendUpdate(bool /* use_tsig_ */) {
+NameChangeTransaction::sendUpdate(const std::string& comment,
+ bool /* use_tsig_ */) {
try {
++update_attempts_;
// @todo add logic to add/replace TSIG key info in request if
@@ -122,6 +159,7 @@ NameChangeTransaction::sendUpdate(bool /* use_tsig_ */) {
postNextEvent(NOP_EVT);
LOG_DEBUG(dctl_logger, DBGLVL_TRACE_DETAIL,
DHCP_DDNS_UPDATE_REQUEST_SENT)
+ .arg(comment)
.arg(getTransactionKey().toStr())
.arg(current_server_->toText());
} catch (const std::exception& ex) {
diff --git a/src/bin/d2/nc_trans.h b/src/bin/d2/nc_trans.h
index e729fa5..b7d64d8 100644
--- a/src/bin/d2/nc_trans.h
+++ b/src/bin/d2/nc_trans.h
@@ -207,12 +207,14 @@ protected:
/// currently selected server. Since the send is asynchronous, the method
/// posts NOP_EVT as the next event and then returns.
///
+ /// @param comment text to include in log detail
/// @param use_tsig True if the update should be include a TSIG key. This
/// is not yet implemented.
///
/// If an exception occurs it will be logged and and the transaction will
/// be failed.
- virtual void sendUpdate(bool use_tsig = false);
+ virtual void sendUpdate(const std::string& comment = "",
+ bool use_tsig = false);
/// @brief Adds events defined by NameChangeTransaction to the event set.
///
@@ -401,6 +403,14 @@ protected:
/// the RData cannot be added to the given RRset.
void addPtrRdata(dns::RRsetPtr& rrset);
+ /// @brief Returns a string version of the current response status and rcode
+ ///
+ /// Renders a string containing the a text label current DNS update status
+ /// and RCODE (if status is DNSClient::SUCCESS)
+ ///
+ /// @return std::string containing constructed text
+ std::string responseString();
+
public:
/// @brief Fetches the NameChangeRequest for this transaction.
///
diff --git a/src/bin/d2/tests/nc_add_unittests.cc b/src/bin/d2/tests/nc_add_unittests.cc
index 05e8a1a..8b91f5a 100644
--- a/src/bin/d2/tests/nc_add_unittests.cc
+++ b/src/bin/d2/tests/nc_add_unittests.cc
@@ -54,10 +54,11 @@ public:
/// It will also simulate an exception-based failure of sendUpdate, if
/// the simulate_send_exception_ flag is true.
///
- /// @param use_tsig_ Parameter is unused, but present in the base class
- /// method.
+ /// @param comment Parameter is unused, but present in base class method.
+ /// @param use_tsig_ Parameter is unused, but present in base class method.
///
- virtual void sendUpdate(bool /* use_tsig_ = false */) {
+ virtual void sendUpdate(const std::string& /*comment*/,
+ bool /* use_tsig_ = false */) {
if (simulate_send_exception_) {
// Make the flag a one-shot by resetting it.
simulate_send_exception_ = false;
diff --git a/src/bin/d2/tests/nc_remove_unittests.cc b/src/bin/d2/tests/nc_remove_unittests.cc
index 37efad6..246fdd2 100644
--- a/src/bin/d2/tests/nc_remove_unittests.cc
+++ b/src/bin/d2/tests/nc_remove_unittests.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2013 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2013-2014 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
@@ -55,10 +55,11 @@ public:
/// It will also simulate an exception-based failure of sendUpdate, if
/// the simulate_send_exception_ flag is true.
///
- /// @param use_tsig_ Parameter is unused, but present in the base class
- /// method.
+ /// @param comment Parameter is unused, but present in base class method
+ /// @param use_tsig Parameter is unused, but present in base class method.
///
- virtual void sendUpdate(bool /* use_tsig_ = false */) {
+ virtual void sendUpdate(const std::string& /* comment */,
+ bool /* use_tsig = false */) {
if (simulate_send_exception_) {
// Make the flag a one-shot by resetting it.
simulate_send_exception_ = false;
More information about the bind10-changes
mailing list