[svn] commit: r4168 - in /branches/trac475: ./ src/bin/ src/bin/auth/ src/bin/auth/tests/testdata/ src/bin/bind10/ src/bin/bind10/tests/ src/bin/recurse/ src/bin/resolver/ src/bin/resolver/tests/ src/lib/asiolink/ src/lib/log/ src/lib/nsas/ src/lib/python/isc/utils/ src/lib/testutils/
BIND 10 source code commits
bind10-changes at lists.isc.org
Wed Jan 5 15:55:29 UTC 2011
Author: chenzhengzhang
Date: Wed Jan 5 15:55:28 2011
New Revision: 4168
Log:
sync with trunk
Added:
branches/trac475/src/bin/resolver/
- copied from r4167, trunk/src/bin/resolver/
Removed:
branches/trac475/src/bin/recurse/
Modified:
branches/trac475/ (props changed)
branches/trac475/ChangeLog
branches/trac475/README
branches/trac475/configure.ac
branches/trac475/src/bin/Makefile.am
branches/trac475/src/bin/auth/auth_srv.h
branches/trac475/src/bin/auth/tests/testdata/ (props changed)
branches/trac475/src/bin/bind10/bind10.py.in (contents, props changed)
branches/trac475/src/bin/bind10/bob.spec
branches/trac475/src/bin/bind10/run_bind10.sh.in
branches/trac475/src/bin/bind10/tests/bind10_test.py
branches/trac475/src/bin/resolver/tests/ (props changed)
branches/trac475/src/lib/asiolink/ (props changed)
branches/trac475/src/lib/asiolink/README
branches/trac475/src/lib/asiolink/asiolink.h
branches/trac475/src/lib/log/ (props changed)
branches/trac475/src/lib/nsas/README
branches/trac475/src/lib/nsas/asiolink.h
branches/trac475/src/lib/python/isc/utils/ (props changed)
branches/trac475/src/lib/testutils/ (props changed)
Modified: branches/trac475/ChangeLog
==============================================================================
--- branches/trac475/ChangeLog (original)
+++ branches/trac475/ChangeLog Wed Jan 5 15:55:28 2011
@@ -62,21 +62,21 @@
(Trac #202, svn r3967)
135. [func] each
- Add b10-recurse. This is an example recursive server that
+ Add b10-resolver. This is an example recursive server that
currently does forwarding only and no caching.
(Trac #327, svn r3903)
134. [func] vorner
- b10-recurse supports timeouts and retries in forwarder mode.
+ b10-resolver supports timeouts and retries in forwarder mode.
(Trac #401, svn r3660)
133. [func] vorner
New temporary logging function available in isc::log. It is used by
- b10-recurse.
+ b10-resolver.
(Trac #393, r3602)
132. [func] vorner
- The b10-recurse is configured through config manager.
+ The b10-resolver is configured through config manager.
It has "listen_on" and "forward_addresses" options.
(Trac #389, r3448)
@@ -139,7 +139,7 @@
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.
+ both). A dummy program has been provided for test purposes.
(Trac #412, svn r3676)
121. [func] jinmei
Modified: branches/trac475/README
==============================================================================
--- branches/trac475/README (original)
+++ branches/trac475/README Wed Jan 5 15:55:28 2011
@@ -15,7 +15,7 @@
This release includes the bind10 master process, b10-msgq message
bus, b10-auth authoritative DNS server (with SQLite3 backend),
-b10-recurse forwarding DNS server, b10-cmdctl remote control daemon,
+b10-resolver forwarding DNS server, b10-cmdctl remote control daemon,
b10-cfgmgr configuration manager, b10-xfrin AXFR inbound service,
b10-xfrout outgoing AXFR service, b10-zonemgr secondary manager,
b10-stats statistics collection and reporting daemon, and a new
Modified: branches/trac475/configure.ac
==============================================================================
--- branches/trac475/configure.ac (original)
+++ branches/trac475/configure.ac Wed Jan 5 15:55:28 2011
@@ -577,8 +577,8 @@
src/bin/auth/Makefile
src/bin/auth/tests/Makefile
src/bin/auth/benchmarks/Makefile
- src/bin/recurse/Makefile
- src/bin/recurse/tests/Makefile
+ src/bin/resolver/Makefile
+ src/bin/resolver/tests/Makefile
src/bin/xfrin/Makefile
src/bin/xfrin/tests/Makefile
src/bin/xfrout/Makefile
@@ -652,8 +652,8 @@
src/bin/xfrout/xfrout.spec.pre
src/bin/xfrout/tests/xfrout_test
src/bin/xfrout/run_b10-xfrout.sh
- src/bin/recurse/recurse.spec.pre
- src/bin/recurse/spec_config.h.pre
+ src/bin/resolver/resolver.spec.pre
+ src/bin/resolver/spec_config.h.pre
src/bin/zonemgr/zonemgr.py
src/bin/zonemgr/zonemgr.spec.pre
src/bin/zonemgr/tests/zonemgr_test
@@ -696,7 +696,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/resolver/run_b10-resolver.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/trac475/src/bin/Makefile.am
==============================================================================
--- branches/trac475/src/bin/Makefile.am (original)
+++ branches/trac475/src/bin/Makefile.am Wed Jan 5 15:55:28 2011
@@ -1,4 +1,4 @@
SUBDIRS = bind10 bindctl cfgmgr loadzone msgq host cmdctl auth xfrin xfrout \
- usermgr zonemgr stats tests recurse
+ usermgr zonemgr stats tests resolver
check-recursive: all-recursive
Modified: branches/trac475/src/bin/auth/auth_srv.h
==============================================================================
--- branches/trac475/src/bin/auth/auth_srv.h (original)
+++ branches/trac475/src/bin/auth/auth_srv.h Wed Jan 5 15:55:28 2011
@@ -185,7 +185,7 @@
/// control commands and configuration updates.
void setConfigSession(isc::config::ModuleCCSession* config_session);
- /// \brief Assign an ASIO IO Service queue to this Recursor object
+ /// \brief Assign an ASIO IO Service queue to this Resolver object
void setIOService(asiolink::IOService& ios) { io_service_ = &ios; }
/// \brief Return this object's ASIO IO Service queue
Modified: branches/trac475/src/bin/bind10/bind10.py.in
==============================================================================
--- branches/trac475/src/bin/bind10/bind10.py.in (original)
+++ branches/trac475/src/bin/bind10/bind10.py.in Wed Jan 5 15:55:28 2011
@@ -208,13 +208,13 @@
self.dns_port = dns_port
self.forward = forward
if forward:
- self.recursive = True
+ self.resolver = True
else:
- self.recursive = False
+ self.resolver = False
self.cc_session = None
self.ccs = None
self.cfg_start_auth = True
- self.cfg_start_recurse = False
+ self.cfg_start_resolver = False
self.curproc = None
self.dead_processes = {}
self.msgq_socket_file = msgq_socket_file
@@ -278,13 +278,13 @@
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")
+ self.cfg_start_resolver = config_data.get("start_resolver")
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))
+ sys.stdout.write("[bind10] - start_resolver: %s\n" %
+ str(self.cfg_start_resolver))
def log_starting(self, process, port = None, address = None):
"""
@@ -423,13 +423,13 @@
Start the Authoritative server
"""
# XXX: this must be read from the configuration manager in the future
- if self.recursive:
- dns_prog = 'b10-recurse'
+ if self.resolver:
+ dns_prog = 'b10-resolver'
else:
dns_prog = 'b10-auth'
dnsargs = [dns_prog]
- if not self.recursive:
- # The recursive uses configuration manager for these
+ if not self.resolver:
+ # The resolver uses configuration manager for these
dnsargs += ['-p', str(self.dns_port)]
if self.address:
dnsargs += ['-a', str(self.address)]
@@ -444,22 +444,22 @@
self.start_process("b10-auth", dnsargs, c_channel_env,
self.dns_port, self.address)
- def start_recurse(self, c_channel_env):
+ def start_resolver(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"
+ self.curproc = "b10-resolver"
# XXX: this must be read from the configuration manager in the future
- resargs = ['b10-recurse']
+ resargs = ['b10-resolver']
if self.uid:
resargs += ['-u', str(self.uid)]
if self.verbose:
resargs += ['-v']
# ... and start
- self.start_process("b10-recurse", resargs, c_channel_env)
+ self.start_process("b10-resolver", resargs, c_channel_env)
def start_xfrout(self, c_channel_env):
self.start_simple("b10-xfrout", c_channel_env)
@@ -496,8 +496,8 @@
self.start_auth(c_channel_env)
# ... and resolver (if selected):
- if self.cfg_start_recurse:
- self.start_recurse(c_channel_env)
+ if self.cfg_start_resolver:
+ self.start_resolver(c_channel_env)
# Everything after the main components can run as non-root.
# TODO: this is only temporary - once the privileged socket creator is
@@ -557,7 +557,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, "Resolver", "Resolver")
self.cc_session.group_sendmsg(cmd, "Xfrout", "Xfrout")
self.cc_session.group_sendmsg(cmd, "Xfrin", "Xfrin")
self.cc_session.group_sendmsg(cmd, "Zonemgr", "Zonemgr")
Modified: branches/trac475/src/bin/bind10/bob.spec
==============================================================================
--- branches/trac475/src/bin/bind10/bob.spec (original)
+++ branches/trac475/src/bin/bind10/bob.spec Wed Jan 5 15:55:28 2011
@@ -10,7 +10,7 @@
"item_default": true
},
{
- "item_name": "start_recurse",
+ "item_name": "start_resolver",
"item_type": "boolean",
"item_optional": false,
"item_default": false
Modified: branches/trac475/src/bin/bind10/run_bind10.sh.in
==============================================================================
--- branches/trac475/src/bin/bind10/run_bind10.sh.in (original)
+++ branches/trac475/src/bin/bind10/run_bind10.sh.in Wed Jan 5 15:55:28 2011
@@ -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/recurse:@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/resolver:@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
export PATH
PYTHONPATH=@abs_top_builddir@/src/lib/python:@abs_top_builddir@/src/lib/dns/python/.libs:@abs_top_builddir@/src/lib/xfr/.libs:@abs_top_builddir@/src/lib/log/.libs
Modified: branches/trac475/src/bin/bind10/tests/bind10_test.py
==============================================================================
--- branches/trac475/src/bin/bind10/tests/bind10_test.py (original)
+++ branches/trac475/src/bin/bind10/tests/bind10_test.py Wed Jan 5 15:55:28 2011
@@ -89,7 +89,7 @@
self.assertEqual(bob.username, None)
self.assertEqual(bob.nocache, False)
self.assertEqual(bob.cfg_start_auth, True)
- self.assertEqual(bob.cfg_start_recurse, False)
+ self.assertEqual(bob.cfg_start_resolver, False)
def test_init_alternate_socket(self):
bob = BoB("alt_socket_file")
@@ -106,7 +106,7 @@
self.assertEqual(bob.username, None)
self.assertEqual(bob.nocache, False)
self.assertEqual(bob.cfg_start_auth, True)
- self.assertEqual(bob.cfg_start_recurse, False)
+ self.assertEqual(bob.cfg_start_resolver, False)
def test_init_alternate_dns_port(self):
bob = BoB(None, 9999)
@@ -123,7 +123,7 @@
self.assertEqual(bob.username, None)
self.assertEqual(bob.nocache, False)
self.assertEqual(bob.cfg_start_auth, True)
- self.assertEqual(bob.cfg_start_recurse, False)
+ self.assertEqual(bob.cfg_start_resolver, False)
def test_init_alternate_address(self):
bob = BoB(None, 1234, IPAddr('127.127.127.127'))
@@ -140,7 +140,7 @@
self.assertEqual(bob.username, None)
self.assertEqual(bob.nocache, False)
self.assertEqual(bob.cfg_start_auth, True)
- self.assertEqual(bob.cfg_start_recurse, False)
+ self.assertEqual(bob.cfg_start_resolver, False)
# Class for testing the Bob.start_all_processes() method call.
#
@@ -157,7 +157,7 @@
self.cfgmgr = False
self.ccsession = False
self.auth = False
- self.recurse = False
+ self.resolver = False
self.xfrout = False
self.xfrin = False
self.zonemgr = False
@@ -180,8 +180,8 @@
def start_auth(self, c_channel_env):
self.auth = True
- def start_recurse(self, c_channel_env):
- self.recurse = True
+ def start_resolver(self, c_channel_env):
+ self.resolver = True
def start_xfrout(self, c_channel_env):
self.xfrout = True
@@ -206,14 +206,14 @@
self.assertEqual(bob.cfgmgr, False)
self.assertEqual(bob.ccsession, False)
self.assertEqual(bob.auth, False)
- self.assertEqual(bob.recurse, False)
+ self.assertEqual(bob.resolver, 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
+ # Checks the processes started when starting neither auth nor resolver
# is specified.
def test_start_none(self):
# Created Bob and ensure initialization correct
@@ -223,7 +223,7 @@
# Start processes and check what was started
c_channel_env = {}
bob.cfg_start_auth = False
- bob.cfg_start_recurse = False
+ bob.cfg_start_resolver = False
bob.start_all_processes(c_channel_env)
@@ -231,7 +231,7 @@
self.assertEqual(bob.cfgmgr, True)
self.assertEqual(bob.ccsession, True)
self.assertEqual(bob.auth, False)
- self.assertEqual(bob.recurse, False)
+ self.assertEqual(bob.resolver, False)
self.assertEqual(bob.xfrout, False)
self.assertEqual(bob.xfrin, False)
self.assertEqual(bob.zonemgr, False)
@@ -247,7 +247,7 @@
# Start processes and check what was started
c_channel_env = {}
bob.cfg_start_auth = True
- bob.cfg_start_recurse = False
+ bob.cfg_start_resolver = False
bob.start_all_processes(c_channel_env)
@@ -255,15 +255,15 @@
self.assertEqual(bob.cfgmgr, True)
self.assertEqual(bob.ccsession, True)
self.assertEqual(bob.auth, True)
- self.assertEqual(bob.recurse, False)
+ self.assertEqual(bob.resolver, 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):
+ # Checks the processes started when starting only the resolver process
+ def test_start_resolver(self):
# Created Bob and ensure initialization correct
bob = StartAllProcessesBob()
self.check_preconditions(bob)
@@ -271,7 +271,7 @@
# Start processes and check what was started
c_channel_env = {}
bob.cfg_start_auth = False
- bob.cfg_start_recurse = True
+ bob.cfg_start_resolver = True
bob.start_all_processes(c_channel_env)
@@ -279,14 +279,14 @@
self.assertEqual(bob.cfgmgr, True)
self.assertEqual(bob.ccsession, True)
self.assertEqual(bob.auth, False)
- self.assertEqual(bob.recurse, True)
+ self.assertEqual(bob.resolver, 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
+ # Checks the processes started when starting both auth and resolver process
def test_start_both(self):
# Created Bob and ensure initialization correct
bob = StartAllProcessesBob()
@@ -295,7 +295,7 @@
# Start processes and check what was started
c_channel_env = {}
bob.cfg_start_auth = True
- bob.cfg_start_recurse = True
+ bob.cfg_start_resolver = True
bob.start_all_processes(c_channel_env)
@@ -303,7 +303,7 @@
self.assertEqual(bob.cfgmgr, True)
self.assertEqual(bob.ccsession, True)
self.assertEqual(bob.auth, True)
- self.assertEqual(bob.recurse, True)
+ self.assertEqual(bob.resolver, True)
self.assertEqual(bob.xfrout, True)
self.assertEqual(bob.xfrin, True)
self.assertEqual(bob.zonemgr, True)
Modified: branches/trac475/src/lib/asiolink/README
==============================================================================
--- branches/trac475/src/lib/asiolink/README (original)
+++ branches/trac475/src/lib/asiolink/README Wed Jan 5 15:55:28 2011
@@ -17,7 +17,7 @@
leaving it in place elsewhere.
Currently, the asiolink library only supports DNS servers (i.e., b10-auth
-and b10-recurse). The plan is to make it more generic and allow it to
+and b10-resolver). The plan is to make it more generic and allow it to
support other modules as well.
Some of the classes defined here--for example, IOSocket, IOEndpoint,
Modified: branches/trac475/src/lib/asiolink/asiolink.h
==============================================================================
--- branches/trac475/src/lib/asiolink/asiolink.h (original)
+++ branches/trac475/src/lib/asiolink/asiolink.h Wed Jan 5 15:55:28 2011
@@ -77,7 +77,7 @@
///
/// Notes to developers:
/// Currently the wrapper interface is fairly specific to use by a
-/// DNS server, i.e., b10-auth or b10-recurse. But the plan is to
+/// DNS server, i.e., b10-auth or b10-resolver. But the plan is to
/// generalize it and have other modules use it as well.
///
/// One obvious drawback of this approach is performance overhead
Modified: branches/trac475/src/lib/nsas/README
==============================================================================
--- branches/trac475/src/lib/nsas/README (original)
+++ branches/trac475/src/lib/nsas/README Wed Jan 5 15:55:28 2011
@@ -2,6 +2,6 @@
documents at http://bind10.isc.org/wiki/Resolver.
At the time of writing (19 October 2010), the file asiolink.h is present in this
-directory only for the purposes of development. When the recursor's
+directory only for the purposes of development. When the resolver's
asynchronous I/O code has been finished, this will be removed and the NSAS will
use the "real" code.
Modified: branches/trac475/src/lib/nsas/asiolink.h
==============================================================================
--- branches/trac475/src/lib/nsas/asiolink.h (original)
+++ branches/trac475/src/lib/nsas/asiolink.h Wed Jan 5 15:55:28 2011
@@ -24,7 +24,7 @@
/// \brief IO Address Dummy Class
///
-/// As part of ther recursor, Evan has written the asiolink.h file, which
+/// As part of ther resolver, Evan has written the asiolink.h file, which
/// encapsulates some of the boost::asio classes. Until these are checked
/// into trunk and merged with this branch, these dummy classes should fulfill
/// their function.
More information about the bind10-changes
mailing list