BIND 10 trac1029, updated. d191035ad012bc481ce0a4545f9b6819b897a04e Merge branch 'master' into trac1029
BIND 10 source code commits
bind10-changes at lists.isc.org
Thu Jun 30 17:38:20 UTC 2011
The branch, trac1029 has been updated
via d191035ad012bc481ce0a4545f9b6819b897a04e (commit)
via dadf18e8c050ad6a5977fa32d563f31de99d3ac7 (commit)
via 3caca9f8debed45019acb731b5ef2f55a3479ee4 (commit)
via 3bbdd1e7d3f89b3a281900c75ceb0830d0cfd7d3 (commit)
via 0a836aa297d08b3c375d245f50971cf4cf2760e7 (commit)
via 22f3ad26d4bb70a03858d42122b7a648211911c7 (commit)
via f8ef5bcb1e8ebc747b32192348faae9fd32fdba9 (commit)
via 666d6e49e1cd46fd293b3fdce239e34588666ed6 (commit)
via 8b21629d234228ff9fbb7a3c5ad5ebeca4b981c1 (commit)
via 4191945aad5aaf0873b15727716d0a988b1c978d (commit)
from ebc5206327363f747822e7344037d9c2b76b8cd9 (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 d191035ad012bc481ce0a4545f9b6819b897a04e
Merge: ebc5206327363f747822e7344037d9c2b76b8cd9 dadf18e8c050ad6a5977fa32d563f31de99d3ac7
Author: Stephen Morris <stephen at isc.org>
Date: Thu Jun 30 18:38:12 2011 +0100
Merge branch 'master' into trac1029
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 60 ++++++++++++++++++--------------
doc/guide/bind10-guide.xml | 17 +++++++++
src/bin/resolver/resolver_messages.mes | 12 ++++--
src/lib/acl/loader.h | 2 +-
src/lib/datasrc/memory_datasrc.cc | 7 +++-
tools/system_messages.py | 6 +++
6 files changed, 71 insertions(+), 33 deletions(-)
-----------------------------------------------------------------------
diff --git a/ChangeLog b/ChangeLog
index 4616678..90db814 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+266. [func] Multiple developers
+ Convert various error messages, debugging and other output
+ to the new logging interface, including for b10-resolver,
+ the resolver library, the CC library, b10-auth, b10-cfgmgr,
+ b10-xfrin, and b10-xfrout. This includes a lot of new
+ documentation describing the new log messages.
+ (Trac #738, #739, #742, #746, #759, #761, #762)
+
265. [func]* jinmei
b10-resolver: Introduced ACL on incoming queries. By default the
resolver accepts queries from ::1 and 127.0.0.1 and rejects all
@@ -52,7 +60,7 @@
Now builds and runs with Python 3.2
(Trac #710, git dae1d2e24f993e1eef9ab429326652f40a006dfb)
-257. [bug] y-aharen
+257. [bug] y-aharen
Fixed a bug an instance of IntervalTimerImpl may be destructed
while deadline_timer is holding the handler. This fix addresses
occasional failure of IntervalTimerTest.destructIntervalTimer.
@@ -61,25 +69,25 @@
256. [bug] jerry
src/bin/xfrin: update xfrin to check TSIG before other part of
incoming message.
- (Trac955, git 261450e93af0b0406178e9ef121f81e721e0855c)
+ (Trac #955, git 261450e93af0b0406178e9ef121f81e721e0855c)
255. [func] zhang likun
src/lib/cache: remove empty code in lib/cache and the corresponding
suppression rule in src/cppcheck-suppress.lst.
- (Trac639, git 4f714bac4547d0a025afd314c309ca5cb603e212)
+ (Trac #639, git 4f714bac4547d0a025afd314c309ca5cb603e212)
254. [bug] jinmei
b10-xfrout: failed to send notifies over IPv6 correctly.
- (Trac964, git 3255c92714737bb461fb67012376788530f16e40)
+ (Trac #964, git 3255c92714737bb461fb67012376788530f16e40)
-253. [func] jelte
+253. [func] jelte
Add configuration options for logging through the virtual module
Logging.
- (Trac 736, git 9fa2a95177265905408c51d13c96e752b14a0824)
+ (Trac #736, git 9fa2a95177265905408c51d13c96e752b14a0824)
-252. [func] stephen
+252. [func] stephen
Add syslog as destination for logging.
- (Trac976, git 31a30f5485859fd3df2839fc309d836e3206546e)
+ (Trac #976, git 31a30f5485859fd3df2839fc309d836e3206546e)
251. [bug]* jinmei
Make sure bindctl private files are non readable to anyone except
@@ -88,38 +96,38 @@
group will have to be adjusted. Also note that this change is
only effective for a fresh install; if these files already exist,
their permissions must be adjusted by hand (if necessary).
- (Trac870, git 461fc3cb6ebabc9f3fa5213749956467a14ebfd4)
+ (Trac #870, git 461fc3cb6ebabc9f3fa5213749956467a14ebfd4)
-250. [bug] ocean
+250. [bug] ocean
src/lib/util/encode, in some conditions, the DecodeNormalizer's
iterator may reach the end() and when later being dereferenced
it will cause crash on some platform.
- (Trac838, git 83e33ec80c0c6485d8b116b13045b3488071770f)
+ (Trac #838, git 83e33ec80c0c6485d8b116b13045b3488071770f)
-249. [func] jerry
+249. [func] jerry
xfrout: add support for TSIG verification.
- (Trac816, git 3b2040e2af2f8139c1c319a2cbc429035d93f217)
+ (Trac #816, git 3b2040e2af2f8139c1c319a2cbc429035d93f217)
-248. [func] stephen
+248. [func] stephen
Add file and stderr as destinations for logging.
- (Trac555, git 38b3546867425bd64dbc5920111a843a3330646b)
+ (Trac #555, git 38b3546867425bd64dbc5920111a843a3330646b)
-247. [func] jelte
+247. [func] jelte
Upstream queries from the resolver now set EDNS0 buffer size.
- (Trac834, git 48e10c2530fe52c9bde6197db07674a851aa0f5d)
+ (Trac #834, git 48e10c2530fe52c9bde6197db07674a851aa0f5d)
-246. [func] stephen
+246. [func] stephen
Implement logging using log4cplus (http://log4cplus.sourceforge.net)
- (Trac899, git 31d3f525dc01638aecae460cb4bc2040c9e4df10)
+ (Trac #899, git 31d3f525dc01638aecae460cb4bc2040c9e4df10)
-245. [func] vorner
+245. [func] vorner
Authoritative server can now sign the answers using TSIG
(configured in tsig_keys/keys, list of strings like
"name:<base64-secret>:sha1-hmac"). It doesn't use them for
ACL yet, only verifies them and signs if the request is signed.
- (Trac875, git fe5e7003544e4e8f18efa7b466a65f336d8c8e4d)
+ (Trac #875, git fe5e7003544e4e8f18efa7b466a65f336d8c8e4d)
-244. [func] stephen
+244. [func] stephen
In unit tests, allow the choice of whether unhandled exceptions are
caught in the unit test program (and details printed) or allowed to
propagate to the default exception handler. See the bind10-dev thread
@@ -129,7 +137,7 @@
243. [func]* feng
Add optional hmac algorithm SHA224/384/812.
- (Trac#782, git 77d792c9d7c1a3f95d3e6a8b721ac79002cd7db1)
+ (Trac #782, git 77d792c9d7c1a3f95d3e6a8b721ac79002cd7db1)
bind10-devel-20110519 released on May 19, 2011
@@ -176,7 +184,7 @@ bind10-devel-20110519 released on May 19, 2011
stats module and stats-httpd module, and maybe with other
statistical modules in future. "stats.spec" has own configuration
and commands of stats module, if it requires.
- (Trac#719, git a234b20dc6617392deb8a1e00eb0eed0ff353c0a)
+ (Trac #719, git a234b20dc6617392deb8a1e00eb0eed0ff353c0a)
236. [func] jelte
C++ client side of configuration now uses BIND10 logging system.
@@ -219,13 +227,13 @@ bind10-devel-20110519 released on May 19, 2011
instead of '%s,%d', which allows us to cope better with
mismatched placeholders and allows reordering of them in
case of translation.
- (Trac901, git 4903410e45670b30d7283f5d69dc28c2069237d6)
+ (Trac #901, git 4903410e45670b30d7283f5d69dc28c2069237d6)
230. [bug] naokikambe
Removed too repeated verbose messages in two cases of:
- when auth sends statistics data to stats
- when stats receives statistics data from other modules
- (Trac#620, git 0ecb807011196eac01f281d40bc7c9d44565b364)
+ (Trac #620, git 0ecb807011196eac01f281d40bc7c9d44565b364)
229. [doc] jreed
Add manual page for b10-host.
diff --git a/doc/guide/bind10-guide.xml b/doc/guide/bind10-guide.xml
index 7d1a006..6a42182 100644
--- a/doc/guide/bind10-guide.xml
+++ b/doc/guide/bind10-guide.xml
@@ -5,6 +5,23 @@
<!ENTITY % version SYSTEM "version.ent">
%version;
]>
+
+<!--
+ - Copyright (C) 2010-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.
+-->
+
<book>
<?xml-stylesheet href="bind10-guide.css" type="text/css"?>
diff --git a/src/bin/resolver/resolver_messages.mes b/src/bin/resolver/resolver_messages.mes
index 6c5be64..05b9a8b 100644
--- a/src/bin/resolver/resolver_messages.mes
+++ b/src/bin/resolver/resolver_messages.mes
@@ -210,10 +210,14 @@ query in the form of <Source IP address>#<source port>.
% RESOLVER_QUERY_REJECTED query rejected: '%1/%2/%3' from %4
An informational message that indicates an incoming query is rejected
in terms of the query ACL. This results in a response with an RCODE of
-REFUSED. See QUERYACCEPTED for the information given in the message.
+REFUSED. The log message shows the query in the form of <query
+name>/<query type>/<query class>, and the client that sends the
+query in the form of <Source IP address>#<source port>.
% RESOLVER_QUERY_DROPPED query dropped: '%1/%2/%3' from %4
An informational message that indicates an incoming query is dropped
-in terms of the query ACL. Unlike the QUERYREJECTED case, the server does
-not return any response. See QUERYACCEPTED for the information given in
-the message.
+in terms of the query ACL. Unlike the RESOLVER_QUERY_REJECTED
+case, the server does not return any response. The log message
+shows the query in the form of <query name>/<query type>/<query
+class>, and the client that sends the query in the form of <Source
+IP address>#<source port>.
diff --git a/src/lib/acl/loader.h b/src/lib/acl/loader.h
index 6b024c9..a2aa2f8 100644
--- a/src/lib/acl/loader.h
+++ b/src/lib/acl/loader.h
@@ -81,7 +81,7 @@ public:
* or if it doesn't contain one of the accepted values.
*
* \param action The JSON representation of the action. It must be a string
- * and contain one of "ACCEPT", "REJECT" or "DENY".
+ * and contain one of "ACCEPT", "REJECT" or "DROP.
* \note We could define different names or add aliases if needed.
*/
BasicAction defaultActionLoader(data::ConstElementPtr action);
diff --git a/src/lib/datasrc/memory_datasrc.cc b/src/lib/datasrc/memory_datasrc.cc
index 3c57d1b..b8019a2 100644
--- a/src/lib/datasrc/memory_datasrc.cc
+++ b/src/lib/datasrc/memory_datasrc.cc
@@ -225,10 +225,13 @@ struct MemoryZone::MemoryZoneImpl {
*/
// Implementation of MemoryZone::add
result::Result add(const ConstRRsetPtr& rrset, DomainTree* domains) {
+ // Sanitize input. This will cause an exception to be thrown
+ // if the input RRset is empty.
+ addValidation(rrset);
+
+ // OK, can add the RRset.
LOG_DEBUG(logger, DBG_TRACE_DATA, DATASRC_MEM_ADD_RRSET).
arg(rrset->getName()).arg(rrset->getType()).arg(origin_);
- // Sanitize input
- addValidation(rrset);
// Add wildcards possibly contained in the owner name to the domain
// tree.
diff --git a/tools/system_messages.py b/tools/system_messages.py
index 6cf3ce9..7b0d60c 100644
--- a/tools/system_messages.py
+++ b/tools/system_messages.py
@@ -58,6 +58,12 @@ SEC_HEADER="""<?xml version="1.0" encoding="UTF-8"?>
<!ENTITY % version SYSTEM "version.ent">
%version;
]>
+<!--
+ This XML document is generated using the system_messages.py tool
+ based on the .mes message files.
+
+ Do not edit this file.
+-->
<book>
<?xml-stylesheet href="bind10-guide.css" type="text/css"?>
More information about the bind10-changes
mailing list