--- /dev/null
+// $Id$
+//
+// Copyright (C) 2009
+// Fraunhofer Institute for Open Communication Systems (FOKUS)
+// Competence Center NETwork research (NET), St. Augustin, GERMANY
+// Thorsten Horstmann <tho@berlios.de>
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the
+// Free Software Foundation, Inc.,
+// 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+/** \file
+ \brief GenericTLV non-inline template implementation */
+
+//#include "GenericTLV.ih"
+
+// Custom includes
+
+#define prefix_
+///////////////////////////////ct.p////////////////////////////////////////
+
+template <class Base>
+template <class Parser>
+prefix_ Parser senf::GenericTLVParserBase<Base>::init()
+{
+ senf::PacketParserBase::size_type oldSize (bytes() );
+ senf::PacketParserBase::size_type newParserSize ( senf::init_bytes<Parser>::value );
+ this->resize( oldSize, newParserSize);
+ std::fill(this->i(), boost::next(this->i(), newParserSize), 0u);
+ Parser concreteParser = Parser(this->i(), this->state() );
+ concreteParser.init();
+// concreteParser.length() = newParserSize - senf::init_bytes<Base>::value;
+ return concreteParser;
+}
+
+template <class Base>
+prefix_ senf::PacketInterpreterBase::range senf::GenericTLVParserBase<Base>::value()
+ const
+{
+ senf::PacketData::iterator begin (boost::next(this->i(), senf::init_bytes<Base>::value ));
+ return PacketInterpreterBase::range(begin, boost::next( begin, this->length()) );
+}
+
+template <class Base>
+template <class ForwardReadableRange>
+prefix_ void senf::GenericTLVParserBase<Base>::value_(ForwardReadableRange const &range)
+{
+ unsigned int rangeSize = boost::size(range);
+ if ( rangeSize != this->length() )
+ resize( bytes(), rangeSize + senf::init_bytes<Base>::value );
+ std::copy( boost::begin(range), boost::end(range), boost::next(
+ this->i(), senf::init_bytes<Base>::value));
+ this->length_() = rangeSize;
+}
+
+
+
+///////////////////////////////ct.e////////////////////////////////////////
+#undef prefix_
+
+\f
+// Local Variables:
+// mode: c++
+// fill-column: 100
+// comment-column: 40
+// c-file-style: "senf"
+// indent-tabs-mode: nil
+// ispell-local-dictionary: "american"
+// compile-command: "scons -u test"
+// End:
--- /dev/null
+// $Id$
+//
+// Copyright (C) 2009
+// Fraunhofer Institute for Open Communication Systems (FOKUS)
+// Competence Center NETwork research (NET), St. Augustin, GERMANY
+// Thorsten Horstmann <tho@berlios.de>
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the
+// Free Software Foundation, Inc.,
+// 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+/** \file
+ \brief GenericTLV inline template implementation */
+
+//#include "GenericTLV.ih"
+
+// Custom includes
+
+#define prefix_ inline
+///////////////////////////////cti.p///////////////////////////////////////
+
+template <class Base>
+prefix_ senf::PacketParserBase::size_type senf::GenericTLVParserBase<Base>::bytes()
+{
+ return senf::init_bytes<Base>::value + this->length();
+}
+
+template <class Base>
+prefix_ void senf::GenericTLVParserBase<Base>::init()
+ const
+{
+ this->defaultInit();
+}
+
+template <class Base>
+template <class Parser>
+prefix_ Parser senf::GenericTLVParserBase<Base>::as()
+{
+ return Parser(this->i(), this->state() );
+}
+
+template <class Base>
+template <class Parser>
+prefix_ bool senf::GenericTLVParserBase<Base>::is()
+{
+ return this->type().value() == Parser::TYPEID;
+}
+
+template <class Base>
+template <class ForwardReadableRange>
+prefix_ void senf::GenericTLVParserBase<Base>::value(
+ ForwardReadableRange const & val,
+ typename boost::disable_if<senf::is_pair<ForwardReadableRange> >::type *)
+{
+ value_( val);
+}
+
+template <class Base>
+template <class First, class Second>
+prefix_ void senf::GenericTLVParserBase<Base>::value(
+ std::pair<First, Second> const & val,
+ typename boost::disable_if<boost::is_convertible<First, typename Base::type_t::value_type> >::type *)
+{
+ value_( val);
+}
+
+template <class Base>
+template <class Type, class ForwardReadableRange>
+prefix_ void senf::GenericTLVParserBase<Base>::value(
+ std::pair<Type, ForwardReadableRange> const & val,
+ typename boost::enable_if<boost::is_convertible<Type, typename Base::type_t::value_type> >::type *)
+{
+ this->type() = val.first;
+ value_( val.second);
+}
+
+///////////////////////////////cti.e///////////////////////////////////////
+#undef prefix_
+
+\f
+// Local Variables:
+// mode: c++
+// fill-column: 100
+// comment-column: 40
+// c-file-style: "senf"
+// indent-tabs-mode: nil
+// ispell-local-dictionary: "american"
+// compile-command: "scons -u test"
+// End:
--- /dev/null
+// $Id$
+//
+// Copyright (C) 2009
+// Fraunhofer Institute for Open Communication Systems (FOKUS)
+// Competence Center NETwork research (NET), St. Augustin, GERMANY
+// Thorsten Horstmann <tho@berlios.de>
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the
+// Free Software Foundation, Inc.,
+// 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+/** \file
+ \brief GenericTLV public header */
+
+#ifndef HH_SENF_Packets_GenericTLV_
+#define HH_SENF_Packets_GenericTLV_ 1
+
+// Custom includes
+#include <senf/Packets/Packets.hh>
+#include <senf/Utils/type_traits.hh>
+
+//#include "GenericTLV.hh.mpp"
+///////////////////////////////hh.p////////////////////////////////////////
+
+namespace senf {
+
+ template <class Base>
+ class GenericTLVParserBase : public Base
+ {
+ public:
+ GenericTLVParserBase(senf::PacketParserBase::data_iterator i, senf::PacketParserBase::state_type s)
+ : Base(i,s) {}
+
+ senf::PacketParserBase::size_type bytes();
+ void init() const;
+
+ template <class Parser>
+ Parser init();
+
+ template <class Parser>
+ Parser as();
+
+ template <class Parser>
+ bool is();
+
+ senf::PacketInterpreterBase::range value() const;
+
+ template<class ForwardReadableRange>
+ void value(ForwardReadableRange const & val,
+ typename boost::disable_if<senf::is_pair<ForwardReadableRange> >::type * = 0);
+
+ template<class First, class Second>
+ void value(std::pair<First, Second> const & val,
+ typename boost::disable_if<boost::is_convertible<First, typename Base::type_t::value_type> >::type * = 0);
+
+ template <class Type, class ForwardReadableRange>
+ void value(std::pair<Type, ForwardReadableRange> const & val,
+ typename boost::enable_if<boost::is_convertible<Type, typename Base::type_t::value_type> >::type * = 0);
+
+ private:
+ template<class ForwardReadableRange>
+ void value_(ForwardReadableRange const &range);
+ };
+}
+
+
+///////////////////////////////hh.e////////////////////////////////////////
+//#include "GenericTLV.cci"
+#include "GenericTLV.ct"
+#include "GenericTLV.cti"
+#endif
+
+\f
+// Local Variables:
+// mode: c++
+// fill-column: 100
+// comment-column: 40
+// c-file-style: "senf"
+// indent-tabs-mode: nil
+// ispell-local-dictionary: "american"
+// compile-command: "scons -u test"
+// End:
--- /dev/null
+// $Id$
+//
+// Copyright (C) 2008
+// Fraunhofer Institute for Open Communication Systems (FOKUS)
+// Competence Center NETwork research (NET), St. Augustin, GERMANY
+// @AUTHOR@
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the
+// Free Software Foundation, Inc.,
+// 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+/** \file
+ \brief GenericTLV unit tests */
+
+// Custom includes
+#include "GenericTLV.hh"
+#include <senf/Utils/hexdump.hh>
+
+#include <senf/Utils/auto_unit_test.hh>
+#include <boost/test/test_tools.hpp>
+
+#define prefix_
+///////////////////////////////cc.p////////////////////////////////////////
+
+namespace {
+ struct MyTLVParserBase
+ : public senf::PacketParserBase
+ {
+# include SENF_PARSER()
+ SENF_PARSER_FIELD ( type, senf::UInt8Parser );
+ SENF_PARSER_FIELD_RO ( length, senf::UInt8Parser );
+ SENF_PARSER_FINALIZE ( MyTLVParserBase );
+ };
+
+ struct MyGenericTLVParser
+ : public senf::GenericTLVParserBase<MyTLVParserBase>
+ {
+ typedef senf::GenericTLVParserBase<MyTLVParserBase> base;
+ MyGenericTLVParser(data_iterator i, state_type s) : base(i,s) {}
+ };
+
+ struct MyConcreteTLVParser
+ : public MyTLVParserBase
+ {
+ # include SENF_PARSER()
+ SENF_PARSER_INHERIT ( MyTLVParserBase );
+ SENF_PARSER_FIELD ( myValue, senf::UInt32Parser );
+ SENF_PARSER_FINALIZE ( MyConcreteTLVParser );
+
+ SENF_PARSER_INIT() {
+ type() = TYPEID;
+ length_() = 4;
+ }
+ static const type_t::value_type TYPEID = 0x42;
+ };
+
+ class MyTestPacketParser
+ : public senf::PacketParserBase
+ {
+# include SENF_PARSER()
+ SENF_PARSER_FIELD_RO ( list_length, senf::UInt8Parser );
+ SENF_PARSER_LIST ( tlv_list, list_length, MyGenericTLVParser );
+ SENF_PARSER_FINALIZE ( MyTestPacketParser );
+ };
+
+ struct MyTestPacketType
+ : public senf::PacketTypeBase,
+ public senf::PacketTypeMixin<MyTestPacketType>
+ {
+ typedef senf::PacketTypeMixin<MyTestPacketType> mixin;
+ typedef MyTestPacketParser parser;
+
+ using mixin::nextPacketRange;
+ using mixin::init;
+ using mixin::initSize;
+ };
+ typedef senf::ConcretePacket<MyTestPacketType> MyTestPacket;
+}
+
+
+BOOST_AUTO_UNIT_TEST(GenericTLV_parser)
+{
+ BOOST_CHECK_EQUAL( senf::init_bytes<MyGenericTLVParser>::value,
+ senf::init_bytes<MyTLVParserBase>::value) ;
+
+ unsigned char data[] = {
+ 0x42, 0x04, // type, length
+ 0x00, 0x01, 0x02, 0x03 // value
+ };
+
+ senf::DataPacket dataPacket ( senf::DataPacket::create(data));
+ MyGenericTLVParser genericTLVParser (dataPacket.data().begin(), &dataPacket.data());
+
+ BOOST_CHECK_EQUAL( senf::bytes( genericTLVParser), sizeof(data) );
+ BOOST_CHECK_EQUAL( genericTLVParser.type(), 0x42 );
+ BOOST_CHECK_EQUAL( genericTLVParser.length(), 0x04 );
+ SENF_CHECK_EQUAL_COLLECTIONS( data+2, data+sizeof(data),
+ genericTLVParser.value().begin(), genericTLVParser.value().end() );
+ genericTLVParser.value( data );
+ SENF_CHECK_EQUAL_COLLECTIONS( data, data+sizeof(data),
+ genericTLVParser.value().begin(), genericTLVParser.value().end() );
+
+ std::vector<unsigned char> value (4, 0xab);
+ genericTLVParser.value( std::make_pair(0x42, value));
+
+ BOOST_CHECK( genericTLVParser.is<MyConcreteTLVParser>());
+
+ MyConcreteTLVParser concreteTLVParser ( genericTLVParser.as<MyConcreteTLVParser>());
+ BOOST_CHECK_EQUAL( concreteTLVParser.type(), 0x42 );
+ BOOST_CHECK_EQUAL( concreteTLVParser.length(), 0x04 );
+ BOOST_CHECK_EQUAL( concreteTLVParser.myValue(), 0xabababab );
+}
+
+BOOST_AUTO_UNIT_TEST(GenericTLV_packet)
+{
+ MyTestPacket p ( MyTestPacket::create());
+ MyTestPacket::Parser::tlv_list_t::container tlvContainer (p->tlv_list() );
+ MyConcreteTLVParser tlv ( tlvContainer.push_back_space().init<MyConcreteTLVParser>());
+ tlv.myValue() << 0xffff;
+ p.finalizeThis();
+
+ unsigned char data[] = {
+ 0x01, // tlv list length
+ // first tlv:
+ 0x42, 0x04, // type, length
+ 0x00, 0x00, 0xff, 0xff // value
+ };
+ SENF_CHECK_EQUAL_COLLECTIONS( data, data+sizeof(data),
+ p.data().begin(), p.data().end() );
+}
+
+
+///////////////////////////////cc.e////////////////////////////////////////
+#undef prefix_
+
+\f
+// Local Variables:
+// mode: c++
+// fill-column: 100
+// comment-column: 40
+// c-file-style: "senf"
+// indent-tabs-mode: nil
+// ispell-local-dictionary: "american"
+// compile-command: "scons -u test"
+// End: