X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPackets%2F80221Bundle%2FTLVParser.hh;h=f454d083ff125db0762fb2a21ffc3310a53139ef;hb=ddb2132be4265f8a0d7d4c954c7c9401e59d027c;hp=5faf9ebadc4e8b5e947faec1c8b1803ace0c3262;hpb=9cb871b939efe93e35dd96808d25089399acfc46;p=senf.git diff --git a/senf/Packets/80221Bundle/TLVParser.hh b/senf/Packets/80221Bundle/TLVParser.hh index 5faf9eb..f454d08 100644 --- a/senf/Packets/80221Bundle/TLVParser.hh +++ b/senf/Packets/80221Bundle/TLVParser.hh @@ -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 public header */ @@ -27,22 +32,14 @@ #define HH_SENF_Packets_80221Bundle_TLVParser_ 1 // Custom includes -#include #include #include "MIHTypes.hh" //#include "TLVParser.mpp" -///////////////////////////////hh.p//////////////////////////////////////// +//-///////////////////////////////////////////////////////////////////////////////////////////////// namespace senf { - struct MIHTLVLengthException : public senf::Exception - { - MIHTLVLengthException() - : senf::Exception("MIHTLVLengthException") {} - }; - - class MIHTLVLengthParser : public detail::packet::IntParserOps, public PacketParserBase @@ -128,6 +125,9 @@ namespace senf { \param v maximum value of length field */ void maxLength(MIHTLVLengthParser::value_type maxl) const; + + void validateType(boost::uint8_t type) const; + void validateTypeLength(boost::uint8_t type, MIHTLVLengthParser::value_type length) const; }; @@ -192,7 +192,7 @@ namespace senf { public: ///\name Value setters - ///@{ + //\{ void value( MIHFId const & id); void value( std::string const & id ); @@ -200,10 +200,10 @@ namespace senf { void value( senf::INet4Address const & addr); void value( senf::INet6Address const & addr); void value( senf::EUI64 const & addr); - ///@} + //\} ///\name Value getters - ///@{ + //\{ MIHFId valueAs( MIHFId::Type type) const; std::string valueAsString() const; @@ -211,10 +211,10 @@ namespace senf { senf::INet4Address valueAsINet4Address() const; senf::INet6Address valueAsINet6Address() const; senf::EUI64 valueAsEUI64() const; - ///@} + //\} ///\name Value comparisons - ///@{ + //\{ bool valueEquals( MIHFId const & id) const; bool valueEquals( std::string const & id ) const; @@ -222,7 +222,7 @@ namespace senf { bool valueEquals( senf::INet4Address const & addr) const; bool valueEquals( senf::INet6Address const & addr) const; bool valueEquals( senf::EUI64 const & addr) const; - ///@} + //\} void dump(std::ostream & os) const; void maxIdLength(boost::uint8_t maxl) const; @@ -293,6 +293,7 @@ namespace senf { } static type_t::value_type const typeId = 1; void dump(std::ostream & os) const; + void validate() const; }; /** \brief Parser for 802.21 destination MIHF_ID TLV @@ -307,6 +308,7 @@ namespace senf { } static type_t::value_type const typeId = 2; void dump(std::ostream & os) const; + void validate() const; }; /** \brief Parser for 802.21 Status TLV @@ -325,6 +327,7 @@ namespace senf { } static type_t::value_type const typeId = 3; void dump(std::ostream & os) const; ///< dump string representation to given stream + void validate() const; enum StatusCode { Success, UnspecifiedFailure, Rejected, AuthorizationFailure, NetworkError }; @@ -344,6 +347,7 @@ namespace senf { } static type_t::value_type const typeId = 11; void dump(std::ostream & os) const; ///< dump string representation to given stream + void validate() const; enum RequestCode { Registration, ReRegistration }; }; @@ -362,12 +366,13 @@ namespace senf { } static type_t::value_type const typeId = 12; void dump(std::ostream & os) const; ///< dump string representation to given stream + void validate() const; }; } -///////////////////////////////hh.e//////////////////////////////////////// +//-///////////////////////////////////////////////////////////////////////////////////////////////// #include "TLVParser.cci" #include "TLVParser.ct" #include "TLVParser.cti"