X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPackets%2FGenericTLV.ct;h=a2df5c042bad8d47aaebfc8809a87111db2739a8;hb=ff5e62baaa8f7e571fbe767f7b2ce7f129c783c4;hp=f2aef9b98ab1506961a9abfb8a3cdf684af4293f;hpb=0061f12af7284b2d2f03de23014ac2faccfd37ed;p=senf.git diff --git a/senf/Packets/GenericTLV.ct b/senf/Packets/GenericTLV.ct index f2aef9b..a2df5c0 100644 --- a/senf/Packets/GenericTLV.ct +++ b/senf/Packets/GenericTLV.ct @@ -2,23 +2,28 @@ // // Copyright (C) 2009 // Fraunhofer Institute for Open Communication Systems (FOKUS) -// Competence Center NETwork research (NET), St. Augustin, GERMANY -// Thorsten Horstmann // -// 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. +// The contents of this file are subject to the Fraunhofer FOKUS Public License +// Version 1.0 (the "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// http://senf.berlios.de/license.html // -// 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. +// The Fraunhofer FOKUS Public License Version 1.0 is based on, +// but modifies the Mozilla Public License Version 1.1. +// See the full license text for the amendments. // -// 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. +// Software distributed under the License is distributed on an "AS IS" basis, +// WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +// for the specific language governing rights and limitations under the License. +// +// The Original Code is Fraunhofer FOKUS code. +// +// The Initial Developer of the Original Code is Fraunhofer-Gesellschaft e.V. +// (registered association), Hansastraße 27 c, 80686 Munich, Germany. +// All Rights Reserved. +// +// Contributor(s): +// Thorsten Horstmann /** \file \brief GenericTLV non-inline template implementation */ @@ -32,17 +37,17 @@ #include #define prefix_ -///////////////////////////////ct.p//////////////////////////////////////// +//-///////////////////////////////////////////////////////////////////////////////////////////////// -/////////////////////////////////////////////////////////////////////////// +//-///////////////////////////////////////////////////////////////////////////////////////////////// // senf::GenericTLVParserBase template template prefix_ Parser senf::GenericTLVParserBase::init() -{ - senf::PacketParserBase::size_type oldSize (bytes() ); - senf::PacketParserBase::size_type newParserSize ( senf::init_bytes::value ); +{ + PacketParserBase::size_type oldSize (bytes() ); + PacketParserBase::size_type newParserSize ( senf::init_bytes::value ); this->resize( oldSize, newParserSize); std::fill(this->i(), boost::next(this->i(), newParserSize), 0u); Parser concreteParser = Parser(this->i(), this->state() ); @@ -52,10 +57,26 @@ prefix_ Parser senf::GenericTLVParserBase::init() } template -prefix_ senf::PacketInterpreterBase::range senf::GenericTLVParserBase::value() - const +prefix_ void senf::GenericTLVParserBase::dump(std::ostream & os) + const { - senf::PacketData::iterator begin ( boost::next(this->i(), senf::bytes( self())) ); + if (Base::Registry::instance().isRegistered( *this)) { + Base::Registry::instance().dump( *this, os); + } else { + boost::io::ios_all_saver ias(os); + os << " GenericTLVParser<" << prettyName(typeid(Base)) << ">\n" + << " type: " << format::dumpint(this->type()) << "\n" + << " length: " << format::dumpint(this->length()) << "\n" + << " value:\n"; + hexdump(value().begin(), value().end(), os); + } +} + +template +prefix_ senf::PacketInterpreterBase::range senf::GenericTLVParserBase::value() + const +{ + PacketData::iterator begin ( boost::next(this->i(), senf::bytes( self())) ); return PacketInterpreterBase::range(begin, boost::next( begin, this->length()) ); } @@ -73,38 +94,74 @@ prefix_ void senf::GenericTLVParserBase::value_(ForwardReadableRange const } -/////////////////////////////////////////////////////////////////////////// -// senf::GenericTLVParserRegistry +//-///////////////////////////////////////////////////////////////////////////////////////////////// +// senf::GenericTLVParserRegistry -template +template template -prefix_ void senf::GenericTLVParserRegistry::registerParser() +prefix_ void senf::GenericTLVParserRegistry::registerParser() { - typename BaseParser::type_t::value_type key (Parser::typeId+0); - typename Map::iterator i (map_.find( key )); - if (i == map_.end() ) - map_.insert(key, new detail::GenericTLVParserRegistry_Entry() ); + Keytype key (Parser::typeId+0); + SENF_ASSERT_EXPRESSION( + map_.insert( key, new detail::GenericTLVParserRegistry_Entry()).second, + "Duplicate TLV registration"); } -template -prefix_ void senf::GenericTLVParserRegistry::dump( - GenericTLVParserBase const & parser, std::ostream & os) +// Wow ... this is stupid .. Boost 1.33 ptr_map API is broken ... + +#if BOOST_VERSION < 103400 +#define PTRMAP_GET_CONTENTS(v) (v) +#else +#define PTRMAP_GET_CONTENTS(v) (*(v).second) +#endif + +template +prefix_ void senf::GenericTLVParserRegistry::dump( + GenericTLVParser const & parser, std::ostream & os) const { typename Map::const_iterator i (map_.find( parser.type())); - if (i == map_.end()) { - boost::io::ios_all_saver ias(os); - os << " GenericTLVParser<" << prettyName(typeid(BaseParser)) << ">\n" - << " type: " << senf::format::dumpint(parser.type()) << "\n" - << " length: " << senf::format::dumpint(parser.length()) << "\n" - << " value:\n"; - hexdump(parser.value().begin(), parser.value().end(), os); - } + if (i != map_.end()) + PTRMAP_GET_CONTENTS(*i).dump(parser, os); +} + +template +prefix_ void senf::GenericTLVParserRegistry::dump( + GenericTLVParser const & parser, Keytype const & key, std::ostream & os) + const +{ + typename Map::const_iterator i (map_.find( key)); + if (i != map_.end()) + PTRMAP_GET_CONTENTS(*i).dump(parser, os); +} + +template +prefix_ senf::PacketParserBase::size_type senf::GenericTLVParserRegistry::bytes( + GenericTLVParser const & parser) + const +{ + typename Map::const_iterator i (map_.find( parser.type())); + if (i != map_.end()) + return PTRMAP_GET_CONTENTS(*i).bytes(parser); + else + throw TLVParserNotRegisteredException(); +} + +template +prefix_ senf::PacketParserBase::size_type senf::GenericTLVParserRegistry::bytes( + GenericTLVParser const & parser, Keytype const & key) + const +{ + typename Map::const_iterator i (map_.find( key)); + if (i != map_.end()) + return PTRMAP_GET_CONTENTS(*i).bytes(parser); else - (i->second)->dump(parser, os); + throw TLVParserNotRegisteredException(); } -///////////////////////////////ct.e//////////////////////////////////////// +#undef PTRMAP_GET_CONTENTS + +//-///////////////////////////////////////////////////////////////////////////////////////////////// #undef prefix_