X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPackets%2FDefaultBundle%2FIPv6ExtOptionType.ct;h=2b2d79a49259d2e1f65ea3bf1f1245162153de82;hb=eb83d096ce313989c3588c1cb6663caa513fb370;hp=201ccbde2c4df69b0ce16bfc69c27ef1e5d3be2c;hpb=79615f135540eb93e24ac7720a9fecb08fba2842;p=senf.git

diff --git a/senf/Packets/DefaultBundle/IPv6ExtOptionType.ct b/senf/Packets/DefaultBundle/IPv6ExtOptionType.ct
index 201ccbd..2b2d79a 100644
--- 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,22 +31,13 @@
 ///////////////////////////////ct.p////////////////////////////////////////
 
 template <class ForwardReadableRange>
-prefix_ void senf::GenericOptTypeTLVPacketParser::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 > optionLength() ){
-//        std::cout << "rangeSize > optionLength()" << std::endl;
-//        data().insert(si, rangeSize - optionLength(),0 );
-//    }
-//    if (rangeSize < optionLength() ){
-//        std::cout << "rangeSize < optionLength()" << std::endl;
-//        data().erase(si, si + (optionLength() - rangeSize));
-//    }
+    
     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;
@@ -57,6 +48,38 @@ prefix_ void senf::GenericOptTypeTLVPacketParser::value(ForwardReadableRange con
     optionLength() = *(boost::next( boost::begin(range), 1));
 }
 
+template <class ForwardReadableRange>
+prefix_ void senf::IPv6GenericOptionTLVParser::setPayload(ForwardReadableRange const &range)
+{
+    unsigned int rangeSize = boost::size(range);
+    if ( rangeSize != optionLength() )
+        resize( (optionLength() + 2), (rangeSize + 2) );
+    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() );
+    resize( oldSize, senf::init_bytes<Parser>::value);
+    data_iterator j = i();
+    std::advance(j, senf::init_bytes<Parser>::value);
+    std::fill(i() , j, 0u);
+    Parser::init();
+    Parser::optionType() = Parser::typeCode;
+    return *(this);
+}
+
+// template <class Parser>
+// prefix_ Parser& senf::GenericOptTypeTLVParser::get()
+// {
+//     SENF_ASSERT (optionType() == typeCode);
+//     return *(this);
+// }
+
+
 ///////////////////////////////ct.e////////////////////////////////////////
 #undef prefix_