// $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
//#include "IPv6ExtOptionType.ih"
// Custom includes
+#include <senf/Utils/hexdump.hh>
#define prefix_
///////////////////////////////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;
}
template <class ForwardReadableRange>
-prefix_ void senf::GenericOptTypeTLVPacketParser::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::GenericOptTypeTLVPacketParser::init()
-{
- 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);
+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::GenericOptTypeTLVPacketParser::get()
+// prefix_ Parser& senf::GenericOptTypeTLVParser::get()
// {
// SENF_ASSERT (optionType() == typeCode);
// return *(this);
///////////////////////////////ct.e////////////////////////////////////////
#undef prefix_
-
+\f
// Local Variables:
// mode: c++
// fill-column: 100