Commit fb4a0a36 authored by hanfeng's avatar hanfeng

[trac775] fix change log confilct for

parents fafa0c06 fe8babb0
219. [bug] feng 223. [bug] feng
If ip address or port isn't usable for name server, name server process If ip address or port isn't usable for name server, name server process
won't exist and give end user chance to reconfigure them. won't exist and give end user chance to reconfigure them.
(Trac #775, git 572ac2cf62e18f7eb69d670b890e2a3443bfd6e7) (Trac #775, git 572ac2cf62e18f7eb69d670b890e2a3443bfd6e7)
222. [bug] jerry
src/lib/zonemgr: Fix a bug that xfrin not checking for new copy of
zone on startup. Imposes some random jitters to avoid many zones
need to do refresh at the same time.
(Trac #387, svn 9140fab9bab5f6502bd15d391fd51ac078b0b89b)
221. [func]* jerry
src/lib/util: Create C++ utility library.
(Trac #749, git 084d1285d038d31067f8cdbb058d626acf03566d)
220. [func] stephen
Added the 'badpacket' program for testing; it sends a set of
(potentially) bad packets to a nameserver and prints the responses.
(Trac #703, git 1b666838b6c0fe265522b30971e878d9f0d21fde)
219. [func] ocean
src/lib: move some dns related code out of asiolink library to
asiodns library
(Trac #751, git 262ac6c6fc61224d54705ed4c700dadb606fcb1c)
218. [func] jinmei 218. [func] jinmei
src/lib/dns: added support for RP RDATA. src/lib/dns: added support for RP RDATA.
(Trac #806, git 4e47d5f6b692c63c907af6681a75024450884a88) (Trac #806, git 4e47d5f6b692c63c907af6681a75024450884a88)
......
...@@ -612,6 +612,7 @@ AC_CONFIG_FILES([Makefile ...@@ -612,6 +612,7 @@ AC_CONFIG_FILES([Makefile
src/bin/bindctl/Makefile src/bin/bindctl/Makefile
src/bin/bindctl/tests/Makefile src/bin/bindctl/tests/Makefile
src/bin/cfgmgr/Makefile src/bin/cfgmgr/Makefile
src/bin/cfgmgr/plugins/Makefile
src/bin/cfgmgr/tests/Makefile src/bin/cfgmgr/tests/Makefile
src/bin/host/Makefile src/bin/host/Makefile
src/bin/loadzone/Makefile src/bin/loadzone/Makefile
...@@ -644,6 +645,8 @@ AC_CONFIG_FILES([Makefile ...@@ -644,6 +645,8 @@ AC_CONFIG_FILES([Makefile
src/lib/Makefile src/lib/Makefile
src/lib/asiolink/Makefile src/lib/asiolink/Makefile
src/lib/asiolink/tests/Makefile src/lib/asiolink/tests/Makefile
src/lib/asiodns/Makefile
src/lib/asiodns/tests/Makefile
src/lib/bench/Makefile src/lib/bench/Makefile
src/lib/bench/example/Makefile src/lib/bench/example/Makefile
src/lib/bench/tests/Makefile src/lib/bench/tests/Makefile
...@@ -669,11 +672,17 @@ AC_CONFIG_FILES([Makefile ...@@ -669,11 +672,17 @@ AC_CONFIG_FILES([Makefile
src/lib/config/Makefile src/lib/config/Makefile
src/lib/config/tests/Makefile src/lib/config/tests/Makefile
src/lib/config/tests/testdata/Makefile src/lib/config/tests/testdata/Makefile
src/lib/util/Makefile
src/lib/util/io/Makefile
src/lib/util/io/tests/Makefile
src/lib/util/unittests/Makefile
src/lib/util/tests/Makefile
src/lib/dns/Makefile src/lib/dns/Makefile
src/lib/dns/tests/Makefile src/lib/dns/tests/Makefile
src/lib/dns/tests/testdata/Makefile src/lib/dns/tests/testdata/Makefile
src/lib/dns/python/Makefile src/lib/dns/python/Makefile
src/lib/dns/python/tests/Makefile src/lib/dns/python/tests/Makefile
src/lib/dns/benchmarks/Makefile
src/lib/exceptions/Makefile src/lib/exceptions/Makefile
src/lib/exceptions/tests/Makefile src/lib/exceptions/tests/Makefile
src/lib/datasrc/Makefile src/lib/datasrc/Makefile
...@@ -694,10 +703,9 @@ AC_CONFIG_FILES([Makefile ...@@ -694,10 +703,9 @@ AC_CONFIG_FILES([Makefile
src/lib/server_common/tests/Makefile src/lib/server_common/tests/Makefile
tests/Makefile tests/Makefile
tests/system/Makefile tests/system/Makefile
src/lib/util/Makefile tests/tools/Makefile
src/lib/util/io/Makefile tests/tools/badpacket/Makefile
src/lib/util/io/tests/Makefile tests/tools/badpacket/tests/Makefile
src/lib/util/unittests/Makefile
]) ])
AC_OUTPUT([doc/version.ent AC_OUTPUT([doc/version.ent
src/bin/cfgmgr/b10-cfgmgr.py src/bin/cfgmgr/b10-cfgmgr.py
......
...@@ -49,6 +49,7 @@ b10_auth_LDADD += $(top_builddir)/src/lib/dns/libdns++.la ...@@ -49,6 +49,7 @@ b10_auth_LDADD += $(top_builddir)/src/lib/dns/libdns++.la
b10_auth_LDADD += $(top_builddir)/src/lib/config/libcfgclient.la b10_auth_LDADD += $(top_builddir)/src/lib/config/libcfgclient.la
b10_auth_LDADD += $(top_builddir)/src/lib/cc/libcc.la b10_auth_LDADD += $(top_builddir)/src/lib/cc/libcc.la
b10_auth_LDADD += $(top_builddir)/src/lib/exceptions/libexceptions.la b10_auth_LDADD += $(top_builddir)/src/lib/exceptions/libexceptions.la
b10_auth_LDADD += $(top_builddir)/src/lib/asiodns/libasiodns.la
b10_auth_LDADD += $(top_builddir)/src/lib/asiolink/libasiolink.la b10_auth_LDADD += $(top_builddir)/src/lib/asiolink/libasiolink.la
b10_auth_LDADD += $(top_builddir)/src/lib/nsas/libnsas.la b10_auth_LDADD += $(top_builddir)/src/lib/nsas/libnsas.la
b10_auth_LDADD += $(top_builddir)/src/lib/xfr/libxfr.la b10_auth_LDADD += $(top_builddir)/src/lib/xfr/libxfr.la
......
...@@ -31,7 +31,8 @@ ...@@ -31,7 +31,8 @@
#include <exceptions/exceptions.h> #include <exceptions/exceptions.h>
#include <dns/buffer.h> #include <util/buffer.h>
#include <dns/edns.h> #include <dns/edns.h>
#include <dns/exceptions.h> #include <dns/exceptions.h>
#include <dns/messagerenderer.h> #include <dns/messagerenderer.h>
...@@ -63,12 +64,14 @@ using namespace isc; ...@@ -63,12 +64,14 @@ using namespace isc;
using namespace isc::cc; using namespace isc::cc;
using namespace isc::datasrc; using namespace isc::datasrc;
using namespace isc::dns; using namespace isc::dns;
using namespace isc::util;
using namespace isc::auth; using namespace isc::auth;
using namespace isc::dns::rdata; using namespace isc::dns::rdata;
using namespace isc::data; using namespace isc::data;
using namespace isc::config; using namespace isc::config;
using namespace isc::xfr; using namespace isc::xfr;
using namespace asiolink; using namespace isc::asiolink;
using namespace isc::asiodns;
using namespace isc::server_common::portconfig; using namespace isc::server_common::portconfig;
class AuthSrvImpl { class AuthSrvImpl {
...@@ -766,6 +769,6 @@ AuthSrv::setListenAddresses(const AddressList& addresses) { ...@@ -766,6 +769,6 @@ AuthSrv::setListenAddresses(const AddressList& addresses) {
} }
void void
AuthSrv::setDNSService(asiolink::DNSService& dnss) { AuthSrv::setDNSService(isc::asiodns::DNSService& dnss) {
dnss_ = &dnss; dnss_ = &dnss;
} }
...@@ -24,13 +24,13 @@ ...@@ -24,13 +24,13 @@
#include <cc/data.h> #include <cc/data.h>
#include <config/ccsession.h> #include <config/ccsession.h>
#include <dns/message.h> #include <dns/message.h>
#include <dns/buffer.h> #include <util/buffer.h>
#include <asiodns/dns_server.h>
#include <asiodns/dns_lookup.h>
#include <asiodns/dns_answer.h>
#include <asiolink/io_message.h> #include <asiolink/io_message.h>
#include <asiolink/io_service.h> #include <asiolink/io_service.h>
#include <asiolink/dns_server.h>
#include <asiolink/dns_lookup.h>
#include <asiolink/dns_answer.h>
#include <asiolink/simple_callback.h> #include <asiolink/simple_callback.h>
#include <asiolink/asiolink.h> #include <asiolink/asiolink.h>
...@@ -116,10 +116,10 @@ public: ...@@ -116,10 +116,10 @@ public:
/// \param server Pointer to the \c DNSServer /// \param server Pointer to the \c DNSServer
/// ///
/// \throw isc::Unexpected Protocol type of \a message is unexpected /// \throw isc::Unexpected Protocol type of \a message is unexpected
void processMessage(const asiolink::IOMessage& io_message, void processMessage(const isc::asiolink::IOMessage& io_message,
isc::dns::MessagePtr message, isc::dns::MessagePtr message,
isc::dns::OutputBufferPtr buffer, isc::util::OutputBufferPtr buffer,
asiolink::DNSServer* server); isc::asiodns::DNSServer* server);
/// \brief Set verbose flag /// \brief Set verbose flag
/// ///
...@@ -202,16 +202,16 @@ public: ...@@ -202,16 +202,16 @@ public:
void setConfigSession(isc::config::ModuleCCSession* config_session); void setConfigSession(isc::config::ModuleCCSession* config_session);
/// \brief Return this object's ASIO IO Service queue /// \brief Return this object's ASIO IO Service queue
asiolink::IOService& getIOService(); isc::asiolink::IOService& getIOService();
/// \brief Return pointer to the DNS Lookup callback function /// \brief Return pointer to the DNS Lookup callback function
asiolink::DNSLookup* getDNSLookupProvider() const { return (dns_lookup_); } isc::asiodns::DNSLookup* getDNSLookupProvider() const { return (dns_lookup_); }
/// \brief Return pointer to the DNS Answer callback function /// \brief Return pointer to the DNS Answer callback function
asiolink::DNSAnswer* getDNSAnswerProvider() const { return (dns_answer_); } isc::asiodns::DNSAnswer* getDNSAnswerProvider() const { return (dns_answer_); }
/// \brief Return pointer to the Checkin callback function /// \brief Return pointer to the Checkin callback function
asiolink::SimpleCallback* getCheckinProvider() const { return (checkin_); } isc::asiolink::SimpleCallback* getCheckinProvider() const { return (checkin_); }
/// \brief Set or update the size (number of slots) of hot spot cache. /// \brief Set or update the size (number of slots) of hot spot cache.
/// ///
...@@ -372,15 +372,15 @@ public: ...@@ -372,15 +372,15 @@ public:
const; const;
/// \brief Assign an ASIO DNS Service queue to this Auth object /// \brief Assign an ASIO DNS Service queue to this Auth object
void setDNSService(asiolink::DNSService& dnss); void setDNSService(isc::asiodns::DNSService& dnss);
private: private:
AuthSrvImpl* impl_; AuthSrvImpl* impl_;
asiolink::SimpleCallback* checkin_; isc::asiolink::SimpleCallback* checkin_;
asiolink::DNSLookup* dns_lookup_; isc::asiodns::DNSLookup* dns_lookup_;
asiolink::DNSAnswer* dns_answer_; isc::asiodns::DNSAnswer* dns_answer_;
asiolink::DNSService* dnss_; isc::asiodns::DNSService* dnss_;
}; };
#endif // __AUTH_SRV_H #endif // __AUTH_SRV_H
......
...@@ -22,6 +22,7 @@ query_bench_LDADD += $(top_builddir)/src/lib/cc/libcc.la ...@@ -22,6 +22,7 @@ query_bench_LDADD += $(top_builddir)/src/lib/cc/libcc.la
query_bench_LDADD += $(top_builddir)/src/lib/xfr/libxfr.la query_bench_LDADD += $(top_builddir)/src/lib/xfr/libxfr.la
query_bench_LDADD += $(top_builddir)/src/lib/log/liblog.la query_bench_LDADD += $(top_builddir)/src/lib/log/liblog.la
query_bench_LDADD += $(top_builddir)/src/lib/nsas/libnsas.la query_bench_LDADD += $(top_builddir)/src/lib/nsas/libnsas.la
query_bench_LDADD += $(top_builddir)/src/lib/asiodns/libasiodns.la
query_bench_LDADD += $(top_builddir)/src/lib/asiolink/libasiolink.la query_bench_LDADD += $(top_builddir)/src/lib/asiolink/libasiolink.la
query_bench_LDADD += $(top_builddir)/src/lib/server_common/libserver_common.la query_bench_LDADD += $(top_builddir)/src/lib/server_common/libserver_common.la
query_bench_LDADD += $(SQLITE_LIBS) query_bench_LDADD += $(SQLITE_LIBS)
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
#include <bench/benchmark.h> #include <bench/benchmark.h>
#include <bench/benchmark_util.h> #include <bench/benchmark_util.h>
#include <dns/buffer.h> #include <util/buffer.h>
#include <dns/message.h> #include <dns/message.h>
#include <dns/name.h> #include <dns/name.h>
#include <dns/question.h> #include <dns/question.h>
...@@ -36,6 +36,7 @@ ...@@ -36,6 +36,7 @@
#include <auth/auth_config.h> #include <auth/auth_config.h>
#include <auth/query.h> #include <auth/query.h>
#include <asiodns/asiodns.h>
#include <asiolink/asiolink.h> #include <asiolink/asiolink.h>
using namespace std; using namespace std;
...@@ -43,9 +44,11 @@ using namespace isc; ...@@ -43,9 +44,11 @@ using namespace isc;
using namespace isc::data; using namespace isc::data;
using namespace isc::auth; using namespace isc::auth;
using namespace isc::dns; using namespace isc::dns;
using namespace isc::util;
using namespace isc::xfr; using namespace isc::xfr;
using namespace isc::bench; using namespace isc::bench;
using namespace asiolink; using namespace isc::asiodns;
using namespace isc::asiolink;
namespace { namespace {
// Commonly used constant: // Commonly used constant:
......
...@@ -27,7 +27,8 @@ ...@@ -27,7 +27,8 @@
#include <exceptions/exceptions.h> #include <exceptions/exceptions.h>
#include <dns/buffer.h> #include <util/buffer.h>
#include <dns/message.h> #include <dns/message.h>
#include <dns/messagerenderer.h> #include <dns/messagerenderer.h>
...@@ -43,6 +44,7 @@ ...@@ -43,6 +44,7 @@
#include <auth/command.h> #include <auth/command.h>
#include <auth/change_user.h> #include <auth/change_user.h>
#include <auth/auth_srv.h> #include <auth/auth_srv.h>
#include <asiodns/asiodns.h>
#include <asiolink/asiolink.h> #include <asiolink/asiolink.h>
#include <log/dummylog.h> #include <log/dummylog.h>
...@@ -51,8 +53,10 @@ using namespace isc::data; ...@@ -51,8 +53,10 @@ using namespace isc::data;
using namespace isc::cc; using namespace isc::cc;
using namespace isc::config; using namespace isc::config;
using namespace isc::dns; using namespace isc::dns;
using namespace isc::util;
using namespace isc::xfr; using namespace isc::xfr;
using namespace asiolink; using namespace isc::asiolink;
using namespace isc::asiodns;
namespace { namespace {
......
...@@ -45,6 +45,7 @@ run_unittests_LDADD += $(SQLITE_LIBS) ...@@ -45,6 +45,7 @@ run_unittests_LDADD += $(SQLITE_LIBS)
run_unittests_LDADD += $(top_builddir)/src/lib/testutils/libtestutils.la run_unittests_LDADD += $(top_builddir)/src/lib/testutils/libtestutils.la
run_unittests_LDADD += $(top_builddir)/src/lib/datasrc/libdatasrc.la run_unittests_LDADD += $(top_builddir)/src/lib/datasrc/libdatasrc.la
run_unittests_LDADD += $(top_builddir)/src/lib/dns/libdns++.la run_unittests_LDADD += $(top_builddir)/src/lib/dns/libdns++.la
run_unittests_LDADD += $(top_builddir)/src/lib/asiodns/libasiodns.la
run_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libasiolink.la run_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libasiolink.la
run_unittests_LDADD += $(top_builddir)/src/lib/config/libcfgclient.la run_unittests_LDADD += $(top_builddir)/src/lib/config/libcfgclient.la
run_unittests_LDADD += $(top_builddir)/src/lib/cc/libcc.la run_unittests_LDADD += $(top_builddir)/src/lib/cc/libcc.la
......
...@@ -41,10 +41,12 @@ ...@@ -41,10 +41,12 @@
using namespace std; using namespace std;
using namespace isc::cc; using namespace isc::cc;
using namespace isc::dns; using namespace isc::dns;
using namespace isc::util;
using namespace isc::dns::rdata; using namespace isc::dns::rdata;
using namespace isc::data; using namespace isc::data;
using namespace isc::xfr; using namespace isc::xfr;
using namespace asiolink; using namespace isc::asiodns;
using namespace isc::asiolink;
using namespace isc::testutils; using namespace isc::testutils;
using namespace isc::server_common::portconfig; using namespace isc::server_common::portconfig;
using isc::UnitTestUtil; using isc::UnitTestUtil;
......
...@@ -99,7 +99,7 @@ AuthConmmandTest::stopServer() { ...@@ -99,7 +99,7 @@ AuthConmmandTest::stopServer() {
} }
TEST_F(AuthConmmandTest, shutdown) { TEST_F(AuthConmmandTest, shutdown) {
asiolink::IntervalTimer itimer(server.getIOService()); isc::asiolink::IntervalTimer itimer(server.getIOService());
itimer.setup(boost::bind(&AuthConmmandTest::stopServer, this), 1); itimer.setup(boost::bind(&AuthConmmandTest::stopServer, this), 1);
server.getIOService().run(); server.getIOService().run();
EXPECT_EQ(0, rcode); EXPECT_EQ(0, rcode);
......
...@@ -35,7 +35,8 @@ ...@@ -35,7 +35,8 @@
using namespace isc::dns; using namespace isc::dns;
using namespace isc::data; using namespace isc::data;
using namespace isc::datasrc; using namespace isc::datasrc;
using namespace asiolink; using namespace isc::asiodns;
using namespace isc::asiolink;
namespace { namespace {
class AuthConfigTest : public ::testing::Test { class AuthConfigTest : public ::testing::Test {
......
...@@ -2,12 +2,12 @@ ...@@ -2,12 +2,12 @@
.\" Title: bind10 .\" Title: bind10
.\" Author: [see the "AUTHORS" section] .\" Author: [see the "AUTHORS" section]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
.\" Date: February 22, 2011 .\" Date: March 31, 2011
.\" Manual: BIND10 .\" Manual: BIND10
.\" Source: BIND10 .\" Source: BIND10
.\" Language: English .\" Language: English
.\" .\"
.TH "BIND10" "8" "February 22, 2011" "BIND10" "BIND10" .TH "BIND10" "8" "March 31, 2011" "BIND10" "BIND10"
.\" ----------------------------------------------------------------- .\" -----------------------------------------------------------------
.\" * set default formatting .\" * set default formatting
.\" ----------------------------------------------------------------- .\" -----------------------------------------------------------------
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
bind10 \- BIND 10 boss process bind10 \- BIND 10 boss process
.SH "SYNOPSIS" .SH "SYNOPSIS"
.HP \w'\fBbind10\fR\ 'u .HP \w'\fBbind10\fR\ 'u
\fBbind10\fR [\fB\-m\ \fR\fB\fIfile\fR\fR] [\fB\-n\fR] [\fB\-u\ \fR\fB\fIuser\fR\fR] [\fB\-v\fR] [\fB\-\-msgq\-socket\-file\ \fR\fB\fIfile\fR\fR] [\fB\-\-no\-cache\fR] [\fB\-\-user\ \fR\fB\fIuser\fR\fR] [\fB\-\-pretty\-name\ \fR\fB\fIname\fR\fR] [\fB\-\-brittle\fR] [\fB\-\-verbose\fR] \fBbind10\fR [\fB\-c\ \fR\fB\fIconfig\-filename\fR\fR] [\fB\-m\ \fR\fB\fIfile\fR\fR] [\fB\-n\fR] [\fB\-p\ \fR\fB\fIdata_path\fR\fR] [\fB\-u\ \fR\fB\fIuser\fR\fR] [\fB\-v\fR] [\fB\-\-brittle\fR] [\fB\-\-cmdctl\-port\fR\ \fIport\fR] [\fB\-\-config\-file\fR\ \fIconfig\-filename\fR] [\fB\-\-data\-path\fR\ \fIdirectory\fR] [\fB\-\-msgq\-socket\-file\ \fR\fB\fIfile\fR\fR] [\fB\-\-no\-cache\fR] [\fB\-\-pid\-file\fR\ \fIfilename\fR] [\fB\-\-pretty\-name\ \fR\fB\fIname\fR\fR] [\fB\-\-user\ \fR\fB\fIuser\fR\fR] [\fB\-\-verbose\fR]
.SH "DESCRIPTION" .SH "DESCRIPTION"
.PP .PP
The The
...@@ -32,6 +32,34 @@ daemon starts up other BIND 10 required daemons\&. It handles restarting of exit ...@@ -32,6 +32,34 @@ daemon starts up other BIND 10 required daemons\&. It handles restarting of exit
.PP .PP
The arguments are as follows: The arguments are as follows:
.PP .PP
\fB\-\-brittle\fR
.RS 4
Shutdown if any of the child processes of
\fBbind10\fR
exit\&. This is intended to help developers debug the server, and should not be used in production\&.
.RE
.PP
\fB\-c\fR \fIconfig\-filename\fR, \fB\-\-config\-file\fR \fIconfig\-filename\fR
.RS 4
The configuration filename to use\&. Can be either absolute or relative to data path\&. In case it is absolute, value of data path is not considered\&.
.sp