X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPackets%2F80221Bundle%2FTLVParser.cci;h=eb7361e82fb916f3665b79e1c6f7428ca24f3398;hb=ddb2132be4265f8a0d7d4c954c7c9401e59d027c;hp=6a893be3df0d159073abe08e11563d4bd9d7cf0a;hpb=0973cf085ba0ebc276342ac20643af2e8084e056;p=senf.git diff --git a/senf/Packets/80221Bundle/TLVParser.cci b/senf/Packets/80221Bundle/TLVParser.cci index 6a893be..eb7361e 100644 --- a/senf/Packets/80221Bundle/TLVParser.cci +++ b/senf/Packets/80221Bundle/TLVParser.cci @@ -2,23 +2,28 @@ // // Copyright (C) 2007 // 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 TLVParser inline non-template implementation */ @@ -28,17 +33,17 @@ // Custom includes #define prefix_ inline -///////////////////////////////cci.p//////////////////////////////////////// +//-///////////////////////////////////////////////////////////////////////////////////////////////// -/////////////////////////////////////////////////////////////////////////// +//-///////////////////////////////////////////////////////////////////////////////////////////////// // MIHTLVLengthParser -prefix_ senf::MIHTLVLengthParser::size_type senf::MIHTLVLengthParser::bytes() const +prefix_ senf::MIHTLVLengthParser::size_type senf::MIHTLVLengthParser::bytes() const { return 1 + ( length_field()<=128 ? 0 : fixed_length_field()); } -/////////////////////////////////////////////////////////////////////////// +//-///////////////////////////////////////////////////////////////////////////////////////////////// // MIHFIdTLVParser::binaryNAIDecoder prefix_ senf::MIHFIdTLVParser::binaryNAIDecoder::binaryNAIDecoder() @@ -51,44 +56,60 @@ prefix_ bool senf::MIHFIdTLVParser::binaryNAIDecoder::operator()(boost::uint8_t return readNextByte_; } -/////////////////////////////////////////////////////////////////////////// +//-///////////////////////////////////////////////////////////////////////////////////////////////// // MIHFIdTLVParser +prefix_ senf::PacketParserBase::data_iterator senf::MIHFIdTLVParser::valueBegin() + const +{ + return i( idValue_offset()); +} + +prefix_ senf::PacketParserBase::data_iterator senf::MIHFIdTLVParser::valueEnd() + const +{ + return i( idValue_offset() + idLength()); +} + prefix_ std::string senf::MIHFIdTLVParser::valueAsString() const { - return std::string( i(1+length_().bytes()), i(1+length_().bytes()+length()) ); + return std::string( valueBegin(), valueEnd()); } prefix_ senf::MACAddress senf::MIHFIdTLVParser::valueAsMACAddress() const { - return MACAddress::from_data( - getNAIDecodedIterator( i(1+length_().bytes()), i(1+length_().bytes()+12) )); + if (idLength() != 6*2) throw WrapException(std::bad_cast()) + << "length of MIHF_ID does not match for a MAC address"; + return MACAddress::from_data( getNAIDecodedIterator( valueBegin(), valueEnd())); } prefix_ senf::INet4Address senf::MIHFIdTLVParser::valueAsINet4Address() const { - return INet4Address::from_data( - getNAIDecodedIterator( i(1+length_().bytes()), i(1+length_().bytes()+8) )); + if (idLength() != 4*2) throw WrapException(std::bad_cast()) + << "length of MIHF_ID does not match for a INet4 address"; + return INet4Address::from_data( getNAIDecodedIterator( valueBegin(), valueEnd())); } prefix_ senf::INet6Address senf::MIHFIdTLVParser::valueAsINet6Address() const { - return INet6Address::from_data( - getNAIDecodedIterator( i(1+length_().bytes()), i(1+length_().bytes()+32) )); + if (idLength() != 16*2) throw WrapException(std::bad_cast()) + << "length of MIHF_ID does not match for a INet6 address"; + return INet6Address::from_data( getNAIDecodedIterator( valueBegin(), valueEnd())); } prefix_ senf::EUI64 senf::MIHFIdTLVParser::valueAsEUI64() const { - return EUI64::from_data( - getNAIDecodedIterator( i(1+length_().bytes()), i(1+length_().bytes()+16) )); + if (idLength() != 8*2) throw WrapException(std::bad_cast()) + << "length of MIHF_ID does not match for a EUI64 address"; + return EUI64::from_data( getNAIDecodedIterator( valueBegin(), valueEnd())); } -prefix_ bool senf::MIHFIdTLVParser::valueEquals( std::string const &id) +prefix_ bool senf::MIHFIdTLVParser::valueEquals( std::string const &id) const { return id == valueAsString(); @@ -97,25 +118,25 @@ prefix_ bool senf::MIHFIdTLVParser::valueEquals( std::string const &id) prefix_ bool senf::MIHFIdTLVParser::valueEquals( senf::MACAddress const & addr) const { - return length()==12 && addr==valueAsMACAddress(); + return idLength()==12 && addr==valueAsMACAddress(); } prefix_ bool senf::MIHFIdTLVParser::valueEquals( senf::INet4Address const & addr) const { - return length()==8 && addr==valueAsINet4Address(); + return idLength()==8 && addr==valueAsINet4Address(); } prefix_ bool senf::MIHFIdTLVParser::valueEquals( senf::INet6Address const & addr) const { - return length()==32 && addr==valueAsINet6Address(); + return idLength()==32 && addr==valueAsINet6Address(); } prefix_ bool senf::MIHFIdTLVParser::valueEquals( senf::EUI64 const & addr) const { - return length()==16 && addr==valueAsEUI64(); + return idLength()==16 && addr==valueAsEUI64(); } prefix_ bool senf::MIHFIdTLVParser::valueEquals( MIHFId const & id) @@ -125,8 +146,22 @@ prefix_ bool senf::MIHFIdTLVParser::valueEquals( MIHFId const & id) } +//-///////////////////////////////////////////////////////////////////////////////////////////////// +// MIHBaseTLVParser + +prefix_ void senf::MIHBaseTLVParser::maxLength(MIHTLVLengthParser::value_type maxl) + const +{ + protect(), length_().capacity(maxl); +} + +prefix_ void senf::MIHBaseTLVParser::finalize() +{ + protect(), length_().finalize(); +}; + -///////////////////////////////cci.e//////////////////////////////////////// +//-///////////////////////////////////////////////////////////////////////////////////////////////// #undef prefix_