Commit 0eefd8be authored by Jelte Jansen's avatar Jelte Jansen
Browse files

Merge branch 'master' of /var/bind10/git/bind10

parents 2be9594e 17f4eab1
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
......
......@@ -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.
......
......@@ -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>
......
......@@ -64,11 +64,11 @@
"item_default": [
{
"address": "::1",
"port": 5300
"port": 53
},
{
"address": "127.0.0.1",
"port": 5300
"port": 53
}
],
"list_item_spec": {
......@@ -87,7 +87,7 @@
"item_name": "port",
"item_type": "integer",
"item_optional": false,
"item_default": 5300
"item_default": 53
}
]
}
......
......@@ -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
......
......@@ -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>
......
......@@ -56,7 +56,6 @@ using namespace asiolink;
namespace {
// Default port current 5300 for testing purposes
static const string PROGRAM = "Resolver";
IOService io_service;
......
......@@ -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
}
]
}
......
......@@ -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_;
};
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment