BIND 10 trac1035, updated. 4f82e3bdef9612a632da55d3ddfd02326d358160 [trac1035] Changes to message descriptions
BIND 10 source code commits
bind10-changes at lists.isc.org
Thu Jun 23 12:33:45 UTC 2011
The branch, trac1035 has been updated
via 4f82e3bdef9612a632da55d3ddfd02326d358160 (commit)
via 6661b327d26dc4e090772b0dd263ae8a7c79d3b8 (commit)
via 868d5912e25819663d9f1f7690bf8a33dacd9b51 (commit)
via 1764a1eb64926211f77067ce98372aa4c748bb8d (commit)
from 3f15151252dd734210582a2ae8923dada661231f (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 4f82e3bdef9612a632da55d3ddfd02326d358160
Author: Stephen Morris <stephen at isc.org>
Date: Thu Jun 23 13:33:17 2011 +0100
[trac1035] Changes to message descriptions
... and correct a couple of IDs missed first time round.
commit 6661b327d26dc4e090772b0dd263ae8a7c79d3b8
Author: Stephen Morris <stephen at isc.org>
Date: Thu Jun 23 13:05:07 2011 +0100
[trac1035] Change message IDs to words separated by underscores
commit 868d5912e25819663d9f1f7690bf8a33dacd9b51
Author: Stephen Morris <stephen at isc.org>
Date: Thu Jun 23 12:38:12 2011 +0100
[trac1035] Remove $PREFIX from nsas_messages.mes
commit 1764a1eb64926211f77067ce98372aa4c748bb8d
Author: Stephen Morris <stephen at isc.org>
Date: Thu Jun 23 12:36:48 2011 +0100
[trac1035] rename nsasdef.h to nsas_messages.h
-----------------------------------------------------------------------
Summary of changes:
src/lib/nsas/Makefile.am | 14 +++---
src/lib/nsas/nameserver_address_store.cc | 5 +-
src/lib/nsas/nameserver_entry.cc | 12 +++---
src/lib/nsas/nsas_log.h | 2 +-
src/lib/nsas/nsas_messages.mes | 67 ++++++++++++++++++++++++++++++
src/lib/nsas/nsasdef.mes | 61 ---------------------------
6 files changed, 83 insertions(+), 78 deletions(-)
create mode 100644 src/lib/nsas/nsas_messages.mes
delete mode 100644 src/lib/nsas/nsasdef.mes
-----------------------------------------------------------------------
diff --git a/src/lib/nsas/Makefile.am b/src/lib/nsas/Makefile.am
index 3ecbca7..663afba 100644
--- a/src/lib/nsas/Makefile.am
+++ b/src/lib/nsas/Makefile.am
@@ -22,19 +22,19 @@ AM_CXXFLAGS += -Wno-unused-parameter
endif
# Define rule to build logging source files from message file
-nsasdef.h nsasdef.cc: nsasdef.mes
- $(top_builddir)/src/lib/log/compiler/message $(top_srcdir)/src/lib/nsas/nsasdef.mes
+nsas_messages.h nsas_messages.cc: nsas_messages.mes
+ $(top_builddir)/src/lib/log/compiler/message $(top_srcdir)/src/lib/nsas/nsas_messages.mes
# What is being built.
lib_LTLIBRARIES = libnsas.la
-# Tell Automake that the nsasdef.{cc,h} source files are created in the build
+# Tell Automake that the nsas_messages.{cc,h} source files are created in the build
# process, so it must create these before doing anything else. Although they
# are a dependency of the library (so will be created from the message file
# anyway), there is no guarantee as to exactly _when_ in the build they will be
# created. As the .h file is included in other sources file (so must be
# present when they are compiled), the safest option is to create it first.
-BUILT_SOURCES = nsasdef.h nsasdef.cc
+BUILT_SOURCES = nsas_messages.h nsas_messages.cc
# Library sources. The generated files will not be in the distribution.
libnsas_la_SOURCES = address_entry.h address_entry.cc
@@ -54,10 +54,10 @@ libnsas_la_SOURCES += fetchable.h
libnsas_la_SOURCES += address_request_callback.h
libnsas_la_SOURCES += glue_hints.h glue_hints.cc
-nodist_libnsas_la_SOURCES = nsasdef.h nsasdef.cc
+nodist_libnsas_la_SOURCES = nsas_messages.h nsas_messages.cc
# The message file should be in the distribution.
-EXTRA_DIST = nsasdef.mes
+EXTRA_DIST = nsas_messages.mes
# Make sure that the generated files are got rid of in a clean operation
-CLEANFILES = *.gcno *.gcda nsasdef.h nsasdef.cc
+CLEANFILES = *.gcno *.gcda nsas_messages.h nsas_messages.cc
diff --git a/src/lib/nsas/nameserver_address_store.cc b/src/lib/nsas/nameserver_address_store.cc
index ac55409..867f028 100644
--- a/src/lib/nsas/nameserver_address_store.cc
+++ b/src/lib/nsas/nameserver_address_store.cc
@@ -32,7 +32,6 @@
#include "zone_entry.h"
#include "glue_hints.h"
#include "address_request_callback.h"
-#include "nsasdef.h"
#include "nsas_log.h"
using namespace isc::dns;
@@ -87,7 +86,7 @@ NameserverAddressStore::lookup(const string& zone, const RRClass& class_code,
boost::shared_ptr<AddressRequestCallback> callback, AddressFamily family,
const GlueHints& glue_hints)
{
- LOG_DEBUG(nsas_logger, NSAS_DBG_TRACE, NSAS_LOOKUPZONE).arg(zone);
+ LOG_DEBUG(nsas_logger, NSAS_DBG_TRACE, NSAS_SEARCH_ZONE_NS).arg(zone);
pair<bool, boost::shared_ptr<ZoneEntry> > zone_obj(
zone_hash_->getOrAdd(HashKey(zone, class_code),
@@ -108,7 +107,7 @@ NameserverAddressStore::cancel(const string& zone,
const boost::shared_ptr<AddressRequestCallback>& callback,
AddressFamily family)
{
- LOG_DEBUG(nsas_logger, NSAS_DBG_TRACE, NSAS_LOOKUPCANCEL).arg(zone);
+ LOG_DEBUG(nsas_logger, NSAS_DBG_TRACE, NSAS_LOOKUP_CANCEL).arg(zone);
boost::shared_ptr<ZoneEntry> entry(zone_hash_->get(HashKey(zone,
class_code)));
diff --git a/src/lib/nsas/nameserver_entry.cc b/src/lib/nsas/nameserver_entry.cc
index 65b2ec2..553c35d 100644
--- a/src/lib/nsas/nameserver_entry.cc
+++ b/src/lib/nsas/nameserver_entry.cc
@@ -179,7 +179,7 @@ NameserverEntry::updateAddressRTTAtIndex(uint32_t rtt, size_t index,
new_rtt = 1;
}
addresses_[family][index].setRTT(new_rtt);
- LOG_DEBUG(nsas_logger, NSAS_DBG_RTT, NSAS_SETRTT)
+ LOG_DEBUG(nsas_logger, NSAS_DBG_RTT, NSAS_UPDATE_RTT)
.arg(addresses_[family][index].getAddress().toText())
.arg(old_rtt).arg(new_rtt);
}
@@ -234,7 +234,7 @@ class NameserverEntry::ResolverCallback :
if (!response_message ||
response_message->getRcode() != isc::dns::Rcode::NOERROR() ||
response_message->getRRCount(isc::dns::Message::SECTION_ANSWER) == 0) {
- LOG_ERROR(nsas_logger, NSAS_INVRESPSTR).arg(entry_->getName());
+ LOG_ERROR(nsas_logger, NSAS_INVALID_RESPONSE).arg(entry_->getName());
failureInternal(lock);
return;
}
@@ -249,7 +249,7 @@ class NameserverEntry::ResolverCallback :
response->getClass() != RRClass(entry_->getClass()))
{
// Invalid response type or class
- LOG_ERROR(nsas_logger, NSAS_INVRESPTC)
+ LOG_ERROR(nsas_logger, NSAS_WRONG_ANSWER)
.arg(entry_->getName()).arg(type_)
.arg(entry_->getClass()).arg(response->getType())
.arg(response->getClass());
@@ -276,7 +276,7 @@ class NameserverEntry::ResolverCallback :
// If we found it, use it. If not, create a new one.
entries.push_back(found ? *found : AddressEntry(
IOAddress(address), 1));
- LOG_DEBUG(nsas_logger, NSAS_DBG_RESULTS, NSAS_NSLKUPSUCC)
+ LOG_DEBUG(nsas_logger, NSAS_DBG_RESULTS, NSAS_FOUND_ADDRESS)
.arg(address).arg(entry_->getName());
}
@@ -322,7 +322,7 @@ class NameserverEntry::ResolverCallback :
* So mark the current address family as unreachable.
*/
virtual void failure() {
- LOG_DEBUG(nsas_logger, NSAS_DBG_RESULTS, NSAS_NSLKUPFAIL)
+ LOG_DEBUG(nsas_logger, NSAS_DBG_RESULTS, NSAS_NS_LOOKUP_FAIL)
.arg(type_).arg(entry_->getName());
Lock lock(entry_->mutex_);
failureInternal(lock);
@@ -437,7 +437,7 @@ NameserverEntry::askIP(isc::resolve::ResolverInterface* resolver,
// We are unlocked here, as the callback from that might want to lock
lock.unlock();
- LOG_DEBUG(nsas_logger, NSAS_DBG_TRACE, NSAS_NSADDR).arg(getName());
+ LOG_DEBUG(nsas_logger, NSAS_DBG_TRACE, NSAS_FIND_NS_ADDRESS).arg(getName());
askIP(resolver, RRType::A(), V4_ONLY);
askIP(resolver, RRType::AAAA(), V6_ONLY);
// Make sure we end the routine when we are not locked
diff --git a/src/lib/nsas/nsas_log.h b/src/lib/nsas/nsas_log.h
index 9631988..ec6844f 100644
--- a/src/lib/nsas/nsas_log.h
+++ b/src/lib/nsas/nsas_log.h
@@ -16,7 +16,7 @@
#define __NSAS_LOG__H
#include <log/macros.h>
-#include "nsasdef.h"
+#include "nsas_messages.h"
namespace isc {
namespace nsas {
diff --git a/src/lib/nsas/nsas_messages.mes b/src/lib/nsas/nsas_messages.mes
new file mode 100644
index 0000000..a52a1a6
--- /dev/null
+++ b/src/lib/nsas/nsas_messages.mes
@@ -0,0 +1,67 @@
+# Copyright (C) 2011 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
+# copyright notice and this permission notice appear in all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+# AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+# PERFORMANCE OF THIS SOFTWARE.
+
+$NAMESPACE isc::nsas
+
+% NSAS_FIND_NS_ADDRESS asking resolver to obtain A and AAAA records for %1
+A debug message issued when the NSAS (nameserver address store - part
+of the resolver) is making a callback into the resolver to retrieve the
+address records for the specified nameserver.
+
+% NSAS_FOUND_ADDRESS found address %1 for %2
+A debug message issued when the NSAS (nameserver address store - part
+of the resolver) has retrieved the given address for the specified
+nameserver through an external query.
+
+% NSAS_INVALID_RESPONSE queried for %1 but got invalid response
+The NSAS made a query for a RR for the specified nameserver but received
+an invalid response. Either the success function was called without a
+DNS message or the message was invalid on some way. (In the latter case,
+the error should have been picked up elsewhere in the processing logic,
+hence the raising of the error here.)
+
+This message indicates an internal error in the nameserver address store
+component (NSAS) of the resolver. Please raise a bug report.
+
+% NSAS_LOOKUP_CANCEL lookup for zone %1 has been canceled
+A debug message issued when an NSAS (nameserver address store - part of
+the resolver) lookup for a zone has been canceled.
+
+% NSAS_NS_LOOKUP_FAIL failed to lookup any %1 for %2
+A debug message issued when the NSAS (nameserver address store - part of
+the resolver) has been unable to retrieve the specified resource record
+for the specified nameserver. This is not necessarily a problem - the
+nameserver may be unreachable, in which case the NSAS will try other
+nameservers in the zone.
+
+% NSAS_SEARCH_ZONE_NS searching NSAS for nameservers for zone %1
+A debug message output when a call is made to the nameserver address store
+(part of the resolver) to obtain the nameservers for the specified zone.
+
+% NSAS_UPDATE_RTT update RTT for %1: was %2 ms, is now %3 ms
+A NSAS (nameserver address store - part of the resolver) debug message
+reporting the update of a round-trip time (RTT) for a query made to the
+specified nameserver. The RTT has been updated using the value given
+and the new RTT is displayed. (The RTT is subject to a calculation that
+damps out sudden changes. As a result, the new RTT used by the NSAS in
+future decisions of which nameserver to use is not necessarily equal to
+the RTT reported.)
+
+% NSAS_WRONG_ANSWER queried for %1 RR of type/class %2/%3, received response %4/%5
+A NSAS (nameserver address store - part of the resolver) made a query for
+a resource record of a particular type and class, but instead received
+an answer with a different given type and class.
+
+This message indicates an internal error in the nameserver address store
+component (NSAS) of the resolver. Please riase a bug report.
diff --git a/src/lib/nsas/nsasdef.mes b/src/lib/nsas/nsasdef.mes
deleted file mode 100644
index 0f32d09..0000000
--- a/src/lib/nsas/nsasdef.mes
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright (C) 2011 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
-# copyright notice and this permission notice appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
-# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-# AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
-# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
-# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-# PERFORMANCE OF THIS SOFTWARE.
-
-$PREFIX NSAS_
-$NAMESPACE isc::nsas
-
-% INVRESPSTR queried for %1 but got invalid response
-This message indicates an internal error in the nameserver address store
-component (NSAS) of the resolver. The NSAS made a query for a RR for the
-specified nameserver but received an invalid response. Either the success
-function was called without a DNS message or the message was invalid on some
-way. (In the latter case, the error should have been picked up elsewhere in
-the processing logic, hence the raising of the error here.)
-
-% INVRESPTC queried for %1 RR of type/class %2/%3, received response %4/%5
-This message indicates an internal error in the nameserver address store
-component (NSAS) of the resolver. The NSAS made a query for the given RR
-type and class, but instead received an answer with the given type and class.
-
-% LOOKUPCANCEL lookup for zone %1 has been cancelled
-A debug message, this is output when a NSAS (nameserver address store -
-part of the resolver) lookup for a zone has been cancelled.
-
-% LOOKUPZONE searching NSAS for nameservers for zone %1
-A debug message, this is output when a call is made to the nameserver address
-store (part of the resolver) to obtain the nameservers for the specified zone.
-
-% NSADDR asking resolver to obtain A and AAAA records for %1
-A debug message, the NSAS (nameserver address store - part of the resolver) is
-making a callback into the resolver to retrieve the address records for the
-specified nameserver.
-
-% NSLKUPFAIL failed to lookup any %1 for %2
-A debug message, the NSAS (nameserver address store - part of the resolver)
-has been unable to retrieve the specified resource record for the specified
-nameserver. This is not necessarily a problem - the nameserver may be
-unreachable, in which case the NSAS will try other nameservers in the zone.
-
-% NSLKUPSUCC found address %1 for %2
-A debug message, the NSAS (nameserver address store - part of the resolver)
-has retrieved the given address for the specified nameserver through an
-external query.
-
-% SETRTT reporting RTT for %1 as %2; new value is now %3
-A NSAS (nameserver address store - part of the resolver) debug message
-reporting the round-trip time (RTT) for a query made to the specified
-nameserver. The RTT has been updated using the value given and the new RTT is
-displayed. (The RTT is subject to a calculation that damps out sudden
-changes. As a result, the new RTT is not necessarily equal to the RTT
-reported.)
More information about the bind10-changes
mailing list