BIND 10 trac1485, updated. 650d4636d56af1a6b5a329f4522357b914ea99e1 [1485] Compilation fixes in perfdhcp

[BIND 10 source code commits]

The branch, trac1485 has been updated
       via  650d4636d56af1a6b5a329f4522357b914ea99e1 (commit)
       via  aa415e021bb1f9e0bb7449fbd9e2b52e84b69bd0 (commit)
      from  4013083662dc7a9e6445ee7804dd6a0f5a21af01 (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 650d4636d56af1a6b5a329f4522357b914ea99e1
Author: Tomek Mrugalski <tomasz at isc.org>
Date:   Tue Jan 21 20:42:57 2014 +0100

    [1485] Compilation fixes in perfdhcp

commit aa415e021bb1f9e0bb7449fbd9e2b52e84b69bd0
Author: Tomek Mrugalski <tomasz at isc.org>
Date:   Tue Jan 21 20:42:40 2014 +0100

    [1485] Compilation fixes in D2 (patch by Tom M.)

-----------------------------------------------------------------------

Summary of changes:
 src/bin/d2/tests/nc_test_utils.cc    |    9 +++++++--
 tests/tools/perfdhcp/test_control.cc |    7 +++----
 2 files changed, 10 insertions(+), 6 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/bin/d2/tests/nc_test_utils.cc b/src/bin/d2/tests/nc_test_utils.cc
index b65b9e4..a907abe 100644
--- a/src/bin/d2/tests/nc_test_utils.cc
+++ b/src/bin/d2/tests/nc_test_utils.cc
@@ -16,6 +16,8 @@
 #include <dns/opcode.h>
 #include <dns/messagerenderer.h>
 #include <nc_test_utils.h>
+#include <asio.hpp>
+#include <asiolink/udp_endpoint.h>
 
 #include <gtest/gtest.h>
 
@@ -42,7 +44,9 @@ FauxServer::FauxServer(asiolink::IOService& io_service,
     server_socket_.reset(new asio::ip::udp::socket(io_service_.get_io_service(),
                                                    asio::ip::udp::v4()));
     server_socket_->set_option(asio::socket_base::reuse_address(true));
-    server_socket_->bind(asio::ip::udp::endpoint(address_.getAddress(), port_));
+
+    isc::asiolink::UDPEndpoint endpoint(address_, port_);
+    server_socket_->bind(endpoint.getASIOEndpoint());
 }
 
 FauxServer::FauxServer(asiolink::IOService& io_service,
@@ -53,7 +57,8 @@ FauxServer::FauxServer(asiolink::IOService& io_service,
     server_socket_.reset(new asio::ip::udp::socket(io_service_.get_io_service(),
                                                    asio::ip::udp::v4()));
     server_socket_->set_option(asio::socket_base::reuse_address(true));
-    server_socket_->bind(asio::ip::udp::endpoint(address_.getAddress(), port_));
+    isc::asiolink::UDPEndpoint endpoint(address_, port_);
+    server_socket_->bind(endpoint.getASIOEndpoint());
 }
 
 
diff --git a/tests/tools/perfdhcp/test_control.cc b/tests/tools/perfdhcp/test_control.cc
index 3751e2f..485fdd0 100644
--- a/tests/tools/perfdhcp/test_control.cc
+++ b/tests/tools/perfdhcp/test_control.cc
@@ -780,8 +780,7 @@ TestControl::openSocket() const {
     } else if (options.getIpVersion() == 6) {
         // If remote address is multicast we need to enable it on
         // the socket that has been created.
-        asio::ip::address_v6 remote_v6 = remoteaddr.getAddress().to_v6();
-        if (remote_v6.is_multicast()) {
+        if (remoteaddr.isV6Multicast()) {
             int hops = 1;
             int ret = setsockopt(sock, IPPROTO_IPV6, IPV6_MULTICAST_HOPS,
                                  &hops, sizeof(hops));
@@ -1643,7 +1642,7 @@ TestControl::sendRequest4(const TestControlSocket& socket,
 
     /// Set client address.
     asiolink::IOAddress yiaddr = offer_pkt4->getYiaddr();
-    if (!yiaddr.getAddress().is_v4()) {
+    if (yiaddr.isV6()) {
         isc_throw(BadValue, "the YIADDR returned in OFFER packet is not "
                   " IPv4 address");
     }
@@ -1751,7 +1750,7 @@ TestControl::sendRequest4(const TestControlSocket& socket,
 
     /// Set client address.
     asiolink::IOAddress yiaddr = offer_pkt4->getYiaddr();
-    if (!yiaddr.getAddress().is_v4()) {
+    if (!yiaddr.isV4()) {
         isc_throw(BadValue, "the YIADDR returned in OFFER packet is not "
                   " IPv4 address");
     }