diff --git a/ChangeLog b/ChangeLog
index 270c477b2e..ffa794b5b6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+ 193. [func]* jreed
+ Listen on the IPv6 (::) and IPv4 (0.0.0.0) wildcard addresses
+ for b10-auth. This returns to previous behavior prior to
+ change #184. Document the listen_on configuration in manual.
+ (Trac #649, git 65a77d8fde64d464c75917a1ab9b6b3f02640ca6)
+
+ 192. [func]* jreed
+ Listen on standard domain port 53 for b10-auth and
+ b10-resolver.
+ (Trac #617, #618, git 137a6934a14cf0c5b5c065e910b8b364beb0973f)
+
191. [func] jinmei
Imported system test framework of BIND 9. It can be run by
'make systest' at the top source directory. Notes: currently it
diff --git a/README b/README
index 5bc31546a8..b10d12ee65 100644
--- a/README
+++ b/README
@@ -164,8 +164,6 @@ source tree:
(Which will use the modules and configurations also from the source
tree.)
-The server will listen on port 5300 for DNS requests.
-
CONFIGURATION
Commands can be given through the bindctl tool.
diff --git a/doc/guide/bind10-guide.xml b/doc/guide/bind10-guide.xml
index 0935c810c3..bceb40cb02 100644
--- a/doc/guide/bind10-guide.xml
+++ b/doc/guide/bind10-guide.xml
@@ -336,14 +336,6 @@ var/
-
-
- The development prototype of the b10-auth server listens on
- 0.0.0.0 (all interfaces) port 5300. (This is not the standard
- domain service port.)
-
-
-
To quickly get started with BIND 10, follow these steps.
@@ -397,7 +389,7 @@ var/
Test it; for example:
- $ dig @127.0.0.1 -p 5300 -c CH -t TXT authors.bind
+ $ dig @127.0.0.1 -c CH -t TXT authors.bind
@@ -1044,11 +1036,6 @@ TODO
process.
-
- This development prototype release listens on all interfaces
- and the non-standard port 5300.
-
-
Server Configurations
diff --git a/src/bin/auth/auth.spec.pre.in b/src/bin/auth/auth.spec.pre.in
index e95dabd7a0..d88ffb5e3e 100644
--- a/src/bin/auth/auth.spec.pre.in
+++ b/src/bin/auth/auth.spec.pre.in
@@ -63,12 +63,12 @@
"item_optional": false,
"item_default": [
{
- "address": "::1",
- "port": 5300
+ "address": "::",
+ "port": 53
},
{
- "address": "127.0.0.1",
- "port": 5300
+ "address": "0.0.0.0",
+ "port": 53
}
],
"list_item_spec": {
@@ -87,7 +87,7 @@
"item_name": "port",
"item_type": "integer",
"item_optional": false,
- "item_default": 5300
+ "item_default": 53
}
]
}
diff --git a/src/bin/auth/b10-auth.8 b/src/bin/auth/b10-auth.8
index dcbe6d8a0f..0356683b11 100644
--- a/src/bin/auth/b10-auth.8
+++ b/src/bin/auth/b10-auth.8
@@ -2,12 +2,12 @@
.\" Title: b10-auth
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.75.2
-.\" Date: February 22, 2011
+.\" Date: March 8, 2011
.\" Manual: BIND10
.\" Source: BIND10
.\" Language: English
.\"
-.TH "B10\-AUTH" "8" "February 22, 2011" "BIND10" "BIND10"
+.TH "B10\-AUTH" "8" "March 8, 2011" "BIND10" "BIND10"
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
@@ -70,6 +70,18 @@ defines the path to the SQLite3 zone file when using the sqlite datasource\&. Th
/usr/local/var/bind10\-devel/zone\&.sqlite3\&.
.PP
+\fIlisten_on\fR
+is a list of addresses and ports for
+\fBb10\-auth\fR
+to listen on\&. The list items are the
+\fIaddress\fR
+string and
+\fIport\fR
+number\&. By default,
+\fBb10\-auth\fR
+listens on port 53 on the IPv6 (::) and IPv4 (0\&.0\&.0\&.0) wildcard addresses\&.
+.PP
+
\fIdatasources\fR
configures data sources\&. The list items include:
\fItype\fR
diff --git a/src/bin/auth/b10-auth.xml b/src/bin/auth/b10-auth.xml
index ce80689481..2b533947d1 100644
--- a/src/bin/auth/b10-auth.xml
+++ b/src/bin/auth/b10-auth.xml
@@ -20,7 +20,7 @@
- February 22, 2011
+ March 8, 2011
@@ -131,6 +131,15 @@
/usr/local/var/bind10-devel/zone.sqlite3.
+
+ listen_on is a list of addresses and ports for
+ b10-auth to listen on.
+ The list items are the address string
+ and port number.
+ By default, b10-auth listens on port 53
+ on the IPv6 (::) and IPv4 (0.0.0.0) wildcard addresses.
+
+
datasources configures data sources.
The list items include:
diff --git a/src/bin/resolver/b10-resolver.8 b/src/bin/resolver/b10-resolver.8
index 3125e32061..849092c007 100644
--- a/src/bin/resolver/b10-resolver.8
+++ b/src/bin/resolver/b10-resolver.8
@@ -74,7 +74,7 @@ to listen on\&. The list items are the
\fIaddress\fR
string and
\fIport\fR
-number\&. The defaults are address ::1 port 5300 and address 127\&.0\&.0\&.1 port 5300\&.
+number\&. The defaults are address ::1 port 53 and address 127\&.0\&.0\&.1 port 53\&.
.PP
\fIretries\fR
diff --git a/src/bin/resolver/b10-resolver.xml b/src/bin/resolver/b10-resolver.xml
index 0d395a71dc..bdf4f8ad25 100644
--- a/src/bin/resolver/b10-resolver.xml
+++ b/src/bin/resolver/b10-resolver.xml
@@ -141,8 +141,9 @@ once that is merged you can for instance do 'config add Resolver/forward_address
b10-resolver to listen on.
The list items are the address string
and port number.
- The defaults are address ::1 port 5300 and
- address 127.0.0.1 port 5300.
+ The defaults are address ::1 port 53 and
+ address 127.0.0.1 port 53.
+
diff --git a/src/bin/resolver/main.cc b/src/bin/resolver/main.cc
index 03f9ab7cb5..d987c74ee9 100644
--- a/src/bin/resolver/main.cc
+++ b/src/bin/resolver/main.cc
@@ -56,7 +56,6 @@ using namespace asiolink;
namespace {
-// Default port current 5300 for testing purposes
static const string PROGRAM = "Resolver";
IOService io_service;
diff --git a/src/bin/resolver/resolver.spec.pre.in b/src/bin/resolver/resolver.spec.pre.in
index bc598b0263..9df1e752d3 100644
--- a/src/bin/resolver/resolver.spec.pre.in
+++ b/src/bin/resolver/resolver.spec.pre.in
@@ -86,11 +86,11 @@
"item_default": [
{
"address": "::1",
- "port": 5300
+ "port": 53
},
{
"address": "127.0.0.1",
- "port": 5300
+ "port": 53
}
],
"list_item_spec": {
@@ -109,7 +109,7 @@
"item_name": "port",
"item_type": "integer",
"item_optional": false,
- "item_default": 5300
+ "item_default": 53
}
]
}
diff --git a/src/lib/asiolink/qid_gen.cc b/src/lib/asiolink/qid_gen.cc
index 1361b95b92..4063b39511 100644
--- a/src/lib/asiolink/qid_gen.cc
+++ b/src/lib/asiolink/qid_gen.cc
@@ -43,9 +43,7 @@ void
QidGenerator::seed() {
struct timeval tv;
gettimeofday(&tv, 0);
- long int seed;
- seed = (tv.tv_sec * 1000000) + tv.tv_usec;
- generator_.seed(seed);
+ generator_.seed((tv.tv_sec * 1000000) + tv.tv_usec);
}
isc::dns::qid_t
diff --git a/src/lib/asiolink/qid_gen.h b/src/lib/asiolink/qid_gen.h
index ba3c23193c..a5caa17d83 100644
--- a/src/lib/asiolink/qid_gen.h
+++ b/src/lib/asiolink/qid_gen.h
@@ -28,7 +28,7 @@
namespace asiolink {
-
+
/// This class generates Qids for outgoing queries
///
/// It is implemented as a singleton; the public way to access it
@@ -47,7 +47,7 @@ public:
///
/// It is recommended that getInstance is used rather than creating
/// separate instances of this class.
- ///
+ ///
/// The constructor automatically seeds the generator with the
/// current time.
QidGenerator();
@@ -61,21 +61,21 @@ public:
///
/// This is automatically called by the constructor
void seed();
-
+
private:
- // "Mersenne Twister: A 623-dimensionally equidistributed
- // uniform pseudo-random number generator", Makoto Matsumoto and
- // Takuji Nishimura, ACM Transactions on Modeling and Computer
- // Simulation: Special Issue on Uniform Random Number Generation,
- // Vol. 8, No. 1, January 1998, pp. 3-30.
+ // "Mersenne Twister: A 623-dimensionally equidistributed
+ // uniform pseudo-random number generator", Makoto Matsumoto and
+ // Takuji Nishimura, ACM Transactions on Modeling and Computer
+ // Simulation: Special Issue on Uniform Random Number Generation,
+ // Vol. 8, No. 1, January 1998, pp. 3-30.
//
// mt19937 is an implementation of one of the pseudo random
// generators described in this paper.
boost::mt19937 generator_;
-
+
// For qid's we want a uniform distribution
boost::uniform_int<> dist_;
-
+
boost::variate_generator > vgen_;
};