[svn] commit: r3728 - in /branches/trac415: ./ src/bin/ src/bin/bind10/ src/bin/bind10/tests/ src/bin/bindctl/ src/bin/msgq/ src/bin/recurse/ src/bin/xfrin/ src/bin/xfrout/ src/lib/config/ src/lib/config/tests/ src/lib/datasrc/ src/lib/datasrc/tests/ src/lib/dns/ src/lib/dns/rdata/any_255/ src/lib/python/isc/config/ src/lib/python/isc/config/tests/ src/lib/python/isc/utils/
BIND 10 source code commits
bind10-changes at lists.isc.org
Mon Dec 6 12:42:10 UTC 2010
Author: jinmei
Date: Mon Dec 6 12:42:10 2010
New Revision: 3728
Log:
sync with trunk
Added:
branches/trac415/src/bin/recurse/
- copied from r3727, trunk/src/bin/recurse/
Modified:
branches/trac415/ (props changed)
branches/trac415/ChangeLog
branches/trac415/README
branches/trac415/configure.ac
branches/trac415/src/bin/Makefile.am
branches/trac415/src/bin/bind10/bind10.py.in (contents, props changed)
branches/trac415/src/bin/bind10/bob.spec
branches/trac415/src/bin/bind10/run_bind10.sh.in
branches/trac415/src/bin/bind10/tests/bind10_test.py
branches/trac415/src/bin/bindctl/bindcmd.py
branches/trac415/src/bin/bindctl/bindctl-source.py.in
branches/trac415/src/bin/msgq/msgq.py.in
branches/trac415/src/bin/xfrin/b10-xfrin.xml
branches/trac415/src/bin/xfrout/b10-xfrout.8
branches/trac415/src/bin/xfrout/b10-xfrout.xml
branches/trac415/src/bin/xfrout/xfrout.spec.pre.in
branches/trac415/src/lib/config/config_data.cc
branches/trac415/src/lib/config/tests/config_data_unittests.cc
branches/trac415/src/lib/datasrc/static_datasrc.cc
branches/trac415/src/lib/datasrc/tests/static_unittest.cc
branches/trac415/src/lib/dns/Makefile.am
branches/trac415/src/lib/dns/rdata/any_255/tsig_250.cc
branches/trac415/src/lib/python/isc/config/config_data.py
branches/trac415/src/lib/python/isc/config/tests/config_data_test.py
branches/trac415/src/lib/python/isc/utils/ (props changed)
Modified: branches/trac415/ChangeLog
==============================================================================
--- branches/trac415/ChangeLog (original)
+++ branches/trac415/ChangeLog Mon Dec 6 12:42:10 2010
@@ -1,3 +1,20 @@
+bind10-devel-20101201 released on December 01, 2010
+
+ 124. [bug] jreed
+ Fix some wrong version reporting. Now also show the version
+ for the component and BIND 10 suite. (Trac #302, svn r3696)
+
+ 123. [bug] jelte
+ src/bin/bindctl printed values had the form of python literals
+ (e.g. 'True'), while the input requires valid JSON (e.g. 'true').
+ Output changed to JSON format for consistency. (svn r3694)
+
+ 122. [func] stephen
+ src/bin/bind10: Added configuration options to Boss to determine
+ whether to start the authoritative server, recursive server (or
+ both). A dummy recursor has been provided for test purposes.
+ (Trac #412, svn r3676)
+
121. [func] jinmei
src/lib/dns: Added support for TSIG RDATA. At this moment this is
not much of real use, however, because no protocol support was
@@ -15,13 +32,14 @@
Note: this fix is incomplete and the loadzone would still be
confused if the owner name is a syntactically indistinguishable
from a TTL specification. This is part of a more general issue
- and will be addressed in Trac #413. (Trac #411, svn r3599)
+ and will be addressed in Trac #413. (Trac #411, svn r3599)
118. [func] jinmei
- src/lib/dns: changed the interface of AbstractRRset::getRdataIterator()
- so that the internal cursor would point to the first RDATA
- automatically. This will be a more intuitive and less error prone
- behavior. This is a backward compatible change. (Trac #410, r3595)
+ src/lib/dns: changed the interface of
+ AbstractRRset::getRdataIterator() so that the internal
+ cursor would point to the first RDATA automatically. This
+ will be a more intuitive and less error prone behavior.
+ This is a backward compatible change. (Trac #410, r3595)
117. [func] jinmei
src/lib/datasrc: added new zone and zone table classes for the
@@ -57,15 +75,13 @@
Add one mixin class to override the naive serve_forever() provided
in python library socketserver. Instead of polling for shutdwon
every poll_interval seconds, one socketpair is used to wake up
- the waiting server.(Trac #352, svn r3366)
+ the waiting server. (Trac #352, svn r3366)
111. [bug]* zhanglikun, Michal Vaner
- Make sure process xfrin/xfrout/zonemgr/cmdctl can be stoped
+ Make sure process xfrin/xfrout/zonemgr/cmdctl can be stopped
properly when user enter "ctrl+c" or 'Boss shutdown' command
- through bindctl.
-
- The ZonemgrRefresh.run_timer and NotifyOut.dispatcher spawn
- a thread themselves.
+ through bindctl. The ZonemgrRefresh.run_timer and
+ NotifyOut.dispatcher spawn a thread themselves.
(Trac #335, svn r3273)
110. [func] Michal Vaner
@@ -77,7 +93,7 @@
109. [func] naokikambe
Added the initial version of the stats module for the statistics
feature of BIND 10, which supports the restricted features and
- items and reports via bindctl command (Trac #191, r3218)
+ items and reports via bindctl command. (Trac #191, r3218)
Added the document of the stats module, which is about how stats
module collects the data (Trac #170, [wiki:StatsModule])
@@ -104,11 +120,11 @@
104. [bug] jerry
bin/zonemgr: zonemgr should be attempting to refresh expired zones.
(Trac #336, r3139)
-
+
103. [bug] jerry
lib/python/isc/log: Fixed an issue with python logging,
- python log shouldn't die with OSError.(Trac #267, r3137)
-
+ python log shouldn't die with OSError. (Trac #267, r3137)
+
102. [build] jinmei
Disable threads in ASIO to minimize build time dependency.
(Trac #345, r3100)
@@ -161,7 +177,7 @@
93. [bug] jinmei
lib/datasrc: A DS query could crash the library (and therefore,
e.g. the authoritative server) if some RR of the same apex name
- is stored in the hot spot cache. (Trac #307, svn r2923)
+ is stored in the hot spot cache. (Trac #307, svn r2923)
92. [func]* jelte
libdns_python (the python wrappers for libdns++) has been renamed
@@ -341,7 +357,7 @@
66. [bug] each
Check for duplicate RRsets before inserting data into a message
section; this, among other things, will prevent multiple copies
- of the same CNAME from showing up when there's a loop. (Trac #69,
+ of the same CNAME from showing up when there's a loop. (Trac #69,
svn r2350)
65. [func] shentingting
@@ -463,7 +479,7 @@
#205, svn r1957)
44. [build] jreed
- Install headers for libdns and libexception. (Trac #68,
+ Install headers for libdns and libexception. (Trac #68,
svn r1941)
43. [func] jelte
@@ -471,7 +487,7 @@
42. [func] jelte
lib/python/isc/config: Make temporary file with python
- tempfile module instead of manual with fixed name. (Trac
+ tempfile module instead of manual with fixed name. (Trac
#184, svn r1859)
41. [func] jelte
@@ -479,7 +495,7 @@
40. [build] jreed
Report detected features and configure settings at end of
- configure output. (svn r1836)
+ configure output. (svn r1836)
39. [func]* each
Renamed libauth to libdatasrc.
@@ -492,7 +508,7 @@
(Trac #135, #151, #134, svn r1797)
37. [build] jinmei
- Check for the availability of python-config. (Trac #159,
+ Check for the availability of python-config. (Trac #159,
svn r1794)
36. [func] shane
@@ -537,7 +553,7 @@
27. [build]
Add missing copyright license statements to various source
- files. (svn r1750)
+ files. (svn r1750)
26. [func]
Use PACKAGE_STRING (name + version) from config.h instead
Modified: branches/trac415/README
==============================================================================
--- branches/trac415/README (original)
+++ branches/trac415/README Mon Dec 6 12:42:10 2010
@@ -17,8 +17,9 @@
bus, b10-auth authoritative DNS server (with SQLite3 backend),
b10-cmdctl remote control daemon, b10-cfgmgr configuration manager,
b10-xfrin AXFR inbound service, b10-xfrout outgoing AXFR service,
-b10-zonemgr secondary manager, and a new libdns++ library for C++
-with a python wrapper.
+b10-zonemgr secondary manager, b10-stats statistics collection and
+reporting daemon, and a new libdns++ library for C++ with a python
+wrapper.
Documentation is included and also available via the BIND 10
website at http://bind10.isc.org/
Modified: branches/trac415/configure.ac
==============================================================================
--- branches/trac415/configure.ac (original)
+++ branches/trac415/configure.ac Mon Dec 6 12:42:10 2010
@@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ([2.59])
-AC_INIT(bind10-devel, 20101013, bind10-dev at isc.org)
+AC_INIT(bind10-devel, 20101201, bind10-dev at isc.org)
AC_CONFIG_SRCDIR(README)
AM_INIT_AUTOMAKE
AC_CONFIG_HEADERS([config.h])
@@ -467,6 +467,7 @@
src/bin/auth/tests/Makefile
src/bin/auth/tests/testdata/Makefile
src/bin/auth/benchmarks/Makefile
+ src/bin/recurse/Makefile
src/bin/xfrin/Makefile
src/bin/xfrin/tests/Makefile
src/bin/xfrout/Makefile
@@ -531,6 +532,9 @@
src/bin/xfrout/xfrout.spec.pre
src/bin/xfrout/tests/xfrout_test
src/bin/xfrout/run_b10-xfrout.sh
+ src/bin/recurse/recurse.py
+ src/bin/recurse/recurse.spec.pre
+ src/bin/recurse/run_b10-recurse.sh
src/bin/zonemgr/zonemgr.py
src/bin/zonemgr/zonemgr.spec.pre
src/bin/zonemgr/tests/zonemgr_test
@@ -573,6 +577,7 @@
chmod +x src/bin/cmdctl/run_b10-cmdctl.sh
chmod +x src/bin/xfrin/run_b10-xfrin.sh
chmod +x src/bin/xfrout/run_b10-xfrout.sh
+ chmod +x src/bin/recurse/run_b10-recurse.sh
chmod +x src/bin/zonemgr/run_b10-zonemgr.sh
chmod +x src/bin/stats/tests/stats_test
chmod +x src/bin/stats/run_b10-stats.sh
Modified: branches/trac415/src/bin/Makefile.am
==============================================================================
--- branches/trac415/src/bin/Makefile.am (original)
+++ branches/trac415/src/bin/Makefile.am Mon Dec 6 12:42:10 2010
@@ -1,4 +1,4 @@
SUBDIRS = bind10 bindctl cfgmgr loadzone msgq host cmdctl auth xfrin xfrout \
- usermgr zonemgr stats tests
+ usermgr zonemgr stats tests recurse
check-recursive: all-recursive
Modified: branches/trac415/src/bin/bind10/bind10.py.in
==============================================================================
--- branches/trac415/src/bin/bind10/bind10.py.in (original)
+++ branches/trac415/src/bin/bind10/bind10.py.in Mon Dec 6 12:42:10 2010
@@ -15,7 +15,7 @@
# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-"""\
+"""
This file implements the Boss of Bind (BoB, or bob) program.
Its purpose is to start up the BIND 10 system, and then manage the
@@ -72,7 +72,7 @@
# This is the version that gets displayed to the user.
# The VERSION string consists of the module name, the module version
# number, and the overall BIND 10 version number (set in configure.ac).
-VERSION = "bind10 20100916 (BIND 10 @PACKAGE_VERSION@)"
+VERSION = "bind10 20101129 (BIND 10 @PACKAGE_VERSION@)"
# This is for bind10.boottime of stats module
_BASETIME = time.gmtime()
@@ -189,137 +189,233 @@
def respawn(self):
self._spawn()
+class CChannelConnectError(Exception): pass
+
class BoB:
"""Boss of BIND class."""
def __init__(self, msgq_socket_file=None, auth_port=5300, address=None,
nocache=False, verbose=False, setuid=None, username=None):
- """Initialize the Boss of BIND. This is a singleton (only one
- can run).
+ """
+ Initialize the Boss of BIND. This is a singleton (only one can run).
- The msgq_socket_file specifies the UNIX domain socket file
- that the msgq process listens on.
- If verbose is True, then the boss reports what it is doing.
- """
- self.verbose = verbose
- self.msgq_socket_file = msgq_socket_file
+ The msgq_socket_file specifies the UNIX domain socket file that the
+ msgq process listens on. If verbose is True, then the boss reports
+ what it is doing.
+ """
+ self.address = address
self.auth_port = auth_port
- self.address = None
- if address:
- self.address = address
self.cc_session = None
self.ccs = None
+ self.cfg_start_auth = True
+ self.cfg_start_recurse = False
+ self.curproc = None
+ self.dead_processes = {}
+ self.msgq_socket_file = msgq_socket_file
+ self.nocache = nocache
self.processes = {}
- self.dead_processes = {}
self.runnable = False
self.uid = setuid
self.username = username
- self.nocache = nocache
+ self.verbose = verbose
def config_handler(self, new_config):
if self.verbose:
- sys.stdout.write("[bind10] handling new config:\n")
- sys.stdout.write(new_config + "\n")
+ sys.stdout.write("[bind10] Handling new configuration: " +
+ str(new_config) + "\n")
answer = isc.config.ccsession.create_answer(0)
return answer
# TODO
def command_handler(self, command, args):
if self.verbose:
- sys.stdout.write("[bind10] Boss got command:\n")
- sys.stdout.write(command + "\n")
+ sys.stdout.write("[bind10] Boss got command: " + command + "\n")
answer = isc.config.ccsession.create_answer(1, "command not implemented")
if type(command) != str:
answer = isc.config.ccsession.create_answer(1, "bad command")
else:
- cmd = command
- if cmd == "shutdown":
- sys.stdout.write("[bind10] got shutdown command\n")
+ if command == "shutdown":
self.runnable = False
answer = isc.config.ccsession.create_answer(0)
else:
answer = isc.config.ccsession.create_answer(1,
"Unknown command")
return answer
-
- def startup(self):
- """Start the BoB instance.
-
- Returns None if successful, otherwise an string describing the
- problem.
- """
- # try to connect to the c-channel daemon,
- # to see if it is already running
- c_channel_env = {}
- if self.msgq_socket_file is not None:
- c_channel_env["BIND10_MSGQ_SOCKET_FILE"] = self.msgq_socket_file
- if self.verbose:
- sys.stdout.write("[bind10] Checking for already running b10-msgq\n")
- # try to connect, and if we can't wait a short while
- try:
- self.cc_session = isc.cc.Session(self.msgq_socket_file)
- return "b10-msgq already running, or socket file not cleaned , cannot start"
- except isc.cc.session.SessionError:
- # this is the case we want, where the msgq is not running
- pass
-
- # start the c-channel daemon
- if self.verbose:
- if self.msgq_socket_file:
- sys.stdout.write("[bind10] Starting b10-msgq\n")
- try:
- c_channel = ProcessInfo("b10-msgq", ["b10-msgq"], c_channel_env,
- True, not self.verbose, uid=self.uid,
- username=self.username)
- except Exception as e:
- return "Unable to start b10-msgq; " + str(e)
+
+ def kill_started_processes(self):
+ """
+ Called as part of the exception handling when a process fails to
+ start, this runs through the list of started processes, killing
+ each one. It then clears that list.
+ """
+ if self.verbose:
+ sys.stdout.write("[bind10] killing started processes:\n")
+
+ for pid in self.processes:
+ if self.verbose:
+ sys.stdout.write("[bind10] - %s\n" % self.processes[pid].name)
+ self.processes[pid].process.kill()
+ self.processes = {}
+
+ def read_bind10_config(self):
+ """
+ Reads the parameters associated with the BoB module itself.
+
+ At present these are the components to start although arguably this
+ information should be in the configuration for the appropriate
+ module itself. (However, this would cause difficulty in the case of
+ xfrin/xfrout and zone manager as we don't need to start those if we
+ are not running the authoritative server.)
+ """
+ if self.verbose:
+ sys.stdout.write("[bind10] Reading Boss configuration:\n")
+
+ config_data = self.ccs.get_full_config()
+ self.cfg_start_auth = config_data.get("start_auth")
+ self.cfg_start_recurse = config_data.get("start_recurse")
+
+ if self.verbose:
+ sys.stdout.write("[bind10] - start_auth: %s\n" %
+ str(self.cfg_start_auth))
+ sys.stdout.write("[bind10] - start_recurse: %s\n" %
+ str(self.cfg_start_recurse))
+
+ def log_starting(self, process, port = None, address = None):
+ """
+ A convenience function to output a "Starting xxx" message if the
+ verbose option is set. Putting this into a separate method ensures
+ that the output form is consistent across all processes.
+
+ The process name (passed as the first argument) is put into
+ self.curproc, and is used to indicate which process failed to
+ start if there is an error (and is used in the "Started" message
+ on success). The optional port and address information are
+ appended to the message (if present).
+ """
+ self.curproc = process
+ if self.verbose:
+ sys.stdout.write("[bind10] Starting %s" % self.curproc)
+ if port is not None:
+ sys.stdout.write(" on port %d" % port)
+ if address is not None:
+ sys.stdout.write(" (address %s)" % str(address))
+ sys.stdout.write("\n")
+
+ def log_started(self, pid = None):
+ """
+ A convenience function to output a 'Started xxxx (PID yyyy)'
+ message. As with starting_message(), this ensures a consistent
+ format.
+ """
+ if self.verbose:
+ sys.stdout.write("[bind10] Started %s" % self.curproc)
+ if pid is not None:
+ sys.stdout.write(" (PID %d)" % pid)
+ sys.stdout.write("\n")
+
+ # The next few methods start the individual processes of BIND-10. They
+ # are called via start_all_process(). If any fail, an exception is raised
+ # which is caught by the caller of start_all_processes(); this kills
+ # processes started up to that point before terminating the program.
+
+ def start_msgq(self, c_channel_env):
+ """
+ Start the message queue and connect to the command channel.
+ """
+ self.log_starting("b10-msgq")
+ c_channel = ProcessInfo("b10-msgq", ["b10-msgq"], c_channel_env,
+ True, not self.verbose, uid=self.uid,
+ username=self.username)
self.processes[c_channel.pid] = c_channel
- if self.verbose:
- sys.stdout.write("[bind10] Started b10-msgq (PID %d)\n" %
- c_channel.pid)
-
- # now connect to the c-channel
+ self.log_started(c_channel.pid)
+
+ # Now connect to the c-channel
cc_connect_start = time.time()
while self.cc_session is None:
# if we have been trying for "a while" give up
if (time.time() - cc_connect_start) > 5:
- c_channel.process.kill()
- return "Unable to connect to c-channel after 5 seconds"
+ raise CChannelConnectError("Unable to connect to c-channel after 5 seconds")
+
# try to connect, and if we can't wait a short while
try:
self.cc_session = isc.cc.Session(self.msgq_socket_file)
except isc.cc.session.SessionError:
time.sleep(0.1)
- # start the configuration manager
- if self.verbose:
- sys.stdout.write("[bind10] Starting b10-cfgmgr\n")
- try:
- bind_cfgd = ProcessInfo("b10-cfgmgr", ["b10-cfgmgr"],
- c_channel_env, uid=self.uid,
- username=self.username)
- except Exception as e:
- c_channel.process.kill()
- return "Unable to start b10-cfgmgr; " + str(e)
+ def start_cfgmgr(self, c_channel_env):
+ """
+ Starts the configuration manager process
+ """
+ self.log_starting("b10-cfgmgr")
+ bind_cfgd = ProcessInfo("b10-cfgmgr", ["b10-cfgmgr"],
+ c_channel_env, uid=self.uid,
+ username=self.username)
self.processes[bind_cfgd.pid] = bind_cfgd
- if self.verbose:
- sys.stdout.write("[bind10] Started b10-cfgmgr (PID %d)\n" %
- bind_cfgd.pid)
+ self.log_started(bind_cfgd.pid)
# sleep until b10-cfgmgr is fully up and running, this is a good place
# to have a (short) timeout on synchronized groupsend/receive
# TODO: replace the sleep by a listen for ConfigManager started
# message
time.sleep(1)
- if self.verbose:
- sys.stdout.write("[bind10] starting ccsession\n")
+
+ def start_ccsession(self, c_channel_env):
+ """
+ Start the CC Session
+
+ The argument c_channel_env is unused but is supplied to keep the
+ argument list the same for all start_xxx methods.
+ """
+ self.log_starting("ccsession")
self.ccs = isc.config.ModuleCCSession(SPECFILE_LOCATION,
self.config_handler, self.command_handler)
self.ccs.start()
- if self.verbose:
- sys.stdout.write("[bind10] ccsession started\n")
-
- # start b10-auth
+ self.log_started()
+
+ # A couple of utility methods for starting processes...
+
+ def start_process(self, name, args, c_channel_env, port=None, address=None):
+ """
+ Given a set of command arguments, start the process and output
+ appropriate log messages. If the start is successful, the process
+ is added to the list of started processes.
+
+ The port and address arguments are for log messages only.
+ """
+ self.log_starting(name, port, address)
+ newproc = ProcessInfo(name, args, c_channel_env)
+ self.processes[newproc.pid] = newproc
+ self.log_started(newproc.pid)
+
+ def start_simple(self, name, c_channel_env, port=None, address=None):
+ """
+ Most of the BIND-10 processes are started with the command:
+
+ <process-name> [-v]
+
+ ... where -v is appended if verbose is enabled. This method
+ generates the arguments from the name and starts the process.
+
+ The port and address arguments are for log messages only.
+ """
+ # Set up the command arguments.
+ args = [name]
+ if self.verbose:
+ args += ['-v']
+
+ # ... and start the process
+ self.start_process(name, args, c_channel_env, port, address)
+
+ # The next few methods start up the rest of the BIND-10 processes.
+ # Although many of these methods are little more than a call to
+ # start_simple, they are retained (a) for testing reasons and (b) as a place
+ # where modifications can be made if the process start-up sequence changes
+ # for a given process.
+
+ def start_auth(self, c_channel_env):
+ """
+ Start the Authoritative server
+ """
# XXX: this must be read from the configuration manager in the future
authargs = ['b10-auth', '-p', str(self.auth_port)]
if self.address:
@@ -330,130 +426,115 @@
authargs += ['-u', str(self.uid)]
if self.verbose:
authargs += ['-v']
- sys.stdout.write("Starting b10-auth using port %d" %
- self.auth_port)
- if self.address:
- sys.stdout.write(" on %s" % str(self.address))
- sys.stdout.write("\n")
- try:
- auth = ProcessInfo("b10-auth", authargs,
- c_channel_env)
- except Exception as e:
- c_channel.process.kill()
- bind_cfgd.process.kill()
- xfrout.process.kill()
- return "Unable to start b10-auth; " + str(e)
- self.processes[auth.pid] = auth
- if self.verbose:
- sys.stdout.write("[bind10] Started b10-auth (PID %d)\n" % auth.pid)
-
- # everything after the authoritative server can run as non-root
+
+ # ... and start
+ self.start_process("b10-auth", authargs, c_channel_env,
+ self.auth_port, self.address)
+
+ def start_recurse(self, c_channel_env):
+ """
+ Start the Resolver. At present, all these arguments and switches
+ are pure speculation. As with the auth daemon, they should be
+ read from the configuration database.
+ """
+ self.curproc = "b10-recurse"
+ # XXX: this must be read from the configuration manager in the future
+ resargs = ['b10-recurse']
+ if self.uid:
+ resargs += ['-u', str(self.uid)]
+ if self.verbose:
+ resargs += ['-v']
+
+ # ... and start
+ self.start_process("b10-recurse", resargs, c_channel_env)
+
+ def start_xfrout(self, c_channel_env):
+ self.start_simple("b10-xfrout", c_channel_env)
+
+ def start_xfrin(self, c_channel_env):
+ self.start_simple("b10-xfrin", c_channel_env)
+
+ def start_zonemgr(self, c_channel_env):
+ self.start_simple("b10-zonemgr", c_channel_env)
+
+ def start_stats(self, c_channel_env):
+ self.start_simple("b10-stats", c_channel_env)
+
+ def start_cmdctl(self, c_channel_env):
+ # XXX: we hardcode port 8080
+ self.start_simple("b10-cmdctl", c_channel_env, 8080)
+
+ def start_all_processes(self, c_channel_env):
+ """
+ Starts up all the processes. Any exception generated during the
+ starting of the processes is handled by the caller.
+ """
+ self.start_msgq(c_channel_env)
+ self.start_cfgmgr(c_channel_env)
+ self.start_ccsession(c_channel_env)
+
+ # Extract the parameters associated with Bob. This can only be
+ # done after the CC Session is started.
+ self.read_bind10_config()
+
+ # Continue starting the processes. The authoritative server (if
+ # selected):
+ if self.cfg_start_auth:
+ self.start_auth(c_channel_env)
+
+ # ... and resolver (if selected):
+ if self.cfg_start_recurse:
+ self.start_recurse(c_channel_env)
+
+ # Everything after the main components can run as non-root.
+ # TODO: this is only temporary - once the privileged socket creator is
+ # fully working, nothing else will run as root.
if self.uid is not None:
posix.setuid(self.uid)
- # start the xfrout before auth-server, to make sure every xfr-query can
- # be processed properly.
- xfrout_args = ['b10-xfrout']
- if self.verbose:
- sys.stdout.write("[bind10] Starting b10-xfrout\n")
- xfrout_args += ['-v']
+ # xfrin/xfrout and the zone manager are only meaningful if the
+ # authoritative server has been started.
+ if self.cfg_start_auth:
+ self.start_xfrout(c_channel_env)
+ self.start_xfrin(c_channel_env)
+ self.start_zonemgr(c_channel_env)
+
+ # ... and finally start the remaining processes
+ self.start_stats(c_channel_env)
+ self.start_cmdctl(c_channel_env)
+
+ def startup(self):
+ """
+ Start the BoB instance.
+
+ Returns None if successful, otherwise an string describing the
+ problem.
+ """
+ # Try to connect to the c-channel daemon, to see if it is already
+ # running
+ c_channel_env = {}
+ if self.msgq_socket_file is not None:
+ c_channel_env["BIND10_MSGQ_SOCKET_FILE"] = self.msgq_socket_file
+ if self.verbose:
+ sys.stdout.write("[bind10] Checking for already running b10-msgq\n")
+ # try to connect, and if we can't wait a short while
try:
- xfrout = ProcessInfo("b10-xfrout", xfrout_args,
- c_channel_env )
+ self.cc_session = isc.cc.Session(self.msgq_socket_file)
+ return "b10-msgq already running, or socket file not cleaned , cannot start"
+ except isc.cc.session.SessionError:
+ # this is the case we want, where the msgq is not running
+ pass
+
+ # Start all processes. If any one fails to start, kill all started
+ # processes and exit with an error indication.
+ try:
+ self.start_all_processes(c_channel_env)
except Exception as e:
- c_channel.process.kill()
- bind_cfgd.process.kill()
- return "Unable to start b10-xfrout; " + str(e)
- self.processes[xfrout.pid] = xfrout
- if self.verbose:
- sys.stdout.write("[bind10] Started b10-xfrout (PID %d)\n" %
- xfrout.pid)
-
- # start b10-xfrin
- xfrin_args = ['b10-xfrin']
- if self.verbose:
- sys.stdout.write("[bind10] Starting b10-xfrin\n")
- xfrin_args += ['-v']
- try:
- xfrind = ProcessInfo("b10-xfrin", xfrin_args,
- c_channel_env)
- except Exception as e:
- c_channel.process.kill()
- bind_cfgd.process.kill()
- xfrout.process.kill()
- auth.process.kill()
- return "Unable to start b10-xfrin; " + str(e)
- self.processes[xfrind.pid] = xfrind
- if self.verbose:
- sys.stdout.write("[bind10] Started b10-xfrin (PID %d)\n" %
- xfrind.pid)
-
- # start b10-zonemgr
- zonemgr_args = ['b10-zonemgr']
- if self.verbose:
- sys.stdout.write("[bind10] Starting b10-zonemgr\n")
- zonemgr_args += ['-v']
- try:
- zonemgr = ProcessInfo("b10-zonemgr", zonemgr_args,
- c_channel_env)
- except Exception as e:
- c_channel.process.kill()
- bind_cfgd.process.kill()
- xfrout.process.kill()
- auth.process.kill()
- xfrind.process.kill()
- return "Unable to start b10-zonemgr; " + str(e)
- self.processes[zonemgr.pid] = zonemgr
- if self.verbose:
- sys.stdout.write("[bind10] Started b10-zonemgr(PID %d)\n" %
- zonemgr.pid)
-
- # start b10-stats
- stats_args = ['b10-stats']
- if self.verbose:
- sys.stdout.write("[bind10] Starting b10-stats\n")
- stats_args += ['-v']
- try:
- statsd = ProcessInfo("b10-stats", stats_args,
- c_channel_env)
- except Exception as e:
- c_channel.process.kill()
- bind_cfgd.process.kill()
- xfrout.process.kill()
- auth.process.kill()
- xfrind.process.kill()
- zonemgr.process.kill()
- return "Unable to start b10-stats; " + str(e)
-
- self.processes[statsd.pid] = statsd
- if self.verbose:
- sys.stdout.write("[bind10] Started b10-stats (PID %d)\n" % statsd.pid)
-
- # start the b10-cmdctl
- # XXX: we hardcode port 8080
- cmdctl_args = ['b10-cmdctl']
- if self.verbose:
- sys.stdout.write("[bind10] Starting b10-cmdctl on port 8080\n")
- cmdctl_args += ['-v']
- try:
- cmd_ctrld = ProcessInfo("b10-cmdctl", cmdctl_args,
- c_channel_env)
- except Exception as e:
- c_channel.process.kill()
- bind_cfgd.process.kill()
- xfrout.process.kill()
- auth.process.kill()
- xfrind.process.kill()
- zonemgr.process.kill()
- statsd.process.kill()
- return "Unable to start b10-cmdctl; " + str(e)
- self.processes[cmd_ctrld.pid] = cmd_ctrld
- if self.verbose:
- sys.stdout.write("[bind10] Started b10-cmdctl (PID %d)\n" %
- cmd_ctrld.pid)
-
+ self.kill_started_processes()
+ return "Unable to start " + self.curproc + ": " + str(e)
+
+ # Started successfully
self.runnable = True
-
return None
def stop_all_processes(self):
@@ -462,6 +543,7 @@
self.cc_session.group_sendmsg(cmd, 'Cmdctl', 'Cmdctl')
self.cc_session.group_sendmsg(cmd, "ConfigManager", "ConfigManager")
self.cc_session.group_sendmsg(cmd, "Auth", "Auth")
+ self.cc_session.group_sendmsg(cmd, "Recurse", "Recurse")
self.cc_session.group_sendmsg(cmd, "Xfrout", "Xfrout")
self.cc_session.group_sendmsg(cmd, "Xfrin", "Xfrin")
self.cc_session.group_sendmsg(cmd, "Zonemgr", "Zonemgr")
@@ -642,11 +724,10 @@
# Enforce line buffering on stdout, even when not a TTY
sys.stdout = io.TextIOWrapper(sys.stdout.detach(), line_buffering=True)
-
# Parse any command-line options.
parser = OptionParser(version=VERSION)
parser.add_option("-a", "--address", dest="address", type="string",
- action="callback", callback=check_addr, default='',
+ action="callback", callback=check_addr, default=None,
help="address the b10-auth daemon will use (default: listen on all addresses)")
parser.add_option("-m", "--msgq-socket-file", dest="msgq_socket_file",
type="string", default=None,
@@ -781,6 +862,7 @@
# shutdown
signal.signal(signal.SIGCHLD, signal.SIG_DFL)
boss_of_bind.shutdown()
+ sys.stdout.write("[bind10] BIND 10 exiting\n");
sys.exit(0)
if __name__ == "__main__":
Modified: branches/trac415/src/bin/bind10/bob.spec
==============================================================================
--- branches/trac415/src/bin/bind10/bob.spec (original)
+++ branches/trac415/src/bin/bind10/bob.spec Mon Dec 6 12:42:10 2010
@@ -3,6 +3,18 @@
"module_name": "Boss",
"module_description": "Master process",
"config_data": [
+ {
+ "item_name": "start_auth",
+ "item_type": "boolean",
+ "item_optional": false,
+ "item_default": true
+ },
+ {
+ "item_name": "start_recurse",
+ "item_type": "boolean",
+ "item_optional": false,
+ "item_default": false
+ }
],
"commands": [
{
Modified: branches/trac415/src/bin/bind10/run_bind10.sh.in
==============================================================================
--- branches/trac415/src/bin/bind10/run_bind10.sh.in (original)
+++ branches/trac415/src/bin/bind10/run_bind10.sh.in Mon Dec 6 12:42:10 2010
@@ -20,7 +20,7 @@
BIND10_PATH=@abs_top_builddir@/src/bin/bind10
-PATH=@abs_top_builddir@/src/bin/msgq:@abs_top_builddir@/src/bin/auth:@abs_top_builddir@/src/bin/cfgmgr:@abs_top_builddir@/src/bin/cmdctl:@abs_top_builddir@/src/bin/stats:@abs_top_builddir@/src/bin/xfrin:@abs_top_builddir@/src/bin/xfrout:@abs_top_builddir@/src/bin/zonemgr:$PATH
+PATH=@abs_top_builddir@/src/bin/msgq:@abs_top_builddir@/src/bin/auth:@abs_top_builddir@/src/bin/cfgmgr:@abs_top_builddir@/src/bin/cmdctl:@abs_top_builddir@/src/bin/stats:@abs_top_builddir@/src/bin/xfrin:@abs_top_builddir@/src/bin/xfrout:@abs_top_builddir@/src/bin/zonemgr:@abs_top_builddir@/src/bin/recurse:$PATH
export PATH
PYTHONPATH=@abs_top_builddir@/src/lib/python:@abs_top_builddir@/src/lib/dns/python/.libs:@abs_top_builddir@/src/lib/xfr/.libs
Modified: branches/trac415/src/bin/bind10/tests/bind10_test.py
==============================================================================
--- branches/trac415/src/bin/bind10/tests/bind10_test.py (original)
+++ branches/trac415/src/bin/bind10/tests/bind10_test.py Mon Dec 6 12:42:10 2010
@@ -79,43 +79,237 @@
self.assertEqual(bob.verbose, False)
self.assertEqual(bob.msgq_socket_file, None)
self.assertEqual(bob.auth_port, 5300)
+ self.assertEqual(bob.address, None)
self.assertEqual(bob.cc_session, None)
- self.assertEqual(bob.address, None)
+ self.assertEqual(bob.ccs, None)
self.assertEqual(bob.processes, {})
self.assertEqual(bob.dead_processes, {})
self.assertEqual(bob.runnable, False)
+ self.assertEqual(bob.uid, None)
+ self.assertEqual(bob.username, None)
+ self.assertEqual(bob.nocache, False)
+ self.assertEqual(bob.cfg_start_auth, True)
+ self.assertEqual(bob.cfg_start_recurse, False)
def test_init_alternate_socket(self):
bob = BoB("alt_socket_file")
self.assertEqual(bob.verbose, False)
self.assertEqual(bob.msgq_socket_file, "alt_socket_file")
+ self.assertEqual(bob.auth_port, 5300)
+ self.assertEqual(bob.address, None)
self.assertEqual(bob.cc_session, None)
+ self.assertEqual(bob.ccs, None)
self.assertEqual(bob.processes, {})
self.assertEqual(bob.dead_processes, {})
self.assertEqual(bob.runnable, False)
+ self.assertEqual(bob.uid, None)
+ self.assertEqual(bob.username, None)
+ self.assertEqual(bob.nocache, False)
+ self.assertEqual(bob.cfg_start_auth, True)
+ self.assertEqual(bob.cfg_start_recurse, False)
def test_init_alternate_auth_port(self):
bob = BoB(None, 9999)
self.assertEqual(bob.verbose, False)
self.assertEqual(bob.msgq_socket_file, None)
self.assertEqual(bob.auth_port, 9999)
+ self.assertEqual(bob.address, None)
self.assertEqual(bob.cc_session, None)
- self.assertEqual(bob.address, None)
+ self.assertEqual(bob.ccs, None)
self.assertEqual(bob.processes, {})
self.assertEqual(bob.dead_processes, {})
self.assertEqual(bob.runnable, False)
+ self.assertEqual(bob.uid, None)
+ self.assertEqual(bob.username, None)
+ self.assertEqual(bob.nocache, False)
+ self.assertEqual(bob.cfg_start_auth, True)
+ self.assertEqual(bob.cfg_start_recurse, False)
def test_init_alternate_address(self):
- bob = BoB(None, 5300, IPAddr('127.127.127.127'))
+ bob = BoB(None, 1234, IPAddr('127.127.127.127'))
self.assertEqual(bob.verbose, False)
- self.assertEqual(bob.auth_port, 5300)
self.assertEqual(bob.msgq_socket_file, None)
+ self.assertEqual(bob.auth_port, 1234)
+ self.assertEqual(bob.address.addr, socket.inet_aton('127.127.127.127'))
self.assertEqual(bob.cc_session, None)
- self.assertEqual(bob.address.addr, socket.inet_aton('127.127.127.127'))
+ self.assertEqual(bob.ccs, None)
self.assertEqual(bob.processes, {})
self.assertEqual(bob.dead_processes, {})
self.assertEqual(bob.runnable, False)
- # verbose testing...
+ self.assertEqual(bob.uid, None)
+ self.assertEqual(bob.username, None)
+ self.assertEqual(bob.nocache, False)
+ self.assertEqual(bob.cfg_start_auth, True)
+ self.assertEqual(bob.cfg_start_recurse, False)
+
+# Class for testing the Bob.start_all_processes() method call.
+#
+# Although testing that external processes start is outside the scope
+# of the unit test, by overriding the process start methods we can check
+# that the right processes are started depending on the configuration
+# options.
+class StartAllProcessesBob(BoB):
+ def __init__(self):
+ BoB.__init__(self)
+
+# Set flags as to which of the overridden methods has been run.
+ self.msgq = False
+ self.cfgmgr = False
+ self.ccsession = False
+ self.auth = False
+ self.recurse = False
+ self.xfrout = False
+ self.xfrin = False
+ self.zonemgr = False
+ self.stats = False
+ self.cmdctl = False
+
+ def read_bind10_config(self):
+ # Configuration options are set directly
+ pass
+
+ def start_msgq(self, c_channel_env):
+ self.msgq = True
+
+ def start_cfgmgr(self, c_channel_env):
+ self.cfgmgr = True
+
+ def start_ccsession(self, c_channel_env):
+ self.ccsession = True
+
+ def start_auth(self, c_channel_env):
+ self.auth = True
+
+ def start_recurse(self, c_channel_env):
+ self.recurse = True
+
+ def start_xfrout(self, c_channel_env):
+ self.xfrout = True
+
+ def start_xfrin(self, c_channel_env):
+ self.xfrin = True
+
+ def start_zonemgr(self, c_channel_env):
+ self.zonemgr = True
+
+ def start_stats(self, c_channel_env):
+ self.stats = True
+
+ def start_cmdctl(self, c_channel_env):
+ self.cmdctl = True
+
+# Check that the start_all_processes method starts the right combination
+# of processes.
+class TestStartAllProcessesBob(unittest.TestCase):
+ def check_preconditions(self, bob):
+ self.assertEqual(bob.msgq, False)
+ self.assertEqual(bob.cfgmgr, False)
+ self.assertEqual(bob.ccsession, False)
+ self.assertEqual(bob.auth, False)
+ self.assertEqual(bob.recurse, False)
+ self.assertEqual(bob.xfrout, False)
+ self.assertEqual(bob.xfrin, False)
+ self.assertEqual(bob.zonemgr, False)
+ self.assertEqual(bob.stats, False)
+ self.assertEqual(bob.cmdctl, False)
+
+ # Checks the processes started when starting neither auth nor recurse
+ # is specified.
+ def test_start_none(self):
+ # Created Bob and ensure initialization correct
+ bob = StartAllProcessesBob()
+ self.check_preconditions(bob)
+
+ # Start processes and check what was started
+ c_channel_env = {}
+ bob.cfg_start_auth = False
+ bob.cfg_start_recurse = False
+
+ bob.start_all_processes(c_channel_env)
+
+ self.assertEqual(bob.msgq, True)
+ self.assertEqual(bob.cfgmgr, True)
+ self.assertEqual(bob.ccsession, True)
+ self.assertEqual(bob.auth, False)
+ self.assertEqual(bob.recurse, False)
+ self.assertEqual(bob.xfrout, False)
+ self.assertEqual(bob.xfrin, False)
+ self.assertEqual(bob.zonemgr, False)
+ self.assertEqual(bob.stats, True)
+ self.assertEqual(bob.cmdctl, True)
+
+ # Checks the processes started when starting only the auth process
+ def test_start_auth(self):
+ # Created Bob and ensure initialization correct
+ bob = StartAllProcessesBob()
+ self.check_preconditions(bob)
+
+ # Start processes and check what was started
+ c_channel_env = {}
+ bob.cfg_start_auth = True
+ bob.cfg_start_recurse = False
+
+ bob.start_all_processes(c_channel_env)
+
+ self.assertEqual(bob.msgq, True)
+ self.assertEqual(bob.cfgmgr, True)
+ self.assertEqual(bob.ccsession, True)
+ self.assertEqual(bob.auth, True)
+ self.assertEqual(bob.recurse, False)
+ self.assertEqual(bob.xfrout, True)
+ self.assertEqual(bob.xfrin, True)
+ self.assertEqual(bob.zonemgr, True)
+ self.assertEqual(bob.stats, True)
+ self.assertEqual(bob.cmdctl, True)
+
+ # Checks the processes started when starting only the recurse process
+ def test_start_recurse(self):
+ # Created Bob and ensure initialization correct
+ bob = StartAllProcessesBob()
+ self.check_preconditions(bob)
+
+ # Start processes and check what was started
+ c_channel_env = {}
+ bob.cfg_start_auth = False
+ bob.cfg_start_recurse = True
+
+ bob.start_all_processes(c_channel_env)
+
+ self.assertEqual(bob.msgq, True)
+ self.assertEqual(bob.cfgmgr, True)
+ self.assertEqual(bob.ccsession, True)
+ self.assertEqual(bob.auth, False)
+ self.assertEqual(bob.recurse, True)
+ self.assertEqual(bob.xfrout, False)
+ self.assertEqual(bob.xfrin, False)
+ self.assertEqual(bob.zonemgr, False)
+ self.assertEqual(bob.stats, True)
+ self.assertEqual(bob.cmdctl, True)
+
+ # Checks the processes started when starting both auth and recurse process
+ def test_start_both(self):
+ # Created Bob and ensure initialization correct
+ bob = StartAllProcessesBob()
+ self.check_preconditions(bob)
+
+ # Start processes and check what was started
+ c_channel_env = {}
+ bob.cfg_start_auth = True
+ bob.cfg_start_recurse = True
+
+ bob.start_all_processes(c_channel_env)
+
+ self.assertEqual(bob.msgq, True)
+ self.assertEqual(bob.cfgmgr, True)
+ self.assertEqual(bob.ccsession, True)
+ self.assertEqual(bob.auth, True)
+ self.assertEqual(bob.recurse, True)
+ self.assertEqual(bob.xfrout, True)
+ self.assertEqual(bob.xfrin, True)
+ self.assertEqual(bob.zonemgr, True)
+ self.assertEqual(bob.stats, True)
+ self.assertEqual(bob.cmdctl, True)
+
if __name__ == '__main__':
unittest.main()
Modified: branches/trac415/src/bin/bindctl/bindcmd.py
==============================================================================
--- branches/trac415/src/bin/bindctl/bindcmd.py (original)
+++ branches/trac415/src/bin/bindctl/bindcmd.py Mon Dec 6 12:42:10 2010
@@ -558,7 +558,7 @@
if value_map['type'] in [ 'module', 'map', 'list' ]:
line += "/"
else:
- line += ":\t" + str(value_map['value'])
+ line += ":\t" + json.dumps(value_map['value'])
line += "\t" + value_map['type']
line += "\t"
if value_map['default']:
Modified: branches/trac415/src/bin/bindctl/bindctl-source.py.in
==============================================================================
--- branches/trac415/src/bin/bindctl/bindctl-source.py.in (original)
+++ branches/trac415/src/bin/bindctl/bindctl-source.py.in Mon Dec 6 12:42:10 2010
@@ -28,7 +28,10 @@
isc.util.process.rename()
-__version__ = 'Bindctl'
+# This is the version that gets displayed to the user.
+# The VERSION string consists of the module name, the module version
+# number, and the overall BIND 10 version number (set in configure.ac).
+VERSION = "bindctl 20101201 (BIND 10 @PACKAGE_VERSION@)"
def prepare_config_commands(tool):
'''Prepare fixed commands for local configuration editing'''
@@ -113,7 +116,7 @@
if __name__ == '__main__':
try:
- parser = OptionParser(version = __version__)
+ parser = OptionParser(version = VERSION)
set_bindctl_options(parser)
(options, args) = parser.parse_args()
server_addr = options.addr + ':' + str(options.port)
Modified: branches/trac415/src/bin/msgq/msgq.py.in
==============================================================================
--- branches/trac415/src/bin/msgq/msgq.py.in (original)
+++ branches/trac415/src/bin/msgq/msgq.py.in Mon Dec 6 12:42:10 2010
@@ -38,7 +38,9 @@
isc.util.process.rename()
# This is the version that gets displayed to the user.
-__version__ = "v20091030 (Paving the DNS Parking Lot)"
+# The VERSION string consists of the module name, the module version
+# number, and the overall BIND 10 version number (set in configure.ac).
+VERSION = "b10-msgq 20100818 (BIND 10 @PACKAGE_VERSION@)"
class MsgQReceiveError(Exception): pass
@@ -421,7 +423,7 @@
parser.values.msgq_port = intval
# Parse any command-line options.
- parser = OptionParser(version=__version__)
+ parser = OptionParser(version=VERSION)
parser.add_option("-v", "--verbose", dest="verbose", action="store_true",
help="display more about what is going on")
parser.add_option("-s", "--socket-file", dest="msgq_socket_file",
@@ -433,7 +435,7 @@
# Announce startup.
if options.verbose:
- sys.stdout.write("[b10-msgq] MsgQ %s\n" % __version__)
+ sys.stdout.write("[b10-msgq] %s\n" % VERSION)
msgq = MsgQ(options.msgq_socket_file, options.verbose)
Modified: branches/trac415/src/bin/xfrin/b10-xfrin.xml
==============================================================================
--- branches/trac415/src/bin/xfrin/b10-xfrin.xml (original)
+++ branches/trac415/src/bin/xfrin/b10-xfrin.xml Mon Dec 6 12:42:10 2010
@@ -149,7 +149,6 @@
the authoritative server to transfer from,
and <varname>port</varname> to define the port number on the
authoritative server (defaults to 53).
-<!-- TODO: note: not documenting db_file since that will be removed. -->
</para>
<!-- TODO: later hostname for master? -->
Modified: branches/trac415/src/bin/xfrout/b10-xfrout.8
==============================================================================
--- branches/trac415/src/bin/xfrout/b10-xfrout.8 (original)
+++ branches/trac415/src/bin/xfrout/b10-xfrout.8 Mon Dec 6 12:42:10 2010
@@ -2,12 +2,12 @@
.\" Title: b10-xfrout
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\" Date: September 8, 2010
+.\" Date: December 1, 2010
.\" Manual: BIND10
.\" Source: BIND10
.\" Language: English
.\"
-.TH "B10\-XFROUT" "8" "September 8, 2010" "BIND10" "BIND10"
+.TH "B10\-XFROUT" "8" "December 1, 2010" "BIND10" "BIND10"
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
@@ -67,11 +67,6 @@
The configurable settings are:
.PP
-\fIdb_file\fR
-defines the path to the SQLite3 data store file\&. The default is
-/usr/local/var/bind10\-devel/zone\&.sqlite3\&.
-.PP
-
\fItransfers_out\fR
defines the maximum number of outgoing zone transfers that can run concurrently\&. The default is 10\&.
.if n \{\
Modified: branches/trac415/src/bin/xfrout/b10-xfrout.xml
==============================================================================
--- branches/trac415/src/bin/xfrout/b10-xfrout.xml (original)
+++ branches/trac415/src/bin/xfrout/b10-xfrout.xml Mon Dec 6 12:42:10 2010
@@ -21,7 +21,7 @@
<refentry>
<refentryinfo>
- <date>September 8, 2010</date>
+ <date>December 1, 2010</date>
</refentryinfo>
<refmeta>
@@ -92,13 +92,6 @@
<title>CONFIGURATION AND COMMANDS</title>
<para>
The configurable settings are:
- </para>
- <para>
- <varname>db_file</varname>
- defines the path to the SQLite3 data store file.
- The default is
- <filename>/usr/local/var/bind10-devel/zone.sqlite3</filename>.
-<!-- TODO: db_file will be removed -->
</para>
<para>
<varname>transfers_out</varname>
Modified: branches/trac415/src/bin/xfrout/xfrout.spec.pre.in
==============================================================================
--- branches/trac415/src/bin/xfrout/xfrout.spec.pre.in (original)
+++ branches/trac415/src/bin/xfrout/xfrout.spec.pre.in Mon Dec 6 12:42:10 2010
@@ -7,12 +7,6 @@
"item_type": "integer",
"item_optional": false,
"item_default": 10
- },
- {
- "item_name": "db_file",
- "item_type": "string",
- "item_optional": false,
- "item_default": "@@LOCALSTATEDIR@@/@PACKAGE@/zone.sqlite3"
},
{
"item_name": "log_name",
Modified: branches/trac415/src/lib/config/config_data.cc
==============================================================================
--- branches/trac415/src/lib/config/config_data.cc (original)
+++ branches/trac415/src/lib/config/config_data.cc Mon Dec 6 12:42:10 2010
@@ -128,11 +128,6 @@
if (recurse && list_el->get("item_type")->stringValue() == "map") {
spec_name_list(result, list_el->get("map_item_spec"), new_prefix, recurse);
} else {
- if (list_el->get("item_type")->stringValue() == "map" ||
- list_el->get("item_type")->stringValue() == "list"
- ) {
- new_prefix += "/";
- }
result->add(Element::create(new_prefix));
}
}
Modified: branches/trac415/src/lib/config/tests/config_data_unittests.cc
==============================================================================
--- branches/trac415/src/lib/config/tests/config_data_unittests.cc (original)
+++ branches/trac415/src/lib/config/tests/config_data_unittests.cc Mon Dec 6 12:42:10 2010
@@ -120,8 +120,8 @@
ModuleSpec spec2 = moduleSpecFromFile(std::string(TEST_DATA_PATH) + "/spec2.spec");
ConfigData cd = ConfigData(spec2);
- EXPECT_EQ("[ \"item1\", \"item2\", \"item3\", \"item4\", \"item5/\", \"item6/\" ]", cd.getItemList()->str());
- EXPECT_EQ("[ \"item1\", \"item2\", \"item3\", \"item4\", \"item5/\", \"item6/value1\", \"item6/value2\" ]", cd.getItemList("", true)->str());
+ EXPECT_EQ("[ \"item1\", \"item2\", \"item3\", \"item4\", \"item5\", \"item6\" ]", cd.getItemList()->str());
+ EXPECT_EQ("[ \"item1\", \"item2\", \"item3\", \"item4\", \"item5\", \"item6/value1\", \"item6/value2\" ]", cd.getItemList("", true)->str());
EXPECT_EQ("[ \"item6/value1\", \"item6/value2\" ]", cd.getItemList("item6")->str());
}
@@ -129,12 +129,12 @@
ModuleSpec spec2 = moduleSpecFromFile(std::string(TEST_DATA_PATH) + "/spec2.spec");
ConfigData cd = ConfigData(spec2);
- EXPECT_EQ("{ \"item1\": 1, \"item2\": 1.1, \"item3\": true, \"item4\": \"test\", \"item5/\": [ \"a\", \"b\" ], \"item6/value1\": \"default\", \"item6/value2\": None }", cd.getFullConfig()->str());
+ EXPECT_EQ("{ \"item1\": 1, \"item2\": 1.1, \"item3\": true, \"item4\": \"test\", \"item5\": [ \"a\", \"b\" ], \"item6/value1\": \"default\", \"item6/value2\": None }", cd.getFullConfig()->str());
ElementPtr my_config = Element::fromJSON("{ \"item1\": 2 }");
cd.setLocalConfig(my_config);
- EXPECT_EQ("{ \"item1\": 2, \"item2\": 1.1, \"item3\": true, \"item4\": \"test\", \"item5/\": [ \"a\", \"b\" ], \"item6/value1\": \"default\", \"item6/value2\": None }", cd.getFullConfig()->str());
+ EXPECT_EQ("{ \"item1\": 2, \"item2\": 1.1, \"item3\": true, \"item4\": \"test\", \"item5\": [ \"a\", \"b\" ], \"item6/value1\": \"default\", \"item6/value2\": None }", cd.getFullConfig()->str());
ElementPtr my_config2 = Element::fromJSON("{ \"item6\": { \"value1\": \"a\" } }");
cd.setLocalConfig(my_config2);
- EXPECT_EQ("{ \"item1\": 1, \"item2\": 1.1, \"item3\": true, \"item4\": \"test\", \"item5/\": [ \"a\", \"b\" ], \"item6/value1\": \"a\", \"item6/value2\": None }", cd.getFullConfig()->str());
+ EXPECT_EQ("{ \"item1\": 1, \"item2\": 1.1, \"item3\": true, \"item4\": \"test\", \"item5\": [ \"a\", \"b\" ], \"item6/value1\": \"a\", \"item6/value2\": None }", cd.getFullConfig()->str());
}
Modified: branches/trac415/src/lib/datasrc/static_datasrc.cc
==============================================================================
--- branches/trac415/src/lib/datasrc/static_datasrc.cc (original)
+++ branches/trac415/src/lib/datasrc/static_datasrc.cc Mon Dec 6 12:42:10 2010
@@ -79,6 +79,7 @@
authors->addRdata(generic::TXT("JINMEI Tatuya"));
authors->addRdata(generic::TXT("Kazunori Fujiwara"));
authors->addRdata(generic::TXT("Michael Graff"));
+ authors->addRdata(generic::TXT("Michal Vaner"));
authors->addRdata(generic::TXT("Naoki Kambe"));
authors->addRdata(generic::TXT("Shane Kerr"));
authors->addRdata(generic::TXT("Shen Tingting"));
Modified: branches/trac415/src/lib/datasrc/tests/static_unittest.cc
==============================================================================
--- branches/trac415/src/lib/datasrc/tests/static_unittest.cc (original)
+++ branches/trac415/src/lib/datasrc/tests/static_unittest.cc Mon Dec 6 12:42:10 2010
@@ -63,6 +63,7 @@
authors_data.push_back("JINMEI Tatuya");
authors_data.push_back("Kazunori Fujiwara");
authors_data.push_back("Michael Graff");
+ authors_data.push_back("Michal Vaner");
authors_data.push_back("Naoki Kambe");
authors_data.push_back("Shane Kerr");
authors_data.push_back("Shen Tingting");
Modified: branches/trac415/src/lib/dns/Makefile.am
==============================================================================
--- branches/trac415/src/lib/dns/Makefile.am (original)
+++ branches/trac415/src/lib/dns/Makefile.am Mon Dec 6 12:42:10 2010
@@ -13,7 +13,8 @@
# TODO: double-check that this is the only way
# NOTE: when an rdata file is added, please also add to this list:
-EXTRA_DIST += rdata/any/tsig_250.cc
+EXTRA_DIST += rdata/any_255/tsig_250.cc
+EXTRA_DIST += rdata/any_255/tsig_250.h
EXTRA_DIST += rdata/in_1/aaaa_28.cc
EXTRA_DIST += rdata/in_1/aaaa_28.h
EXTRA_DIST += rdata/in_1/a_1.cc
Modified: branches/trac415/src/lib/dns/rdata/any_255/tsig_250.cc
==============================================================================
--- branches/trac415/src/lib/dns/rdata/any_255/tsig_250.cc (original)
+++ branches/trac415/src/lib/dns/rdata/any_255/tsig_250.cc Mon Dec 6 12:42:10 2010
@@ -52,6 +52,8 @@
other_data_(static_cast<const uint8_t*>(other_data),
static_cast<const uint8_t*>(other_data) + other_len)
{}
+ template <typename Output>
+ void toWireCommon(Output& output) const;
const Name algorithm_;
const uint64_t time_signed_;
@@ -331,21 +333,21 @@
// toWire().
template <typename Output>
void
-toWireCommon(const TSIG::TSIGImpl& impl, Output& output) {
- output.writeUint16(impl.time_signed_ >> 32);
- output.writeUint32(impl.time_signed_ & 0xffffffff);
- output.writeUint16(impl.fudge_);
- const uint16_t mac_size = impl.mac_.size();
+TSIG::TSIGImpl::toWireCommon(Output& output) const {
+ output.writeUint16(time_signed_ >> 32);
+ output.writeUint32(time_signed_ & 0xffffffff);
+ output.writeUint16(fudge_);
+ const uint16_t mac_size = mac_.size();
output.writeUint16(mac_size);
if (mac_size > 0) {
- output.writeData(&impl.mac_[0], mac_size);
- }
- output.writeUint16(impl.original_id_);
- output.writeUint16(impl.error_);
- const uint16_t other_len = impl.other_data_.size();
+ output.writeData(&mac_[0], mac_size);
+ }
+ output.writeUint16(original_id_);
+ output.writeUint16(error_);
+ const uint16_t other_len = other_data_.size();
output.writeUint16(other_len);
if (other_len > 0) {
- output.writeData(&impl.other_data_[0], other_len);
+ output.writeData(&other_data_[0], other_len);
}
}
@@ -359,7 +361,7 @@
void
TSIG::toWire(OutputBuffer& buffer) const {
impl_->algorithm_.toWire(buffer);
- toWireCommon<OutputBuffer>(*impl_, buffer);
+ impl_->toWireCommon<OutputBuffer>(buffer);
}
/// \brief Render the \c TSIG in the wire format with taking into account
@@ -379,7 +381,7 @@
void
TSIG::toWire(MessageRenderer& renderer) const {
renderer.writeName(impl_->algorithm_, false);
- toWireCommon<MessageRenderer>(*impl_, renderer);
+ impl_->toWireCommon<MessageRenderer>(renderer);
}
// A helper function commonly used for TSIG::compare().
Modified: branches/trac415/src/lib/python/isc/config/config_data.py
==============================================================================
--- branches/trac415/src/lib/python/isc/config/config_data.py (original)
+++ branches/trac415/src/lib/python/isc/config/config_data.py Mon Dec 6 12:42:10 2010
@@ -158,11 +158,9 @@
result.extend(spec_name_list(list_el['map_item_spec'], prefix + list_el['item_name'], recurse))
else:
name = list_el['item_name']
- if list_el['item_type'] in ["list", "map"]:
- name += "/"
result.append(prefix + name)
else:
- raise ConfigDataError("Bad specication")
+ raise ConfigDataError("Bad specification")
else:
raise ConfigDataError("Bad specication")
return result
Modified: branches/trac415/src/lib/python/isc/config/tests/config_data_test.py
==============================================================================
--- branches/trac415/src/lib/python/isc/config/tests/config_data_test.py (original)
+++ branches/trac415/src/lib/python/isc/config/tests/config_data_test.py Mon Dec 6 12:42:10 2010
@@ -175,9 +175,9 @@
def test_spec_name_list(self):
name_list = spec_name_list(self.cd.get_module_spec().get_config_spec())
- self.assertEqual(['item1', 'item2', 'item3', 'item4', 'item5/', 'item6/'], name_list)
+ self.assertEqual(['item1', 'item2', 'item3', 'item4', 'item5', 'item6'], name_list)
name_list = spec_name_list(self.cd.get_module_spec().get_config_spec(), "", True)
- self.assertEqual(['item1', 'item2', 'item3', 'item4', 'item5/', 'item6/value1', 'item6/value2'], name_list)
+ self.assertEqual(['item1', 'item2', 'item3', 'item4', 'item5', 'item6/value1', 'item6/value2'], name_list)
spec_part = find_spec_part(self.cd.get_module_spec().get_config_spec(), "item6")
name_list = spec_name_list(spec_part, "item6", True)
self.assertEqual(['item6/value1', 'item6/value2'], name_list)
@@ -193,7 +193,7 @@
name_list = spec_name_list({ "myModule": config_spec }, "", False)
self.assertEqual(['myModule/'], name_list)
name_list = spec_name_list({ "myModule": config_spec }, "", True)
- self.assertEqual(['myModule/', 'myModule/value1', 'myModule/value2', 'myModule/value3', 'myModule/value4', 'myModule/value5/', 'myModule/value6/v61', 'myModule/value6/v62', 'myModule/value7/', 'myModule/value8/', 'myModule/value9/v91', 'myModule/value9/v92/v92a', 'myModule/value9/v92/v92b'], name_list)
+ self.assertEqual(['myModule/', 'myModule/value1', 'myModule/value2', 'myModule/value3', 'myModule/value4', 'myModule/value5', 'myModule/value6/v61', 'myModule/value6/v62', 'myModule/value7', 'myModule/value8', 'myModule/value9/v91', 'myModule/value9/v92/v92a', 'myModule/value9/v92/v92b'], name_list)
self.assertRaises(ConfigDataError, spec_name_list, 1)
self.assertRaises(ConfigDataError, spec_name_list, [ 'a' ])
@@ -240,19 +240,19 @@
def test_get_item_list(self):
name_list = self.cd.get_item_list()
- self.assertEqual(['item1', 'item2', 'item3', 'item4', 'item5/', 'item6/'], name_list)
+ self.assertEqual(['item1', 'item2', 'item3', 'item4', 'item5', 'item6'], name_list)
name_list = self.cd.get_item_list("", True)
- self.assertEqual(['item1', 'item2', 'item3', 'item4', 'item5/', 'item6/value1', 'item6/value2'], name_list)
+ self.assertEqual(['item1', 'item2', 'item3', 'item4', 'item5', 'item6/value1', 'item6/value2'], name_list)
name_list = self.cd.get_item_list("item6", False)
self.assertEqual(['item6/value1', 'item6/value2'], name_list)
def test_get_full_config(self):
full_config = self.cd.get_full_config()
- self.assertEqual({ "item1": 1, "item2": 1.1, "item3": True, "item4": "test", "item5/": ['a', 'b'], "item6/value1": 'default', 'item6/value2': None}, full_config)
+ self.assertEqual({ "item1": 1, "item2": 1.1, "item3": True, "item4": "test", "item5": ['a', 'b'], "item6/value1": 'default', 'item6/value2': None}, full_config)
my_config = { "item1": 2, "item2": 2.2, "item3": False, "item4": "asdf", "item5": [ "c", "d" ] }
self.cd.set_local_config(my_config)
full_config = self.cd.get_full_config()
- self.assertEqual({ "item1": 2, "item2": 2.2, "item3": False, "item4": "asdf", "item5/": [ "c", "d" ], "item6/value1": 'default', 'item6/value2': None}, full_config)
+ self.assertEqual({ "item1": 2, "item2": 2.2, "item3": False, "item4": "asdf", "item5": [ "c", "d" ], "item6/value1": 'default', 'item6/value2': None}, full_config)
class TestMultiConfigData(unittest.TestCase):
def setUp(self):
@@ -441,13 +441,13 @@
config_items = self.mcd.get_config_item_list(None, False)
self.assertEqual(['Spec2'], config_items)
config_items = self.mcd.get_config_item_list(None, True)
- self.assertEqual(['Spec2/item1', 'Spec2/item2', 'Spec2/item3', 'Spec2/item4', 'Spec2/item5/', 'Spec2/item6/value1', 'Spec2/item6/value2'], config_items)
+ self.assertEqual(['Spec2/item1', 'Spec2/item2', 'Spec2/item3', 'Spec2/item4', 'Spec2/item5', 'Spec2/item6/value1', 'Spec2/item6/value2'], config_items)
config_items = self.mcd.get_config_item_list("Spec2", True)
- self.assertEqual(['Spec2/item1', 'Spec2/item2', 'Spec2/item3', 'Spec2/item4', 'Spec2/item5/', 'Spec2/item6/value1', 'Spec2/item6/value2'], config_items)
+ self.assertEqual(['Spec2/item1', 'Spec2/item2', 'Spec2/item3', 'Spec2/item4', 'Spec2/item5', 'Spec2/item6/value1', 'Spec2/item6/value2'], config_items)
config_items = self.mcd.get_config_item_list("Spec2")
- self.assertEqual(['Spec2/item1', 'Spec2/item2', 'Spec2/item3', 'Spec2/item4', 'Spec2/item5/', 'Spec2/item6/'], config_items)
+ self.assertEqual(['Spec2/item1', 'Spec2/item2', 'Spec2/item3', 'Spec2/item4', 'Spec2/item5', 'Spec2/item6'], config_items)
config_items = self.mcd.get_config_item_list("Spec2", True)
- self.assertEqual(['Spec2/item1', 'Spec2/item2', 'Spec2/item3', 'Spec2/item4', 'Spec2/item5/', 'Spec2/item6/value1', 'Spec2/item6/value2'], config_items)
+ self.assertEqual(['Spec2/item1', 'Spec2/item2', 'Spec2/item3', 'Spec2/item4', 'Spec2/item5', 'Spec2/item6/value1', 'Spec2/item6/value2'], config_items)
if __name__ == '__main__':
unittest.main()
More information about the bind10-changes
mailing list