mir/kea
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/kea synced 2025-08-31 14:05:33 +00:00
Code Issues Releases Wiki Activity

Merge branch 'master' of ssh://bind10.isc.org/var/bind10/git/bind10

Browse Source
This commit is contained in:
JINMEI Tatuya
2011-03-08 16:12:45 -08:00
parent 64978870d1 241571157d
commit 416fcf7eb6
12 changed files with 59 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ChangeLog
View File

@@ -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

2
README
View File

@@ -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.

15
doc/guide/bind10-guide.xml
View File

@@ -336,14 +336,6 @@ var/
</simpara>
</note>
<note>
<simpara>
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.)
</simpara>
</note>
<para>
To quickly get started with BIND 10, follow these steps.
</para>
@@ -397,7 +389,7 @@ var/
<listitem>
<para>Test it; for example:
<screen>$ <userinput>dig @127.0.0.1 -p 5300 -c CH -t TXT authors.bind</userinput></screen>
<screen>$ <userinput>dig @127.0.0.1 -c CH -t TXT authors.bind</userinput></screen>
</para>
</listitem>
@@ -1044,11 +1036,6 @@ TODO
process.
</para>
<note><simpara>
This development prototype release listens on all interfaces
and the non-standard port 5300.
</simpara></note>
<section>
<title>Server Configurations</title>

10
src/bin/auth/auth.spec.pre.in
View File

@@ -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
}
]
}

16
src/bin/auth/b10-auth.8
View File

@@ -2,12 +2,12 @@
.\" Title: b10-auth
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
.\" 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

11
src/bin/auth/b10-auth.xml
View File

@@ -20,7 +20,7 @@
<refentry>
<refentryinfo>
<date>February 22, 2011</date>
<date>March 8, 2011</date>
</refentryinfo>
<refmeta>
@@ -131,6 +131,15 @@
<filename>/usr/local/var/bind10-devel/zone.sqlite3</filename>.
</para>
<para>
<varname>listen_on</varname> is a list of addresses and ports for
<command>b10-auth</command> to listen on.
The list items are the <varname>address</varname> string
and <varname>port</varname> number.
By default, <command>b10-auth</command> listens on port 53
on the IPv6 (::) and IPv4 (0.0.0.0) wildcard addresses.
</para>
<para>
<varname>datasources</varname> configures data sources.
The list items include:

2
src/bin/resolver/b10-resolver.8
View File

@@ -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

5
src/bin/resolver/b10-resolver.xml
View File

@@ -141,8 +141,9 @@ once that is merged you can for instance do 'config add Resolver/forward_address
<command>b10-resolver</command> to listen on.
The list items are the <varname>address</varname> string
and <varname>port</varname> 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.
<!-- TODO: but defaults are not used, Trac #518 -->
</para>
<para>

1
src/bin/resolver/main.cc
View File

@@ -56,7 +56,6 @@ using namespace asiolink;
namespace {
// Default port current 5300 for testing purposes
static const string PROGRAM = "Resolver";
IOService io_service;

6
src/bin/resolver/resolver.spec.pre.in
View File

@@ -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
}
]
}

4
src/lib/asiolink/qid_gen.cc
View File

@@ -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

20
src/lib/asiolink/qid_gen.h
View File

@@ -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<boost::mt19937&, boost::uniform_int<> > vgen_;
};