Packets: Better packet registry dump and implement bundledump utility

[senf.git] / senf / Packets / DefaultBundle / IPv6ExtOptionType.ct

diff --git a/senf/Packets/DefaultBundle/IPv6ExtOptionType.ct b/senf/Packets/DefaultBundle/IPv6ExtOptionType.ct
index 6cb4c62..2b2d79a 100644 (file)
--- a/senf/Packets/DefaultBundle/IPv6ExtOptionType.ct
+++ b/senf/Packets/DefaultBundle/IPv6ExtOptionType.ct
@@ -1,6 +1,6 @@
 // $Id: IPv6ExtOptionType.ct 869 2008-06-09 13:57:27Z pug $
 //
-// Copyright (C) 2007
+// Copyright (C) 2009
 // Fraunhofer Institute for Open Communication Systems (FOKUS)
 // Competence Center NETwork research (NET), St. Augustin, GERMANY
 //     Philipp.Batroff@fokus.fraunhofer.de
@@ -31,14 +31,13 @@
 ///////////////////////////////ct.p////////////////////////////////////////
 
 template <class ForwardReadableRange>
-prefix_ void senf::GenericOptTypeTLVParser::value(ForwardReadableRange const &range)
+prefix_ void senf::IPv6GenericOptionTLVParser::value(ForwardReadableRange const &range)
 {
     unsigned int rangeSize = boost::size(range);
-    safe_data_iterator si( data(),  boost::next(i(), 2 + optionLength() ) );
+    
     if ( (rangeSize-2) != optionLength() )
         resize(optionLength()+2, rangeSize);
-
-    std::copy(boost::next(boost::begin(range), 2), boost::next(boost::end(range)), si);
+    std::copy(boost::next(boost::begin(range), 2), boost::next(boost::end(range)), boost::next(i(), 2 + optionLength() ));
     unsigned int val = *(boost::begin(range));
     unsigned int mask = 192u;
     altAction() = (val & mask) >> 6;
@@ -50,26 +49,26 @@ prefix_ void senf::GenericOptTypeTLVParser::value(ForwardReadableRange const &ra
 }
 
 template <class ForwardReadableRange>
-prefix_ void senf::GenericOptTypeTLVParser::setPayload(ForwardReadableRange const &range)
+prefix_ void senf::IPv6GenericOptionTLVParser::setPayload(ForwardReadableRange const &range)
 {
     unsigned int rangeSize = boost::size(range);
     if ( rangeSize != optionLength() )
         resize( (optionLength() + 2), (rangeSize + 2) );
-    safe_data_iterator si( data(), boost::next( i(), 2) );
-    std::copy( boost::begin(range), boost::end(range), si);
+    std::copy( boost::begin(range), boost::end(range), boost::next( i(), 2));
     optionLength() = rangeSize;
 }
 
 
 template <class Parser>
-prefix_ Parser& senf::GenericOptTypeTLVParser::init()
+prefix_ Parser& senf::IPv6GenericOptionTLVParser::init()
 {
     size_type oldSize ( bytes() );
-    safe_data_iterator j( data(), i() );
     resize( oldSize, senf::init_bytes<Parser>::value);
+    data_iterator j = i();
     std::advance(j, senf::init_bytes<Parser>::value);
-    std::fill(safe_data_iterator(data(), i()) , j, 0u);
-    Parser::optionType() = typeCode;
+    std::fill(i() , j, 0u);
+    Parser::init();
+    Parser::optionType() = Parser::typeCode;
     return *(this);
 }