Utils: moved range.hh .cti into Range.hh .cti

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

diff --git a/senf/Packets/DefaultBundle/IPv6ExtOptionType.ct b/senf/Packets/DefaultBundle/IPv6ExtOptionType.ct
index 95dc085..ca43a48 100644 (file)
--- a/senf/Packets/DefaultBundle/IPv6ExtOptionType.ct
+++ b/senf/Packets/DefaultBundle/IPv6ExtOptionType.ct
@@ -34,11 +34,11 @@ template <class ForwardReadableRange>
 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;
@@ -55,36 +55,34 @@ prefix_ void senf::IPv6GenericOptionTLVParser::setPayload(ForwardReadableRange c
     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::IPv6GenericOptionTLVParser::init()
+{  
+    size_type oldSize (bytes() );
+    size_type newParserSize ( senf::init_bytes<Parser>::value );
+    resize(  oldSize, newParserSize);
+    std::fill(i(),boost::next(i(), newParserSize), 0u);
+    Parser concreteParser = Parser(i(), state() );
+    concreteParser.init();
+    concreteParser.optionLength() = (newParserSize-2);
+    return concreteParser;
+}
 
 template <class Parser>
-prefix_ Parser& senf::IPv6GenericOptionTLVParser::init()
+prefix_ Parser senf::IPv6GenericOptionTLVParser::as()
 {
-    size_type oldSize ( bytes() );
-    safe_data_iterator j( data(), i() );
-    resize( oldSize, senf::init_bytes<Parser>::value);
-    std::advance(j, senf::init_bytes<Parser>::value);
-    std::fill(safe_data_iterator(data(), i()) , j, 0u);
-    Parser::optionType() = typeCode;
-    return *(this);
+    return Parser(i(), state() );
 }
 
-// template <class Parser>
-// prefix_ Parser& senf::GenericOptTypeTLVParser::get()
-// {
-//     SENF_ASSERT (optionType() == typeCode);
-//     return *(this);
-// }
-
 
 ///////////////////////////////ct.e////////////////////////////////////////
 #undef prefix_
 
-
+\f
 // Local Variables:
 // mode: c++
 // fill-column: 100