BIND 10 trac2207, updated. fe827c7e47a642f3aead3b5414c6e8cf3a9970b4 Merge #2292
BIND 10 source code commits
bind10-changes at lists.isc.org
Wed Oct 10 10:20:14 UTC 2012
The branch, trac2207 has been updated
via fe827c7e47a642f3aead3b5414c6e8cf3a9970b4 (commit)
via c6391ad769265a1f5c2d5594dcdb113420c7eb4d (commit)
via d78dd497ecb846ab2545ce1cb7b6e41341ff5995 (commit)
via 3a6ee0d12d06c1f9e5b9f261b3fcaab444a9ae80 (commit)
via 7888a2127db48e004cb1cce24552db230cb3d685 (commit)
via bcf2117983fa80d3f4bb9a13f896963497553b85 (commit)
via fb5aa58dabb47c1ef51890bee7da070c6a567f69 (commit)
via 5879860e006e809fa75fdb78b61f82fdffd69b97 (commit)
via c7ab107ab6a5f079475085e87851d940863481dc (commit)
via dd191127774034a51d658dfe6799ccb397916103 (commit)
via 4973e638d354d8b56dcadf71123ef23c15662021 (commit)
via d41d8af0c726bb923a48948feb6a8f4f6775ea3e (commit)
via 869d14d7056ee7b0c3cf1dd0db1b375be755bba7 (commit)
via daedcaea541b1193018cb71d3cc68ba3ba9ff59c (commit)
via 432064bc3ec7c67797898a182c52add8f6012232 (commit)
via 1ab996e4c54f1449b8e72cce411331193868e78c (commit)
via 7bcaf2b7903ea5a51c2049579f6dc4670746527f (commit)
via f5bd1368b73131abd6e0562e57482310d26ff3eb (commit)
via 00d3de1af86efe6b4df1310a039adad8f6a719ae (commit)
via 73900f62a74bf769b5f6ea7b3cf43428baa19842 (commit)
via 7a628baa1a158b5837d6f383e10b30542d2ac59b (commit)
via 915576b6aa27d020faadf7fbfc4e4d9bb1df129e (commit)
via e1b4bf1cb50160c436f2e5440fd774680b91b7a2 (commit)
via 76243c3ccd7a30484da8478f7457e18fce485492 (commit)
via 44d9dfa8aad85d583b7b90fa01c50613a9d9d1a5 (commit)
via fbc8d38199a95cc51704c40269d0c4c6625ec6b0 (commit)
via 3a8ea5fd501d131e99ec02c4be10a874a94f2d83 (commit)
via 86b1a2387a10ff8e5e646b117c289ebb2e9e57ec (commit)
via 1d3b7eabbb5fa3b6674789428b36d7501768b635 (commit)
via 6b99a39f0ab27939c29a05b0332d5ec255bc0764 (commit)
via c91bffdd00deb8b7f3ceda9954a84e31c0cfb9f1 (commit)
via ec6cf17e571f9cf23fd1e7bcd573df55106550b1 (commit)
via 746376902a020e0711bc85fc29a2b339a85b3db2 (commit)
via 05136b55f90375a1a7e3a76570cb95bf0590c0ad (commit)
via 0d4a6b6be1e6ba8b3b5681b5c3be7c86d56c076f (commit)
via 686eb4e9edb4adee0cee357762fe9448fb0cb6bd (commit)
via 9cfcbb9475e1f42b5c8953a5a037b833edc5aa69 (commit)
via 0c38d26f6acc7d156dc6c6871b4fa332e30728ee (commit)
via b89e44112425a8d5ab44c26ce988cfb08087ff7e (commit)
via 4fa694dbee3372b8c310aca2c2dafc3ca7550e80 (commit)
via b4bdc9b1f5ec444d1bc4002fe7d65a50acc9d897 (commit)
via 5c74085e2f4c16655e77e1bcbc308d4fb0a694f8 (commit)
via 4babe763de5b20437e32829024f25a1b902df82f (commit)
via 274eddb40bacdf8d5933058e33b7d469cb9258c2 (commit)
via f00da76cb77226e6a6b7487f6c5c0bc62d0c3f48 (commit)
via 75ee32436fa5bae4a8f15e25e587d94bf41a59fd (commit)
via ef8ecac02aa21192fb4af8d573daa11b09b3685a (commit)
via 8f7c28971b48c4ee0ab89a3f88d84c4b6fed8185 (commit)
via a38fe354acb2ba6e641d91bec364a22989f30b16 (commit)
via 66f45b3d67dbcb714d445fb3511e19b83cbc8b05 (commit)
via f284e18628afb282c1f5c9feec74b36abd9352be (commit)
via 5bc38109a4c2775a2a2a8389023836facfe8400d (commit)
via 27e2b20fc709884a145df81553504bfc90b8d539 (commit)
via 805fda7d95ada6af81f17fca2816b3a1fe4a3008 (commit)
via 370861e432e88669b2382954b15dbecf1672e032 (commit)
from bf260bbc80a813c30bb7499b8a085d7390d83e83 (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 fe827c7e47a642f3aead3b5414c6e8cf3a9970b4
Merge: bcf2117 c6391ad
Author: Michal 'vorner' Vaner <michal.vaner at nic.cz>
Date: Wed Oct 10 11:58:50 2012 +0200
Merge #2292
commit c6391ad769265a1f5c2d5594dcdb113420c7eb4d
Author: Michal 'vorner' Vaner <michal.vaner at nic.cz>
Date: Wed Oct 10 11:58:17 2012 +0200
[2292] Add a TODO about re-adding tests
Planned for merge #2268
commit d78dd497ecb846ab2545ce1cb7b6e41341ff5995
Author: Michal 'vorner' Vaner <michal.vaner at nic.cz>
Date: Tue Oct 9 14:11:25 2012 +0200
[2292] Clarify test
And make it slightly stronger (it now checks something that should be
mostly obvious too, but who knows, with software).
commit 3a6ee0d12d06c1f9e5b9f261b3fcaab444a9ae80
Author: Michal 'vorner' Vaner <michal.vaner at nic.cz>
Date: Tue Oct 9 14:07:13 2012 +0200
[2292] Pass the old zone back
Instead of releasing it directly. While the internal release was more
convenient, it didn't allow for swapping things fast under a mutex and
then spending the time releasing it unlocked.
commit 7888a2127db48e004cb1cce24552db230cb3d685
Author: Michal 'vorner' Vaner <michal.vaner at nic.cz>
Date: Tue Oct 9 13:39:30 2012 +0200
[2292] Don't pass SegmentObjectHolder
It is supposed to be mostly private. Use it internally only.
commit 869d14d7056ee7b0c3cf1dd0db1b375be755bba7
Author: JINMEI Tatuya <jinmei at isc.org>
Date: Mon Oct 8 11:32:18 2012 -0700
[2292] minor cleanups: constify, indentation
commit 00d3de1af86efe6b4df1310a039adad8f6a719ae
Author: Michal 'vorner' Vaner <michal.vaner at nic.cz>
Date: Sun Oct 7 17:19:12 2012 +0200
[2292] Update tests
They don't need the mutable versions to work, but they used them anyway.
commit 73900f62a74bf769b5f6ea7b3cf43428baa19842
Author: Michal 'vorner' Vaner <michal.vaner at nic.cz>
Date: Sun Oct 7 17:18:33 2012 +0200
[2292] Re-add version of find removed by accident
This one was not mutable, it just took Name as an argument.
commit 7a628baa1a158b5837d6f383e10b30542d2ac59b
Author: Michal 'vorner' Vaner <michal.vaner at nic.cz>
Date: Sun Oct 7 17:03:18 2012 +0200
[2292] Drop tests for InMemoryClient::add
As the method was removed.
commit 915576b6aa27d020faadf7fbfc4e4d9bb1df129e
Author: Michal 'vorner' Vaner <michal.vaner at nic.cz>
Date: Sun Oct 7 16:50:50 2012 +0200
[2292] Remove unused template parameters
The domain tree no longer supports the mutable find versions, so we
don't need the template parameters allowing for them.
commit e1b4bf1cb50160c436f2e5440fd774680b91b7a2
Author: Michal 'vorner' Vaner <michal.vaner at nic.cz>
Date: Sun Oct 7 16:38:23 2012 +0200
[2292] Remove mutable find methods
They are currently used in test code only (so we'll need to update the
tests to compile). The real code seams clean now.
commit 76243c3ccd7a30484da8478f7457e18fce485492
Author: Michal 'vorner' Vaner <michal.vaner at nic.cz>
Date: Sun Oct 7 16:13:56 2012 +0200
[2292] Remove the setZoneData method
Currently, the content of zone is passed to the addZone method. No way
to change it later, but the addZone overwrites the old value if called
again.
This should hopefully allow for removal of mutable find methods from the
tree.
commit 5c74085e2f4c16655e77e1bcbc308d4fb0a694f8
Author: Michal 'vorner' Vaner <michal.vaner at nic.cz>
Date: Tue Oct 2 21:05:33 2012 +0200
[2292] Get rid of the const_cast
It was needed when extracting data from a domain tree chain. The chain
now can hold mutable pointers too, so we use that (and some amount of
template bureaucracy) to avoid the cast.
While the interface changed (on the core find function, it is not
possible to pass const node chain and have a mutable node get out), it
doesn't seem to influence the current code. Also, it is a private
interface anyway, so it should be safe.
commit 4babe763de5b20437e32829024f25a1b902df82f
Author: Michal 'vorner' Vaner <michal.vaner at nic.cz>
Date: Tue Oct 2 20:22:23 2012 +0200
[2292] Parametrize constness of the chain
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 8 +
configure.ac | 3 +-
NEWS => examples/AUTHORS | 0
COPYING => examples/COPYING | 8 +-
TODO => examples/ChangeLog | 0
examples/INSTALL | 9 +
examples/Makefile.am | 4 +
NEWS => examples/NEWS | 0
examples/README | 32 +++
examples/configure.ac | 28 +++
{src/bin => examples}/host/.gitignore | 0
examples/host/Makefile.am | 6 +
{src/bin => examples}/host/README | 0
{src/bin => examples}/host/b10-host.xml | 0
{src/bin => examples}/host/host.cc | 0
examples/m4/ax_boost_include.m4 | 64 ++++++
examples/m4/ax_isc_bind10.m4 | 122 +++++++++++
src/bin/Makefile.am | 2 +-
src/bin/auth/Makefile.am | 2 +-
src/bin/auth/benchmarks/Makefile.am | 1 +
src/bin/auth/benchmarks/query_bench.cc | 16 +-
.../resource.cc => bin/auth/datasrc_config.cc} | 27 +--
src/bin/auth/datasrc_config.h | 120 +++++++++++
src/bin/auth/datasrc_configurator.h | 226 --------------------
src/bin/auth/main.cc | 72 +++++--
src/bin/auth/tests/Makefile.am | 3 +-
src/bin/auth/tests/auth_srv_unittest.cc | 56 ++---
src/bin/auth/tests/command_unittest.cc | 8 +-
...ator_unittest.cc => datasrc_config_unittest.cc} | 111 +++++-----
src/bin/dbutil/dbutil.py.in | 9 +-
src/bin/dbutil/tests/Makefile.am | 2 +
src/bin/dbutil/tests/dbutil_test.sh.in | 6 +-
src/bin/dbutil/tests/testdata/Makefile.am | 1 +
.../{too_many_version.sqlite3 => v2_1.sqlite3} | Bin 13312 -> 15360 bytes
src/bin/dhcp4/tests/Makefile.am | 1 +
src/bin/dhcp6/tests/Makefile.am | 1 +
src/bin/host/Makefile.am | 37 ----
src/lib/acl/dns.cc | 23 +-
src/lib/config/ccsession.cc | 6 +-
src/lib/config/ccsession.h | 13 +-
src/lib/datasrc/memory/domaintree.h | 70 +-----
src/lib/datasrc/memory/memory_client.cc | 40 +---
src/lib/datasrc/memory/memory_client.h | 29 ---
src/lib/datasrc/memory/zone_finder.cc | 2 +-
src/lib/datasrc/memory/zone_table.cc | 44 ++--
src/lib/datasrc/memory/zone_table.h | 63 +++---
src/lib/datasrc/sqlite3_accessor.cc | 134 +++++++-----
.../datasrc/tests/memory/domaintree_unittest.cc | 31 +--
.../datasrc/tests/memory/memory_client_unittest.cc | 104 ++-------
src/lib/datasrc/tests/memory/zone_data_unittest.cc | 2 +-
.../datasrc/tests/memory/zone_table_unittest.cc | 90 ++++++--
src/lib/datasrc/tests/sqlite3_accessor_unittest.cc | 15 +-
src/lib/datasrc/tests/testdata/example.org.sqlite3 | Bin 16384 -> 15360 bytes
src/lib/dhcp/tests/.gitignore | 1 +
src/lib/dns/Makefile.am | 2 +-
src/lib/dns/tests/labelsequence_unittest.cc | 8 +-
src/lib/python/isc/datasrc/sqlite3_ds.py | 3 +-
.../resolve/tests/recursive_query_unittest_2.cc | 13 +-
.../resolve/tests/recursive_query_unittest_3.cc | 15 +-
.../server_common/tests/socket_requestor_test.cc | 4 +-
src/lib/util/Makefile.am | 3 +
src/lib/util/io/fd_share.cc | 1 +
src/lib/util/tests/fd_tests.cc | 4 +-
.../auth => lib/util/threads}/tests/.gitignore | 0
tests/tools/perfdhcp/templates/.gitignore | 5 +
65 files changed, 877 insertions(+), 833 deletions(-)
copy NEWS => examples/AUTHORS (100%)
copy COPYING => examples/COPYING (68%)
rename TODO => examples/ChangeLog (100%)
create mode 100644 examples/INSTALL
create mode 100644 examples/Makefile.am
rename NEWS => examples/NEWS (100%)
create mode 100644 examples/README
create mode 100644 examples/configure.ac
rename {src/bin => examples}/host/.gitignore (100%)
create mode 100644 examples/host/Makefile.am
rename {src/bin => examples}/host/README (100%)
rename {src/bin => examples}/host/b10-host.xml (100%)
rename {src/bin => examples}/host/host.cc (100%)
create mode 100644 examples/m4/ax_boost_include.m4
create mode 100644 examples/m4/ax_isc_bind10.m4
copy src/{lib/util/unittests/resource.cc => bin/auth/datasrc_config.cc} (66%)
create mode 100644 src/bin/auth/datasrc_config.h
delete mode 100644 src/bin/auth/datasrc_configurator.h
rename src/bin/auth/tests/{datasrc_configurator_unittest.cc => datasrc_config_unittest.cc} (78%)
copy src/bin/dbutil/tests/testdata/{too_many_version.sqlite3 => v2_1.sqlite3} (75%)
delete mode 100644 src/bin/host/Makefile.am
copy src/{bin/auth => lib/util/threads}/tests/.gitignore (100%)
create mode 100644 tests/tools/perfdhcp/templates/.gitignore
-----------------------------------------------------------------------
diff --git a/ChangeLog b/ChangeLog
index bad54da..b5c2cf4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+486. [bug]* jinmei
+ All public header files for libb10-dns++ are now installed.
+ Template configure.ac and utility AC macros for external projects
+ using the library is provided under the "examples" directory.
+ The src/bin/host was moved as part of the examples (and not
+ installed with other BIND 10 programs any more).
+ (Trac #1870, git 4973e638d354d8b56dcadf71123ef23c15662021)
+
485. [bug] jelte
Several bugs have been fixed in bindctl; tab-completion now works
within configuration lists, the problem where sometimes the
diff --git a/NEWS b/NEWS
deleted file mode 100644
index e69de29..0000000
diff --git a/TODO b/TODO
deleted file mode 100644
index e69de29..0000000
diff --git a/configure.ac b/configure.ac
index c6a2f01..9177d21 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@
AC_PREREQ([2.59])
AC_INIT(bind10-devel, 20120817, bind10-dev at isc.org)
AC_CONFIG_SRCDIR(README)
-AM_INIT_AUTOMAKE
+AM_INIT_AUTOMAKE([foreign])
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])dnl be backward compatible
AC_CONFIG_HEADERS([config.h])
AC_CONFIG_MACRO_DIR([m4macros])
@@ -1099,7 +1099,6 @@ AC_CONFIG_FILES([Makefile
src/bin/dbutil/Makefile
src/bin/dbutil/tests/Makefile
src/bin/dbutil/tests/testdata/Makefile
- src/bin/host/Makefile
src/bin/loadzone/Makefile
src/bin/loadzone/tests/correct/Makefile
src/bin/loadzone/tests/error/Makefile
diff --git a/examples/AUTHORS b/examples/AUTHORS
new file mode 100644
index 0000000..e69de29
diff --git a/examples/COPYING b/examples/COPYING
new file mode 100644
index 0000000..f3febbe
--- /dev/null
+++ b/examples/COPYING
@@ -0,0 +1,13 @@
+Copyright (C) 2012 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.
diff --git a/examples/ChangeLog b/examples/ChangeLog
new file mode 100644
index 0000000..e69de29
diff --git a/examples/INSTALL b/examples/INSTALL
new file mode 100644
index 0000000..43436c2
--- /dev/null
+++ b/examples/INSTALL
@@ -0,0 +1,9 @@
+If using git (not the tarball), build the "configure" file:
+ autoreconf --install
+
+To then build from source:
+ ./configure
+ make
+
+You may have to specify the location of BIND 10 header files and
+library objects. See configure options by ./configure --help.
diff --git a/examples/Makefile.am b/examples/Makefile.am
new file mode 100644
index 0000000..ef437eb
--- /dev/null
+++ b/examples/Makefile.am
@@ -0,0 +1,4 @@
+SUBDIRS = host
+
+# Make sure macros under m4 will be included
+ACLOCAL_AMFLAGS = -I m4
diff --git a/examples/NEWS b/examples/NEWS
new file mode 100644
index 0000000..e69de29
diff --git a/examples/README b/examples/README
new file mode 100644
index 0000000..12dbbba
--- /dev/null
+++ b/examples/README
@@ -0,0 +1,32 @@
+This is the top directory for sample programs that can be developed
+using public BIND 10 libraries outside of the BIND 10 project. It's
+intended to be built with installed BIND 10 header files and library
+objects, so it's not a target of the main build tree, and does not
+refer to any other part of the BIND 10 source tree that contains
+this directory.
+
+On the top (sub) directory (where this README file is stored), we
+provide a sample configure.ac and Makefile.am files for GNU automake
+environments with helper autoconf macros to detect the available and
+location of BIND 10 header files and library objects.
+
+You can use the configure.ac and Makefile.am files with macros under
+the "m4" subdirectory as a template for your own project. The key is
+to call the AX_ISC_BIND10 function (as the sample configure.ac does)
+from your configure.ac. Then it will check the availability of
+necessary stuff and set some corresponding AC variables. You can then
+use the resulting variables in your Makefile.in or Makefile.ac.
+
+If you use automake, don't forget adding the following line to the top
+level Makefile.am:
+
+ACLOCAL_AMFLAGS = -I m4
+
+This is necessary to incorporate the helper macro definitions.
+
+If you don't use automake but autoconf, make sure to add the following
+to the configure.ac file:
+
+sinclude(m4/ax_boost_include.m4)
+sinclude(m4/ax_isc_bind10.m4)
+(and same for other m4 files as they are added under m4/)
diff --git a/examples/configure.ac b/examples/configure.ac
new file mode 100644
index 0000000..9379687
--- /dev/null
+++ b/examples/configure.ac
@@ -0,0 +1,28 @@
+# -*- Autoconf -*-
+# Process this file with autoconf to produce a configure script.
+
+AC_PREREQ([2.59])
+AC_INIT(bind10-examples, 20120817, bind10-dev at isc.org)
+AC_CONFIG_SRCDIR([README])
+AM_INIT_AUTOMAKE
+AC_CONFIG_HEADERS([config.h])
+
+# Checks for programs.
+AC_PROG_CXX
+AC_LANG([C++])
+
+# Checks for BIND 10 headers and libraries
+AX_ISC_BIND10
+
+# For the example host program, we require the BIND 10 DNS library
+if test "x$BIND10_DNS_LIB" = "x"; then
+ AC_MSG_ERROR([unable to find BIND 10 DNS library needed to build 'host'])
+fi
+
+# Checks for typedefs, structures, and compiler characteristics.
+AC_HEADER_STDBOOL
+
+AC_CONFIG_FILES([Makefile
+ host/Makefile])
+
+AC_OUTPUT
diff --git a/examples/host/.gitignore b/examples/host/.gitignore
new file mode 100644
index 0000000..01ef357
--- /dev/null
+++ b/examples/host/.gitignore
@@ -0,0 +1,2 @@
+/b10-host
+/b10-host.1
diff --git a/examples/host/Makefile.am b/examples/host/Makefile.am
new file mode 100644
index 0000000..dbd57a2
--- /dev/null
+++ b/examples/host/Makefile.am
@@ -0,0 +1,6 @@
+AM_CPPFLAGS = $(BOOST_CPPFLAGS) $(BIND10_CPPFLAGS)
+
+bin_PROGRAMS = b10-host
+b10_host_SOURCES = host.cc
+b10_host_LDFLAGS = ${BIND10_LDFLAGS}
+b10_host_LDADD = ${BIND10_DNS_LIB}
diff --git a/examples/host/README b/examples/host/README
new file mode 100644
index 0000000..5cc4068
--- /dev/null
+++ b/examples/host/README
@@ -0,0 +1,4 @@
+Rewriting host(1) in C++ from scratch using BIND 10's libdns++.
+
+The bugs and incompatibilities are listed in the manual page
+and in the source code.
diff --git a/examples/host/b10-host.xml b/examples/host/b10-host.xml
new file mode 100644
index 0000000..a17ef67
--- /dev/null
+++ b/examples/host/b10-host.xml
@@ -0,0 +1,196 @@
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"
+ [<!ENTITY mdash "—">]>
+<!--
+ - 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.
+-->
+
+<!-- $Id$ -->
+<refentry>
+
+ <refentryinfo>
+ <date>May 4, 2011</date>
+ </refentryinfo>
+
+ <refmeta>
+ <refentrytitle>b10-host</refentrytitle>
+ <manvolnum>1</manvolnum>
+ <refmiscinfo>BIND10</refmiscinfo>
+ </refmeta>
+
+ <refnamediv>
+ <refname>b10-host</refname>
+ <refpurpose>DNS lookup utility</refpurpose>
+ </refnamediv>
+
+ <docinfo>
+ <copyright>
+ <year>2011</year>
+ <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
+ </copyright>
+ </docinfo>
+
+ <refsynopsisdiv>
+ <cmdsynopsis>
+ <command>b10-host</command>
+ <arg><option>-a</option></arg>
+ <arg><option>-c <replaceable>class</replaceable></option></arg>
+ <arg><option>-d</option></arg>
+ <arg><option>-p <replaceable>port</replaceable></option></arg>
+ <arg><option>-r</option></arg>
+ <arg><option>-t <replaceable>type</replaceable></option></arg>
+ <arg><option>-v</option></arg>
+ <arg><replaceable>name</replaceable></arg>
+ <arg><option><replaceable>server</replaceable></option></arg>
+ </cmdsynopsis>
+ </refsynopsisdiv>
+
+ <refsect1>
+ <title>DESCRIPTION</title>
+ <para>
+ The <command>b10-host</command> utility does DNS lookups.
+ Its initial goal is to be a
+ <citerefentry><refentrytitle>host</refentrytitle>
+ <manvolnum>1</manvolnum></citerefentry>
+ clone, but also add a few features useful for BIND 10 development
+ testing.
+ </para>
+
+ <para>
+ By default, it looks up the A, AAAA, and MX record sets for the
+ <replaceable>name</replaceable>.
+ Optionally, you may select a name server to query against by adding
+ the <replaceable>server</replaceable> argument.
+ </para>
+ </refsect1>
+
+ <refsect1>
+ <title>OPTIONS</title>
+
+ <para>The arguments are as follows:</para>
+
+ <variablelist>
+
+ <varlistentry>
+ <term><option>-a</option></term>
+ <listitem><para>
+ Enable verbose mode and do a query for type ANY.
+ (If the <option>-t</option> option is also set, then the
+ ANY query is not done, but it still uses verbose mode.)
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><option>-c <replaceable>class</replaceable></option></term>
+ <listitem><para>
+ Define the class for the query.
+ The default is IN (Internet).
+<!-- TODO: bug if class is unknown causes seg fault and possible core dump -->
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><option>-d</option></term>
+ <listitem><para>
+ Enable verbose output mode, including elapsed time in
+ milliseconds.
+ Verbose mode shows the header, question, answer, authority,
+ and additional sections (if provided).
+ (Same as <option>-v</option>.)
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><option>-p <replaceable>port</replaceable></option></term>
+ <listitem><para>
+ Select an alternative port for the query.
+ This may be a number or a service name.
+ The default is 53 (domain).
+ This is not a standard feature of
+ <citerefentry><refentrytitle>host</refentrytitle>
+ <manvolnum>1</manvolnum></citerefentry>.
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><option>-r</option></term>
+ <listitem><para>
+ Disable recursive processing by not setting the
+ Recursion Desired flag in the query.
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><option>-t <replaceable>type</replaceable></option></term>
+ <listitem><para>
+ Select a specific resource record type for the query.
+ By default, it looks up the A, AAAA, and MX record sets.
+<!-- TODO: bug if class is unknown causes seg fault and possible core dump -->
+ (This overrides the <option>-a</option> option.)
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><option>-v</option></term>
+ <listitem><para>
+ Same as <option>-d</option> option.
+ </para></listitem>
+ </varlistentry>
+
+ </variablelist>
+
+ </refsect1>
+
+ <refsect1>
+ <title>COMPATIBILITY / BUGS</title>
+ <para>
+ <command>b10-host</command> does not do reverse lookups by
+ default yet (by detecting if name is a IPv4 or IPv6 address).
+ </para>
+
+ <para>
+ Unknown <option>-c</option> class or <option>-t</option> type
+ causes <command>b10-host</command> to Abort.
+ </para>
+
+ <para>
+ Not all types are supported yet for formatting.
+ Not all switches are supported yet.
+ </para>
+
+ <para>
+ It doesn't use <filename>/etc/resolv.conf</filename> at this time.
+ The default name server used is 127.0.0.1.
+ </para>
+
+ <para>
+ <option>-p</option> is not a standard feature.
+ </para>
+ </refsect1>
+
+ <refsect1>
+ <title>HISTORY</title>
+ <para>
+ The C++ version of <command>b10-host</command> was started in
+ October 2009 by Jeremy C. Reed of ISC.
+ Its usage and output were based on the standard <command>host</command>
+ command.
+ </para>
+ </refsect1>
+</refentry><!--
+ - Local variables:
+ - mode: sgml
+ - End:
+-->
diff --git a/examples/host/host.cc b/examples/host/host.cc
new file mode 100644
index 0000000..a5c6522
--- /dev/null
+++ b/examples/host/host.cc
@@ -0,0 +1,253 @@
+// 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.
+
+// host rewritten in C++ using BIND 10 DNS library
+
+#include <arpa/inet.h>
+#include <netdb.h> // for getaddrinfo
+#include <sys/time.h> // for gettimeofday
+#include <sys/socket.h> // networking functions and definitions on FreeBSD
+
+#include <unistd.h>
+
+#include <string>
+#include <iostream>
+
+#include <util/buffer.h>
+
+#include <dns/name.h>
+#include <dns/message.h>
+#include <dns/messagerenderer.h>
+#include <dns/opcode.h>
+#include <dns/rcode.h>
+#include <dns/rrclass.h>
+#include <dns/rrtype.h>
+#include <dns/rrset.h>
+#include <dns/message.h>
+
+using namespace std;
+using namespace isc::dns;
+using namespace isc::util;
+
+namespace {
+char* dns_type = NULL; // not set, so A, AAAA, MX
+const char* server = "127.0.0.1";
+const char* server_port = "53";
+const char* dns_class = "IN";
+bool verbose = false;
+bool dns_any = false;
+int first_time = 1;
+bool recursive_bit = true;
+struct timeval before_time, after_time;
+
+int
+host_lookup(const char* const name, const char* const dns_class,
+ const char* const type, bool any) {
+
+ Message msg(Message::RENDER);
+
+ msg.setQid(0); // does this matter?
+
+ // TODO: add switch for this
+ msg.setOpcode(Opcode::QUERY());
+ msg.setRcode(Rcode::NOERROR());
+ if (recursive_bit) {
+ msg.setHeaderFlag(Message::HEADERFLAG_RD); // set recursive bit
+ }
+
+ msg.addQuestion(Question(Name(name),
+ RRClass(dns_class),
+ any ? RRType::ANY() : RRType(type))); // if NULL then:
+
+ MessageRenderer renderer;
+ msg.toWire(renderer);
+
+ struct addrinfo hints, *res;
+ memset(&hints, 0, sizeof(hints));
+ hints.ai_family = AF_UNSPEC;
+ hints.ai_socktype = SOCK_DGRAM;
+ hints.ai_flags = 0; // not using AI_NUMERICHOST in case to bootstrap
+ if (getaddrinfo(server, server_port, &hints, &res) != 0) {
+ cerr << "address/port conversion for " << server << ":"
+ << server_port << " failed" << endl;
+ return (1);
+ }
+
+ if (verbose) {
+ cout << "Trying \"" << name << "\"\n";
+ }
+
+ if (verbose && first_time) {
+ // this is only output the first time
+ first_time = 0;
+ cout << "Using domain server:\n";
+ cout << "Name: " << server << "\n";
+ // TODO: I guess I have to do a lookup to get that address and aliases
+ // too
+ //cout << "Address: " << address << "\n" ; // "#" << port << "\n";
+ //cout << "Aliases: " << server << "\n";
+ }
+
+ int s = socket(res->ai_family, res->ai_socktype, res->ai_protocol);
+
+ if (s < 0) {
+ cerr << "failed to open socket" << endl;
+ return (1);
+ }
+
+ if (verbose) {
+ gettimeofday(&before_time, NULL);
+ }
+
+ sendto(s, renderer.getData(), renderer.getLength(), 0, res->ai_addr,
+ res->ai_addrlen);
+
+ struct sockaddr_storage ss;
+ struct sockaddr* sa;
+ socklen_t sa_len;
+
+ sa_len = sizeof(ss);
+ sa = static_cast<struct sockaddr*>((void*)&ss);
+
+ char recvbuf[4096];
+ int cc;
+ if ((cc = recvfrom(s, recvbuf, sizeof(recvbuf), 0, sa, &sa_len)) > 0) {
+ try {
+ Message rmsg(Message::PARSE);
+ InputBuffer ibuffer(recvbuf, cc);
+
+ rmsg.fromWire(ibuffer);
+ if (!verbose) {
+ string description = "";
+ for (RRsetIterator it =
+ rmsg.beginSection(Message::SECTION_ANSWER);
+ it != rmsg.endSection(Message::SECTION_ANSWER);
+ ++it) {
+
+ if ((*it)->getType() == RRType::A()) {
+ description = "has address";
+ }
+ else if ((*it)->getType() == RRType::AAAA()) {
+ description = "has IPv6 address";
+ }
+ else if ((*it)->getType() == RRType::MX()) {
+ description = "mail is handled by";
+ }
+ else if ((*it)->getType() == RRType::TXT()) {
+ description = "descriptive text";
+ }
+
+ RdataIteratorPtr rit = (*it)->getRdataIterator();
+ for (; !rit->isLast(); rit->next()) {
+ // instead of using my name, maybe use returned label?
+ cout << name << " " << description << " " <<
+ (*rit).getCurrent().toText() << endl;
+ }
+ }
+ } else {
+ gettimeofday(&after_time, NULL);
+
+ // HEADER and QUESTION, ANSWER, AUTHORITY, and ADDITIONAL
+ std::cout << rmsg.toText() << std::endl;
+
+ if (before_time.tv_usec > after_time.tv_usec) {
+ after_time.tv_usec += 1000000;
+ --after_time.tv_sec;
+ }
+
+ int elapsed_time =
+ (after_time.tv_sec - before_time.tv_sec)
+ + ((after_time.tv_usec - before_time.tv_usec))/1000;
+
+ // TODO: if NXDOMAIN, host(1) doesn't show HEADER
+ // Host hsdjkfhksjhdfkj not found: 3(NXDOMAIN)
+ // TODO: test if NXDOMAIN
+
+ std::cout << "Received " << cc <<
+ " bytes in " << elapsed_time << " ms\n";
+ // TODO: " bytes from 127.0.0.1#53 in 0 ms
+
+ } //verbose
+/*
+TODO: handle InvalidRRClass
+TODO: handle invalid type exception
+ } catch (InvalidType ivt) {
+ std::cerr << "invalid type:" << ivt.what();
+*/
+ } catch (const exception& ex) {
+ std::cerr << "parse failed for " <<
+ string(name) << "/" << type << ": " << ex.what() << std::endl;
+ } catch (...) {
+ std::cerr << "parse failed for " << string(name) << "/" << type;
+ }
+ }
+
+ freeaddrinfo(res);
+
+ return (0);
+} // host_lookup()
+}
+
+int
+main(int argc, char* argv[]) {
+ int c;
+
+ while ((c = getopt(argc, argv, "ac:dp:rt:v")) != -1)
+ switch (c) {
+ case 'a':
+ dns_any = true;
+ verbose = true;
+ break;
+ case 'c':
+ dns_class = optarg;
+ break;
+ // p for port is a non-standard switch
+ case 'p':
+ server_port = optarg;
+ break;
+ case 'r':
+ recursive_bit = false;
+ break;
+ case 't':
+ dns_type = optarg;
+ break;
+ case 'd':
+ // drop through to v, because debug and verbose are equivalent
+ case 'v':
+ verbose = true;
+ break;
+ }
+ argc -= optind;
+ argv += optind;
+
+ if (argc < 1) {
+ cout << "Usage: host [-adrv] [-c class] [-p port] [-t type] hostname [server]\n";
+ exit(1);
+ }
+
+ if (argc >= 2) {
+ server = argv[1];
+ }
+
+ if (dns_type == NULL) {
+ host_lookup(argv[0], dns_class, "A", dns_any);
+ // TODO: don't do next if A doesn't exist
+ host_lookup(argv[0], dns_class, "AAAA", dns_any);
+ host_lookup(argv[0], dns_class, "MX", dns_any);
+ } else {
+ // -t overrides -a, regardless of order
+ host_lookup(argv[0], dns_class, dns_type, false);
+ }
+ return (0);
+}
diff --git a/examples/m4/ax_boost_include.m4 b/examples/m4/ax_boost_include.m4
new file mode 100644
index 0000000..e41614d
--- /dev/null
+++ b/examples/m4/ax_boost_include.m4
@@ -0,0 +1,64 @@
+dnl @synopsis AX_BOOST_INCLUDE
+dnl
+dnl Test for the Boost C++ header files
+dnl
+dnl If no path to the installed boost header files is given via the
+dnl --with-boost-include option, the macro searchs under
+dnl /usr/local /usr/pkg /opt /opt/local directories.
+dnl
+dnl This macro calls:
+dnl
+dnl AC_SUBST(BOOST_CPPFLAGS)
+dnl
+
+AC_DEFUN([AX_BOOST_INCLUDE], [
+AC_LANG_SAVE
+AC_LANG([C++])
+
+#
+# Configure Boost header path
+#
+# If explicitly specified, use it.
+AC_ARG_WITH([boost-include],
+ AS_HELP_STRING([--with-boost-include=PATH],
+ [specify exact directory for Boost headers]),
+ [boost_include_path="$withval"])
+# If not specified, try some common paths.
+if test -z "$with_boost_include"; then
+ boostdirs="/usr/local /usr/pkg /opt /opt/local"
+ for d in $boostdirs
+ do
+ if test -f $d/include/boost/shared_ptr.hpp; then
+ boost_include_path=$d/include
+ break
+ fi
+ done
+fi
+CPPFLAGS_SAVES="$CPPFLAGS"
+if test "${boost_include_path}" ; then
+ BOOST_CPPFLAGS="-I${boost_include_path}"
+ CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
+fi
+# Make sure some commonly used headers are available
+AC_CHECK_HEADERS([boost/shared_ptr.hpp boost/bind.hpp boost/function.hpp],,
+ AC_MSG_ERROR([Missing required Boost header files.]))
+
+# Detect whether Boost tries to use threads by default, and, if not,
+# make it sure explicitly. In some systems the automatic detection
+# may depend on preceding header files, and if inconsistency happens
+# it could lead to a critical disruption.
+AC_MSG_CHECKING([whether Boost tries to use threads])
+AC_TRY_COMPILE([
+#include <boost/config.hpp>
+#ifdef BOOST_HAS_THREADS
+#error "boost will use threads"
+#endif],,
+[AC_MSG_RESULT(no)
+ CPPFLAGS_BOOST_THREADCONF="-DBOOST_DISABLE_THREADS=1"],
+[AC_MSG_RESULT(yes)])
+
+CPPFLAGS="$CPPFLAGS_SAVES $CPPFLAGS_BOOST_THREADCONF"
+AC_SUBST(BOOST_CPPFLAGS)
+
+AC_LANG_RESTORE
+])dnl AX_BOOST_INCLUDE
diff --git a/examples/m4/ax_isc_bind10.m4 b/examples/m4/ax_isc_bind10.m4
new file mode 100644
index 0000000..63e028c
--- /dev/null
+++ b/examples/m4/ax_isc_bind10.m4
@@ -0,0 +1,122 @@
+dnl @synopsis AX_BIND10
+dnl
+dnl @summary figure out how to build C++ programs using ISC BIND 10 libraries
+dnl
+dnl If no path to the installed BIND 10 header files or libraries is given
+dnl via the --with-bind10-include or --with-bind10-lib option, the macro
+dnl searchs under /usr/local/{include, lib}, /usr/pkg/{include, lib},
+dnl /opt/{include, lib}, /opt/local/{include, lib} directories, respectively.
+dnl
+dnl This macro calls:
+dnl
+dnl AC_SUBST(BIND10_CPPFLAGS)
+dnl AC_SUBST(BIND10_LDFLAGS)
+dnl AC_SUBST(BIND10_COMMON_LIB)
+dnl AC_SUBST(BIND10_DNS_LIB)
+dnl
+dnl If this macro finds CPPFLAGS, LDFLAGS or COMMON_LIB unavailable, it treats
+dnl that as a fatal error.
+dnl Checks for other BIND 10 module libraries are option, as not all
+dnl applications need all libraries. The main configure.ac can handle any
+dnl missing library as fatal by checking whether the corresponding
+dnl BIND10_xxx_LIB is defined.
+
+AC_DEFUN([AX_ISC_BIND10], [
+AC_REQUIRE([AX_BOOST_INCLUDE])
+AC_LANG_SAVE
+AC_LANG([C++])
+
+# Check for BIND10 common headers
+
+AC_ARG_WITH(bind10-include,
+ AS_HELP_STRING([--with-bind10-include=PATH],
+ [specify a path to BIND 10 header files]),
+ bind10_inc_path="$withval", bind10_inc_path="no")
+# If not specified, try some common paths.
+if test "$bind10_inc_path" = "no"; then
+ for d in /usr/local /usr/pkg /opt /opt/local
+ do
+ if test -f $d/include/util/buffer.h; then
+ bind10_inc_path=$d
+ break
+ fi
+ done
+fi
+CPPFLAGS_SAVES="$CPPFLAGS"
+if test "${bind10_inc_path}" != "no"; then
+ BIND10_CPPFLAGS="-I${bind10_inc_path}"
+ CPPFLAGS="$CPPFLAGS $BIND10_CPPFLAGS"
+fi
+AC_CHECK_HEADERS([util/buffer.h],,
+ AC_MSG_ERROR([Missing a commonly used BIND 10 header files]))
+CPPFLAGS="$CPPFLAGS_SAVES"
+AC_SUBST(BIND10_CPPFLAGS)
+
+# Check for BIND10 libraries
+CPPFLAGS_SAVED="$CPPFLAGS"
+CPPFLAGS="$CPPFLAGS $BIND10_CPPFLAGS"
+
+AC_ARG_WITH(bind10-lib,
+ AS_HELP_STRING([--with-bind10-lib=PATH],
+ [specify a path to BIND 10 library files]),
+ bind10_lib_path="$withval", bind10_lib_path="no")
+if test $bind10_lib_path != "no"; then
+ bind10_lib_dirs=$bind10_lib_path
+else
+ # If not specified, try some common paths.
+ bind10_lib_dirs="/usr/local/lib /usr/pkg/lib /opt/lib /opt/local/lib"
+fi
+
+# make sure we have buildable libraries
+AC_MSG_CHECKING([for BIND 10 common library])
+BIND10_COMMON_LIB="-lb10-util -lb10-exceptions"
+LDFLAGS="$LDFLAGS $BIND10_LDFLAGS"
+LIBS="$LIBS $BIND10_COMMON_LIB"
+for d in $bind10_lib_dirs
+do
+ LDFLAGS_SAVED="$LDFLAGS"
+ LDFLAGS="$LDFLAGS -L$d"
+ AC_TRY_LINK([
+#include <util/buffer.h>
+],[
+isc::util::OutputBuffer buffer(0);
+], [BIND10_LDFLAGS="-L${d}"])
+ if test "x$BIND10_LDFLAGS" != "x"; then
+ break
+ fi
+ LDFLAGS="$LDFLAGS_SAVED"
+done
+if test "x$BIND10_LDFLAGS" != "x"; then
+ AC_MSG_RESULT(yes)
+else
+ AC_MSG_RESULT(no)
+ AC_MSG_ERROR([unable to find required BIND 10 libraries])
+fi
+
+# restore LIBS once at this point
+LIBS="$LIBS_SAVES"
+
+AC_SUBST(BIND10_LDFLAGS)
+AC_SUBST(BIND10_COMMON_LIB)
+
+# Check per-module BIND 10 libraries
+
+# DNS library
+AC_MSG_CHECKING([for BIND 10 DNS library])
+LIBS="$LIBS $BIND10_COMMON_LIB -lb10-dns++"
+AC_TRY_LINK([
+#include <dns/rrtype.h>
+],[
+isc::dns::RRType rrtype(1);
+], [BIND10_DNS_LIB="-lb10-dns++"
+ AC_MSG_RESULT(yes)],
+ [AC_MSG_RESULT(no)])
+LIBS="$LIBS_SAVES"
+AC_SUBST(BIND10_DNS_LIB)
+
+# Restore other flags
+CPPFLAGS="$CPPFLAGS_SAVED"
+LDFLAGS="$LDFLAGS_SAVES"
+
+AC_LANG_RESTORE
+])dnl AX_ISC_BIND10
diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
index 7af44f9..0b4c1ae 100644
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = bind10 bindctl cfgmgr ddns loadzone msgq host cmdctl auth xfrin \
+SUBDIRS = bind10 bindctl cfgmgr ddns loadzone msgq cmdctl auth xfrin \
xfrout usermgr zonemgr stats tests resolver sockcreator dhcp4 dhcp6 \
dbutil sysinfo
diff --git a/src/bin/auth/Makefile.am b/src/bin/auth/Makefile.am
index 6128a4c..9eee9d4 100644
--- a/src/bin/auth/Makefile.am
+++ b/src/bin/auth/Makefile.am
@@ -55,7 +55,7 @@ b10_auth_SOURCES += auth_config.cc auth_config.h
b10_auth_SOURCES += command.cc command.h
b10_auth_SOURCES += common.h common.cc
b10_auth_SOURCES += statistics.cc statistics.h
-b10_auth_SOURCES += datasrc_configurator.h
+b10_auth_SOURCES += datasrc_config.h datasrc_config.cc
b10_auth_SOURCES += main.cc
nodist_b10_auth_SOURCES = auth_messages.h auth_messages.cc
diff --git a/src/bin/auth/benchmarks/Makefile.am b/src/bin/auth/benchmarks/Makefile.am
index 48e552a..c525b66 100644
--- a/src/bin/auth/benchmarks/Makefile.am
+++ b/src/bin/auth/benchmarks/Makefile.am
@@ -17,6 +17,7 @@ query_bench_SOURCES += ../auth_srv.h ../auth_srv.cc
query_bench_SOURCES += ../auth_config.h ../auth_config.cc
query_bench_SOURCES += ../statistics.h ../statistics.cc
query_bench_SOURCES += ../auth_log.h ../auth_log.cc
+query_bench_SOURCES += ../datasrc_config.h ../datasrc_config.cc
nodist_query_bench_SOURCES = ../auth_messages.h ../auth_messages.cc
diff --git a/src/bin/auth/benchmarks/query_bench.cc b/src/bin/auth/benchmarks/query_bench.cc
index 93253db..73f702b 100644
--- a/src/bin/auth/benchmarks/query_bench.cc
+++ b/src/bin/auth/benchmarks/query_bench.cc
@@ -30,7 +30,7 @@
#include <auth/auth_srv.h>
#include <auth/auth_config.h>
-#include <auth/datasrc_configurator.h>
+#include <auth/datasrc_config.h>
#include <auth/query.h>
#include <asiodns/asiodns.h>
@@ -125,8 +125,8 @@ public:
OutputBuffer& buffer) :
QueryBenchMark(queries, query_message, buffer)
{
- DataSourceConfigurator::testReconfigure(
- server_.get(),
+ configureDataSource(
+ *server_,
Element::fromJSON("{\"IN\":"
" [{\"type\": \"sqlite3\","
" \"params\": {"
@@ -139,13 +139,13 @@ class MemoryQueryBenchMark : public QueryBenchMark {
public:
MemoryQueryBenchMark(const char* const zone_file,
const char* const zone_origin,
- const BenchQueries& queries,
- Message& query_message,
- OutputBuffer& buffer) :
+ const BenchQueries& queries,
+ Message& query_message,
+ OutputBuffer& buffer) :
QueryBenchMark(queries, query_message, buffer)
{
- DataSourceConfigurator::testReconfigure(
- server_.get(),
+ configureDataSource(
+ *server_,
Element::fromJSON("{\"IN\":"
" [{\"type\": \"MasterFiles\","
" \"cache-enable\": true, "
diff --git a/src/bin/auth/datasrc_config.cc b/src/bin/auth/datasrc_config.cc
new file mode 100644
index 0000000..73fb519
--- /dev/null
+++ b/src/bin/auth/datasrc_config.cc
@@ -0,0 +1,26 @@
+// Copyright (C) 2012 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.
+
+#include <cc/data.h>
+#include "auth_srv.h"
+#include "datasrc_config.h"
+
+// This is a trivial specialization for the commonly used version.
+// Defined in .cc to avoid accidental creation of multiple copies.
+void
+configureDataSource(AuthSrv& server, const isc::data::ConstElementPtr& config)
+{
+ return (configureDataSourceGeneric<AuthSrv,
+ isc::datasrc::ConfigurableClientList>(server, config));
+}
diff --git a/src/bin/auth/datasrc_config.h b/src/bin/auth/datasrc_config.h
new file mode 100644
index 0000000..79ace28
--- /dev/null
+++ b/src/bin/auth/datasrc_config.h
@@ -0,0 +1,120 @@
+// Copyright (C) 2012 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.
+
+#ifndef DATASRC_CONFIG_H
+#define DATASRC_CONFIG_H
+
+#include "auth_srv.h"
+
+#include <cc/data.h>
+#include <datasrc/client_list.h>
+#include <util/threads/lock.h>
+
+#include <boost/shared_ptr.hpp>
+
+#include <set>
+
+/// \brief Configure the authoritative server's data source lists
+///
+/// This will hook into the data_sources module configuration and it will
+/// keep the local copy of data source clients in the list in the authoritative
+/// server.
+///
+/// This function is templated. This is simply because of easier testing.
+/// You don't need to pay attention to it, use the configureDataSource
+/// specialization instead.
+///
+/// \param server It is the server to configure.
+/// \param config The configuration value to parse. It is in the form
+/// as an update from the config manager.
+template<class Server, class List>
+void
+configureDataSourceGeneric(Server& server,
+ const isc::data::ConstElementPtr& config)
+{
+ typedef boost::shared_ptr<List> ListPtr;
+ typedef std::map<std::string, isc::data::ConstElementPtr> Map;
+ typedef std::pair<isc::dns::RRClass, ListPtr> RollbackPair;
+ typedef std::pair<isc::dns::RRClass, isc::data::ConstElementPtr>
+ RollbackConfiguration;
+
+ // Lock the client lists, we're going to manipulate them.
+ isc::util::thread::Mutex::Locker locker(server.getClientListMutex());
+
+ // Some structures to be able to perform a rollback
+ std::vector<RollbackPair> rollback_sets;
+ std::vector<RollbackConfiguration> rollback_configurations;
+ try {
+ // Get the configuration and current state.
+ const Map& map(config->mapValue());
+ const std::vector<isc::dns::RRClass>
+ activeVector(server.getClientListClasses());
+ std::set<isc::dns::RRClass> active(activeVector.begin(),
+ activeVector.end());
+ // Go through the configuration and change everything.
+ for (Map::const_iterator it(map.begin()); it != map.end(); ++it) {
+ const isc::dns::RRClass rrclass(it->first);
+ active.erase(rrclass);
+ ListPtr list(server.getClientList(rrclass));
+ bool need_set(false);
+ if (list) {
+ rollback_configurations.
+ push_back(RollbackConfiguration(rrclass,
+ list->getConfiguration()));
+ } else {
+ list.reset(new List(rrclass));
+ need_set = true;
+ rollback_sets.push_back(RollbackPair(rrclass, ListPtr()));
+ }
+ list->configure(it->second, true);
+ if (need_set) {
+ server.setClientList(rrclass, list);
+ }
+ }
+ // Remove the ones that are not in the configuration.
+ for (std::set<isc::dns::RRClass>::iterator it(active.begin());
+ it != active.end(); ++it) {
+ // There seems to be no way the setClientList could throw.
+ // But this is just to make sure in case it did to restore
+ // the original.
+ rollback_sets.push_back(
+ RollbackPair(*it, server.getClientList(*it)));
+ server.setClientList(*it, ListPtr());
+ }
+ } catch (...) {
+ // Perform a rollback of the changes. The old configuration should
+ // work.
+ for (typename std::vector<RollbackPair>::const_iterator
+ it(rollback_sets.begin()); it != rollback_sets.end(); ++it) {
+ server.setClientList(it->first, it->second);
+ }
+ for (typename std::vector<RollbackConfiguration>::const_iterator
+ it(rollback_configurations.begin());
+ it != rollback_configurations.end(); ++it) {
+ server.getClientList(it->first)->configure(it->second, true);
+ }
+ throw;
+ }
+}
+
+/// \brief Concrete version of configureDataSource() for the
+/// use with authoritative server implementation.
+void
+configureDataSource(AuthSrv& server, const isc::data::ConstElementPtr& config);
+
+#endif // DATASRC_CONFIG_H
+
+// Local Variables:
+// mode: c++
+// End:
diff --git a/src/bin/auth/datasrc_configurator.h b/src/bin/auth/datasrc_configurator.h
deleted file mode 100644
index 6b2f582..0000000
--- a/src/bin/auth/datasrc_configurator.h
+++ /dev/null
@@ -1,226 +0,0 @@
-// Copyright (C) 2012 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.
-
-#ifndef DATASRC_CONFIGURATOR_H
-#define DATASRC_CONFIGURATOR_H
-
-#include "auth_srv.h"
-
-#include <datasrc/client_list.h>
-#include <config/ccsession.h>
-#include <cc/data.h>
-#include <util/threads/lock.h>
-
-#include <set>
-
-/// \brief A class to configure the authoritative server's data source lists
-///
-/// This will hook into the data_sources module configuration and it will
-/// keep the local copy of data source clients in the list in the authoritative
-/// server.
-///
-/// The class is slightly unusual. Due to some technical limitations, the hook
-/// needs to be static method. Therefore it is not possible to create instances
-/// of the class.
-///
-/// Also, the class is a template. This is simply because of easier testing.
-/// You don't need to pay attention to it, use the DataSourceConfigurator
-/// type alias instead.
-template<class Server, class List>
-class DataSourceConfiguratorGeneric {
-private:
- /// \brief Disallow creation of instances
- DataSourceConfiguratorGeneric();
- /// \brief Internal method to hook into the ModuleCCSession
- ///
- /// It simply calls reconfigure.
- static void reconfigureInternal(const std::string&,
- isc::data::ConstElementPtr config,
- const isc::config::ConfigData&)
- {
- if (config->contains("classes")) {
- reconfigure(config->get("classes"));
- }
- }
- static Server* server_;
- static isc::config::ModuleCCSession* session_;
- typedef boost::shared_ptr<List> ListPtr;
-public:
- /// \brief Initializes the class.
- ///
- /// This configures which session and server should be used.
- /// It hooks to the session now and downloads the configuration.
- /// It is synchronous (it may block for some time).
- ///
- /// Note that you need to call cleanup before the server or
- /// session dies, otherwise it might access them after they
- /// are destroyed.
- ///
- /// \param session The session to hook into and to access the configuration
- /// through.
- /// \param server It is the server to configure.
- /// \throw isc::InvalidOperation if this is called when already initialized.
- /// \throw isc::InvalidParameter if any of the parameters is NULL
- /// \throw isc::config::ModuleCCError if the remote configuration is not
- /// available for some reason.
- static void init(isc::config::ModuleCCSession* session,
- Server* server)
- {
- if (session == NULL) {
- isc_throw(isc::InvalidParameter, "The session must not be NULL");
- }
- if (server == NULL) {
- isc_throw(isc::InvalidParameter, "The server must not be NULL");
- }
- if (server_ != NULL) {
- isc_throw(isc::InvalidOperation,
- "The configurator is already initialized");
- }
- server_ = server;
- session_ = session;
- session->addRemoteConfig("data_sources", reconfigureInternal, false);
- }
- /// \brief Deinitializes the class.
- ///
- /// This detaches from the session and removes the server from internal
- /// storage. The current configuration in the server is preserved.
- ///
- /// This can be called even if it is not initialized currently. You
- /// can initialize it again after this.
- static void cleanup() {
- if (session_ != NULL) {
- session_->removeRemoteConfig("data_sources");
- }
- session_ = NULL;
- server_ = NULL;
- }
- /// \brief Reads new configuration and replaces the old one.
- ///
- /// It instructs the server to replace the lists with new ones as needed.
- /// You don't need to call it directly (but you could, though the benefit
- /// is unknown and it would be questionable at least). It is called
- /// automatically on normal updates.
- ///
- /// \param config The configuration value to parse. It is in the form
- /// as an update from the config manager.
- /// \throw InvalidOperation if it is called when not initialized.
- static void reconfigure(const isc::data::ConstElementPtr& config) {
- if (server_ == NULL) {
- isc_throw(isc::InvalidOperation,
- "Can't reconfigure while not initialized by init()");
- }
- // Lock the client lists, we're going to manipulate them.
- isc::util::thread::Mutex::Locker locker(server_->getClientListMutex());
- typedef std::map<std::string, isc::data::ConstElementPtr> Map;
- typedef std::pair<isc::dns::RRClass, ListPtr> RollbackPair;
- typedef std::pair<isc::dns::RRClass, isc::data::ConstElementPtr>
- RollbackConfiguration;
- // Some structures to be able to perform a rollback
- std::vector<RollbackPair> rollback_sets;
- std::vector<RollbackConfiguration> rollback_configurations;
- try {
- // Get the configuration and current state.
- const Map& map(config->mapValue());
- const std::vector<isc::dns::RRClass>
- activeVector(server_->getClientListClasses());
- std::set<isc::dns::RRClass> active(activeVector.begin(),
- activeVector.end());
- // Go through the configuration and change everything.
- for (Map::const_iterator it(map.begin()); it != map.end(); ++it) {
- isc::dns::RRClass rrclass(it->first);
- active.erase(rrclass);
- ListPtr list(server_->getClientList(rrclass));
- bool need_set(false);
- if (list) {
- rollback_configurations.
- push_back(RollbackConfiguration(rrclass,
- list->getConfiguration()));
- } else {
- list.reset(new List(rrclass));
- need_set = true;
- rollback_sets.push_back(RollbackPair(rrclass, ListPtr()));
- }
- list->configure(it->second, true);
- if (need_set) {
- server_->setClientList(rrclass, list);
- }
- }
- // Remove the ones that are not in the configuration.
- for (std::set<isc::dns::RRClass>::iterator it(active.begin());
- it != active.end(); ++it) {
- // There seems to be no way the setClientList could throw.
- // But this is just to make sure in case it did to restore
- // the original.
- rollback_sets.push_back(
- RollbackPair(*it, server_->getClientList(*it)));
- server_->setClientList(*it, ListPtr());
- }
- } catch (...) {
- // Perform a rollback of the changes. The old configuration should
- // work.
- for (typename std::vector<RollbackPair>::const_iterator
- it(rollback_sets.begin()); it != rollback_sets.end(); ++it) {
- server_->setClientList(it->first, it->second);
- }
- for (typename std::vector<RollbackConfiguration>::const_iterator
- it(rollback_configurations.begin());
- it != rollback_configurations.end(); ++it) {
- server_->getClientList(it->first)->configure(it->second, true);
- }
- throw;
- }
- }
- /// \brief Version of reconfigure for easier testing.
- ///
- /// This method can be used to reconfigure a server without first
- /// initializing the configurator. This does not need a session.
- /// Otherwise, it acts the same as reconfigure.
- ///
- /// This is not meant for production code. Do not use there.
- ///
- /// \param server The server to configure.
- /// \param config The config to use.
- /// \throw isc::InvalidOperation if the configurator is initialized.
- /// \throw anything that reconfigure does.
- static void testReconfigure(Server* server,
- const isc::data::ConstElementPtr& config)
- {
- if (server_ != NULL) {
- isc_throw(isc::InvalidOperation, "Currently initialized.");
- }
- try {
- server_ = server;
- reconfigure(config);
- server_ = NULL;
- } catch (...) {
- server_ = NULL;
- throw;
- }
- }
-};
-
-template<class Server, class List>
-isc::config::ModuleCCSession*
-DataSourceConfiguratorGeneric<Server, List>::session_(NULL);
-
-template<class Server, class List>
-Server* DataSourceConfiguratorGeneric<Server, List>::server_(NULL);
-
-/// \brief Concrete version of DataSourceConfiguratorGeneric for the
-/// use in authoritative server.
-typedef DataSourceConfiguratorGeneric<AuthSrv,
- isc::datasrc::ConfigurableClientList>
- DataSourceConfigurator;
-
-#endif
diff --git a/src/bin/auth/main.cc b/src/bin/auth/main.cc
index 3cca3c0..b425813 100644
--- a/src/bin/auth/main.cc
+++ b/src/bin/auth/main.cc
@@ -14,17 +14,6 @@
#include <config.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/select.h>
-#include <netdb.h>
-#include <netinet/in.h>
-#include <stdlib.h>
-#include <errno.h>
-
-#include <cassert>
-#include <iostream>
-
#include <exceptions/exceptions.h>
#include <util/buffer.h>
@@ -45,13 +34,26 @@
#include <auth/command.h>
#include <auth/auth_srv.h>
#include <auth/auth_log.h>
-#include <auth/datasrc_configurator.h>
+#include <auth/datasrc_config.h>
#include <asiodns/asiodns.h>
#include <asiolink/asiolink.h>
#include <log/logger_support.h>
#include <server_common/keyring.h>
#include <server_common/socket_request.h>
+#include <boost/bind.hpp>
+
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <sys/select.h>
+#include <netdb.h>
+#include <netinet/in.h>
+#include <stdlib.h>
+#include <errno.h>
+
+#include <cassert>
+#include <iostream>
+
using namespace std;
using namespace isc::asiodns;
using namespace isc::asiolink;
@@ -70,7 +72,7 @@ namespace {
/* need global var for config/command handlers.
* todo: turn this around, and put handlers in the authserver
* class itself? */
-AuthSrv *auth_server;
+AuthSrv* auth_server;
ConstElementPtr
my_config_handler(ConstElementPtr new_config) {
@@ -84,6 +86,29 @@ my_command_handler(const string& command, ConstElementPtr args) {
}
void
+datasrcConfigHandler(AuthSrv* server, bool* first_time,
+ ModuleCCSession* config_session, const std::string&,
+ isc::data::ConstElementPtr config,
+ const isc::config::ConfigData&)
+{
+ assert(server != NULL);
+ if (config->contains("classes")) {
+ if (*first_time) {
+ // HACK: The default is not passed to the handler in the first
+ // callback. This one will get the default (or, current value).
+ // Further updates will work the usual way.
+ assert(config_session != NULL);
+ *first_time = false;
+ configureDataSource(*auth_server,
+ config_session->getRemoteConfigValue(
+ "data_sources", "classes"));
+ } else {
+ configureDataSource(*server, config->get("classes"));
+ }
+ }
+}
+
+void
usage() {
cerr << "Usage: b10-auth [-v]"
<< endl;
@@ -191,13 +216,15 @@ main(int argc, char* argv[]) {
isc::server_common::initKeyring(*config_session);
auth_server->setTSIGKeyRing(&isc::server_common::keyring);
- // Start the data source configuration
- DataSourceConfigurator::init(config_session, auth_server);
- // HACK: The default is not passed to the handler. This one will
- // get the default (or, current value). Further updates will work
- // the usual way.
- DataSourceConfigurator::reconfigure(
- config_session->getRemoteConfigValue("data_sources", "classes"));
+ // Start the data source configuration. We pass first_time and
+ // config_session for the hack described in datasrcConfigHandler.
+ bool first_time = true;
+ config_session->addRemoteConfig("data_sources",
+ boost::bind(datasrcConfigHandler,
+ auth_server, &first_time,
+ config_session,
+ _1, _2, _3),
+ false);
// Now start asynchronous read.
config_session->start();
@@ -221,7 +248,10 @@ main(int argc, char* argv[]) {
xfrin_session->disconnect();
}
- DataSourceConfigurator::cleanup();
+ // If we haven't registered callback for data sources, this will be just
+ // no-op.
+ config_session->removeRemoteConfig("data_sources");
+
delete xfrin_session;
delete config_session;
delete cc_session;
diff --git a/src/bin/auth/tests/Makefile.am b/src/bin/auth/tests/Makefile.am
index 7c01a6b..6b9d385 100644
--- a/src/bin/auth/tests/Makefile.am
+++ b/src/bin/auth/tests/Makefile.am
@@ -42,6 +42,7 @@ run_unittests_SOURCES += ../auth_config.h ../auth_config.cc
run_unittests_SOURCES += ../command.h ../command.cc
run_unittests_SOURCES += ../common.h ../common.cc
run_unittests_SOURCES += ../statistics.h ../statistics.cc
+run_unittests_SOURCES += ../datasrc_config.h ../datasrc_config.cc
run_unittests_SOURCES += datasrc_util.h datasrc_util.cc
run_unittests_SOURCES += auth_srv_unittest.cc
run_unittests_SOURCES += config_unittest.cc
@@ -50,7 +51,7 @@ run_unittests_SOURCES += command_unittest.cc
run_unittests_SOURCES += common_unittest.cc
run_unittests_SOURCES += query_unittest.cc
run_unittests_SOURCES += statistics_unittest.cc
-run_unittests_SOURCES += datasrc_configurator_unittest.cc
+run_unittests_SOURCES += datasrc_config_unittest.cc
run_unittests_SOURCES += run_unittests.cc
nodist_run_unittests_SOURCES = ../auth_messages.h ../auth_messages.cc
diff --git a/src/bin/auth/tests/auth_srv_unittest.cc b/src/bin/auth/tests/auth_srv_unittest.cc
index 3197e7e..60a9a2a 100644
--- a/src/bin/auth/tests/auth_srv_unittest.cc
+++ b/src/bin/auth/tests/auth_srv_unittest.cc
@@ -36,7 +36,7 @@
#include <auth/command.h>
#include <auth/common.h>
#include <auth/statistics.h>
-#include <auth/datasrc_configurator.h>
+#include <auth/datasrc_config.h>
#include <util/unittests/mock_socketsession.h>
#include <util/threads/lock.h>
@@ -722,17 +722,17 @@ TEST_F(AuthSrvTest, notifyWithSessionMessageError) {
}
void
-updateDatabase(AuthSrv* server, const char* params) {
+updateDatabase(AuthSrv& server, const char* params) {
const ConstElementPtr config(Element::fromJSON("{"
"\"IN\": [{"
" \"type\": \"sqlite3\","
" \"params\": " + string(params) +
"}]}"));
- DataSourceConfigurator::testReconfigure(server, config);
+ configureDataSource(server, config);
}
void
-updateInMemory(AuthSrv* server, const char* origin, const char* filename) {
+updateInMemory(AuthSrv& server, const char* origin, const char* filename) {
const ConstElementPtr config(Element::fromJSON("{"
"\"IN\": [{"
" \"type\": \"MasterFiles\","
@@ -745,17 +745,17 @@ updateInMemory(AuthSrv* server, const char* origin, const char* filename) {
" \"type\": \"static\","
" \"params\": \"" + string(STATIC_DSRC_FILE) + "\""
"}]}"));
- DataSourceConfigurator::testReconfigure(server, config);
+ configureDataSource(server, config);
}
void
-updateBuiltin(AuthSrv* server) {
+updateBuiltin(AuthSrv& server) {
const ConstElementPtr config(Element::fromJSON("{"
"\"CH\": [{"
" \"type\": \"static\","
" \"params\": \"" + string(STATIC_DSRC_FILE) + "\""
"}]}"));
- DataSourceConfigurator::testReconfigure(server, config);
+ configureDataSource(server, config);
}
// Try giving the server a TSIG signed request and see it can anwer signed as
@@ -766,7 +766,7 @@ TEST_F(AuthSrvTest, DISABLED_TSIGSigned) { // Needs builtin
TEST_F(AuthSrvTest, TSIGSigned) {
#endif
// Prepare key, the client message, etc
- updateBuiltin(&server);
+ updateBuiltin(server);
const TSIGKey key("key:c2VjcmV0Cg==:hmac-sha1");
TSIGContext context(key);
UnitTestUtil::createRequestMessage(request_message, opcode, default_qid,
@@ -814,7 +814,7 @@ TEST_F(AuthSrvTest, DISABLED_builtInQueryViaDNSServer) {
#else
TEST_F(AuthSrvTest, builtInQueryViaDNSServer) {
#endif
- updateBuiltin(&server);
+ updateBuiltin(server);
UnitTestUtil::createRequestMessage(request_message, Opcode::QUERY(),
default_qid, Name("VERSION.BIND."),
RRClass::CH(), RRType::TXT());
@@ -846,7 +846,7 @@ TEST_F(AuthSrvTest, DISABLED_builtInQuery) {
#else
TEST_F(AuthSrvTest, builtInQuery) {
#endif
- updateBuiltin(&server);
+ updateBuiltin(server);
UnitTestUtil::createRequestMessage(request_message, Opcode::QUERY(),
default_qid, Name("VERSION.BIND."),
RRClass::CH(), RRType::TXT());
@@ -867,7 +867,7 @@ TEST_F(AuthSrvTest, DISABLED_iqueryViaDNSServer) { // Needs builtin
#else
TEST_F(AuthSrvTest, iqueryViaDNSServer) { // Needs builtin
#endif
- updateBuiltin(&server);
+ updateBuiltin(server);
createDataFromFile("iquery_fromWire.wire");
(*server.getDNSLookupProvider())(*io_message, parse_message,
response_message,
@@ -889,7 +889,7 @@ TEST_F(AuthSrvTest, DISABLED_updateConfig) {
#else
TEST_F(AuthSrvTest, updateConfig) {
#endif
- updateDatabase(&server, CONFIG_TESTDB);
+ updateDatabase(server, CONFIG_TESTDB);
// query for existent data in the installed data source. The resulting
// response should have the AA flag on, and have an RR in each answer
@@ -907,7 +907,7 @@ TEST_F(AuthSrvTest, DISABLED_datasourceFail) {
#else
TEST_F(AuthSrvTest, datasourceFail) {
#endif
- updateDatabase(&server, CONFIG_TESTDB);
+ updateDatabase(server, CONFIG_TESTDB);
// This query will hit a corrupted entry of the data source (the zoneload
// tool and the data source itself naively accept it). This will result
@@ -927,10 +927,10 @@ TEST_F(AuthSrvTest, DISABLED_updateConfigFail) {
TEST_F(AuthSrvTest, updateConfigFail) {
#endif
// First, load a valid data source.
- updateDatabase(&server, CONFIG_TESTDB);
+ updateDatabase(server, CONFIG_TESTDB);
// Next, try to update it with a non-existent one. This should fail.
- EXPECT_THROW(updateDatabase(&server, BADCONFIG_TESTDB),
+ EXPECT_THROW(updateDatabase(server, BADCONFIG_TESTDB),
isc::datasrc::DataSourceError);
// The original data source should still exist.
@@ -953,7 +953,7 @@ TEST_F(AuthSrvTest, updateWithInMemoryClient) {
" \"params\": {},"
" \"cache-enable\": true"
"}]}"));
- DataSourceConfigurator::testReconfigure(&server, config);
+ configureDataSource(server, config);
// after successful configuration, we should have one (with empty zoneset).
// The memory data source is empty, should return REFUSED rcode.
@@ -974,7 +974,7 @@ TEST_F(AuthSrvTest, queryWithInMemoryClientNoDNSSEC) {
// query handler class, and confirm it returns no error and a non empty
// answer section. Detailed examination on the response content
// for various types of queries are tested in the query tests.
- updateInMemory(&server, "example.", CONFIG_INMEMORY_EXAMPLE);
+ updateInMemory(server, "example.", CONFIG_INMEMORY_EXAMPLE);
createDataFromFile("nsec3query_nodnssec_fromWire.wire");
server.processMessage(*io_message, *parse_message, *response_obuffer,
@@ -993,7 +993,7 @@ TEST_F(AuthSrvTest, queryWithInMemoryClientDNSSEC) {
// Similar to the previous test, but the query has the DO bit on.
// The response should contain RRSIGs, and should have more RRs than
// the previous case.
- updateInMemory(&server, "example.", CONFIG_INMEMORY_EXAMPLE);
+ updateInMemory(server, "example.", CONFIG_INMEMORY_EXAMPLE);
createDataFromFile("nsec3query_fromWire.wire");
server.processMessage(*io_message, *parse_message, *response_obuffer,
@@ -1013,7 +1013,7 @@ TEST_F(AuthSrvTest,
)
{
// Set up the in-memory
- updateInMemory(&server, "example.", CONFIG_INMEMORY_EXAMPLE);
+ updateInMemory(server, "example.", CONFIG_INMEMORY_EXAMPLE);
// This shouldn't affect the result of class CH query
UnitTestUtil::createRequestMessage(request_message, Opcode::QUERY(),
@@ -1425,7 +1425,7 @@ TEST_F(AuthSrvTest,
)
{
// Set real inmem client to proxy
- updateInMemory(&server, "example.", CONFIG_INMEMORY_EXAMPLE);
+ updateInMemory(server, "example.", CONFIG_INMEMORY_EXAMPLE);
{
isc::util::thread::Mutex::Locker locker(server.getClientListMutex());
boost::shared_ptr<isc::datasrc::ConfigurableClientList>
@@ -1450,16 +1450,16 @@ TEST_F(AuthSrvTest,
// If non null rrset is given, it will be passed to the proxy so it can
// return some faked response.
void
-setupThrow(AuthSrv* server, ThrowWhen throw_when, bool isc_exception,
+setupThrow(AuthSrv& server, ThrowWhen throw_when, bool isc_exception,
ConstRRsetPtr rrset = ConstRRsetPtr())
{
updateInMemory(server, "example.", CONFIG_INMEMORY_EXAMPLE);
- isc::util::thread::Mutex::Locker locker(server->getClientListMutex());
+ isc::util::thread::Mutex::Locker locker(server.getClientListMutex());
boost::shared_ptr<isc::datasrc::ConfigurableClientList>
- list(new FakeList(server->getClientList(RRClass::IN()), throw_when,
+ list(new FakeList(server.getClientList(RRClass::IN()), throw_when,
isc_exception, rrset));
- server->setClientList(RRClass::IN(), list);
+ server.setClientList(RRClass::IN(), list);
}
TEST_F(AuthSrvTest,
@@ -1482,11 +1482,11 @@ TEST_F(AuthSrvTest,
RRClass::IN(), RRType::TXT());
for (ThrowWhen* when(throws); *when != THROW_NEVER; ++when) {
createRequestPacket(request_message, IPPROTO_UDP);
- setupThrow(&server, *when, true);
+ setupThrow(server, *when, true);
processAndCheckSERVFAIL();
// To be sure, check same for non-isc-exceptions
createRequestPacket(request_message, IPPROTO_UDP);
- setupThrow(&server, *when, false);
+ setupThrow(server, *when, false);
processAndCheckSERVFAIL();
}
}
@@ -1502,7 +1502,7 @@ TEST_F(AuthSrvTest,
)
{
createDataFromFile("nsec3query_nodnssec_fromWire.wire");
- setupThrow(&server, THROW_AT_GET_CLASS, true);
+ setupThrow(server, THROW_AT_GET_CLASS, true);
// getClass is not called so it should just answer
server.processMessage(*io_message, *parse_message, *response_obuffer,
@@ -1526,7 +1526,7 @@ TEST_F(AuthSrvTest,
ConstRRsetPtr empty_rrset(new RRset(Name("foo.example"),
RRClass::IN(), RRType::TXT(),
RRTTL(0)));
- setupThrow(&server, THROW_NEVER, true, empty_rrset);
+ setupThrow(server, THROW_NEVER, true, empty_rrset);
// Repeat the query processing two times. Due to the faked RRset,
// toWire() should throw, and it should result in SERVFAIL.
diff --git a/src/bin/auth/tests/command_unittest.cc b/src/bin/auth/tests/command_unittest.cc
index e57de93..c799483 100644
--- a/src/bin/auth/tests/command_unittest.cc
+++ b/src/bin/auth/tests/command_unittest.cc
@@ -19,7 +19,7 @@
#include <auth/auth_srv.h>
#include <auth/auth_config.h>
#include <auth/command.h>
-#include <auth/datasrc_configurator.h>
+#include <auth/datasrc_config.h>
#include <dns/name.h>
#include <dns/rrclass.h>
@@ -208,7 +208,7 @@ configureZones(AuthSrv& server) {
" \"cache-enable\": true"
"}]}"));
- DataSourceConfigurator::testReconfigure(&server, config);
+ configureDataSource(server, config);
zoneChecks(server);
}
@@ -271,7 +271,7 @@ TEST_F(AuthCommandTest,
" \"cache-enable\": true,"
" \"cache-zones\": [\"example.org\"]"
"}]}"));
- DataSourceConfigurator::testReconfigure(&server_, config);
+ configureDataSource(server_, config);
{
isc::util::thread::Mutex::Locker locker(server_.getClientListMutex());
@@ -335,7 +335,7 @@ TEST_F(AuthCommandTest,
" \"cache-enable\": true,"
" \"cache-zones\": [\"example.com\"]"
"}]}"));
- EXPECT_THROW(DataSourceConfigurator::testReconfigure(&server_, config2),
+ EXPECT_THROW(configureDataSource(server_, config2),
ConfigurableClientList::ConfigurationError);
result_ = execAuthServerCommand(server_, "loadzone",
diff --git a/src/bin/auth/tests/datasrc_config_unittest.cc b/src/bin/auth/tests/datasrc_config_unittest.cc
new file mode 100644
index 0000000..3d3aa58
--- /dev/null
+++ b/src/bin/auth/tests/datasrc_config_unittest.cc
@@ -0,0 +1,298 @@
+// Copyright (C) 2012 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.
+
+#include <auth/datasrc_config.h>
+
+#include <config/tests/fake_session.h>
+#include <config/ccsession.h>
+#include <util/threads/lock.h>
+
+#include <gtest/gtest.h>
+
+#include <boost/bind.hpp>
+#include <boost/shared_ptr.hpp>
+
+#include <memory>
+
+using namespace isc;
+using namespace isc::cc;
+using namespace isc::config;
+using namespace isc::data;
+using namespace isc::dns;
+using namespace std;
+using namespace boost;
+
+namespace {
+
+class DatasrcConfigTest;
+
+class FakeList {
+public:
+ FakeList(const RRClass&) :
+ configuration_(new ListElement)
+ {}
+ void configure(const ConstElementPtr& configuration, bool allow_cache) {
+ EXPECT_TRUE(allow_cache);
+ conf_ = configuration->get(0)->get("type")->stringValue();
+ configuration_ = configuration;
+ }
+ const string& getConf() const {
+ return (conf_);
+ }
+ ConstElementPtr getConfiguration() const {
+ return (configuration_);
+ }
+private:
+ string conf_;
+ ConstElementPtr configuration_;
+};
+
+typedef shared_ptr<FakeList> ListPtr;
+
+void
+testConfigureDataSource(DatasrcConfigTest& test,
+ const isc::data::ConstElementPtr& config)
+{
+ // We use the test fixture for the Server type. This makes it possible
+ // to easily fake all needed methods and look that they were called.
+ configureDataSourceGeneric<DatasrcConfigTest, FakeList>(test, config);
+}
+
+void
+datasrcConfigHandler(DatasrcConfigTest* fake_server, const std::string&,
+ isc::data::ConstElementPtr config,
+ const isc::config::ConfigData&)
+{
+ if (config->contains("classes")) {
+ testConfigureDataSource(*fake_server, config->get("classes"));
+ }
+}
+
+class DatasrcConfigTest : public ::testing::Test {
+public:
+ // These pretend to be the server
+ ListPtr getClientList(const RRClass& rrclass) {
+ log_ += "get " + rrclass.toText() + "\n";
+ return (lists_[rrclass]);
+ }
+ void setClientList(const RRClass& rrclass, const ListPtr& list) {
+ log_ += "set " + rrclass.toText() + " " +
+ (list ? list->getConf() : "") + "\n";
+ lists_[rrclass] = list;
+ }
+ vector<RRClass> getClientListClasses() const {
+ vector<RRClass> result;
+ for (std::map<RRClass, ListPtr>::const_iterator it(lists_.begin());
+ it != lists_.end(); ++it) {
+ result.push_back(it->first);
+ }
+ return (result);
+ }
+ isc::util::thread::Mutex& getClientListMutex() const {
+ return (mutex_);
+ }
+protected:
+ DatasrcConfigTest() :
+ session(ElementPtr(new ListElement), ElementPtr(new ListElement),
+ ElementPtr(new ListElement)),
+ specfile(string(TEST_OWN_DATA_DIR) + "/spec.spec")
+ {
+ initSession();
+ }
+ void initSession() {
+ session.getMessages()->add(createAnswer());
+ mccs.reset(new ModuleCCSession(specfile, session, NULL, NULL, false,
+ false));
+ }
+ void TearDown() {
+ // Make sure no matter what we did, it is cleaned up. Also check
+ // we really have subscribed to the configuration, and after removing
+ // it we actually cancel it.
+ EXPECT_TRUE(session.haveSubscription("data_sources", "*"));
+ mccs->removeRemoteConfig("data_sources");
+ EXPECT_FALSE(session.haveSubscription("data_sources", "*"));
+ }
+ void SetUp() {
+ session.getMessages()->
+ add(createAnswer(0,
+ moduleSpecFromFile(string(PLUGIN_DATA_PATH) +
+ "/datasrc.spec").
+ getFullSpec()));
+ session.getMessages()->add(createAnswer(0,
+ ElementPtr(new MapElement)));
+ mccs->addRemoteConfig("data_sources",
+ boost::bind(datasrcConfigHandler,
+ this, _1, _2, _3), false);
+ }
+ ElementPtr buildConfig(const string& config) const {
+ const ElementPtr internal(Element::fromJSON(config));
+ const ElementPtr external(Element::fromJSON("{\"version\": 1}"));
+ external->set("classes", internal);
+ return (external);
+ }
+ void initializeINList() {
+ const ConstElementPtr
+ config(buildConfig("{\"IN\": [{\"type\": \"xxx\"}]}"));
+ session.addMessage(createCommand("config_update", config),
+ "data_sources", "*");
+ mccs->checkCommand();
+ // Check it called the correct things (check that there's no IN yet and
+ // set a new one.
+ EXPECT_EQ("get IN\nset IN xxx\n", log_);
+ EXPECT_EQ(1, lists_.size());
+ }
+ FakeSession session;
+ auto_ptr<ModuleCCSession> mccs;
+ const string specfile;
+ std::map<RRClass, ListPtr> lists_;
+ string log_;
+ mutable isc::util::thread::Mutex mutex_;
+};
+
+// Push there a configuration with a single list.
+TEST_F(DatasrcConfigTest, createList) {
+ initializeINList();
+}
+
+TEST_F(DatasrcConfigTest, modifyList) {
+ // First, initialize the list
+ initializeINList();
+ // And now change the configuration of the list
+ const ElementPtr
+ config(buildConfig("{\"IN\": [{\"type\": \"yyy\"}]}"));
+ session.addMessage(createCommand("config_update", config), "data_sources",
+ "*");
+ log_ = "";
+ mccs->checkCommand();
+ // This one does not set
+ EXPECT_EQ("get IN\n", log_);
+ // But this should contain the yyy configuration
+ EXPECT_EQ("yyy", lists_[RRClass::IN()]->getConf());
+ EXPECT_EQ(1, lists_.size());
+}
+
+// Check we can have multiple lists at once
+TEST_F(DatasrcConfigTest, multiple) {
+ const ElementPtr
+ config(buildConfig("{\"IN\": [{\"type\": \"yyy\"}], "
+ "\"CH\": [{\"type\": \"xxx\"}]}"));
+ session.addMessage(createCommand("config_update", config), "data_sources",
+ "*");
+ mccs->checkCommand();
+ // We have set commands for both classes.
+ EXPECT_EQ("get CH\nset CH xxx\nget IN\nset IN yyy\n", log_);
+ // We should have both there
+ EXPECT_EQ("yyy", lists_[RRClass::IN()]->getConf());
+ EXPECT_EQ("xxx", lists_[RRClass::CH()]->getConf());
+ EXPECT_EQ(2, lists_.size());
+}
+
+// Check we can add another one later and the old one does not get
+// overwritten.
+//
+// It's almost like above, but we initialize first with single-list
+// config.
+TEST_F(DatasrcConfigTest, updateAdd) {
+ initializeINList();
+ const ElementPtr
+ config(buildConfig("{\"IN\": [{\"type\": \"yyy\"}], "
+ "\"CH\": [{\"type\": \"xxx\"}]}"));
+ session.addMessage(createCommand("config_update", config), "data_sources",
+ "*");
+ log_ = "";
+ mccs->checkCommand();
+ // The CH is set, IN not
+ EXPECT_EQ("get CH\nset CH xxx\nget IN\n", log_);
+ // But this should contain the yyy configuration
+ EXPECT_EQ("xxx", lists_[RRClass::CH()]->getConf());
+ EXPECT_EQ("yyy", lists_[RRClass::IN()]->getConf());
+ EXPECT_EQ(2, lists_.size());
+}
+
+// We delete a class list in this test.
+TEST_F(DatasrcConfigTest, updateDelete) {
+ initializeINList();
+ const ElementPtr
+ config(buildConfig("{}"));
+ session.addMessage(createCommand("config_update", config), "data_sources",
+ "*");
+ log_ = "";
+ mccs->checkCommand();
+ EXPECT_EQ("get IN\nset IN \n", log_);
+ EXPECT_FALSE(lists_[RRClass::IN()]);
+ // In real auth server, the NULL one would be removed. However, we just
+ // store it, so the IN bucket is still in there. This checks there's nothing
+ // else.
+ EXPECT_EQ(1, lists_.size());
+}
+
+// Check that we can rollback an addition if something else fails
+TEST_F(DatasrcConfigTest, rollbackAddition) {
+ initializeINList();
+ // The configuration is wrong. However, the CH one will get done first.
+ const ElementPtr
+ config(buildConfig("{\"IN\": [{\"type\": 13}], "
+ "\"CH\": [{\"type\": \"xxx\"}]}"));
+ session.addMessage(createCommand("config_update", config), "data_sources",
+ "*");
+ log_ = "";
+ // It does not throw, as it is handled in the ModuleCCSession.
+ // Throwing from the reconfigure is checked in other tests.
+ EXPECT_NO_THROW(mccs->checkCommand());
+ // Anyway, the result should not contain CH now and the original IN should
+ // be there.
+ EXPECT_EQ("xxx", lists_[RRClass::IN()]->getConf());
+ EXPECT_FALSE(lists_[RRClass::CH()]);
+}
+
+// Check that we can rollback a deletion if something else fails
+TEST_F(DatasrcConfigTest, rollbackDeletion) {
+ initializeINList();
+ // Put the CH there
+ const ElementPtr
+ config1(Element::fromJSON("{\"IN\": [{\"type\": \"yyy\"}], "
+ "\"CH\": [{\"type\": \"xxx\"}]}"));
+ testConfigureDataSource(*this, config1);
+ const ElementPtr
+ config2(Element::fromJSON("{\"IN\": [{\"type\": 13}]}"));
+ // This would delete CH. However, the IN one fails.
+ // As the deletions happen after the additions/settings
+ // and there's no known way to cause an exception during the
+ // deletions, it is not a true rollback, but the result should
+ // be the same.
+ EXPECT_THROW(testConfigureDataSource(*this, config2), TypeError);
+ EXPECT_EQ("yyy", lists_[RRClass::IN()]->getConf());
+ EXPECT_EQ("xxx", lists_[RRClass::CH()]->getConf());
+}
+
+// Check that we can roll back configuration change if something
+// fails later on.
+TEST_F(DatasrcConfigTest, rollbackConfiguration) {
+ initializeINList();
+ // Put the CH there
+ const ElementPtr
+ config1(Element::fromJSON("{\"IN\": [{\"type\": \"yyy\"}], "
+ "\"CH\": [{\"type\": \"xxx\"}]}"));
+ testConfigureDataSource(*this, config1);
+ // Now, the CH happens first. But nevertheless, it should be
+ // restored to the previoeus version.
+ const ElementPtr
+ config2(Element::fromJSON("{\"IN\": [{\"type\": 13}], "
+ "\"CH\": [{\"type\": \"yyy\"}]}"));
+ EXPECT_THROW(testConfigureDataSource(*this, config2), TypeError);
+ EXPECT_EQ("yyy", lists_[RRClass::IN()]->getConf());
+ EXPECT_EQ("xxx", lists_[RRClass::CH()]->getConf());
+}
+
+}
diff --git a/src/bin/auth/tests/datasrc_configurator_unittest.cc b/src/bin/auth/tests/datasrc_configurator_unittest.cc
deleted file mode 100644
index 254b238..0000000
--- a/src/bin/auth/tests/datasrc_configurator_unittest.cc
+++ /dev/null
@@ -1,303 +0,0 @@
-// Copyright (C) 2012 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.
-
-#include <auth/datasrc_configurator.h>
-
-#include <config/tests/fake_session.h>
-#include <config/ccsession.h>
-#include <util/threads/lock.h>
-
-#include <gtest/gtest.h>
-#include <memory>
-#include <boost/shared_ptr.hpp>
-
-using namespace isc;
-using namespace isc::cc;
-using namespace isc::config;
-using namespace isc::data;
-using namespace isc::dns;
-using namespace std;
-using namespace boost;
-
-namespace {
-
-class DatasrcConfiguratorTest;
-
-class FakeList {
-public:
- FakeList(const RRClass&) :
- configuration_(new ListElement)
- {}
- void configure(const ConstElementPtr& configuration, bool allow_cache) {
- EXPECT_TRUE(allow_cache);
- conf_ = configuration->get(0)->get("type")->stringValue();
- configuration_ = configuration;
- }
- const string& getConf() const {
- return (conf_);
- }
- ConstElementPtr getConfiguration() const {
- return (configuration_);
- }
-private:
- string conf_;
- ConstElementPtr configuration_;
-};
-
-typedef shared_ptr<FakeList> ListPtr;
-
-// We use the test fixture as both parameters, this makes it possible
-// to easily fake all needed methods and look that they were called.
-typedef DataSourceConfiguratorGeneric<DatasrcConfiguratorTest,
- FakeList> Configurator;
-
-class DatasrcConfiguratorTest : public ::testing::Test {
-public:
- // These pretend to be the server
- ListPtr getClientList(const RRClass& rrclass) {
- log_ += "get " + rrclass.toText() + "\n";
- return (lists_[rrclass]);
- }
- void setClientList(const RRClass& rrclass, const ListPtr& list) {
- log_ += "set " + rrclass.toText() + " " +
- (list ? list->getConf() : "") + "\n";
- lists_[rrclass] = list;
- }
- vector<RRClass> getClientListClasses() const {
- vector<RRClass> result;
- for (std::map<RRClass, ListPtr>::const_iterator it(lists_.begin());
- it != lists_.end(); ++it) {
- result.push_back(it->first);
- }
- return (result);
- }
- isc::util::thread::Mutex& getClientListMutex() const {
- return (mutex_);
- }
-protected:
- DatasrcConfiguratorTest() :
- session(ElementPtr(new ListElement), ElementPtr(new ListElement),
- ElementPtr(new ListElement)),
- specfile(string(TEST_OWN_DATA_DIR) + "/spec.spec")
- {
- initSession();
- }
- void initSession() {
- session.getMessages()->add(createAnswer());
- mccs.reset(new ModuleCCSession(specfile, session, NULL, NULL, false,
- false));
- }
- void TearDown() {
- // Make sure no matter what we did, it is cleaned up.
- Configurator::cleanup();
- }
- void init(const ElementPtr& config = ElementPtr()) {
- session.getMessages()->
- add(createAnswer(0,
- moduleSpecFromFile(string(PLUGIN_DATA_PATH) +
- "/datasrc.spec").
- getFullSpec()));
- if (config) {
- session.getMessages()->add(createAnswer(0, config));
- } else {
- session.getMessages()->
- add(createAnswer(0, ElementPtr(new MapElement)));
- }
- Configurator::init(mccs.get(), this);
- }
- void SetUp() {
- init();
- }
- ElementPtr buildConfig(const string& config) const {
- const ElementPtr internal(Element::fromJSON(config));
- const ElementPtr external(Element::fromJSON("{\"version\": 1}"));
- external->set("classes", internal);
- return (external);
- }
- void initializeINList() {
- const ElementPtr
- config(buildConfig("{\"IN\": [{\"type\": \"xxx\"}]}"));
- session.addMessage(createCommand("config_update", config), "data_sources",
- "*");
- mccs->checkCommand();
- // Check it called the correct things (check that there's no IN yet and
- // set a new one.
- EXPECT_EQ("get IN\nset IN xxx\n", log_);
- EXPECT_EQ(1, lists_.size());
- }
- FakeSession session;
- auto_ptr<ModuleCCSession> mccs;
- const string specfile;
- std::map<RRClass, ListPtr> lists_;
- string log_;
- mutable isc::util::thread::Mutex mutex_;
-};
-
-// Check the initialization (and cleanup)
-TEST_F(DatasrcConfiguratorTest, initialization) {
- // It can't be initialized again
- EXPECT_THROW(init(), InvalidOperation);
- EXPECT_TRUE(session.haveSubscription("data_sources", "*"));
- // Deinitialize to make the tests reasonable
- Configurator::cleanup();
- EXPECT_FALSE(session.haveSubscription("data_sources", "*"));
- // We can't reconfigure now (not even manually)
- EXPECT_THROW(Configurator::reconfigure(ElementPtr(new MapElement())),
- InvalidOperation);
- // If one of them is NULL, it does not work
- EXPECT_THROW(Configurator::init(NULL, this), InvalidParameter);
- EXPECT_FALSE(session.haveSubscription("data_sources", "*"));
- EXPECT_THROW(Configurator::init(mccs.get(), NULL), InvalidParameter);
- EXPECT_FALSE(session.haveSubscription("data_sources", "*"));
- // But we can initialize it again now
- EXPECT_NO_THROW(init());
- EXPECT_TRUE(session.haveSubscription("data_sources", "*"));
-}
-
-// Push there a configuration with a single list.
-TEST_F(DatasrcConfiguratorTest, createList) {
- initializeINList();
-}
-
-TEST_F(DatasrcConfiguratorTest, modifyList) {
- // First, initialize the list
- initializeINList();
- // And now change the configuration of the list
- const ElementPtr
- config(buildConfig("{\"IN\": [{\"type\": \"yyy\"}]}"));
- session.addMessage(createCommand("config_update", config), "data_sources",
- "*");
- log_ = "";
- mccs->checkCommand();
- // This one does not set
- EXPECT_EQ("get IN\n", log_);
- // But this should contain the yyy configuration
- EXPECT_EQ("yyy", lists_[RRClass::IN()]->getConf());
- EXPECT_EQ(1, lists_.size());
-}
-
-// Check we can have multiple lists at once
-TEST_F(DatasrcConfiguratorTest, multiple) {
- const ElementPtr
- config(buildConfig("{\"IN\": [{\"type\": \"yyy\"}], "
- "\"CH\": [{\"type\": \"xxx\"}]}"));
- session.addMessage(createCommand("config_update", config), "data_sources",
- "*");
- mccs->checkCommand();
- // We have set commands for both classes.
- EXPECT_EQ("get CH\nset CH xxx\nget IN\nset IN yyy\n", log_);
- // We should have both there
- EXPECT_EQ("yyy", lists_[RRClass::IN()]->getConf());
- EXPECT_EQ("xxx", lists_[RRClass::CH()]->getConf());
- EXPECT_EQ(2, lists_.size());
-}
-
-// Check we can add another one later and the old one does not get
-// overwritten.
-//
-// It's almost like above, but we initialize first with single-list
-// config.
-TEST_F(DatasrcConfiguratorTest, updateAdd) {
- initializeINList();
- const ElementPtr
- config(buildConfig("{\"IN\": [{\"type\": \"yyy\"}], "
- "\"CH\": [{\"type\": \"xxx\"}]}"));
- session.addMessage(createCommand("config_update", config), "data_sources",
- "*");
- log_ = "";
- mccs->checkCommand();
- // The CH is set, IN not
- EXPECT_EQ("get CH\nset CH xxx\nget IN\n", log_);
- // But this should contain the yyy configuration
- EXPECT_EQ("xxx", lists_[RRClass::CH()]->getConf());
- EXPECT_EQ("yyy", lists_[RRClass::IN()]->getConf());
- EXPECT_EQ(2, lists_.size());
-}
-
-// We delete a class list in this test.
-TEST_F(DatasrcConfiguratorTest, updateDelete) {
- initializeINList();
- const ElementPtr
- config(buildConfig("{}"));
- session.addMessage(createCommand("config_update", config), "data_sources",
- "*");
- log_ = "";
- mccs->checkCommand();
- EXPECT_EQ("get IN\nset IN \n", log_);
- EXPECT_FALSE(lists_[RRClass::IN()]);
- // In real auth server, the NULL one would be removed. However, we just
- // store it, so the IN bucket is still in there. This checks there's nothing
- // else.
- EXPECT_EQ(1, lists_.size());
-}
-
-// Check that we can rollback an addition if something else fails
-TEST_F(DatasrcConfiguratorTest, rollbackAddition) {
- initializeINList();
- // The configuration is wrong. However, the CH one will get done first.
- const ElementPtr
- config(buildConfig("{\"IN\": [{\"type\": 13}], "
- "\"CH\": [{\"type\": \"xxx\"}]}"));
- session.addMessage(createCommand("config_update", config), "data_sources",
- "*");
- log_ = "";
- // It does not throw, as it is handled in the ModuleCCSession.
- // Throwing from the reconfigure is checked in other tests.
- EXPECT_NO_THROW(mccs->checkCommand());
- // Anyway, the result should not contain CH now and the original IN should
- // be there.
- EXPECT_EQ("xxx", lists_[RRClass::IN()]->getConf());
- EXPECT_FALSE(lists_[RRClass::CH()]);
-}
-
-// Check that we can rollback a deletion if something else fails
-TEST_F(DatasrcConfiguratorTest, rollbackDeletion) {
- initializeINList();
- // Put the CH there
- const ElementPtr
- config1(Element::fromJSON("{\"IN\": [{\"type\": \"yyy\"}], "
- "\"CH\": [{\"type\": \"xxx\"}]}"));
- Configurator::reconfigure(config1);
- const ElementPtr
- config2(Element::fromJSON("{\"IN\": [{\"type\": 13}]}"));
- // This would delete CH. However, the IN one fails.
- // As the deletions happen after the additions/settings
- // and there's no known way to cause an exception during the
- // deletions, it is not a true rollback, but the result should
- // be the same.
- EXPECT_THROW(Configurator::reconfigure(config2), TypeError);
- EXPECT_EQ("yyy", lists_[RRClass::IN()]->getConf());
- EXPECT_EQ("xxx", lists_[RRClass::CH()]->getConf());
-}
-
-// Check that we can roll back configuration change if something
-// fails later on.
-TEST_F(DatasrcConfiguratorTest, rollbackConfiguration) {
- initializeINList();
- // Put the CH there
- const ElementPtr
- config1(Element::fromJSON("{\"IN\": [{\"type\": \"yyy\"}], "
- "\"CH\": [{\"type\": \"xxx\"}]}"));
- Configurator::reconfigure(config1);
- // Now, the CH happens first. But nevertheless, it should be
- // restored to the previoeus version.
- const ElementPtr
- config2(Element::fromJSON("{\"IN\": [{\"type\": 13}], "
- "\"CH\": [{\"type\": \"yyy\"}]}"));
- EXPECT_THROW(Configurator::reconfigure(config2), TypeError);
- EXPECT_EQ("yyy", lists_[RRClass::IN()]->getConf());
- EXPECT_EQ("xxx", lists_[RRClass::CH()]->getConf());
-}
-
-}
diff --git a/src/bin/dbutil/dbutil.py.in b/src/bin/dbutil/dbutil.py.in
index 4b76a56..a844484 100755
--- a/src/bin/dbutil/dbutil.py.in
+++ b/src/bin/dbutil/dbutil.py.in
@@ -193,10 +193,17 @@ UPGRADES = [
"ALTER TABLE schema_version " +
"ADD COLUMN minor INTEGER NOT NULL DEFAULT 0"
]
+ },
+
+ {'from': (2, 0), 'to': (2, 1),
+ 'statements': [
+ "CREATE INDEX nsec3_byhash_and_rdtype ON nsec3 " +
+ "(hash, rdtype)"
+ ]
}
# To extend this, leave the above statements in place and add another
-# dictionary to the list. The "from" version should be (2, 0), the "to"
+# dictionary to the list. The "from" version should be (2, 1), the "to"
# version whatever the version the update is to, and the SQL statements are
# the statements required to perform the upgrade. This way, the upgrade
# program will be able to upgrade both a V1.0 and a V2.0 database.
diff --git a/src/bin/dbutil/tests/Makefile.am b/src/bin/dbutil/tests/Makefile.am
index b4231b3..aaa57cc 100644
--- a/src/bin/dbutil/tests/Makefile.am
+++ b/src/bin/dbutil/tests/Makefile.am
@@ -2,6 +2,8 @@ SUBDIRS = . testdata
# Tests of the update script.
+noinst_SCRIPTS = dbutil_test.sh
+
check-local:
B10_LOCKFILE_DIR_FROM_BUILD=$(abs_top_builddir) \
$(SHELL) $(abs_builddir)/dbutil_test.sh
diff --git a/src/bin/dbutil/tests/dbutil_test.sh.in b/src/bin/dbutil/tests/dbutil_test.sh.in
index f82eeb0..35314e8 100755
--- a/src/bin/dbutil/tests/dbutil_test.sh.in
+++ b/src/bin/dbutil/tests/dbutil_test.sh.in
@@ -165,7 +165,7 @@ upgrade_ok_test() {
if [ $? -eq 0 ]
then
# Compare schema with the reference
- get_schema $testdata/v2_0.sqlite3
+ get_schema $testdata/v2_1.sqlite3
expected_schema=$db_schema
get_schema $tempfile
actual_schema=$db_schema
@@ -177,7 +177,7 @@ upgrade_ok_test() {
fi
# Check the version is set correctly
- check_version $tempfile "V2.0"
+ check_version $tempfile "V2.1"
# Check that a backup was made
check_backup $1 $2
@@ -449,7 +449,7 @@ copy_file $testdata/old_v1.sqlite3 $tempfile
Yes
.
passzero $?
-check_version $tempfile "V2.0"
+check_version $tempfile "V2.1"
rm -f $tempfile $backupfile
echo "13.4 Interactive prompt - no"
diff --git a/src/bin/dbutil/tests/testdata/Makefile.am b/src/bin/dbutil/tests/testdata/Makefile.am
index 0d850a7..f4873f4 100644
--- a/src/bin/dbutil/tests/testdata/Makefile.am
+++ b/src/bin/dbutil/tests/testdata/Makefile.am
@@ -10,3 +10,4 @@ EXTRA_DIST += old_v1.sqlite3
EXTRA_DIST += README
EXTRA_DIST += too_many_version.sqlite3
EXTRA_DIST += v2_0.sqlite3
+EXTRA_DIST += v2_1.sqlite3
diff --git a/src/bin/dbutil/tests/testdata/v2_1.sqlite3 b/src/bin/dbutil/tests/testdata/v2_1.sqlite3
new file mode 100644
index 0000000..ca2dee9
Binary files /dev/null and b/src/bin/dbutil/tests/testdata/v2_1.sqlite3 differ
diff --git a/src/bin/dhcp4/tests/Makefile.am b/src/bin/dhcp4/tests/Makefile.am
index 906b5d1..ddc3000 100644
--- a/src/bin/dhcp4/tests/Makefile.am
+++ b/src/bin/dhcp4/tests/Makefile.am
@@ -16,6 +16,7 @@ check-local:
for pytest in $(PYTESTS) ; do \
echo Running test: $$pytest ; \
PYTHONPATH=$(COMMON_PYTHON_PATH):$(abs_top_srcdir)/src/bin:$(abs_top_builddir)/src/bin/bind10:$(abs_top_builddir)/src/lib/util/io/.libs \
+ B10_LOCKFILE_DIR_FROM_BUILD=$(abs_top_builddir) \
$(LIBRARY_PATH_PLACEHOLDER) \
$(PYCOVERAGE_RUN) $(abs_srcdir)/$$pytest || exit ; \
done
diff --git a/src/bin/dhcp6/tests/Makefile.am b/src/bin/dhcp6/tests/Makefile.am
index 1d9308f..de87582 100644
--- a/src/bin/dhcp6/tests/Makefile.am
+++ b/src/bin/dhcp6/tests/Makefile.am
@@ -15,6 +15,7 @@ check-local:
for pytest in $(PYTESTS) ; do \
echo Running test: $$pytest ; \
$(LIBRARY_PATH_PLACEHOLDER) \
+ B10_LOCKFILE_DIR_FROM_BUILD=$(abs_top_builddir) \
PYTHONPATH=$(COMMON_PYTHON_PATH):$(abs_top_srcdir)/src/bin:$(abs_top_builddir)/src/bin/bind10:$(abs_top_builddir)/src/lib/util/io/.libs \
$(PYCOVERAGE_RUN) $(abs_srcdir)/$$pytest || exit ; \
done
diff --git a/src/bin/host/.gitignore b/src/bin/host/.gitignore
deleted file mode 100644
index 01ef357..0000000
--- a/src/bin/host/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/b10-host
-/b10-host.1
diff --git a/src/bin/host/Makefile.am b/src/bin/host/Makefile.am
deleted file mode 100644
index 42ef954..0000000
--- a/src/bin/host/Makefile.am
+++ /dev/null
@@ -1,37 +0,0 @@
-AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib
-AM_CPPFLAGS += -I$(top_srcdir)/src/lib/dns -I$(top_builddir)/src/lib/dns
-AM_CPPFLAGS += $(BOOST_INCLUDES)
-
-AM_CXXFLAGS = $(B10_CXXFLAGS)
-
-if USE_STATIC_LINK
-AM_LDFLAGS = -static
-endif
-
-CLEANFILES = *.gcno *.gcda
-
-bin_PROGRAMS = b10-host
-b10_host_SOURCES = host.cc
-b10_host_LDADD = $(top_builddir)/src/lib/dns/libb10-dns++.la
-b10_host_LDADD += $(top_builddir)/src/lib/util/libb10-util.la
-b10_host_LDADD += $(top_builddir)/src/lib/exceptions/libb10-exceptions.la
-
-man_MANS = b10-host.1
-DISTCLEANFILES = $(man_MANS)
-EXTRA_DIST = $(man_MANS) b10-host.xml
-
-.PHONY: man
-if GENERATE_DOCS
-
-man: b10-host.1
-
-b10-host.1: b10-host.xml
- @XSLTPROC@ --novalid --xinclude --nonet -o $@ http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $(srcdir)/b10-host.xml
-
-else
-
-$(man_MANS):
- @echo Man generation disabled. Creating dummy $@. Configure with --enable-generate-docs to enable it.
- @echo Man generation disabled. Remove this file, configure with --enable-generate-docs, and rebuild BIND 10 > $@
-
-endif
diff --git a/src/bin/host/README b/src/bin/host/README
deleted file mode 100644
index 5cc4068..0000000
--- a/src/bin/host/README
+++ /dev/null
@@ -1,4 +0,0 @@
-Rewriting host(1) in C++ from scratch using BIND 10's libdns++.
-
-The bugs and incompatibilities are listed in the manual page
-and in the source code.
diff --git a/src/bin/host/b10-host.xml b/src/bin/host/b10-host.xml
deleted file mode 100644
index a17ef67..0000000
--- a/src/bin/host/b10-host.xml
+++ /dev/null
@@ -1,196 +0,0 @@
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"
- [<!ENTITY mdash "—">]>
-<!--
- - 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.
--->
-
-<!-- $Id$ -->
-<refentry>
-
- <refentryinfo>
- <date>May 4, 2011</date>
- </refentryinfo>
-
- <refmeta>
- <refentrytitle>b10-host</refentrytitle>
- <manvolnum>1</manvolnum>
- <refmiscinfo>BIND10</refmiscinfo>
- </refmeta>
-
- <refnamediv>
- <refname>b10-host</refname>
- <refpurpose>DNS lookup utility</refpurpose>
- </refnamediv>
-
- <docinfo>
- <copyright>
- <year>2011</year>
- <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
- </copyright>
- </docinfo>
-
- <refsynopsisdiv>
- <cmdsynopsis>
- <command>b10-host</command>
- <arg><option>-a</option></arg>
- <arg><option>-c <replaceable>class</replaceable></option></arg>
- <arg><option>-d</option></arg>
- <arg><option>-p <replaceable>port</replaceable></option></arg>
- <arg><option>-r</option></arg>
- <arg><option>-t <replaceable>type</replaceable></option></arg>
- <arg><option>-v</option></arg>
- <arg><replaceable>name</replaceable></arg>
- <arg><option><replaceable>server</replaceable></option></arg>
- </cmdsynopsis>
- </refsynopsisdiv>
-
- <refsect1>
- <title>DESCRIPTION</title>
- <para>
- The <command>b10-host</command> utility does DNS lookups.
- Its initial goal is to be a
- <citerefentry><refentrytitle>host</refentrytitle>
- <manvolnum>1</manvolnum></citerefentry>
- clone, but also add a few features useful for BIND 10 development
- testing.
- </para>
-
- <para>
- By default, it looks up the A, AAAA, and MX record sets for the
- <replaceable>name</replaceable>.
- Optionally, you may select a name server to query against by adding
- the <replaceable>server</replaceable> argument.
- </para>
- </refsect1>
-
- <refsect1>
- <title>OPTIONS</title>
-
- <para>The arguments are as follows:</para>
-
- <variablelist>
-
- <varlistentry>
- <term><option>-a</option></term>
- <listitem><para>
- Enable verbose mode and do a query for type ANY.
- (If the <option>-t</option> option is also set, then the
- ANY query is not done, but it still uses verbose mode.)
- </para></listitem>
- </varlistentry>
-
- <varlistentry>
- <term><option>-c <replaceable>class</replaceable></option></term>
- <listitem><para>
- Define the class for the query.
- The default is IN (Internet).
-<!-- TODO: bug if class is unknown causes seg fault and possible core dump -->
- </para></listitem>
- </varlistentry>
-
- <varlistentry>
- <term><option>-d</option></term>
- <listitem><para>
- Enable verbose output mode, including elapsed time in
- milliseconds.
- Verbose mode shows the header, question, answer, authority,
- and additional sections (if provided).
- (Same as <option>-v</option>.)
- </para></listitem>
- </varlistentry>
-
- <varlistentry>
- <term><option>-p <replaceable>port</replaceable></option></term>
- <listitem><para>
- Select an alternative port for the query.
- This may be a number or a service name.
- The default is 53 (domain).
- This is not a standard feature of
- <citerefentry><refentrytitle>host</refentrytitle>
- <manvolnum>1</manvolnum></citerefentry>.
- </para></listitem>
- </varlistentry>
-
- <varlistentry>
- <term><option>-r</option></term>
- <listitem><para>
- Disable recursive processing by not setting the
- Recursion Desired flag in the query.
- </para></listitem>
- </varlistentry>
-
- <varlistentry>
- <term><option>-t <replaceable>type</replaceable></option></term>
- <listitem><para>
- Select a specific resource record type for the query.
- By default, it looks up the A, AAAA, and MX record sets.
-<!-- TODO: bug if class is unknown causes seg fault and possible core dump -->
- (This overrides the <option>-a</option> option.)
- </para></listitem>
- </varlistentry>
-
- <varlistentry>
- <term><option>-v</option></term>
- <listitem><para>
- Same as <option>-d</option> option.
- </para></listitem>
- </varlistentry>
-
- </variablelist>
-
- </refsect1>
-
- <refsect1>
- <title>COMPATIBILITY / BUGS</title>
- <para>
- <command>b10-host</command> does not do reverse lookups by
- default yet (by detecting if name is a IPv4 or IPv6 address).
- </para>
-
- <para>
- Unknown <option>-c</option> class or <option>-t</option> type
- causes <command>b10-host</command> to Abort.
- </para>
-
- <para>
- Not all types are supported yet for formatting.
- Not all switches are supported yet.
- </para>
-
- <para>
- It doesn't use <filename>/etc/resolv.conf</filename> at this time.
- The default name server used is 127.0.0.1.
- </para>
-
- <para>
- <option>-p</option> is not a standard feature.
- </para>
- </refsect1>
-
- <refsect1>
- <title>HISTORY</title>
- <para>
- The C++ version of <command>b10-host</command> was started in
- October 2009 by Jeremy C. Reed of ISC.
- Its usage and output were based on the standard <command>host</command>
- command.
- </para>
- </refsect1>
-</refentry><!--
- - Local variables:
- - mode: sgml
- - End:
--->
diff --git a/src/bin/host/host.cc b/src/bin/host/host.cc
deleted file mode 100644
index a5c6522..0000000
--- a/src/bin/host/host.cc
+++ /dev/null
@@ -1,253 +0,0 @@
-// 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.
-
-// host rewritten in C++ using BIND 10 DNS library
-
-#include <arpa/inet.h>
-#include <netdb.h> // for getaddrinfo
-#include <sys/time.h> // for gettimeofday
-#include <sys/socket.h> // networking functions and definitions on FreeBSD
-
-#include <unistd.h>
-
-#include <string>
-#include <iostream>
-
-#include <util/buffer.h>
-
-#include <dns/name.h>
-#include <dns/message.h>
-#include <dns/messagerenderer.h>
-#include <dns/opcode.h>
-#include <dns/rcode.h>
-#include <dns/rrclass.h>
-#include <dns/rrtype.h>
-#include <dns/rrset.h>
-#include <dns/message.h>
-
-using namespace std;
-using namespace isc::dns;
-using namespace isc::util;
-
-namespace {
-char* dns_type = NULL; // not set, so A, AAAA, MX
-const char* server = "127.0.0.1";
-const char* server_port = "53";
-const char* dns_class = "IN";
-bool verbose = false;
-bool dns_any = false;
-int first_time = 1;
-bool recursive_bit = true;
-struct timeval before_time, after_time;
-
-int
-host_lookup(const char* const name, const char* const dns_class,
- const char* const type, bool any) {
-
- Message msg(Message::RENDER);
-
- msg.setQid(0); // does this matter?
-
- // TODO: add switch for this
- msg.setOpcode(Opcode::QUERY());
- msg.setRcode(Rcode::NOERROR());
- if (recursive_bit) {
- msg.setHeaderFlag(Message::HEADERFLAG_RD); // set recursive bit
- }
-
- msg.addQuestion(Question(Name(name),
- RRClass(dns_class),
- any ? RRType::ANY() : RRType(type))); // if NULL then:
-
- MessageRenderer renderer;
- msg.toWire(renderer);
-
- struct addrinfo hints, *res;
- memset(&hints, 0, sizeof(hints));
- hints.ai_family = AF_UNSPEC;
- hints.ai_socktype = SOCK_DGRAM;
- hints.ai_flags = 0; // not using AI_NUMERICHOST in case to bootstrap
- if (getaddrinfo(server, server_port, &hints, &res) != 0) {
- cerr << "address/port conversion for " << server << ":"
- << server_port << " failed" << endl;
- return (1);
- }
-
- if (verbose) {
- cout << "Trying \"" << name << "\"\n";
- }
-
- if (verbose && first_time) {
- // this is only output the first time
- first_time = 0;
- cout << "Using domain server:\n";
- cout << "Name: " << server << "\n";
- // TODO: I guess I have to do a lookup to get that address and aliases
- // too
- //cout << "Address: " << address << "\n" ; // "#" << port << "\n";
- //cout << "Aliases: " << server << "\n";
- }
-
- int s = socket(res->ai_family, res->ai_socktype, res->ai_protocol);
-
- if (s < 0) {
- cerr << "failed to open socket" << endl;
- return (1);
- }
-
- if (verbose) {
- gettimeofday(&before_time, NULL);
- }
-
- sendto(s, renderer.getData(), renderer.getLength(), 0, res->ai_addr,
- res->ai_addrlen);
-
- struct sockaddr_storage ss;
- struct sockaddr* sa;
- socklen_t sa_len;
-
- sa_len = sizeof(ss);
- sa = static_cast<struct sockaddr*>((void*)&ss);
-
- char recvbuf[4096];
- int cc;
- if ((cc = recvfrom(s, recvbuf, sizeof(recvbuf), 0, sa, &sa_len)) > 0) {
- try {
- Message rmsg(Message::PARSE);
- InputBuffer ibuffer(recvbuf, cc);
-
- rmsg.fromWire(ibuffer);
- if (!verbose) {
- string description = "";
- for (RRsetIterator it =
- rmsg.beginSection(Message::SECTION_ANSWER);
- it != rmsg.endSection(Message::SECTION_ANSWER);
- ++it) {
-
- if ((*it)->getType() == RRType::A()) {
- description = "has address";
- }
- else if ((*it)->getType() == RRType::AAAA()) {
- description = "has IPv6 address";
- }
- else if ((*it)->getType() == RRType::MX()) {
- description = "mail is handled by";
- }
- else if ((*it)->getType() == RRType::TXT()) {
- description = "descriptive text";
- }
-
- RdataIteratorPtr rit = (*it)->getRdataIterator();
- for (; !rit->isLast(); rit->next()) {
- // instead of using my name, maybe use returned label?
- cout << name << " " << description << " " <<
- (*rit).getCurrent().toText() << endl;
- }
- }
- } else {
- gettimeofday(&after_time, NULL);
-
- // HEADER and QUESTION, ANSWER, AUTHORITY, and ADDITIONAL
- std::cout << rmsg.toText() << std::endl;
-
- if (before_time.tv_usec > after_time.tv_usec) {
- after_time.tv_usec += 1000000;
- --after_time.tv_sec;
- }
-
- int elapsed_time =
- (after_time.tv_sec - before_time.tv_sec)
- + ((after_time.tv_usec - before_time.tv_usec))/1000;
-
- // TODO: if NXDOMAIN, host(1) doesn't show HEADER
- // Host hsdjkfhksjhdfkj not found: 3(NXDOMAIN)
- // TODO: test if NXDOMAIN
-
- std::cout << "Received " << cc <<
- " bytes in " << elapsed_time << " ms\n";
- // TODO: " bytes from 127.0.0.1#53 in 0 ms
-
- } //verbose
-/*
-TODO: handle InvalidRRClass
-TODO: handle invalid type exception
- } catch (InvalidType ivt) {
- std::cerr << "invalid type:" << ivt.what();
-*/
- } catch (const exception& ex) {
- std::cerr << "parse failed for " <<
- string(name) << "/" << type << ": " << ex.what() << std::endl;
- } catch (...) {
- std::cerr << "parse failed for " << string(name) << "/" << type;
- }
- }
-
- freeaddrinfo(res);
-
- return (0);
-} // host_lookup()
-}
-
-int
-main(int argc, char* argv[]) {
- int c;
-
- while ((c = getopt(argc, argv, "ac:dp:rt:v")) != -1)
- switch (c) {
- case 'a':
- dns_any = true;
- verbose = true;
- break;
- case 'c':
- dns_class = optarg;
- break;
- // p for port is a non-standard switch
- case 'p':
- server_port = optarg;
- break;
- case 'r':
- recursive_bit = false;
- break;
- case 't':
- dns_type = optarg;
- break;
- case 'd':
- // drop through to v, because debug and verbose are equivalent
- case 'v':
- verbose = true;
- break;
- }
- argc -= optind;
- argv += optind;
-
- if (argc < 1) {
- cout << "Usage: host [-adrv] [-c class] [-p port] [-t type] hostname [server]\n";
- exit(1);
- }
-
- if (argc >= 2) {
- server = argv[1];
- }
-
- if (dns_type == NULL) {
- host_lookup(argv[0], dns_class, "A", dns_any);
- // TODO: don't do next if A doesn't exist
- host_lookup(argv[0], dns_class, "AAAA", dns_any);
- host_lookup(argv[0], dns_class, "MX", dns_any);
- } else {
- // -t overrides -a, regardless of order
- host_lookup(argv[0], dns_class, dns_type, false);
- }
- return (0);
-}
diff --git a/src/lib/acl/dns.cc b/src/lib/acl/dns.cc
index d16ec65..5466dad 100644
--- a/src/lib/acl/dns.cc
+++ b/src/lib/acl/dns.cc
@@ -12,12 +12,6 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#include <memory>
-#include <string>
-#include <vector>
-
-#include <boost/shared_ptr.hpp>
-
#include <exceptions/exceptions.h>
#include <dns/name.h>
@@ -31,6 +25,13 @@
#include <acl/loader.h>
#include <acl/logic_check.h>
+#include <boost/shared_ptr.hpp>
+#include <boost/scoped_ptr.hpp>
+
+#include <memory>
+#include <string>
+#include <vector>
+
using namespace std;
using namespace isc::dns;
using namespace isc::data;
@@ -106,10 +107,12 @@ internal::RequestCheckCreator::create(const string& name,
RequestLoader&
getRequestLoader() {
- static RequestLoader* loader(NULL);
- if (loader == NULL) {
+ // To ensure that the singleton gets destroyed at the end of the
+ // program's lifetime, we put it in a static scoped_ptr.
+ static boost::scoped_ptr<RequestLoader> loader(NULL);
+ if (loader.get() == NULL) {
// Creator registration may throw, so we first store the new loader
- // in an auto pointer in order to provide the strong exception
+ // in a second auto pointer in order to provide the strong exception
// guarantee.
auto_ptr<RequestLoader> loader_ptr =
auto_ptr<RequestLoader>(new RequestLoader(REJECT));
@@ -129,7 +132,7 @@ getRequestLoader() {
new LogicCreator<AllOfSpec, RequestContext>("ALL")));
// From this point there shouldn't be any exception thrown
- loader = loader_ptr.release();
+ loader.reset(loader_ptr.release());
}
return (*loader);
diff --git a/src/lib/config/ccsession.cc b/src/lib/config/ccsession.cc
index daec005..8516d6c 100644
--- a/src/lib/config/ccsession.cc
+++ b/src/lib/config/ccsession.cc
@@ -338,7 +338,7 @@ getRelatedLoggers(ConstElementPtr loggers) {
// Now find the wildcard names (the one that start with "*").
BOOST_FOREACH(ConstElementPtr cur_logger, loggers->listValue()) {
- std::string cur_name = cur_logger->get("name")->stringValue();
+ const std::string cur_name = cur_logger->get("name")->stringValue();
// If name is '*', or starts with '*.', replace * with root
// logger name.
if (cur_name == "*" || cur_name.length() > 1 &&
@@ -671,9 +671,7 @@ ModuleCCSession::fetchRemoteSpec(const std::string& module, bool is_filename) {
std::string
ModuleCCSession::addRemoteConfig(const std::string& spec_name,
- void (*handler)(const std::string& module,
- ConstElementPtr,
- const ConfigData&),
+ RemoteHandler handler,
bool spec_is_filename)
{
// First get the module name, specification and default config
diff --git a/src/lib/config/ccsession.h b/src/lib/config/ccsession.h
index e96a33d..4b99a44 100644
--- a/src/lib/config/ccsession.h
+++ b/src/lib/config/ccsession.h
@@ -283,7 +283,7 @@ public:
* the configuration manager must know it). If
* spec_is_filename is true (the default), then a
* filename is assumed, otherwise a module name.
- * \param handler The handler function called whenever there's a change.
+ * \param handler The handler functor called whenever there's a change.
* Called once initally from this function. May be NULL
* if you don't want any handler to be called and you're
* fine with requesting the data through
@@ -296,11 +296,11 @@ public:
* \return The name of the module specified in the given specification
* file
*/
+ typedef boost::function<void(const std::string&,
+ isc::data::ConstElementPtr,
+ const ConfigData&)> RemoteHandler;
std::string addRemoteConfig(const std::string& spec_name,
- void (*handler)(const std::string& module_name,
- isc::data::ConstElementPtr
- update,
- const ConfigData& config_data) = NULL,
+ RemoteHandler handler = RemoteHandler(),
bool spec_is_filename = true);
/**
@@ -513,9 +513,6 @@ private:
const std::string& command,
isc::data::ConstElementPtr args);
- typedef void (*RemoteHandler)(const std::string&,
- isc::data::ConstElementPtr,
- const ConfigData&);
std::map<std::string, ConfigData> remote_module_configs_;
std::map<std::string, RemoteHandler> remote_module_handlers_;
diff --git a/src/lib/datasrc/memory/domaintree.h b/src/lib/datasrc/memory/domaintree.h
index 20f4693..7e68f53 100644
--- a/src/lib/datasrc/memory/domaintree.h
+++ b/src/lib/datasrc/memory/domaintree.h
@@ -1080,55 +1080,25 @@ public:
/// of it. In that case, node parameter is left intact.
//@{
- /// \brief Simple find.
+ /// \brief Simple find
///
/// Acts as described in the \ref find section.
Result find(const isc::dns::Name& name,
- DomainTreeNode<T>** node) const {
- DomainTreeNodeChain<T> node_path;
- const isc::dns::LabelSequence ls(name);
- return (find<void*>(ls, node, node_path, NULL, NULL));
- }
-
- /// \brief Simple find returning immutable node.
- ///
- /// Acts as described in the \ref find section, but returns immutable node
- /// pointer.
- Result find(const isc::dns::Name& name,
const DomainTreeNode<T>** node) const {
DomainTreeNodeChain<T> node_path;
- DomainTreeNode<T> *target_node = NULL;
const isc::dns::LabelSequence ls(name);
- Result ret = (find<void*>(ls, &target_node, node_path, NULL, NULL));
- if (ret != NOTFOUND) {
- *node = target_node;
- }
+ Result ret = (find<void*>(ls, node, node_path, NULL, NULL));
return (ret);
}
/// \brief Simple find, with node_path tracking
///
/// Acts as described in the \ref find section.
- Result find(const isc::dns::Name& name, DomainTreeNode<T>** node,
- DomainTreeNodeChain<T>& node_path) const
- {
- const isc::dns::LabelSequence ls(name);
- return (find<void*>(ls, node, node_path, NULL, NULL));
- }
-
- /// \brief Simple find returning immutable node, with node_path tracking
- ///
- /// Acts as described in the \ref find section, but returns immutable node
- /// pointer.
Result find(const isc::dns::Name& name, const DomainTreeNode<T>** node,
DomainTreeNodeChain<T>& node_path) const
{
- DomainTreeNode<T> *target_node = NULL;
const isc::dns::LabelSequence ls(name);
- Result ret = (find<void*>(ls, &target_node, node_path, NULL, NULL));
- if (ret != NOTFOUND) {
- *node = target_node;
- }
+ Result ret = (find<void*>(ls, node, node_path, NULL, NULL));
return (ret);
}
@@ -1143,13 +1113,9 @@ public:
bool (*callback)(const DomainTreeNode<T>&, CBARG),
CBARG callback_arg) const
{
- DomainTreeNode<T>* target_node = NULL;
const isc::dns::LabelSequence ls(name);
- Result ret = find(ls, &target_node, node_path, callback,
+ Result ret = find(ls, node, node_path, callback,
callback_arg);
- if (ret != NOTFOUND) {
- *node = target_node;
- }
return (ret);
}
@@ -1229,30 +1195,10 @@ public:
/// \c true, it returns immediately with the current node.
template <typename CBARG>
Result find(const isc::dns::LabelSequence& target_labels_orig,
- DomainTreeNode<T>** node,
- DomainTreeNodeChain<T>& node_path,
- bool (*callback)(const DomainTreeNode<T>&, CBARG),
- CBARG callback_arg) const;
-
- /// \brief Simple find returning immutable node.
- ///
- /// Acts as described in the \ref find section, but returns immutable
- /// node pointer.
- template <typename CBARG>
- Result find(const isc::dns::LabelSequence& target_labels,
const DomainTreeNode<T>** node,
DomainTreeNodeChain<T>& node_path,
bool (*callback)(const DomainTreeNode<T>&, CBARG),
- CBARG callback_arg) const
- {
- DomainTreeNode<T>* target_node = NULL;
- Result ret = find(target_labels, &target_node, node_path,
- callback, callback_arg);
- if (ret != NOTFOUND) {
- *node = target_node;
- }
- return (ret);
- }
+ CBARG callback_arg) const;
//@}
/// \brief return the next bigger node in DNSSEC order from a given node
@@ -1515,7 +1461,7 @@ template <typename T>
template <typename CBARG>
typename DomainTree<T>::Result
DomainTree<T>::find(const isc::dns::LabelSequence& target_labels_orig,
- DomainTreeNode<T>** target,
+ const DomainTreeNode<T>** target,
DomainTreeNodeChain<T>& node_path,
bool (*callback)(const DomainTreeNode<T>&, CBARG),
CBARG callback_arg) const
@@ -1526,11 +1472,11 @@ DomainTree<T>::find(const isc::dns::LabelSequence& target_labels_orig,
" and label sequence");
}
- DomainTreeNode<T>* node;
+ const DomainTreeNode<T>* node;
if (!node_path.isEmpty()) {
// Get the top node in the node chain
- node = const_cast<DomainTreeNode<T>*>(node_path.top());
+ node = node_path.top();
// Start searching from its down pointer
node = node->getDown();
} else {
diff --git a/src/lib/datasrc/memory/memory_client.cc b/src/lib/datasrc/memory/memory_client.cc
index 5f6f510..1609611 100644
--- a/src/lib/datasrc/memory/memory_client.cc
+++ b/src/lib/datasrc/memory/memory_client.cc
@@ -627,22 +627,20 @@ InMemoryClient::InMemoryClientImpl::load(
// node must point to a valid node now
assert(node != NULL);
- std::string* tstr = node->setData(new std::string(filename));
+ const std::string* tstr = node->setData(new std::string(filename));
delete tstr;
- ZoneTable::AddResult result(zone_table_->addZone(mem_sgmt_, rrclass_,
- zone_name));
+ const ZoneTable::AddResult result(zone_table_->addZone(mem_sgmt_, rrclass_,
+ zone_name,
+ holder.release()));
if (result.code == result::SUCCESS) {
// Only increment the zone count if the zone doesn't already
// exist.
++zone_count_;
}
-
- ZoneTable::FindResult fr(zone_table_->setZoneData(zone_name,
- holder.release()));
- assert(fr.code == result::SUCCESS);
- if (fr.zone_data != NULL) {
- ZoneData::destroy(mem_sgmt_, fr.zone_data, rrclass_);
+ // Destroy the old instance of the zone if there was any
+ if (result.zone_data != NULL) {
+ ZoneData::destroy(mem_sgmt_, result.zone_data, rrclass_);
}
return (result.code);
@@ -732,9 +730,9 @@ InMemoryClient::load(const isc::dns::Name& zone_name,
const std::string
InMemoryClient::getFileName(const isc::dns::Name& zone_name) const {
- FileNameNode* node(NULL);
- FileNameTree::Result result = impl_->file_name_tree_->find(zone_name,
- &node);
+ const FileNameNode* node(NULL);
+ const FileNameTree::Result result = impl_->file_name_tree_->find(zone_name,
+ &node);
if (result == FileNameTree::EXACTMATCH) {
return (*node->getData());
} else {
@@ -742,24 +740,6 @@ InMemoryClient::getFileName(const isc::dns::Name& zone_name) const {
}
}
-result::Result
-InMemoryClient::add(const isc::dns::Name& zone_name,
- const ConstRRsetPtr& rrset)
-{
- const ZoneTable::FindResult result =
- impl_->zone_table_->findZone(zone_name);
- if (result.code != result::SUCCESS) {
- isc_throw(DataSourceError, "No such zone: " + zone_name.toText());
- }
-
- const ConstRRsetPtr sig_rrset =
- rrset ? rrset->getRRsig() : ConstRRsetPtr();
- impl_->add(rrset, sig_rrset, zone_name, *result.zone_data);
-
- // add() doesn't allow duplicate add, so we always return SUCCESS.
- return (result::SUCCESS);
-}
-
namespace {
class MemoryIterator : public ZoneIterator {
diff --git a/src/lib/datasrc/memory/memory_client.h b/src/lib/datasrc/memory/memory_client.h
index 330d62e..c37ad53 100644
--- a/src/lib/datasrc/memory/memory_client.h
+++ b/src/lib/datasrc/memory/memory_client.h
@@ -139,35 +139,6 @@ public:
/// zone from a file before.
const std::string getFileName(const isc::dns::Name& zone_name) const;
- /// \brief Inserts an rrset into the zone.
- ///
- /// It puts another RRset into the zone.
- ///
- /// In the current implementation, this method doesn't allow an existing
- /// RRset to be updated or overridden. So the caller must make sure that
- /// all RRs of the same type and name must be given in the form of a
- /// single RRset. The current implementation will also require that
- /// when an RRSIG is added, the RRset to be covered has already been
- /// added. These restrictions are probably too strict when this data
- /// source accepts various forms of input, so they should be revisited
- /// later.
- ///
- /// Except for NullRRset and OutOfZone, this method does not guarantee
- /// strong exception safety (it is currently not needed, if it is needed
- /// in future, it should be implemented).
- ///
- /// \throw NullRRset \c rrset is a NULL pointer.
- /// \throw OutOfZone The owner name of \c rrset is outside of the
- /// origin of the zone.
- /// \throw AddError Other general errors.
- /// \throw Others This method might throw standard allocation exceptions.
- ///
- /// \param rrset The set to add.
- /// \return SUCCESS or EXIST (if an rrset for given name and type already
- /// exists).
- result::Result add(const isc::dns::Name& zone_name,
- const isc::dns::ConstRRsetPtr& rrset);
-
/// \brief RRset is NULL exception.
///
/// This is thrown if the provided RRset parameter is NULL.
diff --git a/src/lib/datasrc/memory/zone_finder.cc b/src/lib/datasrc/memory/zone_finder.cc
index 86dd874..11188a0 100644
--- a/src/lib/datasrc/memory/zone_finder.cc
+++ b/src/lib/datasrc/memory/zone_finder.cc
@@ -428,7 +428,7 @@ FindNodeResult findNode(const ZoneData& zone_data,
ZoneFinder::FindOptions options,
bool out_of_zone_ok = false)
{
- ZoneNode* node = NULL;
+ const ZoneNode* node = NULL;
FindState state((options & ZoneFinder::FIND_GLUE_OK) != 0);
const ZoneTree& tree(zone_data.getZoneTree());
diff --git a/src/lib/datasrc/memory/zone_table.cc b/src/lib/datasrc/memory/zone_table.cc
index a74a61d..836b020 100644
--- a/src/lib/datasrc/memory/zone_table.cc
+++ b/src/lib/datasrc/memory/zone_table.cc
@@ -69,17 +69,13 @@ ZoneTable::destroy(util::MemorySegment& mem_sgmt, ZoneTable* ztable,
ZoneTable::AddResult
ZoneTable::addZone(util::MemorySegment& mem_sgmt, RRClass zone_class,
- const Name& zone_name)
+ const Name& zone_name, ZoneData* content)
{
- // Create a new ZoneData instance first. If the specified name already
- // exists in the table, the new data will soon be destroyed, but we want
- // to make sure if this allocation fails the tree won't be changed to
- // provide as strong guarantee as possible. In practice, we generally
- // expect the caller tries to add a zone only when it's a new one, so
- // this should be a minor concern.
- SegmentObjectHolder<ZoneData, RRClass> holder(
- mem_sgmt, ZoneData::create(mem_sgmt, zone_name), zone_class);
-
+ if (content == NULL) {
+ isc_throw(isc::BadValue, "Zone content must not be NULL");
+ }
+ SegmentObjectHolder<ZoneData, RRClass> holder(mem_sgmt, content,
+ zone_class);
// Get the node where we put the zone
ZoneTableNode* node(NULL);
switch (zones_->insert(mem_sgmt, zone_name, &node)) {
@@ -94,18 +90,18 @@ ZoneTable::addZone(util::MemorySegment& mem_sgmt, RRClass zone_class,
// Can Not Happen
assert(node != NULL);
- // Is it empty? We either just created it or it might be nonterminal
- if (node->isEmpty()) {
- node->setData(holder.get());
- return (AddResult(result::SUCCESS, holder.release()));
- } else { // There's something there already
- return (AddResult(result::EXIST, node->getData()));
+ // We can release now, setData never throws
+ ZoneData* old = node->setData(holder.release());
+ if (old != NULL) {
+ return (AddResult(result::EXIST, old));
+ } else {
+ return (AddResult(result::SUCCESS, NULL));
}
}
ZoneTable::FindResult
ZoneTable::findZone(const Name& name) const {
- ZoneTableNode* node(NULL);
+ const ZoneTableNode* node(NULL);
result::Result my_result;
// Translate the return codes
@@ -132,20 +128,6 @@ ZoneTable::findZone(const Name& name) const {
return (FindResult(my_result, node->getData()));
}
-ZoneTable::FindResult
-ZoneTable::setZoneData(const Name& name, ZoneData* data)
-{
- ZoneTableNode* node(NULL);
-
- ZoneTableTree::Result result(zones_->find(name, &node));
-
- if (result != ZoneTableTree::EXACTMATCH) {
- return (FindResult(result::NOTFOUND, NULL));
- } else {
- return (FindResult(result::SUCCESS, node->setData(data)));
- }
-}
-
} // end of namespace memory
} // end of namespace datasrc
} // end of namespace isc
diff --git a/src/lib/datasrc/memory/zone_table.h b/src/lib/datasrc/memory/zone_table.h
index 8ad6213..024558e 100644
--- a/src/lib/datasrc/memory/zone_table.h
+++ b/src/lib/datasrc/memory/zone_table.h
@@ -74,23 +74,23 @@ private:
typedef DomainTreeNode<ZoneData> ZoneTableNode;
public:
- /// \brief Result data of addZone() method.
- struct AddResult {
- AddResult(result::Result param_code, ZoneData* param_zone_data) :
- code(param_code), zone_data(param_zone_data)
- {}
- const result::Result code;
- ZoneData* const zone_data;
- };
+ /// \brief Result data of addZone() method.
+ struct AddResult {
+ AddResult(result::Result param_code, ZoneData* param_zone_data) :
+ code(param_code), zone_data(param_zone_data)
+ {}
+ const result::Result code;
+ ZoneData* const zone_data;
+ };
/// \brief Result data of findZone() method.
struct FindResult {
FindResult(result::Result param_code,
- ZoneData* param_zone_data) :
+ const ZoneData* param_zone_data) :
code(param_code), zone_data(param_zone_data)
{}
const result::Result code;
- ZoneData* const zone_data;
+ const ZoneData* const zone_data;
};
private:
@@ -140,30 +140,29 @@ public:
/// Add a new zone to the \c ZoneTable.
///
- /// This method creates a new \c ZoneData for the given zone name and
- /// holds it in the internal table. The newly created zone data will be
- /// returned via the \c zone_data member of the return value. If the given
- /// zone name already exists in the table, a new data object won't be
- /// created; instead, the existing corresponding data will be returned.
- ///
- /// The zone table keeps the ownership of the created zone data; the
- /// caller must not try to destroy it directly. (We'll eventually
- /// add an interface to delete specific zone data from the table).
+ /// This method adds a given zone data to the internal table.
///
/// \throw std::bad_alloc Internal resource allocation fails.
///
/// \param mem_sgmt The \c MemorySegment to allocate zone data to be
- /// created. It must be the same segment that was used to create
- /// the zone table at the time of create().
+ /// created. It must be the same segment that was used to create
+ /// the zone table at the time of create().
/// \param zone_name The name of the zone to be added.
/// \param zone_class The RR class of the zone. It must be the RR class
- /// that is supposed to be associated to the zone table.
+ /// that is supposed to be associated to the zone table.
+ /// \param content This one should hold the zone content (the ZoneData).
+ /// The ownership is passed onto the zone table. Must not be null.
+ /// Must correspond to the name and class and must be allocated from
+ /// mem_sgmt.
/// \return \c result::SUCCESS If the zone is successfully
- /// added to the zone table.
- /// \return \c result::EXIST The zone table already contains
- /// zone of the same origin.
- AddResult addZone(util::MemorySegment& mem_sgmt, dns::RRClass zone_class,
- const dns::Name& zone_name);
+ /// added to the zone table.
+ /// \return \c result::EXIST The zone table already contained
+ /// zone of the same origin. The old data is replaced and returned
+ /// inside the result.
+ AddResult addZone(util::MemorySegment& mem_sgmt,
+ dns::RRClass zone_class,
+ const dns::Name& zone_name,
+ ZoneData* content);
/// Find a zone that best matches the given name in the \c ZoneTable.
///
@@ -185,16 +184,6 @@ public:
/// \return A \c FindResult object enclosing the search result (see above).
FindResult findZone(const isc::dns::Name& name) const;
- /// Override the ZoneData for a node (zone) in the zone tree.
- ///
- /// \throw none
- ///
- /// \param name A domain name for which the zone data is set.
- /// \param data The new zone data to set.
- /// \return A \c FindResult object containing the old data if the
- /// zone was found.
- FindResult setZoneData(const isc::dns::Name& name, ZoneData* data);
-
private:
boost::interprocess::offset_ptr<ZoneTableTree> zones_;
};
diff --git a/src/lib/datasrc/sqlite3_accessor.cc b/src/lib/datasrc/sqlite3_accessor.cc
index 672121e..68d6554 100644
--- a/src/lib/datasrc/sqlite3_accessor.cc
+++ b/src/lib/datasrc/sqlite3_accessor.cc
@@ -44,7 +44,7 @@ namespace {
// program may not be taking advantage of features (possibly performance
// improvements) added to the database.
const int SQLITE_SCHEMA_MAJOR_VERSION = 2;
-const int SQLITE_SCHEMA_MINOR_VERSION = 0;
+const int SQLITE_SCHEMA_MINOR_VERSION = 1;
}
namespace isc {
@@ -65,19 +65,20 @@ enum StatementID {
DEL_ZONE_RECORDS = 6,
ADD_RECORD = 7,
DEL_RECORD = 8,
- ITERATE = 9,
- FIND_PREVIOUS = 10,
- ADD_RECORD_DIFF = 11,
- LOW_DIFF_ID = 12,
- HIGH_DIFF_ID = 13,
- DIFF_RECS = 14,
- NSEC3 = 15,
- NSEC3_PREVIOUS = 16,
- NSEC3_LAST = 17,
- ADD_NSEC3_RECORD = 18,
- DEL_ZONE_NSEC3_RECORDS = 19,
- DEL_NSEC3_RECORD = 20,
- NUM_STATEMENTS = 21
+ ITERATE_RECORDS = 9,
+ ITERATE_NSEC3 = 10,
+ FIND_PREVIOUS = 11,
+ ADD_RECORD_DIFF = 12,
+ LOW_DIFF_ID = 13,
+ HIGH_DIFF_ID = 14,
+ DIFF_RECS = 15,
+ NSEC3 = 16,
+ NSEC3_PREVIOUS = 17,
+ NSEC3_LAST = 18,
+ ADD_NSEC3_RECORD = 19,
+ DEL_ZONE_NSEC3_RECORDS = 20,
+ DEL_NSEC3_RECORD = 21,
+ NUM_STATEMENTS = 22
};
const char* const text_statements[NUM_STATEMENTS] = {
@@ -102,19 +103,17 @@ const char* const text_statements[NUM_STATEMENTS] = {
"VALUES (?1, ?2, ?3, ?4, ?5, ?6, ?7)",
"DELETE FROM records WHERE zone_id=?1 AND name=?2 " // DEL_RECORD
"AND rdtype=?3 AND rdata=?4",
- // The following iterates the whole zone. As the NSEC3 records
- // (and corresponding RRSIGs) live in separate table, we need to
- // take both of them. As the RRSIGs are for NSEC3s in the other
- // table, we can easily hardcode the sigtype.
- //
- // The extra column is so we can order it by rname. This is to
- // preserve the previous order, mostly for tests.
- // TODO: Is it possible to get rid of the ordering?
- "SELECT rdtype, ttl, sigtype, rdata, name, rname FROM records " // ITERATE
- "WHERE zone_id = ?1 "
- "UNION "
- "SELECT rdtype, ttl, \"NSEC3\", rdata, owner, owner FROM nsec3 "
- "WHERE zone_id = ?1 ORDER by rname, rdtype",
+
+ // ITERATE_RECORDS:
+ // The following iterates the whole zone in the records table.
+ "SELECT rdtype, ttl, sigtype, rdata, name FROM records "
+ "WHERE zone_id = ?1 ORDER BY rname, rdtype",
+
+ // ITERATE_NSEC3:
+ // The following iterates the whole zone in the nsec3 table. As the
+ // RRSIGs are for NSEC3s, we can hardcode the sigtype.
+ "SELECT rdtype, ttl, \"NSEC3\", rdata, owner FROM nsec3 "
+ "WHERE zone_id = ?1 ORDER BY hash, rdtype",
/*
* This one looks for previous name with NSEC record. It is done by
* using the reversed name. The NSEC is checked because we need to
@@ -332,7 +331,7 @@ public:
const char* const SCHEMA_LIST[] = {
"CREATE TABLE schema_version (version INTEGER NOT NULL, "
"minor INTEGER NOT NULL DEFAULT 0)",
- "INSERT INTO schema_version VALUES (2, 0)",
+ "INSERT INTO schema_version VALUES (2, 1)",
"CREATE TABLE zones (id INTEGER PRIMARY KEY, "
"name TEXT NOT NULL COLLATE NOCASE, "
"rdclass TEXT NOT NULL COLLATE NOCASE DEFAULT 'IN', "
@@ -358,6 +357,7 @@ const char* const SCHEMA_LIST[] = {
"ttl INTEGER NOT NULL, rdtype TEXT NOT NULL COLLATE NOCASE, "
"rdata TEXT NOT NULL)",
"CREATE INDEX nsec3_byhash ON nsec3 (hash)",
+ "CREATE INDEX nsec3_byhash_and_rdtype ON nsec3 (hash, rdtype)",
"CREATE TABLE diffs (id INTEGER PRIMARY KEY, "
"zone_id INTEGER NOT NULL, "
"version INTEGER NOT NULL, "
@@ -642,11 +642,21 @@ public:
iterator_type_(ITT_ALL),
accessor_(accessor),
statement_(NULL),
+ statement2_(NULL),
+ rc_(SQLITE_OK),
+ rc2_(SQLITE_OK),
name_("")
{
- // We create the statement now and then just keep getting data from it
+ // We create the statements now and then just keep getting data
+ // from them.
statement_ = prepare(accessor->dbparameters_->db_,
- text_statements[ITERATE]);
+ text_statements[ITERATE_NSEC3]);
+ bindZoneId(id);
+
+ std::swap(statement_, statement2_);
+
+ statement_ = prepare(accessor->dbparameters_->db_,
+ text_statements[ITERATE_RECORDS]);
bindZoneId(id);
}
@@ -665,6 +675,9 @@ public:
iterator_type_(qtype == QT_NSEC3 ? ITT_NSEC3 : ITT_NAME),
accessor_(accessor),
statement_(NULL),
+ statement2_(NULL),
+ rc_(SQLITE_OK),
+ rc2_(SQLITE_OK),
name_(name)
{
// Choose the statement text depending on the query type, and
@@ -703,29 +716,35 @@ public:
// If there's another row, get it
// If finalize has been called (e.g. when previous getNext() got
// SQLITE_DONE), directly return false
- if (statement_ == NULL) {
- return false;
- }
- const int rc(sqlite3_step(statement_));
- if (rc == SQLITE_ROW) {
- // For both types, we copy the first four columns
- copyColumn(data, TYPE_COLUMN);
- copyColumn(data, TTL_COLUMN);
- // The NSEC3 lookup does not provide the SIGTYPE, it is not
- // necessary and not contained in the table.
- if (iterator_type_ != ITT_NSEC3) {
- copyColumn(data, SIGTYPE_COLUMN);
+ while (statement_ != NULL) {
+ rc_ = sqlite3_step(statement_);
+ if (rc_ == SQLITE_ROW) {
+ // For both types, we copy the first four columns
+ copyColumn(data, TYPE_COLUMN);
+ copyColumn(data, TTL_COLUMN);
+ // The NSEC3 lookup does not provide the SIGTYPE, it is not
+ // necessary and not contained in the table.
+ if (iterator_type_ != ITT_NSEC3) {
+ copyColumn(data, SIGTYPE_COLUMN);
+ }
+ copyColumn(data, RDATA_COLUMN);
+ // Only copy Name if we are iterating over every record
+ if (iterator_type_ == ITT_ALL) {
+ copyColumn(data, NAME_COLUMN);
+ }
+ return (true);
+ } else if (rc_ != SQLITE_DONE) {
+ isc_throw(DataSourceError,
+ "Unexpected failure in sqlite3_step: " <<
+ sqlite3_errmsg(accessor_->dbparameters_->db_));
}
- copyColumn(data, RDATA_COLUMN);
- // Only copy Name if we are iterating over every record
- if (iterator_type_ == ITT_ALL) {
- copyColumn(data, NAME_COLUMN);
+ // We are done with statement_. If statement2_ has not been
+ // used yet, try that one now.
+ if ((statement2_ == NULL) || (rc2_ != SQLITE_OK)) {
+ break;
}
- return (true);
- } else if (rc != SQLITE_DONE) {
- isc_throw(DataSourceError,
- "Unexpected failure in sqlite3_step: " <<
- sqlite3_errmsg(accessor_->dbparameters_->db_));
+ std::swap(statement_, statement2_);
+ std::swap(rc_, rc2_);
}
finalize();
return (false);
@@ -771,13 +790,22 @@ private:
}
void finalize() {
- sqlite3_finalize(statement_);
- statement_ = NULL;
+ if (statement_ != NULL) {
+ sqlite3_finalize(statement_);
+ statement_ = NULL;
+ }
+ if (statement2_ != NULL) {
+ sqlite3_finalize(statement2_);
+ statement2_ = NULL;
+ }
}
const IteratorType iterator_type_;
boost::shared_ptr<const SQLite3Accessor> accessor_;
sqlite3_stmt* statement_;
+ sqlite3_stmt* statement2_;
+ int rc_;
+ int rc2_;
const std::string name_;
};
diff --git a/src/lib/datasrc/tests/memory/domaintree_unittest.cc b/src/lib/datasrc/tests/memory/domaintree_unittest.cc
index cb16e02..45e256a 100644
--- a/src/lib/datasrc/tests/memory/domaintree_unittest.cc
+++ b/src/lib/datasrc/tests/memory/domaintree_unittest.cc
@@ -256,8 +256,8 @@ TEST_F(DomainTreeTest, subTreeRoot) {
// "g.h" is not a subtree root
EXPECT_EQ(TestDomainTree::EXACTMATCH,
- dtree_expose_empty_node.find(Name("g.h"), &dtnode));
- EXPECT_FALSE(dtnode->getFlag(TestDomainTreeNode::FLAG_SUBTREE_ROOT));
+ dtree_expose_empty_node.find(Name("g.h"), &cdtnode));
+ EXPECT_FALSE(cdtnode->getFlag(TestDomainTreeNode::FLAG_SUBTREE_ROOT));
// fission the node "g.h"
EXPECT_EQ(TestDomainTree::ALREADYEXISTS,
@@ -270,8 +270,8 @@ TEST_F(DomainTreeTest, subTreeRoot) {
// "g.h" should be a subtree root now.
EXPECT_EQ(TestDomainTree::EXACTMATCH,
- dtree_expose_empty_node.find(Name("g.h"), &dtnode));
- EXPECT_TRUE(dtnode->getFlag(TestDomainTreeNode::FLAG_SUBTREE_ROOT));
+ dtree_expose_empty_node.find(Name("g.h"), &cdtnode));
+ EXPECT_TRUE(cdtnode->getFlag(TestDomainTreeNode::FLAG_SUBTREE_ROOT));
}
TEST_F(DomainTreeTest, additionalNodeFission) {
@@ -286,8 +286,8 @@ TEST_F(DomainTreeTest, additionalNodeFission) {
// "t.0" is not a subtree root
EXPECT_EQ(TestDomainTree::EXACTMATCH,
- dtree_expose_empty_node.find(Name("t.0"), &dtnode));
- EXPECT_FALSE(dtnode->getFlag(TestDomainTreeNode::FLAG_SUBTREE_ROOT));
+ dtree_expose_empty_node.find(Name("t.0"), &cdtnode));
+ EXPECT_FALSE(cdtnode->getFlag(TestDomainTreeNode::FLAG_SUBTREE_ROOT));
// fission the node "t.0"
EXPECT_EQ(TestDomainTree::ALREADYEXISTS,
@@ -300,8 +300,8 @@ TEST_F(DomainTreeTest, additionalNodeFission) {
// "t.0" should be a subtree root now.
EXPECT_EQ(TestDomainTree::EXACTMATCH,
- dtree_expose_empty_node.find(Name("t.0"), &dtnode));
- EXPECT_TRUE(dtnode->getFlag(TestDomainTreeNode::FLAG_SUBTREE_ROOT));
+ dtree_expose_empty_node.find(Name("t.0"), &cdtnode));
+ EXPECT_TRUE(cdtnode->getFlag(TestDomainTreeNode::FLAG_SUBTREE_ROOT));
}
TEST_F(DomainTreeTest, findName) {
@@ -328,10 +328,10 @@ TEST_F(DomainTreeTest, findName) {
EXPECT_EQ(TestDomainTree::PARTIALMATCH,
dtree_expose_empty_node.find(Name("m.d.e.f"), &cdtnode));
- // find dtnode
+ // find cdtnode
EXPECT_EQ(TestDomainTree::EXACTMATCH, dtree.find(Name("q.w.y.d.e.f"),
- &dtnode));
- EXPECT_EQ(Name("q"), dtnode->getName());
+ &cdtnode));
+ EXPECT_EQ(Name("q"), cdtnode->getName());
}
TEST_F(DomainTreeTest, findError) {
@@ -411,11 +411,12 @@ performCallbackTest(TestDomainTree& dtree,
Name("example"),
&parentdtnode));
// the child/parent nodes shouldn't "inherit" the callback flag.
- // "dtnode" may be invalid due to the insertion, so we need to re-find
- // it.
+ // "dtnode" should still validly point to "callback.example", but we
+ // explicitly confirm it.
EXPECT_EQ(TestDomainTree::EXACTMATCH, dtree.find(Name("callback.example"),
- &dtnode));
- EXPECT_TRUE(dtnode->getFlag(TestDomainTreeNode::FLAG_CALLBACK));
+ &cdtnode));
+ ASSERT_EQ(dtnode, cdtnode);
+ EXPECT_TRUE(cdtnode->getFlag(TestDomainTreeNode::FLAG_CALLBACK));
EXPECT_FALSE(subdtnode->getFlag(TestDomainTreeNode::FLAG_CALLBACK));
EXPECT_FALSE(parentdtnode->getFlag(TestDomainTreeNode::FLAG_CALLBACK));
diff --git a/src/lib/datasrc/tests/memory/memory_client_unittest.cc b/src/lib/datasrc/tests/memory/memory_client_unittest.cc
index 58979a4..004f663 100644
--- a/src/lib/datasrc/tests/memory/memory_client_unittest.cc
+++ b/src/lib/datasrc/tests/memory/memory_client_unittest.cc
@@ -543,29 +543,6 @@ TEST_F(MemoryClientTest, loadRRSIGs) {
EXPECT_EQ(1, client_->getZoneCount());
}
-TEST_F(MemoryClientTest, loadRRSIGsRdataMixedCoveredTypes) {
- client_->load(Name("example.org"),
- TEST_DATA_DIR "/example.org-rrsigs.zone");
-
- RRsetPtr rrset(new RRset(Name("example.org"),
- RRClass::IN(), RRType::A(), RRTTL(3600)));
- rrset->addRdata(in::A("192.0.2.1"));
- rrset->addRdata(in::A("192.0.2.2"));
-
- RRsetPtr rrsig(new RRset(Name("example.org"), zclass_,
- RRType::RRSIG(), RRTTL(300)));
- rrsig->addRdata(generic::RRSIG("A 5 3 3600 20000101000000 20000201000000 "
- "12345 example.org. FAKEFAKEFAKE"));
- rrsig->addRdata(generic::RRSIG("NS 5 3 3600 20000101000000 20000201000000 "
- "54321 example.org. FAKEFAKEFAKEFAKE"));
- rrset->addRRsig(rrsig);
-
- EXPECT_THROW(client_->add(Name("example.org"), rrset),
- InMemoryClient::AddError);
-
- // Teardown checks for memory segment leaks
-}
-
TEST_F(MemoryClientTest, getZoneCount) {
EXPECT_EQ(0, client_->getZoneCount());
client_->load(Name("example.org"), TEST_DATA_DIR "/example.org-empty.zone");
@@ -655,75 +632,6 @@ TEST_F(MemoryClientTest, getIteratorGetSOAThrowsNotImplemented) {
EXPECT_THROW(iterator->getSOA(), isc::NotImplemented);
}
-TEST_F(MemoryClientTest, addRRsetToNonExistentZoneThrows) {
- // The zone "example.org" doesn't exist, so we can't add an RRset to
- // it.
- RRsetPtr rrset_a(new RRset(Name("example.org"), RRClass::IN(), RRType::A(),
- RRTTL(300)));
- rrset_a->addRdata(rdata::in::A("192.0.2.1"));
- EXPECT_THROW(client_->add(Name("example.org"), rrset_a), DataSourceError);
-}
-
-TEST_F(MemoryClientTest, addOutOfZoneThrows) {
- // Out of zone names should throw.
- client_->load(Name("example.org"),
- TEST_DATA_DIR "/example.org-empty.zone");
-
- RRsetPtr rrset_a(new RRset(Name("a.example.com"),
- RRClass::IN(), RRType::A(), RRTTL(300)));
- rrset_a->addRdata(rdata::in::A("192.0.2.1"));
-
- EXPECT_THROW(client_->add(Name("example.org"), rrset_a),
- OutOfZone);
- // Teardown checks for memory segment leaks
-}
-
-TEST_F(MemoryClientTest, addNullRRsetThrows) {
- client_->load(Name("example.org"),
- TEST_DATA_DIR "/example.org-rrsigs.zone");
-
- EXPECT_THROW(client_->add(Name("example.org"), ConstRRsetPtr()),
- InMemoryClient::NullRRset);
-
- // Teardown checks for memory segment leaks
-}
-
-TEST_F(MemoryClientTest, addEmptyRRsetThrows) {
- client_->load(Name("example.org"),
- TEST_DATA_DIR "/example.org-rrsigs.zone");
-
- RRsetPtr rrset_a(new RRset(Name("example.org"), RRClass::IN(), RRType::A(),
- RRTTL(300)));
- EXPECT_THROW(client_->add(Name("example.org"), rrset_a),
- InMemoryClient::AddError);
-
- // Teardown checks for memory segment leaks
-}
-
-TEST_F(MemoryClientTest, add) {
- client_->load(Name("example.org"), TEST_DATA_DIR "/example.org-empty.zone");
-
- // Add another RRset
- RRsetPtr rrset_a(new RRset(Name("example.org"), RRClass::IN(), RRType::A(),
- RRTTL(300)));
- rrset_a->addRdata(rdata::in::A("192.0.2.1"));
- client_->add(Name("example.org"), rrset_a);
-
- ZoneIteratorPtr iterator(client_->getIterator(Name("example.org")));
-
- // First we have the SOA
- ConstRRsetPtr rrset(iterator->getNextRRset());
- EXPECT_TRUE(rrset);
- EXPECT_EQ(RRType::A(), rrset->getType());
-
- rrset = iterator->getNextRRset();
- EXPECT_TRUE(rrset);
- EXPECT_EQ(RRType::SOA(), rrset->getType());
-
- // There's nothing else in this zone
- EXPECT_EQ(ConstRRsetPtr(), iterator->getNextRRset());
-}
-
TEST_F(MemoryClientTest, findZoneData) {
client_->load(Name("example.org"),
TEST_DATA_DIR "/example.org-rrsigs.zone");
@@ -774,4 +682,16 @@ TEST_F(MemoryClientTest, getJournalReaderNotImplemented) {
EXPECT_THROW(client_->getJournalReader(Name("."), 0, 0),
isc::NotImplemented);
}
+
+// TODO (upon merge of #2268): Re-add (and modify not to need
+// InMemoryClient::add) the tests removed in
+// 7a628baa1a158b5837d6f383e10b30542d2ac59b. Maybe some of them
+// are really not needed.
+//
+// * MemoryClientTest::loadRRSIGsRdataMixedCoveredTypes
+// * MemoryClientTest::addRRsetToNonExistentZoneThrows
+// * MemoryClientTest::addOutOfZoneThrows
+// * MemoryClientTest::addNullRRsetThrows
+// * MemoryClientTest::addEmptyRRsetThrows
+// * MemoryClientTest::add
}
diff --git a/src/lib/datasrc/tests/memory/zone_data_unittest.cc b/src/lib/datasrc/tests/memory/zone_data_unittest.cc
index d15fe8b..3c28cec 100644
--- a/src/lib/datasrc/tests/memory/zone_data_unittest.cc
+++ b/src/lib/datasrc/tests/memory/zone_data_unittest.cc
@@ -108,7 +108,7 @@ void
checkFindRdataSet(const ZoneTree& tree, const Name& name, RRType type,
const RdataSet* expected_set)
{
- ZoneNode* node = NULL;
+ const ZoneNode* node = NULL;
tree.find(name, &node);
ASSERT_NE(static_cast<ZoneNode*>(NULL), node);
EXPECT_EQ(expected_set, RdataSet::find(node->getData(), type));
diff --git a/src/lib/datasrc/tests/memory/zone_table_unittest.cc b/src/lib/datasrc/tests/memory/zone_table_unittest.cc
index 359df49..9cf1b34 100644
--- a/src/lib/datasrc/tests/memory/zone_table_unittest.cc
+++ b/src/lib/datasrc/tests/memory/zone_table_unittest.cc
@@ -22,6 +22,7 @@
#include <datasrc/result.h>
#include <datasrc/memory/zone_data.h>
#include <datasrc/memory/zone_table.h>
+#include <datasrc/memory/segment_object_holder.h>
#include <gtest/gtest.h>
@@ -30,6 +31,7 @@
using namespace isc::dns;
using namespace isc::datasrc;
using namespace isc::datasrc::memory;
+using namespace isc::datasrc::memory::detail;
namespace {
// Memory segment specified for tests. It normally behaves like a "local"
@@ -87,46 +89,89 @@ TEST_F(ZoneTableTest, create) {
}
TEST_F(ZoneTableTest, addZone) {
+ // It doesn't accept empty (NULL) zones
+ EXPECT_THROW(zone_table->addZone(mem_sgmt_, zclass_, zname1, NULL),
+ isc::BadValue);
+
+ SegmentObjectHolder<ZoneData, RRClass> holder1(
+ mem_sgmt_, ZoneData::create(mem_sgmt_, zname1), zclass_);
+ const ZoneData* data1(holder1.get());
// Normal successful case.
- const ZoneTable::AddResult result1 =
- zone_table->addZone(mem_sgmt_, zclass_, zname1);
+ const ZoneTable::AddResult result1(zone_table->addZone(mem_sgmt_, zclass_,
+ zname1,
+ holder1.release()));
EXPECT_EQ(result::SUCCESS, result1.code);
+ EXPECT_EQ(NULL, result1.zone_data);
+ // It got released by it
+ EXPECT_EQ(NULL, holder1.get());
// Duplicate add doesn't replace the existing data.
- EXPECT_EQ(result::EXIST, zone_table->addZone(mem_sgmt_, zclass_,
- zname1).code);
- EXPECT_EQ(result1.zone_data,
- zone_table->addZone(mem_sgmt_, zclass_, zname1).zone_data);
+ SegmentObjectHolder<ZoneData, RRClass> holder2(
+ mem_sgmt_, ZoneData::create(mem_sgmt_, zname1), zclass_);
+ const ZoneTable::AddResult result2(zone_table->addZone(mem_sgmt_, zclass_,
+ zname1,
+ holder2.release()));
+ EXPECT_EQ(result::EXIST, result2.code);
+ // The old one gets out
+ EXPECT_EQ(data1, result2.zone_data);
+ // It releases this one even when we replace the old zone
+ EXPECT_EQ(NULL, holder2.get());
+ // We need to release the old one manually
+ ZoneData::destroy(mem_sgmt_, result2.zone_data, zclass_);
+
+ SegmentObjectHolder<ZoneData, RRClass> holder3(
+ mem_sgmt_, ZoneData::create(mem_sgmt_, Name("EXAMPLE.COM")),
+ zclass_);
// names are compared in a case insensitive manner.
- EXPECT_EQ(result::EXIST, zone_table->addZone(mem_sgmt_, zclass_,
- Name("EXAMPLE.COM")).code);
+ const ZoneTable::AddResult result3(zone_table->addZone(mem_sgmt_, zclass_,
+ Name("EXAMPLE.COM"),
+ holder3.release()));
+ EXPECT_EQ(result::EXIST, result3.code);
+ ZoneData::destroy(mem_sgmt_, result3.zone_data, zclass_);
// Add some more different ones. Should just succeed.
+ SegmentObjectHolder<ZoneData, RRClass> holder4(
+ mem_sgmt_, ZoneData::create(mem_sgmt_, zname2), zclass_);
EXPECT_EQ(result::SUCCESS,
- zone_table->addZone(mem_sgmt_, zclass_, zname2).code);
+ zone_table->addZone(mem_sgmt_, zclass_, zname2,
+ holder4.release()).code);
+ SegmentObjectHolder<ZoneData, RRClass> holder5(
+ mem_sgmt_, ZoneData::create(mem_sgmt_, zname3), zclass_);
EXPECT_EQ(result::SUCCESS,
- zone_table->addZone(mem_sgmt_, zclass_, zname3).code);
+ zone_table->addZone(mem_sgmt_, zclass_, zname3,
+ holder5.release()).code);
// Have the memory segment throw an exception in extending the internal
// tree. It still shouldn't cause memory leak (which would be detected
// in TearDown()).
- mem_sgmt_.setThrowCount(2);
- EXPECT_THROW(zone_table->addZone(mem_sgmt_, zclass_, Name("example.org")),
+ SegmentObjectHolder<ZoneData, RRClass> holder6(
+ mem_sgmt_, ZoneData::create(mem_sgmt_, Name("example.org")), zclass_);
+ mem_sgmt_.setThrowCount(1);
+ EXPECT_THROW(zone_table->addZone(mem_sgmt_, zclass_, Name("example.org"),
+ holder6.release()),
std::bad_alloc);
}
TEST_F(ZoneTableTest, findZone) {
- const ZoneTable::AddResult add_result1 =
- zone_table->addZone(mem_sgmt_, zclass_, zname1);
- EXPECT_EQ(result::SUCCESS, add_result1.code);
+ SegmentObjectHolder<ZoneData, RRClass> holder1(
+ mem_sgmt_, ZoneData::create(mem_sgmt_, zname1), zclass_);
+ ZoneData* zone_data = holder1.get();
+ EXPECT_EQ(result::SUCCESS, zone_table->addZone(mem_sgmt_, zclass_, zname1,
+ holder1.release()).code);
+ SegmentObjectHolder<ZoneData, RRClass> holder2(
+ mem_sgmt_, ZoneData::create(mem_sgmt_, zname2), zclass_);
EXPECT_EQ(result::SUCCESS,
- zone_table->addZone(mem_sgmt_, zclass_, zname2).code);
+ zone_table->addZone(mem_sgmt_, zclass_, zname2,
+ holder2.release()).code);
+ SegmentObjectHolder<ZoneData, RRClass> holder3(
+ mem_sgmt_, ZoneData::create(mem_sgmt_, zname3), zclass_);
EXPECT_EQ(result::SUCCESS,
- zone_table->addZone(mem_sgmt_, zclass_, zname3).code);
+ zone_table->addZone(mem_sgmt_, zclass_, zname3,
+ holder3.release()).code);
const ZoneTable::FindResult find_result1 =
zone_table->findZone(Name("example.com"));
EXPECT_EQ(result::SUCCESS, find_result1.code);
- EXPECT_EQ(add_result1.zone_data, find_result1.zone_data);
+ EXPECT_EQ(zone_data, find_result1.zone_data);
EXPECT_EQ(result::NOTFOUND,
zone_table->findZone(Name("example.org")).code);
@@ -137,14 +182,17 @@ TEST_F(ZoneTableTest, findZone) {
// and the code should be PARTIALMATCH.
EXPECT_EQ(result::PARTIALMATCH,
zone_table->findZone(Name("www.example.com")).code);
- EXPECT_EQ(add_result1.zone_data,
+ EXPECT_EQ(zone_data,
zone_table->findZone(Name("www.example.com")).zone_data);
// make sure the partial match is indeed the longest match by adding
// a zone with a shorter origin and query again.
+ SegmentObjectHolder<ZoneData, RRClass> holder4(
+ mem_sgmt_, ZoneData::create(mem_sgmt_, Name("com")), zclass_);
EXPECT_EQ(result::SUCCESS, zone_table->addZone(mem_sgmt_, zclass_,
- Name("com")).code);
- EXPECT_EQ(add_result1.zone_data,
+ Name("com"),
+ holder4.release()).code);
+ EXPECT_EQ(zone_data,
zone_table->findZone(Name("www.example.com")).zone_data);
}
}
diff --git a/src/lib/datasrc/tests/sqlite3_accessor_unittest.cc b/src/lib/datasrc/tests/sqlite3_accessor_unittest.cc
index 718d29b..100a0dd 100644
--- a/src/lib/datasrc/tests/sqlite3_accessor_unittest.cc
+++ b/src/lib/datasrc/tests/sqlite3_accessor_unittest.cc
@@ -191,6 +191,11 @@ TEST_F(SQLite3AccessorTest, iterator) {
checkRR(context, "sub.example.org.", "3600", "NS", "ns.sub.example.org.");
checkRR(context, "ns.sub.example.org.", "3600", "A", "192.0.2.101");
checkRR(context, "www.example.org.", "3600", "A", "192.0.2.1");
+ checkRR(context, "ns3.example.org.", "3600", "NSEC3",
+ "1 1 12 aabbccdd 2T7B4G4VSA5SMI47K61MV5BV1A22BOJR A RRSIG");
+ checkRR(context, "ns3.example.org.", "3600", "RRSIG",
+ "NSEC3 5 3 3600 20000101000000 20000201000000 "
+ "12345 ns3.example.org. FAKEFAKEFAKE");
// Check there's no other
EXPECT_FALSE(context->getNext(data));
@@ -665,16 +670,16 @@ TEST_F(SQLite3Create, creationtest) {
TEST_F(SQLite3Create, emptytest) {
ASSERT_FALSE(isReadable(SQLITE_NEW_DBFILE));
- // open one manualle
+ // open one manually
sqlite3* db;
ASSERT_EQ(SQLITE_OK, sqlite3_open(SQLITE_NEW_DBFILE, &db));
- // empty, but not locked, so creating it now should work
+ // empty, but not locked, so creating another accessor should work
SQLite3Accessor accessor2(SQLITE_NEW_DBFILE, "IN");
sqlite3_close(db);
- // should work now that we closed it
+ // should still work now that we closed it
SQLite3Accessor accessor3(SQLITE_NEW_DBFILE, "IN");
}
@@ -692,8 +697,10 @@ TEST_F(SQLite3Create, lockedtest) {
sqlite3_exec(db, "ROLLBACK TRANSACTION", NULL, NULL, NULL);
- // should work now that we closed it
+ // should work now that the transaction has been rolled back
SQLite3Accessor accessor3(SQLITE_NEW_DBFILE, "IN");
+
+ ASSERT_EQ(SQLITE_OK, sqlite3_close(db));
}
TEST_F(SQLite3AccessorTest, clone) {
diff --git a/src/lib/datasrc/tests/testdata/example.org.sqlite3 b/src/lib/datasrc/tests/testdata/example.org.sqlite3
index c7388ff..c799d2e 100644
Binary files a/src/lib/datasrc/tests/testdata/example.org.sqlite3 and b/src/lib/datasrc/tests/testdata/example.org.sqlite3 differ
diff --git a/src/lib/dhcp/tests/.gitignore b/src/lib/dhcp/tests/.gitignore
index 313429d..89ea505 100644
--- a/src/lib/dhcp/tests/.gitignore
+++ b/src/lib/dhcp/tests/.gitignore
@@ -1 +1,2 @@
/libdhcp++_unittests
+/libdhcpsrv_unittests
diff --git a/src/lib/dns/Makefile.am b/src/lib/dns/Makefile.am
index 38809e0..40cb943 100644
--- a/src/lib/dns/Makefile.am
+++ b/src/lib/dns/Makefile.am
@@ -149,11 +149,11 @@ libdns___include_HEADERS = \
messagerenderer.h \
name.h \
question.h \
+ opcode.h \
rcode.h \
rdata.h \
rrparamregistry.h \
rrset.h \
- rrsetlist.h \
rrttl.h \
tsigkey.h
# Purposely not installing these headers:
diff --git a/src/lib/dns/tests/labelsequence_unittest.cc b/src/lib/dns/tests/labelsequence_unittest.cc
index 90d470d..62cbcec 100644
--- a/src/lib/dns/tests/labelsequence_unittest.cc
+++ b/src/lib/dns/tests/labelsequence_unittest.cc
@@ -860,8 +860,12 @@ TEST_F(LabelSequenceTest, badDeserialize) {
const uint8_t toomany_offsets[] = { Name::MAX_LABELS + 1 };
EXPECT_THROW(LabelSequence ls(toomany_offsets), isc::BadValue);
- // exceed MAX_LABEL_LEN
- const uint8_t offsets_toolonglabel[] = { 2, 0, 64 };
+ // (second) offset does not match actual label length
+ const uint8_t offsets_wrongoffset[] = { 2, 0, 64, 1 };
+ EXPECT_THROW(LabelSequence ls(offsets_wrongoffset), isc::BadValue);
+
+ // offset matches, but exceeds MAX_LABEL_LEN
+ const uint8_t offsets_toolonglabel[] = { 2, 0, 64, 64 };
EXPECT_THROW(LabelSequence ls(offsets_toolonglabel), isc::BadValue);
// Inconsistent data: an offset is lower than the previous offset
diff --git a/src/lib/python/isc/datasrc/sqlite3_ds.py b/src/lib/python/isc/datasrc/sqlite3_ds.py
index f9b47c0..dc80afd 100644
--- a/src/lib/python/isc/datasrc/sqlite3_ds.py
+++ b/src/lib/python/isc/datasrc/sqlite3_ds.py
@@ -25,7 +25,7 @@ RR_RDATA_INDEX = 7
# Current major and minor versions of schema
SCHEMA_MAJOR_VERSION = 2
-SCHEMA_MINOR_VERSION = 0
+SCHEMA_MINOR_VERSION = 1
class Sqlite3DSError(Exception):
""" Define exceptions."""
@@ -81,6 +81,7 @@ def create(cur):
rdtype TEXT NOT NULL COLLATE NOCASE,
rdata TEXT NOT NULL)""")
cur.execute("CREATE INDEX nsec3_byhash ON nsec3 (hash)")
+ cur.execute("CREATE INDEX nsec3_byhash_and_rdtype ON nsec3 (hash, rdtype)")
cur.execute("""CREATE TABLE diffs (id INTEGER PRIMARY KEY,
zone_id INTEGER NOT NULL,
version INTEGER NOT NULL,
diff --git a/src/lib/resolve/tests/recursive_query_unittest_2.cc b/src/lib/resolve/tests/recursive_query_unittest_2.cc
index 2b3d129..6cb404d 100644
--- a/src/lib/resolve/tests/recursive_query_unittest_2.cc
+++ b/src/lib/resolve/tests/recursive_query_unittest_2.cc
@@ -76,14 +76,17 @@ using namespace std;
/// directed to one or other of the "servers" in the RecursiveQueryTest2 class,
/// regardless of the glue returned in referrals.
+namespace {
+const char* const TEST_ADDRESS = "127.0.0.1"; ///< Servers are on this address
+const uint16_t TEST_PORT = 5301; ///< ... and this port
+const size_t BUFFER_SIZE = 1024; ///< For all buffers
+const char* const WWW_EXAMPLE_ORG = "192.0.2.254";
+ ///< Address of www.example.org
+} //end anonymous namespace
+
namespace isc {
namespace asiodns {
-const std::string TEST_ADDRESS = "127.0.0.1"; ///< Servers are on this address
-const uint16_t TEST_PORT = 5301; ///< ... and this port
-const size_t BUFFER_SIZE = 1024; ///< For all buffers
-const char* WWW_EXAMPLE_ORG = "192.0.2.254"; ///< Address of www.example.org
-
// As the test is fairly long and complex, debugging "print" statements have
// been left in although they are disabled. Set the following to "true" to
// enable them.
diff --git a/src/lib/resolve/tests/recursive_query_unittest_3.cc b/src/lib/resolve/tests/recursive_query_unittest_3.cc
index 168ec80..abfea9a 100644
--- a/src/lib/resolve/tests/recursive_query_unittest_3.cc
+++ b/src/lib/resolve/tests/recursive_query_unittest_3.cc
@@ -69,15 +69,16 @@ using namespace std;
/// By using the "test_server_" element of RecursiveQuery, all queries are
/// directed to one or other of the "servers" in the RecursiveQueryTest3 class.
-namespace isc {
-namespace asiodns {
-
-const std::string TEST_ADDRESS3 = "127.0.0.1";
- ///< Servers are on this address
+namespace {
+const char* const TEST_ADDRESS3 = "127.0.0.1"; ///< Servers are on this address
const uint16_t TEST_PORT3 = 5303; ///< ... and this port
-const size_t BUFFER_SIZE = 1024; ///< For all buffers
+const size_t BUFFER_SIZE = 1024; ///< For all buffers
-const std::string DUMMY_ADDR3 = "1.2.3.4"; ///< address to return as A
+const char* const DUMMY_ADDR3 = "1.2.3.4"; ///< address to return as A
+} // end anonymous namespace
+
+namespace isc {
+namespace asiodns {
class MockResolver3 : public isc::resolve::ResolverInterface {
public:
diff --git a/src/lib/server_common/tests/socket_requestor_test.cc b/src/lib/server_common/tests/socket_requestor_test.cc
index 9878c63..ac1731f 100644
--- a/src/lib/server_common/tests/socket_requestor_test.cc
+++ b/src/lib/server_common/tests/socket_requestor_test.cc
@@ -410,7 +410,8 @@ private:
isc_throw(Unexpected,
"mkstemp() created a filename too long for sun_path");
}
- strncpy(socket_address.sun_path, path_, len);
+ strncpy(socket_address.sun_path, path_,
+ sizeof(socket_address.sun_path));
#ifdef HAVE_SA_LEN
socket_address.sun_len = len;
#endif
@@ -542,7 +543,6 @@ TEST_F(SocketRequestorTest, testSocketPassing) {
EXPECT_EQ("foo", socket_id.second);
EXPECT_EQ(0, close(socket_id.first));
}
-
// Create a second socket server, to test that multiple different
// domains sockets would work as well (even though we don't actually
// use that feature)
diff --git a/src/lib/util/Makefile.am b/src/lib/util/Makefile.am
index fe1b327..13f8f7b 100644
--- a/src/lib/util/Makefile.am
+++ b/src/lib/util/Makefile.am
@@ -33,3 +33,6 @@ EXTRA_DIST = python/pycppwrapper_util.h
libb10_util_la_LIBADD = $(top_builddir)/src/lib/exceptions/libb10-exceptions.la
CLEANFILES = *.gcno *.gcda
+
+libb10_util_includedir = $(includedir)/$(PACKAGE_NAME)/util
+libb10_util_include_HEADERS = buffer.h
diff --git a/src/lib/util/io/fd_share.cc b/src/lib/util/io/fd_share.cc
index 7adbbbe..8666441 100644
--- a/src/lib/util/io/fd_share.cc
+++ b/src/lib/util/io/fd_share.cc
@@ -142,6 +142,7 @@ send_fd(const int sock, const int fd) {
if (msghdr.msg_control == NULL) {
return (FD_OTHER_ERROR);
}
+ std::memset(msghdr.msg_control, 0, msghdr.msg_controllen);
struct cmsghdr* cmsg = CMSG_FIRSTHDR(&msghdr);
cmsg->cmsg_len = cmsg_len(sizeof(int));
diff --git a/src/lib/util/tests/fd_tests.cc b/src/lib/util/tests/fd_tests.cc
index 6ba2766..b709405 100644
--- a/src/lib/util/tests/fd_tests.cc
+++ b/src/lib/util/tests/fd_tests.cc
@@ -34,7 +34,9 @@ class FDTest : public ::testing::Test {
// We do not care what is inside, we just need it to be the same
data(new unsigned char[TEST_DATA_SIZE]),
buffer(NULL)
- { }
+ {
+ memset(data, 0, TEST_DATA_SIZE);
+ }
~ FDTest() {
delete[] data;
delete[] buffer;
diff --git a/src/lib/util/threads/tests/.gitignore b/src/lib/util/threads/tests/.gitignore
new file mode 100644
index 0000000..d6d1ec8
--- /dev/null
+++ b/src/lib/util/threads/tests/.gitignore
@@ -0,0 +1 @@
+/run_unittests
diff --git a/tests/tools/perfdhcp/templates/.gitignore b/tests/tools/perfdhcp/templates/.gitignore
new file mode 100644
index 0000000..6f865da
--- /dev/null
+++ b/tests/tools/perfdhcp/templates/.gitignore
@@ -0,0 +1,5 @@
+/test1.hex
+/test2.hex
+/test3.hex
+/test4.hex
+/test5.hex
More information about the bind10-changes
mailing list