BIND 10 master, updated. 33a0d78c8ff1bd0083251fdad2def37c6c9064dc Merge branch 'trac1166'
BIND 10 source code commits
bind10-changes at lists.isc.org
Thu Nov 3 00:07:14 UTC 2011
The branch, master has been updated
via 33a0d78c8ff1bd0083251fdad2def37c6c9064dc (commit)
via b843d05fdaefa92abcec50a781dbdfbadb4c9bed (commit)
via e9f0637479f992936b2feab96e50a84a6a4dfebd (commit)
via 6d842a64386a5c64a5136cadb4a1e646ee1901e5 (commit)
via 9741148f1166694a65612ea27be4080dbf7194cc (commit)
via b4591042f81a9ec8157bc74d023f1fa5c91999e7 (commit)
via 834f8d0f752eda6b2baa5dffb48bc0d86de8c90a (commit)
via 27a209e24883177391c382906dcd0104a54faf79 (commit)
via 1c71878fcb9d5579383561cdaacd78b81fc28694 (commit)
via 4d18d306085f15ff218dd7dca303aa53122aa2d3 (commit)
via 12114c5c973d70be91bfe946962e4373fa4d890a (commit)
via 8820f1314ddcaea75e069f2a11bced9bd1b80ef8 (commit)
via c5825a1d48bb2def1c6113629e30de4ac9dd2b0a (commit)
via a0007d1c88df41e7796f89e24f7af5b40660fbf3 (commit)
from b7e1847c3a1979d3ac593de435e142335cbc7188 (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 33a0d78c8ff1bd0083251fdad2def37c6c9064dc
Merge: b7e1847c3a1979d3ac593de435e142335cbc7188 b843d05fdaefa92abcec50a781dbdfbadb4c9bed
Author: Jeremy C. Reed <jreed at ISC.org>
Date: Wed Nov 2 19:07:12 2011 -0500
Merge branch 'trac1166'
commit b843d05fdaefa92abcec50a781dbdfbadb4c9bed
Author: Jeremy C. Reed <jreed at ISC.org>
Date: Wed Nov 2 19:05:57 2011 -0500
[trac1166][jreed-doxygen] Resolved doxygen-related TODOs
And revert the change from jreed-doxygen to io_asio_socket.h.
Opened a ticket for that #1366.
commit e9f0637479f992936b2feab96e50a84a6a4dfebd
Merge: 409e800ffc208240ec70eb63bc2e56aadfbb21e1 6d842a64386a5c64a5136cadb4a1e646ee1901e5
Author: Jeremy C. Reed <jreed at ISC.org>
Date: Wed Nov 2 07:56:17 2011 -0500
[trac1166]Merge commit '6d842a64386a5c64a5136cadb4a1e646ee1901e5' into trac1166
This included fixing conflict which introduced a new fix changing
bogus \parameter to \param.
-----------------------------------------------------------------------
Summary of changes:
src/lib/acl/dns.h | 4 ++--
src/lib/acl/loader.h | 6 +++---
src/lib/asiolink/dummy_io_cb.h | 7 ++++---
src/lib/asiolink/io_asio_socket.h | 20 ++++----------------
src/lib/cache/logger.h | 2 +-
src/lib/cache/message_cache.h | 2 ++
src/lib/cache/resolver_cache.h | 4 ++--
src/lib/cache/rrset_entry.h | 4 ++--
src/lib/cc/logger.h | 2 +-
src/lib/cc/session.cc | 3 ++-
src/lib/datasrc/logger.h | 2 +-
src/lib/datasrc/rbtree.h | 6 ++++--
src/lib/dns/message.h | 4 ++--
src/lib/dns/messagerenderer.cc | 2 --
src/lib/dns/name.cc | 2 +-
src/lib/dns/rdatafields.h | 2 +-
src/lib/dns/rrset.h | 2 +-
src/lib/dns/tsigkey.h | 13 ++++++-------
src/lib/log/log_formatter.h | 2 +-
src/lib/log/logger_level_impl.h | 2 +-
src/lib/log/logger_manager_impl.h | 2 --
src/lib/log/logger_specification.h | 2 +-
src/lib/log/message_dictionary.h | 2 +-
src/lib/nsas/nameserver_address_store.h | 5 ++++-
src/lib/nsas/zone_entry.h | 2 +-
src/lib/resolve/recursive_query.cc | 1 +
src/lib/resolve/recursive_query.h | 16 +++++++++++++---
src/lib/resolve/resolve.h | 1 -
src/lib/server_common/client.h | 2 +-
src/lib/server_common/logger.h | 2 +-
30 files changed, 64 insertions(+), 62 deletions(-)
-----------------------------------------------------------------------
diff --git a/src/lib/acl/dns.h b/src/lib/acl/dns.h
index 426c961..d08fcf3 100644
--- a/src/lib/acl/dns.h
+++ b/src/lib/acl/dns.h
@@ -71,8 +71,8 @@ struct RequestContext {
///
/// \exception None
///
- /// \parameter remote_address_param The remote IP address
- /// \parameter tsig_param A valid pointer to the TSIG record included in
+ /// \param remote_address_param The remote IP address
+ /// \param tsig_param A valid pointer to the TSIG record included in
/// the request or NULL if the request doesn't contain a TSIG.
RequestContext(const IPAddress& remote_address_param,
const isc::dns::TSIGRecord* tsig_param) :
diff --git a/src/lib/acl/loader.h b/src/lib/acl/loader.h
index f60b144..fc69b44 100644
--- a/src/lib/acl/loader.h
+++ b/src/lib/acl/loader.h
@@ -125,7 +125,7 @@ BasicAction defaultActionLoader(data::ConstElementPtr action);
*
* The rest of the element are matches. The left side is the name of the
* match type (for example match for source IP address or match for message
- * size). The <parameter> is whatever is needed to describe the match and
+ * size). The parameter is whatever is needed to describe the match and
* depends on the match type, the loader passes it verbatim to creator
* of that match type.
*
@@ -148,7 +148,7 @@ public:
/**
* \brief Constructor.
*
- * \param default_action The default action for created ACLs.
+ * \param defaultAction The default action for created ACLs.
* \param actionLoader is the loader which will be used to convert actions
* from their JSON representation. The default value is suitable for
* the BasicAction enum. If you did not specify the second
@@ -202,7 +202,7 @@ public:
* parameters might look like, they are not checked in any way.
* Therefore it's up to the creator (or the check being created)
* to validate the data and throw if it is bad.
- * \param Current loader calling this creator. This can be used
+ * \param loader Current loader calling this creator. This can be used
* to load subexpressions in case of compound check.
*/
virtual boost::shared_ptr<Check<Context> > create(
diff --git a/src/lib/asiolink/dummy_io_cb.h b/src/lib/asiolink/dummy_io_cb.h
index 2081906..bcaefe9 100644
--- a/src/lib/asiolink/dummy_io_cb.h
+++ b/src/lib/asiolink/dummy_io_cb.h
@@ -39,7 +39,8 @@ public:
/// \brief Asynchronous I/O callback method
///
- /// \param error Unused
+ /// TODO: explain why this method should never be called.
+ /// This should be unused.
void operator()(asio::error_code)
{
// TODO: log an error if this method ever gets called.
@@ -47,8 +48,8 @@ public:
/// \brief Asynchronous I/O callback method
///
- /// \param error Unused
- /// \param length Unused
+ /// TODO: explain why this method should never be called.
+ /// This should be unused.
void operator()(asio::error_code, size_t)
{
// TODO: log an error if this method ever gets called.
diff --git a/src/lib/asiolink/io_asio_socket.h b/src/lib/asiolink/io_asio_socket.h
index 864708c..aeac63d 100644
--- a/src/lib/asiolink/io_asio_socket.h
+++ b/src/lib/asiolink/io_asio_socket.h
@@ -82,8 +82,6 @@ class IOEndpoint;
/// derived class for testing purposes rather than providing factory methods
/// (i.e., getDummy variants below).
///
-/// TODO: Check if IOAsioSocket class is still needed
-///
/// \param C Template parameter identifying type of the callback object.
template <typename C>
@@ -328,10 +326,9 @@ public:
///
/// A call that is a no-op on UDP sockets, this opens a connection to the
/// system identified by the given endpoint.
+ /// The endpoint and callback are unused.
///
- /// \param endpoint Unused
- /// \param callback Unused.
- ///false indicating that the operation completed synchronously.
+ /// \return false indicating that the operation completed synchronously.
virtual bool open(const IOEndpoint*, C&) {
return (false);
}
@@ -339,23 +336,14 @@ public:
/// \brief Send Asynchronously
///
/// Must be supplied as it is abstract in the base class.
- ///
- /// \param data Unused
- /// \param length Unused
- /// \param endpoint Unused
- /// \param callback Unused
+ /// This is unused.
virtual void asyncSend(const void*, size_t, const IOEndpoint*, C&) {
}
/// \brief Receive Asynchronously
///
/// Must be supplied as it is abstract in the base class.
- ///
- /// \param data Unused
- /// \param length Unused
- /// \param offset Unused
- /// \param endpoint Unused
- /// \param callback Unused
+ /// The parameters are unused.
virtual void asyncReceive(void* data, size_t, size_t, IOEndpoint*, C&) {
}
diff --git a/src/lib/cache/logger.h b/src/lib/cache/logger.h
index 3bba413..52c9743 100644
--- a/src/lib/cache/logger.h
+++ b/src/lib/cache/logger.h
@@ -18,7 +18,7 @@
#include <log/macros.h>
#include <cache/cache_messages.h>
-/// \file logger.h
+/// \file cache/logger.h
/// \brief Cache library global logger
///
/// This holds the logger for the cache library. It is a private header
diff --git a/src/lib/cache/message_cache.h b/src/lib/cache/message_cache.h
index 44d7fd1..b418f23 100644
--- a/src/lib/cache/message_cache.h
+++ b/src/lib/cache/message_cache.h
@@ -52,6 +52,8 @@ public:
virtual ~MessageCache();
/// \brief Look up message in cache.
+ /// \param qname Name of the domain for which the message is being sought.
+ /// \param qtype Type of the RR for which the message is being sought.
/// \param message generated response message if the message entry
/// can be found.
///
diff --git a/src/lib/cache/resolver_cache.h b/src/lib/cache/resolver_cache.h
index 9ad4388..5630bd7 100644
--- a/src/lib/cache/resolver_cache.h
+++ b/src/lib/cache/resolver_cache.h
@@ -89,8 +89,8 @@ public:
ResolverClassCache(const isc::dns::RRClass& cache_class);
/// \brief Construct Function.
- /// \param caches_size cache size information for each
- /// messages/rrsets of different classes.
+ /// \param cache_info Cache size information for each message/rrsets of
+ /// different classes.
ResolverClassCache(const CacheSizeInfo& cache_info);
/// \name Lookup Interfaces
diff --git a/src/lib/cache/rrset_entry.h b/src/lib/cache/rrset_entry.h
index 5fa8f2c..09cf79c 100644
--- a/src/lib/cache/rrset_entry.h
+++ b/src/lib/cache/rrset_entry.h
@@ -27,9 +27,9 @@ using namespace isc::nsas;
namespace isc {
namespace cache {
-/// \enum RRset Trustworthiness
+/// \enum RRsetTrustLevel
/// For detail of RRset trustworthiness, please refer to
-/// RFC2181 section5.4.1.
+/// RFC 2181 section 5.4.1.
/// Bigger value is more trustworthy.
enum RRsetTrustLevel {
/// Default trust for RRset.
diff --git a/src/lib/cc/logger.h b/src/lib/cc/logger.h
index 34b5809..d6253d0 100644
--- a/src/lib/cc/logger.h
+++ b/src/lib/cc/logger.h
@@ -18,7 +18,7 @@
#include <cc/cc_messages.h>
#include <log/macros.h>
-/// \file logger.h
+/// \file cc/logger.h
/// \brief Command Channel library global logger
///
/// This holds the logger for the CC library. It is a private header
diff --git a/src/lib/cc/session.cc b/src/lib/cc/session.cc
index e0e24cf..0052aca 100644
--- a/src/lib/cc/session.cc
+++ b/src/lib/cc/session.cc
@@ -254,7 +254,8 @@ SessionImpl::internalRead(const asio::error_code& error,
}
}
-Session::Session(io_service& io_service) : impl_(new SessionImpl(io_service))
+Session::Session(asio::io_service& io_service) :
+ impl_(new SessionImpl(io_service))
{}
Session::~Session() {
diff --git a/src/lib/datasrc/logger.h b/src/lib/datasrc/logger.h
index c360900..db4e5cb 100644
--- a/src/lib/datasrc/logger.h
+++ b/src/lib/datasrc/logger.h
@@ -18,7 +18,7 @@
#include <log/macros.h>
#include <datasrc/datasrc_messages.h>
-/// \file logger.h
+/// \file datasrc/logger.h
/// \brief Data Source library global logger
///
/// This holds the logger for the data source library. It is a private header
diff --git a/src/lib/datasrc/rbtree.h b/src/lib/datasrc/rbtree.h
index ccdfa48..b6c098a 100644
--- a/src/lib/datasrc/rbtree.h
+++ b/src/lib/datasrc/rbtree.h
@@ -209,7 +209,7 @@ public:
/// \exception isc::InvalidParameter Unsettable flag is specified
/// \exception None otherwise
/// \param flag The node flag to be changed.
- /// \on If \c true, set the flag to on; otherwise set it to off.
+ /// \param on If \c true, set the flag to on; otherwise set it to off.
void setFlag(Flags flag, bool on = true) {
if ((flag & ~SETTABLE_FLAGS) != 0) {
isc_throw(isc::InvalidParameter,
@@ -226,7 +226,8 @@ public:
private:
/// \name Callback related methods
///
- /// See the description of \c RBTree<T>::find() about callbacks.
+ /// See the description of \c RBTree<T>::find() at \ref callback
+ /// about callbacks.
///
/// These methods never throw an exception.
//@{
@@ -702,6 +703,7 @@ public:
}
/// \brief Find with callback and node chain.
+ /// \anchor callback
///
/// This version of \c find() is specifically designed for the backend
/// of the \c InMemoryZoneFinder class, and implements all necessary
diff --git a/src/lib/dns/message.h b/src/lib/dns/message.h
index f286c67..47632cb 100644
--- a/src/lib/dns/message.h
+++ b/src/lib/dns/message.h
@@ -526,7 +526,7 @@ public:
/// source message to the same section of this message
///
/// \param section the section to append
- /// \param target The source Message
+ /// \param source The source Message
void appendSection(const Section section, const Message& source);
/// \brief Prepare for making a response from a request.
@@ -668,7 +668,7 @@ typedef boost::shared_ptr<const Message> ConstMessagePtr;
///
/// \param os A \c std::ostream object on which the insertion operation is
/// performed.
-/// \param record A \c Message object output by the operation.
+/// \param message A \c Message object output by the operation.
/// \return A reference to the same \c std::ostream object referenced by
/// parameter \c os after the insertion operation.
std::ostream& operator<<(std::ostream& os, const Message& message);
diff --git a/src/lib/dns/messagerenderer.cc b/src/lib/dns/messagerenderer.cc
index 767aca9..02f5519 100644
--- a/src/lib/dns/messagerenderer.cc
+++ b/src/lib/dns/messagerenderer.cc
@@ -150,8 +150,6 @@ private:
struct MessageRenderer::MessageRendererImpl {
/// \brief Constructor from an output buffer.
///
- /// \param buffer An \c OutputBuffer object to which wire format data is
- /// written.
MessageRendererImpl() :
nbuffer_(Name::MAX_WIRE), msglength_limit_(512),
truncated_(false), compress_mode_(MessageRenderer::CASE_INSENSITIVE)
diff --git a/src/lib/dns/name.cc b/src/lib/dns/name.cc
index 4cd0b2b..772417f 100644
--- a/src/lib/dns/name.cc
+++ b/src/lib/dns/name.cc
@@ -700,7 +700,7 @@ Name::split(const unsigned int first, const unsigned int n) const {
}
Name
-Name::split(const unsigned level) const {
+Name::split(const unsigned int level) const {
if (level >= getLabelCount()) {
isc_throw(OutOfRange, "invalid level for name split (" << level
<< ") for name " << *this);
diff --git a/src/lib/dns/rdatafields.h b/src/lib/dns/rdatafields.h
index e33bcd7..16880f0 100644
--- a/src/lib/dns/rdatafields.h
+++ b/src/lib/dns/rdatafields.h
@@ -296,7 +296,7 @@ public:
/// as long as the \c RdataFields object is used.
///
/// \param fields An array of \c FieldSpec entries. This can be \c NULL.
- /// \param nfields The number of entries of \c fields.
+ /// \param fields_length The total length of the \c fields.
/// \param data A pointer to memory region for the entire RDATA. This can
/// be NULL.
/// \param data_length The length of \c data in bytes.
diff --git a/src/lib/dns/rrset.h b/src/lib/dns/rrset.h
index 6c15b53..1586465 100644
--- a/src/lib/dns/rrset.h
+++ b/src/lib/dns/rrset.h
@@ -478,7 +478,7 @@ public:
/// \brief Return the current \c Rdata corresponding to the rdata cursor.
///
- /// \return A reference to an \c rdata::::Rdata object corresponding
+ /// \return A reference to an \c rdata::Rdata object corresponding
/// to the rdata cursor.
virtual const rdata::Rdata& getCurrent() const = 0;
diff --git a/src/lib/dns/tsigkey.h b/src/lib/dns/tsigkey.h
index 31211d1..6081dd3 100644
--- a/src/lib/dns/tsigkey.h
+++ b/src/lib/dns/tsigkey.h
@@ -113,10 +113,10 @@ public:
/// \brief Constructor from an input string
///
/// The string must be of the form:
- /// <name>:<secret>[:<algorithm>]
- /// Where <name> is a domain name for the key, <secret> is a
+ /// name:secret[:algorithm]
+ /// Where "name" is a domain name for the key, "secret" is a
/// base64 representation of the key secret, and the optional
- /// algorithm is an algorithm identifier as specified in RFC4635.
+ /// "algorithm" is an algorithm identifier as specified in RFC 4635.
/// The default algorithm is hmac-md5.sig-alg.reg.int.
///
/// The same restriction about the algorithm name (and secret) as that
@@ -188,11 +188,10 @@ public:
///
/// The resulting string will be of the form
/// name:secret:algorithm
- /// Where <name> is a domain name for the key, <secret> is a
- /// base64 representation of the key secret, and algorithm is
- /// an algorithm identifier as specified in RFC4635
+ /// Where "name" is a domain name for the key, "secret" is a
+ /// base64 representation of the key secret, and "algorithm" is
+ /// an algorithm identifier as specified in RFC 4635.
///
- /// \param key the TSIG key to convert
/// \return The string representation of the given TSIGKey.
std::string toText() const;
diff --git a/src/lib/log/log_formatter.h b/src/lib/log/log_formatter.h
index ca23844..7a9e5fa 100644
--- a/src/lib/log/log_formatter.h
+++ b/src/lib/log/log_formatter.h
@@ -169,7 +169,7 @@ public:
/// Deactivates the current formatter. In case the formatter is not active,
/// only produces another inactive formatter.
///
- /// \param arg The argument to place into the placeholder.
+ /// \param value The argument to place into the placeholder.
template<class Arg> Formatter& arg(const Arg& value) {
if (logger_) {
try {
diff --git a/src/lib/log/logger_level_impl.h b/src/lib/log/logger_level_impl.h
index 9289a1d..c990796 100644
--- a/src/lib/log/logger_level_impl.h
+++ b/src/lib/log/logger_level_impl.h
@@ -83,7 +83,7 @@ public:
/// The log4cplus log level may be non-standard in which case it is
/// encoding a BIND 10 debug level as well.
///
- /// \param level log4cplus log level
+ /// \param loglevel log4cplus log level
///
/// \return Equivalent BIND 10 severity and debug level
static
diff --git a/src/lib/log/logger_manager_impl.h b/src/lib/log/logger_manager_impl.h
index aa596a0..f99f832 100644
--- a/src/lib/log/logger_manager_impl.h
+++ b/src/lib/log/logger_manager_impl.h
@@ -59,8 +59,6 @@ public:
/// This resets the hierachy of loggers back to their defaults. This means
/// that all non-root loggers (if they exist) are set to NOT_SET, and the
/// root logger reset to logging informational messages.
- ///
- /// \param root_name BIND 10 name of the root logger
static void processInit();
/// \brief Process Specification
diff --git a/src/lib/log/logger_specification.h b/src/lib/log/logger_specification.h
index 35c879c..6805fdd 100644
--- a/src/lib/log/logger_specification.h
+++ b/src/lib/log/logger_specification.h
@@ -103,7 +103,7 @@ public:
/// \brief Add output option.
///
- /// \param Option to add to the list.
+ /// \param option Option to add to the list.
void addOutputOption(const OutputOption& option) {
options_.push_back(option);
}
diff --git a/src/lib/log/message_dictionary.h b/src/lib/log/message_dictionary.h
index 23f76d7..519986d 100644
--- a/src/lib/log/message_dictionary.h
+++ b/src/lib/log/message_dictionary.h
@@ -79,7 +79,7 @@ public:
///
/// \return true if the message was added to the dictionary, false if the
/// message existed and it was not added.
- virtual bool add (const std::string& ident, const std::string& test);
+ virtual bool add (const std::string& ident, const std::string& text);
/// \brief Replace Message
diff --git a/src/lib/nsas/nameserver_address_store.h b/src/lib/nsas/nameserver_address_store.h
index 87845c9..1af535a 100644
--- a/src/lib/nsas/nameserver_address_store.h
+++ b/src/lib/nsas/nameserver_address_store.h
@@ -92,7 +92,10 @@ public:
/// \brief cancel the given lookup action
///
- /// \param callback Callback object that would be called
+ /// \param zone Name of zone.
+ /// \param class_code Class of the zone.
+ /// \param callback Callback object that would be called.
+ /// \param family Address family for which lookup is being cancelled.
void cancel(const std::string& zone, const dns::RRClass& class_code,
const boost::shared_ptr<AddressRequestCallback>& callback,
AddressFamily family = ANY_OK);
diff --git a/src/lib/nsas/zone_entry.h b/src/lib/nsas/zone_entry.h
index f772784..482b89f 100644
--- a/src/lib/nsas/zone_entry.h
+++ b/src/lib/nsas/zone_entry.h
@@ -66,7 +66,7 @@ public:
* different objects.
* \param nameserver_table Hashtable of NameServerEntry objects for
* this zone
- * \param namesever_lru LRU for the nameserver entries
+ * \param nameserver_lru LRU for the nameserver entries
* \todo Move to cc file, include the lookup (if NSAS uses resolver for
* everything)
*/
diff --git a/src/lib/resolve/recursive_query.cc b/src/lib/resolve/recursive_query.cc
index d692dc1..0d3fb4c 100644
--- a/src/lib/resolve/recursive_query.cc
+++ b/src/lib/resolve/recursive_query.cc
@@ -84,6 +84,7 @@ questionText(const isc::dns::Question& question) {
/// It is not public function, therefore it's not in header. But it's not
/// in anonymous namespace, so we can call it from unittests.
/// \param name The name we want to delegate to.
+/// \param rrclass The class.
/// \param cache The place too look for known delegations.
std::string
deepestDelegation(Name name, RRClass rrclass,
diff --git a/src/lib/resolve/recursive_query.h b/src/lib/resolve/recursive_query.h
index b9fb80d..9af2d72 100644
--- a/src/lib/resolve/recursive_query.h
+++ b/src/lib/resolve/recursive_query.h
@@ -38,7 +38,7 @@ public:
///
/// Adds a round-trip time to the internal vector of times.
///
- /// \param RTT to record.
+ /// \param rtt RTT to record.
void addRtt(uint32_t rtt) {
rtt_.push_back(rtt);
}
@@ -73,6 +73,10 @@ public:
///
/// \param dns_service The DNS Service to perform the recursive
/// query on.
+ /// \param nsas Nameserver address store, used to hold information about zone
+ /// nameservers.
+ /// \param cache Resolver cache object, used to hold information about retrieved
+ /// records.
/// \param upstream Addresses and ports of the upstream servers
/// to forward queries to.
/// \param upstream_root Addresses and ports of the root servers
@@ -133,8 +137,10 @@ public:
/// object.
///
/// \param question The question being answered <qname/qclass/qtype>
- /// \param answer_message An output Message into which the final response will be copied
- /// \param buffer An output buffer into which the intermediate responses will be copied
+ /// \param answer_message An output Message into which the final response will
+ /// be copied.
+ /// \param buffer An output buffer into which the intermediate responses will
+ /// be copied.
/// \param server A pointer to the \c DNSServer object handling the client
void resolve(const isc::dns::Question& question,
isc::dns::MessagePtr answer_message,
@@ -147,6 +153,10 @@ public:
/// function resolve().
///
/// \param query_message the full query got from client.
+ /// \param answer_message the full answer received from other server.
+ /// \param buffer Output buffer into which the responses will be copied.
+ /// \param server Server object that handles receipt and processing of the
+ /// received messages.
/// \param callback callback object
void forward(isc::dns::ConstMessagePtr query_message,
isc::dns::MessagePtr answer_message,
diff --git a/src/lib/resolve/resolve.h b/src/lib/resolve/resolve.h
index 550b620..0a588e2 100644
--- a/src/lib/resolve/resolve.h
+++ b/src/lib/resolve/resolve.h
@@ -37,7 +37,6 @@ namespace resolve {
/// section), you can simply use this to create an error response.
///
/// \param answer_message The message to clear and place the error in
-/// \param question The question to add to the
/// \param error_code The error Rcode
void makeErrorMessage(isc::dns::MessagePtr answer_message,
const isc::dns::Rcode& error_code);
diff --git a/src/lib/server_common/client.h b/src/lib/server_common/client.h
index 1c5928a..8cafb1e 100644
--- a/src/lib/server_common/client.h
+++ b/src/lib/server_common/client.h
@@ -140,7 +140,7 @@ private:
///
/// \param os A \c std::ostream object on which the insertion operation is
/// performed.
-/// \param edns A reference to an \c Client object output by the operation.
+/// \param client A reference to a \c Client object output by the operation.
/// \return A reference to the same \c std::ostream object referenced by
/// parameter \c os after the insertion operation.
std::ostream& operator<<(std::ostream& os, const Client& client);
diff --git a/src/lib/server_common/logger.h b/src/lib/server_common/logger.h
index ae07865..80bc81d 100644
--- a/src/lib/server_common/logger.h
+++ b/src/lib/server_common/logger.h
@@ -18,7 +18,7 @@
#include <log/macros.h>
#include <server_common/server_common_messages.h>
-/// \file logger.h
+/// \file server_common/logger.h
/// \brief Server Common library global logger
///
/// This holds the logger for the server common library. It is a private header
More information about the bind10-changes
mailing list