BIND 10 master, updated. ea110815f2864c353ac69ba54dd837987890d496 Merge branch 'master' into trac2650
BIND 10 source code commits
bind10-changes at lists.isc.org
Tue Feb 12 03:55:43 UTC 2013
The branch, master has been updated
via ea110815f2864c353ac69ba54dd837987890d496 (commit)
via e540ba5b43c265fff937245932c06ed501859574 (commit)
via db77f1f08e569fc378c1e63361503773f9b9e85e (commit)
via 2284240947b4871b246d6d3a4be073dcb560325d (commit)
via aeda8e4862687e5ecd870a520616b734fa910b39 (commit)
from 12071a88b91b30fada5848868fc3ecd173785b37 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit ea110815f2864c353ac69ba54dd837987890d496
Merge: e540ba5 12071a8
Author: Mukund Sivaraman <muks at isc.org>
Date: Tue Feb 12 09:13:10 2013 +0530
Merge branch 'master' into trac2650
-----------------------------------------------------------------------
Summary of changes:
src/lib/asiodns/tcp_server.cc | 1 -
src/lib/asiodns/tcp_server.h | 1 -
src/lib/asiodns/udp_server.cc | 7 +++----
src/lib/datasrc/memory/zone_finder.cc | 1 +
src/lib/datasrc/memory_datasrc.cc | 1 +
src/lib/datasrc/sqlite3_accessor.cc | 3 +++
src/lib/dns/master_loader.cc | 1 +
src/lib/util/io/socketsession.cc | 2 +-
8 files changed, 10 insertions(+), 7 deletions(-)
-----------------------------------------------------------------------
diff --git a/src/lib/asiodns/tcp_server.cc b/src/lib/asiodns/tcp_server.cc
index 3442de9..397e004 100644
--- a/src/lib/asiodns/tcp_server.cc
+++ b/src/lib/asiodns/tcp_server.cc
@@ -184,7 +184,6 @@ TCPServer::operator()(asio::error_code ec, size_t length) {
// provides the appropriate operator() but is otherwise functionless.
iosock_.reset(new TCPSocket<DummyIOCallback>(*socket_));
io_message_.reset(new IOMessage(data_.get(), length, *iosock_, *peer_));
- bytes_ = length;
// Perform any necessary operations prior to processing the incoming
// packet (e.g., checking for queued configuration messages).
diff --git a/src/lib/asiodns/tcp_server.h b/src/lib/asiodns/tcp_server.h
index 46f484b..50e8717 100644
--- a/src/lib/asiodns/tcp_server.h
+++ b/src/lib/asiodns/tcp_server.h
@@ -122,7 +122,6 @@ private:
// State information that is entirely internal to a given instance
// of the coroutine can be declared here.
- size_t bytes_;
bool done_;
// Callback functions provided by the caller
diff --git a/src/lib/asiodns/udp_server.cc b/src/lib/asiodns/udp_server.cc
index bdf79a7..cf4b1c4 100644
--- a/src/lib/asiodns/udp_server.cc
+++ b/src/lib/asiodns/udp_server.cc
@@ -61,7 +61,7 @@ struct UDPServer::Data {
*/
Data(io_service& io_service, const ip::address& addr, const uint16_t port,
SimpleCallback* checkin, DNSLookup* lookup, DNSAnswer* answer) :
- io_(io_service), done_(false),
+ io_(io_service), bytes_(0), done_(false),
checkin_callback_(checkin),lookup_callback_(lookup),
answer_callback_(answer)
{
@@ -77,7 +77,7 @@ struct UDPServer::Data {
}
Data(io_service& io_service, int fd, int af, SimpleCallback* checkin,
DNSLookup* lookup, DNSAnswer* answer) :
- io_(io_service), done_(false),
+ io_(io_service), bytes_(0), done_(false),
checkin_callback_(checkin),lookup_callback_(lookup),
answer_callback_(answer)
{
@@ -104,7 +104,7 @@ struct UDPServer::Data {
* We also allocate data for receiving the packet here.
*/
Data(const Data& other) :
- io_(other.io_), socket_(other.socket_), done_(false),
+ io_(other.io_), socket_(other.socket_), bytes_(0), done_(false),
checkin_callback_(other.checkin_callback_),
lookup_callback_(other.lookup_callback_),
answer_callback_(other.answer_callback_)
@@ -168,7 +168,6 @@ struct UDPServer::Data {
size_t bytes_;
bool done_;
-
// Callback functions provided by the caller
const SimpleCallback* checkin_callback_;
const DNSLookup* lookup_callback_;
diff --git a/src/lib/datasrc/memory/zone_finder.cc b/src/lib/datasrc/memory/zone_finder.cc
index 56c4110..4ae0159 100644
--- a/src/lib/datasrc/memory/zone_finder.cc
+++ b/src/lib/datasrc/memory/zone_finder.cc
@@ -573,6 +573,7 @@ FindNodeResult findNode(const ZoneData& zone_data,
/// For (successful) type ANY query, found_node points to the
/// corresponding zone node, which is recorded within this specialized
/// context.
+// cppcheck-suppress noConstructor
class InMemoryZoneFinder::Context : public ZoneFinder::Context {
public:
Context(InMemoryZoneFinder& finder, ZoneFinder::FindOptions options,
diff --git a/src/lib/datasrc/memory_datasrc.cc b/src/lib/datasrc/memory_datasrc.cc
index 45d7920..3081759 100644
--- a/src/lib/datasrc/memory_datasrc.cc
+++ b/src/lib/datasrc/memory_datasrc.cc
@@ -782,6 +782,7 @@ struct RBNodeResultContext {
};
}
+// cppcheck-suppress noConstructor
class InMemoryZoneFinder::Context : public ZoneFinder::Context {
public:
/// \brief Constructor.
diff --git a/src/lib/datasrc/sqlite3_accessor.cc b/src/lib/datasrc/sqlite3_accessor.cc
index 632c271..a858028 100644
--- a/src/lib/datasrc/sqlite3_accessor.cc
+++ b/src/lib/datasrc/sqlite3_accessor.cc
@@ -682,6 +682,8 @@ convertToPlainChar(const unsigned char* ucp, sqlite3 *db) {
}
}
+
+// cppcheck-suppress noConstructor
class SQLite3Accessor::Context : public DatabaseAccessor::IteratorContext {
public:
// Construct an iterator for all records. When constructed this
@@ -887,6 +889,7 @@ SQLite3Accessor::getAllRecords(int id) const {
/// This iterator is used to search through the differences table for the
/// resouce records making up an IXFR between two versions of a zone.
+// cppcheck-suppress noConstructor
class SQLite3Accessor::DiffContext : public DatabaseAccessor::IteratorContext {
public:
diff --git a/src/lib/dns/master_loader.cc b/src/lib/dns/master_loader.cc
index 29e7e1d..1c822ea 100644
--- a/src/lib/dns/master_loader.cc
+++ b/src/lib/dns/master_loader.cc
@@ -54,6 +54,7 @@ public:
} // end unnamed namespace
+// cppcheck-suppress noConstructor
class MasterLoader::MasterLoaderImpl {
public:
MasterLoaderImpl(const char* master_file,
diff --git a/src/lib/util/io/socketsession.cc b/src/lib/util/io/socketsession.cc
index ba4e6c7..4acca92 100644
--- a/src/lib/util/io/socketsession.cc
+++ b/src/lib/util/io/socketsession.cc
@@ -82,7 +82,7 @@ const size_t INITIAL_BUFSIZE = 512;
const int SOCKSESSION_BUFSIZE = (DEFAULT_HEADER_BUFLEN + MAX_DATASIZE) * 2;
struct SocketSessionForwarder::ForwarderImpl {
- ForwarderImpl() : buf_(DEFAULT_HEADER_BUFLEN) {}
+ ForwarderImpl() : fd_(-1), buf_(DEFAULT_HEADER_BUFLEN) {}
struct sockaddr_un sock_un_;
socklen_t sock_un_len_;
int fd_;
More information about the bind10-changes
mailing list