Merge branch 'isc-master' into minor-changes

7 files changed, 25 insertions, 25 deletions

diff --git a/src/lib/dhcp_ddns/Makefile.am b/src/lib/dhcp_ddns/Makefile.am
index d510a8823a..99c84c4caa 100644
--- a/src/lib/dhcp_ddns/Makefile.am
+++ b/src/lib/dhcp_ddns/Makefile.am
@@ -34,7 +34,7 @@ libkea_dhcp_ddns_la_CXXFLAGS = $(AM_CXXFLAGS)
 libkea_dhcp_ddns_la_CPPFLAGS = $(AM_CPPFLAGS)
 libkea_dhcp_ddns_la_LDFLAGS  = $(AM_LDFLAGS)
 libkea_dhcp_ddns_la_LDFLAGS += $(CRYPTO_LDFLAGS)
-libkea_dhcp_ddns_la_LDFLAGS += -no-undefined -version-info 1:1:0
+libkea_dhcp_ddns_la_LDFLAGS += -no-undefined -version-info 1:2:0
 
 libkea_dhcp_ddns_la_LIBADD  =
 libkea_dhcp_ddns_la_LIBADD += $(top_builddir)/src/lib/config/libkea-cfgclient.la
diff --git a/src/lib/dhcp_ddns/libdhcp_ddns.dox b/src/lib/dhcp_ddns/libdhcp_ddns.dox
index e6102f6bc4..c03e30c778 100644
--- a/src/lib/dhcp_ddns/libdhcp_ddns.dox
+++ b/src/lib/dhcp_ddns/libdhcp_ddns.dox
@@ -1,11 +1,11 @@
-// Copyright (C) 2013-2015 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2013-2017 Internet Systems Consortium, Inc. ("ISC")
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 /**
-@page libdhcp_ddns libdhcp_ddns - DHCP_DDNS Request I/O Library
+@page libdhcp_ddns libkea-dhcp_ddns - DHCP_DDNS Request I/O Library
 
 @section libdhcp_ddnsIntro Introduction
 
@@ -48,7 +48,7 @@ only transport supported is via UDP Sockets.
 
 The UDP implementation is provided by isc::dhcp_ddns::NameChangeUDPSender
 and isc::dhcp_ddns::NameChangeUDPListener.  The implementation is strictly
-unidirectional: there is no explicit acknowledgement of receipt of a
+unidirectional: there is no explicit acknowledgment of receipt of a
 request so, as it is UDP, no guarantee of delivery.
 
 */
diff --git a/src/lib/dhcp_ddns/ncr_io.cc b/src/lib/dhcp_ddns/ncr_io.cc
index a7c30c0e51..9068f13289 100644
--- a/src/lib/dhcp_ddns/ncr_io.cc
+++ b/src/lib/dhcp_ddns/ncr_io.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2013-2016 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2013-2017 Internet Systems Consortium, Inc. ("ISC")
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -189,8 +189,8 @@ NameChangeSender::startSending(isc::asiolink::IOService& io_service) {
 
 void
 NameChangeSender::stopSending() {
-    // Set it send indicator to false, no matter what. This allows us to at 
-    // least try to re-open via startSending(). Also, setting it false now, 
+    // Set it send indicator to false, no matter what. This allows us to at
+    // least try to re-open via startSending(). Also, setting it false now,
     // allows us to break sendNext() chain in invokeSendHandler.
     setSending(false);
 
@@ -393,7 +393,7 @@ NameChangeSender::runReadyIO() {
     }
 
     // We shouldn't be here if IO isn't ready to execute.
-    // By running poll we're gauranteed not to hang.
+    // By running poll we're guaranteed not to hang.
     /// @todo Trac# 3325 requests that asiolink::IOService provide a
     /// wrapper for poll().
     io_service_->get_io_service().poll_one();
diff --git a/src/lib/dhcp_ddns/ncr_io.h b/src/lib/dhcp_ddns/ncr_io.h
index e32bb326fa..dce72a5407 100644
--- a/src/lib/dhcp_ddns/ncr_io.h
+++ b/src/lib/dhcp_ddns/ncr_io.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2013-2015 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2013-2017 Internet Systems Consortium, Inc. ("ISC")
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -550,7 +550,7 @@ public:
     ///
     /// @throw NcrSenderError if either sender is in send mode, if the number of
     /// messages in the source sender's queue is larger than this sender's
-    /// maxium queue size, or if this sender's queue is not empty.
+    /// maximum queue size, or if this sender's queue is not empty.
     void assumeQueue(NameChangeSender& source_sender);
 
     /// @brief Returns a file descriptor suitable for use with select
@@ -754,7 +754,7 @@ private:
     /// @brief Boolean indicator which tracks sending status.
     bool sending_;
 
-    /// @brief A pointer to regisetered send completion handler.
+    /// @brief A pointer to registered send completion handler.
     RequestSendHandler& send_handler_;
 
     /// @brief Maximum number of entries permitted in the send queue.
diff --git a/src/lib/dhcp_ddns/ncr_msg.h b/src/lib/dhcp_ddns/ncr_msg.h
index 065e1181bc..958f57509d 100644
--- a/src/lib/dhcp_ddns/ncr_msg.h
+++ b/src/lib/dhcp_ddns/ncr_msg.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2013-2016 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2013-2017 Internet Systems Consortium, Inc. ("ISC")
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -33,7 +33,7 @@ public:
         isc::Exception(file, line, what) { };
 };
 
-/// @brief Exception thrown when there is an error occured during computation
+/// @brief Exception thrown when there is an error occurred during computation
 /// of the DHCID.
 class DhcidRdataComputeError : public isc::Exception {
 public:
@@ -180,14 +180,14 @@ public:
         return (this->bytes_ != other.bytes_);
     }
 
-    /// @brief Compares two D2Dhcids lexcially
+    /// @brief Compares two D2Dhcids lexically
     bool operator<(const D2Dhcid& other) const {
         return (this->bytes_ < other.bytes_);
     }
 
 private:
 
-    /// @brief Creates the DHCID using specified indetifier.
+    /// @brief Creates the DHCID using specified identifier.
     ///
     /// This function creates the DHCID RDATA as specified in RFC4701,
     /// section 3.5.
diff --git a/src/lib/dhcp_ddns/ncr_udp.cc b/src/lib/dhcp_ddns/ncr_udp.cc
index 048b5367f2..655f8b06e6 100644
--- a/src/lib/dhcp_ddns/ncr_udp.cc
+++ b/src/lib/dhcp_ddns/ncr_udp.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2013-2016 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2013-2017 Internet Systems Consortium, Inc. ("ISC")
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -114,7 +114,7 @@ NameChangeUDPListener::open(isc::asiolink::IOService& io_service) {
 
 void
 NameChangeUDPListener::doReceive() {
-    // Call the socket's asychronous receiving, passing ourself in as callback.
+    // Call the socket's asynchronous receiving, passing ourself in as callback.
     RawBufferPtr recv_buffer = recv_callback_->getBuffer();
     socket_->asyncReceive(recv_buffer.get(), recv_callback_->getBufferSize(),
                           0, recv_callback_->getDataSource().get(),
@@ -174,7 +174,7 @@ NameChangeUDPListener::receiveCompletionHandler(const bool successful,
         if (error_code.value() == boost::asio::error::operation_aborted) {
             // A shutdown cancels all outstanding reads.  For this reason,
             // it can be an expected event, so log it as a debug message.
-            LOG_DEBUG(dhcp_ddns_logger, DBGLVL_TRACE_BASIC,
+            LOG_DEBUG(dhcp_ddns_logger, isc::log::DBGLVL_TRACE_BASIC,
                       DHCP_DDNS_NCR_UDP_RECV_CANCELED);
             result = STOPPED;
         } else {
@@ -235,7 +235,7 @@ NameChangeUDPSender::open(isc::asiolink::IOService& io_service) {
             asio_socket_->set_option(boost::asio::socket_base::reuse_address(true));
         }
 
-        // Bind the low leve socket to our endpoint.
+        // Bind the low level socket to our endpoint.
         asio_socket_->bind(endpoint.getASIOEndpoint());
     } catch (boost::system::system_error& ex) {
         isc_throw (NcrUDPError, ex.code().message());
@@ -294,7 +294,7 @@ NameChangeUDPSender::doSend(NameChangeRequestPtr& ncr) {
     send_callback_->putData(static_cast<const uint8_t*>(ncr_buffer.getData()),
                             ncr_buffer.getLength());
 
-    // Call the socket's asychronous send, passing our callback
+    // Call the socket's asynchronous send, passing our callback
     socket_->asyncSend(send_callback_->getData(), send_callback_->getPutLen(),
                        send_callback_->getDataSource().get(), *send_callback_);
 
diff --git a/src/lib/dhcp_ddns/tests/ncr_udp_unittests.cc b/src/lib/dhcp_ddns/tests/ncr_udp_unittests.cc
index eda0abcf21..e6ac57a739 100644
--- a/src/lib/dhcp_ddns/tests/ncr_udp_unittests.cc
+++ b/src/lib/dhcp_ddns/tests/ncr_udp_unittests.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2013-2015 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2013-2017 Internet Systems Consortium, Inc. ("ISC")
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -720,7 +720,7 @@ TEST_F (NameChangeUDPTest, roundTripTest) {
 }
 
 // Tests error handling of a failure to mark the watch socket ready, when
-// sendRequestt() is called.
+// sendRequest() is called.
 TEST(NameChangeUDPSenderBasicTest, watchClosedBeforeSendRequest) {
     isc::asiolink::IOAddress ip_address(TEST_ADDRESS);
     isc::asiolink::IOService io_service;
@@ -739,7 +739,7 @@ TEST(NameChangeUDPSenderBasicTest, watchClosedBeforeSendRequest) {
     // Tamper with the watch socket by closing the select-fd.
     close(sender.getSelectFd());
 
-    // Send should fail as we interferred by closing the select-fd.
+    // Send should fail as we interfered by closing the select-fd.
     ASSERT_THROW(sender.sendRequest(ncr), util::WatchSocketError);
 
     // Verify we didn't invoke the handler.
@@ -776,7 +776,7 @@ TEST(NameChangeUDPSenderBasicTest, watchClosedAfterSendRequest) {
     close (sender.getSelectFd());
 
     // Run one handler. This should execute the send completion handler
-    // after sending the first message.  Duing completion handling, we will
+    // after sending the first message.  Doing completion handling, we will
     // attempt to queue the second message which should fail.
     ASSERT_NO_THROW(sender.runReadyIO());
 
@@ -823,7 +823,7 @@ TEST(NameChangeUDPSenderBasicTest, watchSocketBadRead) {
     ASSERT_NE(util::WatchSocket::MARKER, buf);
 
     // Run one handler. This should execute the send completion handler
-    // after sending the message.  Duing completion handling clearing the
+    // after sending the message.  Doing completion handling clearing the
     // watch socket should fail, which will close the socket, but not
     // result in a throw.
     ASSERT_NO_THROW(sender.runReadyIO());