X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPackets%2FDefaultBundle%2FIPv6Extensions.test.cc;h=fde52a343de6676ff62026b6f842cff6fef4ab9b;hb=d9143facc7806e2c03ee357fd9697ea9a1277377;hp=9451b445933fd9e34deb9edb4d2118185258eebf;hpb=943a0081e419e87e958889eb630f09180a9c196c;p=senf.git

diff --git a/senf/Packets/DefaultBundle/IPv6Extensions.test.cc b/senf/Packets/DefaultBundle/IPv6Extensions.test.cc
index 9451b44..fde52a3 100644
--- a/senf/Packets/DefaultBundle/IPv6Extensions.test.cc
+++ b/senf/Packets/DefaultBundle/IPv6Extensions.test.cc
@@ -5,6 +5,7 @@
 // Competence Center NETwork research (NET), St. Augustin, GERMANY
 //     Stefan Bund <g0dil@berlios.de>
 //     Philipp Batroff <philipp.batroff@fokus.fraunhofer.de>
+//
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation; either version 2 of the License, or
@@ -80,9 +81,9 @@ BOOST_AUTO_UNIT_TEST(ipv6Extensions_fragment)
     std::ostringstream oss (std::ostringstream::out);
     SENF_CHECK_NO_THROW( pFragment_packet.dump( oss));
 
-    BOOST_CHECK( pFragment_packet.next().is<senf::IPv6Fragment>() );
+    BOOST_CHECK( pFragment_packet.next().is<senf::IPv6FragmentPacket>() );
 
-    senf::IPv6Fragment fFragment_packet (pFragment_packet.next().as<senf::IPv6Fragment>());
+    senf::IPv6FragmentPacket fFragment_packet (pFragment_packet.next().as<senf::IPv6FragmentPacket>());
 
     BOOST_CHECK_EQUAL( fFragment_packet->nextHeader(), 17u );
     BOOST_CHECK_EQUAL( fFragment_packet->fragmentOffset(), 160u );
@@ -141,9 +142,9 @@ BOOST_AUTO_UNIT_TEST(ipv6Extensions_routing)
     std::ostringstream oss (std::ostringstream::out);
     SENF_CHECK_NO_THROW( pRouting_packet.dump( oss));
 
-    BOOST_REQUIRE( pRouting_packet.next().is<senf::IPv6Routing>() );
+    BOOST_REQUIRE( pRouting_packet.next().is<senf::IPv6RoutingPacket>() );
 
-    senf::IPv6Routing pRouting_extension (pRouting_packet.next().as<senf::IPv6Routing>());
+    senf::IPv6RoutingPacket pRouting_extension (pRouting_packet.next().as<senf::IPv6RoutingPacket>());
 
     BOOST_CHECK_EQUAL( pRouting_extension->nextHeader(), 58u );
     BOOST_CHECK_EQUAL( pRouting_extension->headerLength(), 0x00 );
@@ -197,13 +198,14 @@ BOOST_AUTO_UNIT_TEST(ipv6Extensions_hopByHop_parse)
     std::ostringstream oss (std::ostringstream::out);
     SENF_CHECK_NO_THROW( pHop_packet.dump( oss ));
 
-    BOOST_REQUIRE( pHop_packet.next().is<senf::IPv6HopByHop>() );
-    senf::IPv6HopByHop pHop_extension (pHop_packet.next().as<senf::IPv6HopByHop>());
+    BOOST_REQUIRE( pHop_packet.next().is<senf::IPv6HopByHopOptionsPacket>() );
+    senf::IPv6HopByHopOptionsPacket pHop_extension (
+            pHop_packet.next().as<senf::IPv6HopByHopOptionsPacket>());
     BOOST_CHECK_EQUAL( pHop_extension->nextHeader(), 58u );
     BOOST_CHECK_EQUAL( pHop_extension->headerLength(), 0x00 );
 
-    senf::IPv6HopByHop::Parser::options_t::container optC(pHop_extension->options() );
-    senf::IPv6HopByHop::Parser::options_t::container::iterator listIter (optC.begin());
+    senf::IPv6HopByHopOptionsPacket::Parser::options_t::container optC(pHop_extension->options() );
+    senf::IPv6HopByHopOptionsPacket::Parser::options_t::container::iterator listIter (optC.begin());
 
     BOOST_CHECK_EQUAL( listIter->altAction(), 0u);
     BOOST_CHECK_EQUAL( listIter->changeFlag(), 0u);
@@ -259,34 +261,36 @@ BOOST_AUTO_UNIT_TEST(ipv6Extensions_hopByHop_create)
     ip->hopLimit() = 1u;
     ip->source() = senf::INet6Address::from_string("fe80::219:b9ff:feeb:b226");
     ip->destination() = senf::INet6Address::from_string("ff02::16");
-    senf::IPv6HopByHop pext (senf::IPv6HopByHop::createAfter(ip) );
+    senf::IPv6HopByHopOptionsPacket pext (senf::IPv6HopByHopOptionsPacket::createAfter(ip) );
     pext->nextHeader() = 58u;
     pext->headerLength() = 0u;
     {
-        senf::IPv6HopByHop::Parser::options_t::container optC(pext->options() );
-        
-        optC.push_back_space();
-        senf::GenericOptTypeTLVParser opt = optC.back().init<senf::GenericOptTypeTLVParser>();
-        opt.altAction() = 0u;
-        opt.changeFlag() = 0u;
-        opt.optionType() = 5u;
-        unsigned char val[] = {0x00, 0x00};
-        opt.setPayload(val);
-        
-        optC.push_back_space();
-        opt = optC.back().init<senf::GenericOptTypeTLVParser>();
-        opt.altAction() = 0u;
-        opt.changeFlag() = 0u;
-        opt.optionType() = 2u;
+        senf::IPv6HopByHopOptionsPacket::Parser::options_t::container optC(pext->options() );
+        {
+            senf::IPv6GenericOptionTLVParser opt (
+                optC.push_back_space().init<senf::IPv6GenericOptionTLVParser>());
+            opt.altAction() = 0u;
+            opt.changeFlag() = 0u;
+            opt.optionType() = 5u;
+            unsigned char val[] = {0x00, 0x00};
+            opt.setPayload(val);
+        }
+        {
+            senf::IPv6GenericOptionTLVParser opt (
+                optC.push_back_space().init<senf::IPv6GenericOptionTLVParser>());
+            opt.altAction() = 0u;
+            opt.changeFlag() = 0u;
+            opt.optionType() = 2u;
+        }
     }
     senf::ICMPv6Packet icmp (senf::ICMPv6Packet::createAfter (pext));
     icmp->type() = 0x8f;
     icmp->code() = 0u;
     ip.finalizeAll();
     SENF_CHECK_NO_THROW( ip.dump(oss) );
-    BOOST_CHECK_EQUAL_COLLECTIONS(
-            HopByHop_packetData, HopByHop_packetData+sizeof(HopByHop_packetData),
-            ip.data().begin(), ip.data().end() );
+    SENF_CHECK_EQUAL_COLLECTIONS(
+        HopByHop_packetData, HopByHop_packetData+sizeof(HopByHop_packetData),
+        ip.data().begin(), ip.data().end() );
 }
 
 ///////////////////////////////cc.e////////////////////////////////////////