X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPackets%2FDefaultBundle%2FIPv6Extensions.test.cc;h=15075bb06dbca7c22affc78b41dec5c40518d3a3;hb=309d78606f59617de0cfb1469b22111c846891ad;hp=d5976c0b4fe7d9c05c0234b205e4d429a3602926;hpb=79615f135540eb93e24ac7720a9fecb08fba2842;p=senf.git

diff --git a/senf/Packets/DefaultBundle/IPv6Extensions.test.cc b/senf/Packets/DefaultBundle/IPv6Extensions.test.cc
index d5976c0..15075bb 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
@@ -31,6 +32,7 @@
 #include "IPv6Packet.hh"
 #include "UDPPacket.hh"
 #include "ICMPv6Packet.hh"
+#include <senf/Utils/hexdump.hh>
 
 #include <senf/Utils/auto_unit_test.hh>
 #include <boost/test/test_tools.hpp>
@@ -79,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::IPv6Extension_Fragment>() );
+    BOOST_CHECK( pFragment_packet.next().is<senf::IPv6FragmentPacket>() );
 
-    senf::IPv6Extension_Fragment fFragment_packet (pFragment_packet.next().as<senf::IPv6Extension_Fragment>());
+    senf::IPv6FragmentPacket fFragment_packet (pFragment_packet.next().as<senf::IPv6FragmentPacket>());
 
     BOOST_CHECK_EQUAL( fFragment_packet->nextHeader(), 17u );
     BOOST_CHECK_EQUAL( fFragment_packet->fragmentOffset(), 160u );
@@ -140,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::IPv6Extension_Routing>() );
+    BOOST_REQUIRE( pRouting_packet.next().is<senf::IPv6RoutingPacket>() );
 
-    senf::IPv6Extension_Routing pRouting_extension (pRouting_packet.next().as<senf::IPv6Extension_Routing>());
+    senf::IPv6RoutingPacket pRouting_extension (pRouting_packet.next().as<senf::IPv6RoutingPacket>());
 
     BOOST_CHECK_EQUAL( pRouting_extension->nextHeader(), 58u );
     BOOST_CHECK_EQUAL( pRouting_extension->headerLength(), 0x00 );
@@ -196,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::IPv6Extension_HopByHop>() );
-    senf::IPv6Extension_HopByHop pHop_extension (pHop_packet.next().as<senf::IPv6Extension_HopByHop>());
+    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::IPv6Extension_HopByHop::Parser::options_t::container optC(pHop_extension->options() );
-    senf::IPv6Extension_HopByHop::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);
@@ -221,6 +224,72 @@ BOOST_AUTO_UNIT_TEST(ipv6Extensions_hopByHop_parse)
     BOOST_CHECK_EQUAL( pICMPv6->checksum(), 0x50cc);
 }
 
+BOOST_AUTO_UNIT_TEST(ipv6Extensions_hopByHop_create)                                                                                                      
+{                                                                                                                                                         
+    std::ostringstream oss (std::ostringstream::out);                                                                                                   
+    unsigned char HopByHop_packetData[] = {
+            0x60, 0x00, 0x00, 0x00, //IP version, class, flow label                                                                                       
+            0x00, 0x0c,           //payload length                                                                                                        
+            0x00,                 //next header: IPv6 hop-by-hop option (0)                                                                               
+            0x01,                 //hop limit (1)                                                                                                         
+            0xfe, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,     //IPv6 Source address (fe80::219:b9ff:feeb:b226)                                          
+            0x02, 0x19, 0xb9, 0xff, 0xfe, 0xeb, 0xb2, 0x26,
+
+            0xff, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,     //IPv6 Destination address ff02::16
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x16,
+            //HopByHop option
+            0x3a,   //next Header (ICMPv6)
+            0x00,   //Length (0 = 8Bytes)
+
+            //option Header
+            0x05, //option type
+            0x02, //option Length (= 2 byte)
+            0x00, 0x00, //data (zero data here ...)
+
+            0x02, //option type (2, set for testing purposes only)
+            0x00,  //option Type length (=0, no data field needed here)
+
+            //ICMPv6
+            0x8f, //type 143
+            0x00, //code 0, should always be 0
+            0xca, 0xdf, //checksum
+    };
+    senf::IPv6Packet ip (senf::IPv6Packet::create());
+    ip->version() = 6u;
+    ip->length() = 12u;
+    ip->nextHeader() = 0u;
+    ip->hopLimit() = 1u;
+    ip->source() = senf::INet6Address::from_string("fe80::219:b9ff:feeb:b226");
+    ip->destination() = senf::INet6Address::from_string("ff02::16");
+    senf::IPv6HopByHopOptionsPacket pext (senf::IPv6HopByHopOptionsPacket::createAfter(ip) );
+    pext->nextHeader() = 58u;
+    pext->headerLength() = 0u;
+    {
+        senf::IPv6HopByHopOptionsPacket::Parser::options_t::container optC(pext->options() );
+        
+        optC.push_back_space();
+        senf::IPv6GenericOptionTLVParser opt = optC.back().init<senf::IPv6GenericOptionTLVParser>();
+        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::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) );
+    SENF_CHECK_EQUAL_COLLECTIONS(
+        HopByHop_packetData, HopByHop_packetData+sizeof(HopByHop_packetData),
+        ip.data().begin(), ip.data().end() );
+}
 
 ///////////////////////////////cc.e////////////////////////////////////////
 #undef prefix_