Packets/80221Bundle: more GenericTLVBase integration; removed GenericTLVPacket; some...

[senf.git] / senf / Packets / DefaultBundle / IPv6Extensions.test.cc

diff --git a/senf/Packets/DefaultBundle/IPv6Extensions.test.cc b/senf/Packets/DefaultBundle/IPv6Extensions.test.cc
index 635fba2..a473d85 100644 (file)
--- a/senf/Packets/DefaultBundle/IPv6Extensions.test.cc
+++ b/senf/Packets/DefaultBundle/IPv6Extensions.test.cc
@@ -209,12 +209,12 @@ BOOST_AUTO_UNIT_TEST(ipv6Extensions_hopByHop_parse)
     BOOST_CHECK_EQUAL( listIter->altAction(), 0u);
     BOOST_CHECK_EQUAL( listIter->changeFlag(), 0u);
     BOOST_CHECK_EQUAL( listIter->optionType(), 5u);
-    BOOST_CHECK_EQUAL( listIter->optionLength(), 2u);
+    BOOST_CHECK_EQUAL( listIter->length(), 2u);
     ++listIter;
     BOOST_CHECK_EQUAL( listIter->altAction(), 0u);
     BOOST_CHECK_EQUAL( listIter->changeFlag(), 0u);
     BOOST_CHECK_EQUAL( listIter->optionType(), 2u);
-    BOOST_CHECK_EQUAL( listIter->optionLength(), 0);
+    BOOST_CHECK_EQUAL( listIter->length(), 0);
 
     BOOST_REQUIRE( pHop_extension.next().is<senf::ICMPv6Packet>() );
     senf::ICMPv6Packet pICMPv6  (pHop_extension.next().as<senf::ICMPv6Packet>());
@@ -223,6 +223,7 @@ 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);
@@ -285,7 +286,7 @@ BOOST_AUTO_UNIT_TEST(ipv6Extensions_hopByHop_create)
             opt.changeFlag() = 0u;
             opt.optionType() = 5u;
             unsigned char val[] = {0x00, 0x00};
-            opt.setPayload(val);
+            opt.value(val);
         }
     }
 
@@ -306,6 +307,7 @@ BOOST_AUTO_UNIT_TEST(ipv6Extensions_hopByHop_create)
             eth.data().begin(), eth.data().end() );
 }
 
+
 namespace {
     struct IPv6ChecksumOptionTLVParser : public senf::IPv6OptionTLVParser
     {
@@ -316,7 +318,7 @@ namespace {
         
         SENF_PARSER_INIT() {
             optionType() = typeCode;
-            optionLength() = senf::init_bytes<IPv6ChecksumOptionTLVParser>::value -senf::init_bytes<IPv6OptionTLVParser>::value;
+            length() = senf::init_bytes<IPv6ChecksumOptionTLVParser>::value -senf::init_bytes<IPv6OptionTLVParser>::value;
             slfNetType() = SN_typeCode;     
         }
         SENF_PARSER_FINALIZE ( IPv6ChecksumOptionTLVParser );
@@ -325,20 +327,12 @@ namespace {
     };
 }
 
-BOOST_AUTO_UNIT_TEST(ipv6Extensions_hopByHop_create_SN) {    
-    unsigned char data[] = { 
-            0x3a, 0x01,  // Hop-By-Hop Header (nextHeader, length) 
-            0x0d, 0x05,  // option type, length
-            // option value: slfNetType, checksum
-            0x01, 0x01, 0x23, 0x45, 0x67,
-            // padding (PadN option: type, length, 0-padding)
-            0x01, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00
-    };
-    
+BOOST_AUTO_UNIT_TEST(ipv6Extensions_hopByHop_create_SN)
+{    
     senf::IPv6HopByHopOptionsPacket p ( senf::IPv6HopByHopOptionsPacket::create() );
     p->nextHeader() = 0x3a;
     {
-        senf::IPv6HopByHopOptionsPacket::Parser::options_t::container optC(p->options() );
+        senf::IPv6HopByHopOptionsPacket::Parser::options_t::container optC (p->options() );
         {
             IPv6ChecksumOptionTLVParser opt ( 
                     optC.push_back_space().init<IPv6ChecksumOptionTLVParser>());
@@ -347,10 +341,43 @@ BOOST_AUTO_UNIT_TEST(ipv6Extensions_hopByHop_create_SN) {
         }
     }
 
+    unsigned char data[] = { 
+            0x3a, 0x01,  // Hop-By-Hop Header (nextHeader, length) 
+            0x0d, 0x05,  // option type, length
+            // option value: slfNetType, checksum
+            0x01, 0x01, 0x23, 0x45, 0x67,
+            // padding (PadN option: type, length, 0-padding)
+            0x01, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00
+    };
     SENF_CHECK_EQUAL_COLLECTIONS( data, data+sizeof(data),
                                  p.data().begin(), p.data().end() );    
 }
 
+
+BOOST_AUTO_UNIT_TEST(ipv6Extensions_hopByHop_parse_SN)
+{
+    unsigned char data[] = { 
+            0x3a, 0x01,  // Hop-By-Hop Header (nextHeader, length) 
+            0x0d, 0x05,  // option type, length
+            // option value: slfNetType, checksum
+            0x01, 0x01, 0x23, 0x45, 0x67,
+            // padding (PadN option: type, length, 0-padding)
+            0x01, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00
+    };
+    
+    senf::IPv6HopByHopOptionsPacket p ( senf::IPv6HopByHopOptionsPacket::create(data) );
+    BOOST_CHECK_EQUAL( p->nextHeader(), 0x3a);
+    
+    typedef senf::IPv6HopByHopOptionsPacket::Parser::options_t::container optContainer_t; 
+    optContainer_t optC (p->options() );
+    optContainer_t::iterator listIter (optC.begin());
+    
+    BOOST_CHECK_EQUAL( listIter->optionType(), 0x0d);
+    IPv6ChecksumOptionTLVParser opt ( listIter->as<IPv6ChecksumOptionTLVParser>());
+    BOOST_CHECK_EQUAL( opt.slfNetType(), 0x01);
+    BOOST_CHECK_EQUAL( opt.checksum(), 0x01234567);
+}
+
 ///////////////////////////////cc.e////////////////////////////////////////
 #undef prefix_