Commit 1d6b96dd authored by chenzhengzhang's avatar chenzhengzhang
Browse files

Merge branch 'master' into trac699

parents 681b1839 ece21d1b
209. [func] jelte
Resolver now uses the NSAS when looking for a nameserver to
query for any specific zone. This also includes keeping track of
the RTT for that nameserver.
(Trac #495, git 76022a7e9f3ff339f0f9f10049aa85e5784d72c5)
208. [bug]* jelte
Resolver now answers REFUSED on queries that are not for class IN.
This includes the various CH TXT queries, which will be added
later.
(git 012f9e78dc611c72ea213f9bd6743172e1a2ca20)
207. [func] jelte
Resolver now starts listening on localhost:53 if no configuration
is set.
......
To build "configure" file:
autoreconf
If using git (not the tarball), build the "configure" file:
autoreconf --install
To then build from source:
./configure
......
......@@ -15,9 +15,9 @@ five year plan are described here:
This release includes the bind10 master process, b10-msgq message
bus, b10-auth authoritative DNS server (with SQLite3 and in-memory
backends), 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
backends), b10-resolver recursive or 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 libdns++ library for C++ with a python wrapper.
......
......@@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ([2.59])
AC_INIT(bind10-devel, 20110224, bind10-dev@isc.org)
AC_INIT(bind10-devel, 20110322, bind10-dev@isc.org)
AC_CONFIG_SRCDIR(README)
AM_INIT_AUTOMAKE
AC_CONFIG_HEADERS([config.h])
......
This diff is collapsed.
......@@ -20,6 +20,9 @@
.\" -----------------------------------------------------------------
.SH "NAME"
b10-cfgmgr \- Configuration manager
.SH "SYNOPSIS"
.HP \w'\fBb10\-cfgmgr\fR\ 'u
\fBb10\-cfgmgr\fR [\fB\-c\fR\fB\fIconfig\-filename\fR\fR] [\fB\-p\fR\fB\fIdata_path\fR\fR]
.SH "DESCRIPTION"
.PP
The
......@@ -43,8 +46,21 @@ The daemon may be cleanly stopped by sending the SIGTERM signal to the process\&
When it exits, it saves its current configuration to
/usr/local/var/bind10\-devel/b10\-config\&.db\&.
.SH "ARGUMENTS"
.PP
The daemon has no command line options\&. It ignores any arguments\&.
The arguments are as follows:
.PP
\fB\-c\fR\fIconfig\-filename\fR, \fB\-\-config\-filename\fR \fIconfig\-filename\fR
.RS 4
The configuration database filename to use\&. Can be either absolute or relative to data path\&.
.sp
Defaults to b10\-config\&.db
.RE
.PP
\fB\-p\fR\fIdata\-path\fR, \fB\-\-data\-path\fR \fIdata\-path\fR
.RS 4
The path where BIND 10 looks for files\&. The configuration file is looked for here, if it is relative\&. If it is absolute, the path is ignored\&.
.RE
.SH "FILES"
.PP
/usr/local/var/bind10\-devel/b10\-config\&.db
......
......@@ -84,10 +84,7 @@
<!-- TODO: does it periodically save configuration? -->
</para>
<para>
The daemon has no command line options. It ignores any arguments.
<!-- TODO: add a verbose or quiet switch so it is not so noisy -->
</para>
</refsect1>
<refsect1>
......
#!@PYTHON@
# Copyright (C) 2010 Internet Systems Consortium.
# Copyright (C) 2010 CZ NIC
#
# Permission to use, copy, modify, and distribute this software for any
# purpose with or without fee is hereby granted, provided that the above
......
......@@ -117,7 +117,7 @@ class SendNonblock(unittest.TestCase):
Tests that the whole thing will not get blocked if someone does not read.
"""
def terminate_check(self, task, timeout = 10):
def terminate_check(self, task, timeout=30):
"""
Runs task in separate process (task is a function) and checks
it terminates sooner than timeout.
......@@ -194,7 +194,7 @@ class SendNonblock(unittest.TestCase):
length = len(data)
queue_pid = os.fork()
if queue_pid == 0:
signal.alarm(30)
signal.alarm(120)
msgq.setup_poller()
msgq.register_socket(queue)
msgq.run()
......
......@@ -457,6 +457,9 @@ Resolver::processMessage(const IOMessage& io_message,
} else if (qtype == RRType::IXFR()) {
makeErrorMessage(query_message, answer_message,
buffer, Rcode::NOTIMP());
} else if (question->getClass() != RRClass::IN()) {
makeErrorMessage(query_message, answer_message,
buffer, Rcode::REFUSED());
} else {
// The RecursiveQuery object will post the "resume" event to the
// DNSServer when an answer arrives, so we don't have to do it now.
......
# Copyright (C) 2010 CZ NIC
# Copyright (C) 2010 Internet Systems Consortium, Inc. ("ISC")
#
# Permission to use, copy, modify, and distribute this software for any
# purpose with or without fee is hereby granted, provided that the above
......
#!@PYTHON@
# Copyright (C) 2010 Internet Systems Consortium.
# Copyright (C) 2010 CZ NIC
#
# Permission to use, copy, modify, and distribute this software for any
# purpose with or without fee is hereby granted, provided that the above
......
#!@PYTHON@
# Copyright (C) 2010 Internet Systems Consortium.
# Copyright (C) 2010 CZ NIC
#
# Permission to use, copy, modify, and distribute this software for any
# purpose with or without fee is hereby granted, provided that the above
......
#!@PYTHON@
# Copyright (C) 2010 Internet Systems Consortium.
# Copyright (C) 2010 CZ NIC
#
# Permission to use, copy, modify, and distribute this software for any
# purpose with or without fee is hereby granted, provided that the above
......
// Copyright (C) 2010 CZ NIC
// Copyed from other version of auth/asiolink.cc which is:
// Copyright (C) 2010 Internet Systems Consortium, Inc. ("ISC")
//
// Permission to use, copy, modify, and/or distribute this software for any
......
......@@ -144,6 +144,7 @@ class SimpleClient : public ServerStopper {
{
wait_for_response_timer_.reset(new deadline_timer(service));
received_data_ = new char[MAX_DATA_LEN];
received_data_len_ = 0;
wait_server_time_out_ = wait_server_time_out;
}
......
......@@ -21,6 +21,7 @@ EXTRA_DIST += data22_6.data
EXTRA_DIST += data22_7.data
EXTRA_DIST += data22_8.data
EXTRA_DIST += data22_9.data
EXTRA_DIST += data22_10.data
EXTRA_DIST += spec1.spec
EXTRA_DIST += spec2.spec
EXTRA_DIST += spec3.spec
......
// Copyright (C) 2010 CZ NIC
// Copyright (C) 2010 Internet Systems Consortium, Inc. ("ISC")
//
// Permission to use, copy, modify, and/or distribute this software for any
......
// Copyright (C) 2010 Internet Systems Consortium, Inc. ("ISC")
// Copyright (C) 2011 CZ NIC
//
// Permission to use, copy, modify, and/or distribute this software for any
// purpose with or without fee is hereby granted, provided that the above
......
// Copyright (C) 2010 CZ NIC
// Copyright (C) 2010 Internet Systems Consortium, Inc. ("ISC")
//
// Permission to use, copy, modify, and/or distribute this software for any
......
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