X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FSocket%2FProtocols%2FINet%2FINet6Address.test.cc;h=52b1289c4856004507eefe1239a5ec5af6586c79;hb=61b2e2ea5cb50df90931acf3fcd840493ba762a9;hp=7a09b838e4003c4825778a5b7cfdc7ae864eb5d9;hpb=26610f603ebdd465307b9621f532c1fe19fd5571;p=senf.git

diff --git a/senf/Socket/Protocols/INet/INet6Address.test.cc b/senf/Socket/Protocols/INet/INet6Address.test.cc
index 7a09b83..52b1289 100644
--- a/senf/Socket/Protocols/INet/INet6Address.test.cc
+++ b/senf/Socket/Protocols/INet/INet6Address.test.cc
@@ -29,6 +29,9 @@
 // Custom includes
 #include "INet6Address.hh"
 #include <senf/Utils/String.hh>
+#include <senf/Socket/Protocols/AddressExceptions.hh>
+#include <senf/Socket/Protocols/Raw/EUI64.hh>
+#include <senf/Socket/Protocols/Raw/MACAddress.hh>
 
 #include <senf/Utils/auto_unit_test.hh>
 #include <boost/test/test_tools.hpp>
@@ -36,7 +39,7 @@
 #define prefix_
 ///////////////////////////////cc.p////////////////////////////////////////
 
-BOOST_AUTO_UNIT_TEST(inet6Address)
+SENF_AUTO_UNIT_TEST(inet6Address)
 {
     using senf::INet6Address;
     using senf::INet4Address;
@@ -61,12 +64,12 @@ BOOST_AUTO_UNIT_TEST(inet6Address)
         BOOST_CHECK_EQUAL( addr1[13], 14 );
         BOOST_CHECK_EQUAL( addr1[14], 15 );
         BOOST_CHECK_EQUAL( addr1[15], 0 );
-        BOOST_CHECK( INet6Address::from_string("www.go6.net") != INet6Address::None );
+        SENF_CHECK_NOT_EQUAL( INet6Address::from_string("www.go6.net"), INet6Address::None );
         INet6Address addr2;
         BOOST_CHECK_EQUAL( senf::str(addr2), "::" );
         addr2 = INet6Address::from_string("::1");
-        BOOST_CHECK( addr1 != addr2 );
-        addr1 =INet6Address::from_string("::1");
+        SENF_CHECK_NOT_EQUAL( addr1, addr2 );
+        addr1 = INet6Address::from_string("::1");
         BOOST_CHECK_EQUAL( addr1, addr2 );
         addr1 = INet6Address::None;
         addr2 = INet6Address::from_string("::");
@@ -78,12 +81,12 @@ BOOST_AUTO_UNIT_TEST(inet6Address)
         BOOST_CHECK_EQUAL( addr3, INet6Address::from_string("1200::21") );
         BOOST_CHECK_EQUAL( INet6Address::from_inet4address(INet4Address(0x01020304)),
                            INet6Address::from_string("::ffff:1.2.3.4") );
+        BOOST_CHECK( INet6Address::from_inet4address(INet4Address(0x01020304)).inet4Mapped());
 
         BOOST_CHECK_THROW( INet6Address::from_string("1.2.3.4"), UnknownHostnameException );
         BOOST_CHECK_EQUAL( INet6Address::from_string("1.2.3.4", INet6Address::ResolveINet4),
                            INet6Address::from_string("::ffff:1.2.3.4") );
     }
-
     {
         INet6Address addr (INet6Address::from_string("2001:dead:beef::1002:3004"));
         BOOST_CHECK_EQUAL( addr.network(), senf::INet6Network(
@@ -131,7 +134,6 @@ BOOST_AUTO_UNIT_TEST(inet6Address)
         BOOST_CHECK( INet6Address::Loopback );
         BOOST_CHECK( ! INet6Address::None );
     }
-
     {
         std::stringstream str;
         INet6Address addr;
@@ -153,7 +155,6 @@ BOOST_AUTO_UNIT_TEST(inet6Address)
         BOOST_CHECK( ! str.fail());
         BOOST_CHECK_EQUAL(addr, INet6Address::from_string("2001:dead:beef::1002:3004"));
     }
-
     {
         INet6Address addr;
         addr.network(0x2000010203040506ull);
@@ -161,9 +162,18 @@ BOOST_AUTO_UNIT_TEST(inet6Address)
         addr.id(1u);
         BOOST_CHECK_EQUAL( addr, INet6Address(0x2000u,0x0102u,0x0304u,0x0506u,0u,0u,0u,1u) );
     }
+    {
+        using senf::MACAddress;
+        BOOST_CHECK_EQUAL(
+                INet6Address::from_mac( MACAddress::from_string("00-0C-29-C2-52-FF")),
+                INet6Address::from_string("fe80::20c:29ff:fec2:52ff") );
+        BOOST_CHECK_EQUAL(
+                INet6Address::from_eui64( senf::EUI64::from_mac( MACAddress::from_string("a4:ba:db:fd:b8:76"))),
+                INet6Address::from_string("fe80::a6ba:dbff:fefd:b876") );
+    }
 }
 
-BOOST_AUTO_UNIT_TEST(inet6Network)
+SENF_AUTO_UNIT_TEST(inet6Network)
 {
     using senf::INet6Address;
     using senf::INet6Network;
@@ -179,13 +189,15 @@ BOOST_AUTO_UNIT_TEST(inet6Network)
     BOOST_CHECK_EQUAL( net2.address(), INet6Address::from_string("2001:db8:1230::") );
     BOOST_CHECK_EQUAL( net2.prefix_len(), 44u );
 
-    BOOST_CHECK( net != net2 );
+    SENF_CHECK_NOT_EQUAL( net, net2 );
     BOOST_CHECK( net.match(INet6Address::from_string("ff14:1234::1")) );
     BOOST_CHECK( ! net2.match(INet6Address::from_string("ff13:1234::1")) );
     BOOST_CHECK( ! net.match(net2) );
     BOOST_CHECK( net2.match(INet6Network("2001:db8:1234::/48")) );
     BOOST_CHECK( ! net2.match(INet6Network("2001:db8:1234::/32")) );
 
+    BOOST_CHECK( ! INet6Network("ff14:1234::1/128").match(INet6Network("ff14:1234::2/128")) );
+
     BOOST_CHECK_EQUAL( senf::str(net2), "2001:db8:1230::/44" );
 
     BOOST_CHECK_EQUAL( net2.host(0x1234u), INet6Address::from_string("2001:db8:1230::1234") );
@@ -193,6 +205,22 @@ BOOST_AUTO_UNIT_TEST(inet6Network)
 
     BOOST_CHECK_THROW( INet6Network(""), AddressSyntaxException );
     BOOST_CHECK_THROW( INet6Network("2001:db8:1234::/beef"), AddressSyntaxException );
+
+    {
+        std::stringstream str;
+        INet6Network net;
+        str >> net;
+        BOOST_CHECK( str.fail());
+    }
+    {
+        std::stringstream str;
+        INet6Network net ("2001:db8:1230::/44");
+        str << net;
+        BOOST_CHECK_EQUAL( str.str(), "2001:db8:1230::/44");
+        str >> net;
+        BOOST_CHECK( ! str.fail());
+        BOOST_CHECK_EQUAL(net, INet6Network("2001:db8:1230::/44"));
+    }
 }
 
 ///////////////////////////////cc.e////////////////////////////////////////