commit 4a4ccfe7d65a5cadf91a70533e3d458ab91fa27c
author Eric Newberry <enewberry@email.arizona.edu> Thu Jul 21 22:51:04 2016 -0700
committer Eric Newberry <enewberry@email.arizona.edu> Sat Jul 23 09:40:27 2016 -0700
tree d4b161a3c21ab6244abe378381a36619e00bc003
parent 5149320e5b183c41d70ea5a1bef5ceaf21ba3084

face: Set FaceScope to local for IPv4-mapped IPv6 loopback addresses

refs #3682

Change-Id: I33c22d3585c8fee081b1317cdd6587ec0f0e4ef5

tests/daemon/face/websocket-transport.t.cpp

diff --git a/tests/daemon/face/websocket-transport.t.cpp b/tests/daemon/face/websocket-transport.t.cpp
index 8dbd717..993ebc2 100644
--- a/tests/daemon/face/websocket-transport.t.cpp
+++ b/tests/daemon/face/websocket-transport.t.cpp
@@ -115,7 +115,13 @@
                      const time::milliseconds& pongTimeout = time::seconds(1))
   {
     this->serverListen(ep, pongTimeout);
-    std::string uri = "ws://" + ep.address().to_string() + ":" + to_string(ep.port());
+    std::string uri;
+    if (ep.address().is_v6()) {
+      uri = "ws://[" + ep.address().to_string() + "]:" + to_string(ep.port());
+    }
+    else {
+      uri = "ws://" + ep.address().to_string() + ":" + to_string(ep.port());
+    }
     this->clientConnect(uri);
     BOOST_REQUIRE_EQUAL(limitedIo.run(2, // serverHandleOpen, clientHandleOpen
                         time::seconds(1)), LimitedIo::EXCEED_OPS);
@@ -248,6 +254,29 @@
   BOOST_CHECK_EQUAL(transport->getMtu(), MTU_UNLIMITED);
 }
 
+BOOST_AUTO_TEST_CASE(StaticPropertiesLocalIpv4MappedIpv6)
+{
+  auto address4 = getTestIp<ip::address_v4>(LoopbackAddress::Yes);
+  SKIP_IF_IP_UNAVAILABLE(address4);
+  auto address6 = ip::address_v6::v4_mapped(address4);
+  BOOST_REQUIRE(address6.is_v4_mapped());
+  this->endToEndInitialize(ip::tcp::endpoint(address6, 20070));
+
+  checkStaticPropertiesInitialized(*transport);
+
+  BOOST_CHECK_EQUAL(transport->getLocalUri().getScheme(), "ws");
+  BOOST_CHECK_EQUAL(transport->getLocalUri().getHost(), "::ffff:127.0.0.1");
+  BOOST_CHECK_EQUAL(transport->getLocalUri().getPort(), "20070");
+  BOOST_CHECK_EQUAL(transport->getLocalUri().getPath(), "");
+  BOOST_CHECK_EQUAL(transport->getRemoteUri().getScheme(), "wsclient");
+  BOOST_CHECK_EQUAL(transport->getRemoteUri().getHost(), "::ffff:127.0.0.1");
+  BOOST_CHECK_EQUAL(transport->getRemoteUri().getPath(), "");
+  BOOST_CHECK_EQUAL(transport->getScope(), ndn::nfd::FACE_SCOPE_LOCAL);
+  BOOST_CHECK_EQUAL(transport->getPersistency(), ndn::nfd::FACE_PERSISTENCY_ON_DEMAND);
+  BOOST_CHECK_EQUAL(transport->getLinkType(), ndn::nfd::LINK_TYPE_POINT_TO_POINT);
+  BOOST_CHECK_EQUAL(transport->getMtu(), MTU_UNLIMITED);
+}
+
 BOOST_AUTO_TEST_CASE(PingPong)
 {
   auto address = getTestIp<ip::address_v4>();