X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPackets%2F80221Bundle%2FTLVParser.cci;h=eb7361e82fb916f3665b79e1c6f7428ca24f3398;hb=ddb2132be4265f8a0d7d4c954c7c9401e59d027c;hp=be724dfd56a6bdcb0475ae8fab8f85ee08302cba;hpb=482523171f06cf239fd7e8c991f81711c02cf0ba;p=senf.git

diff --git a/senf/Packets/80221Bundle/TLVParser.cci b/senf/Packets/80221Bundle/TLVParser.cci
index be724df..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 <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.
+// 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 <tho@berlios.de>
 
 /** \file
     \brief TLVParser inline non-template implementation */
@@ -28,54 +33,135 @@
 // 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()
+    : readNextByte_( true)
+{}
+
+prefix_ bool senf::MIHFIdTLVParser::binaryNAIDecoder::operator()(boost::uint8_t v)
+{
+    readNextByte_ = readNextByte_ ? false : true;
+    return readNextByte_;
+}
+
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // MIHFIdTLVParser
 
-prefix_ std::string senf::MIHFIdTLVParser::asString()
+prefix_ senf::PacketParserBase::data_iterator senf::MIHFIdTLVParser::valueBegin()
+    const
+{
+    return i( idValue_offset());
+}
+
+prefix_ senf::PacketParserBase::data_iterator senf::MIHFIdTLVParser::valueEnd()
     const
 {
-    return std::string( i(1+length_().bytes()), i(1+length_().bytes()+length()) );
+    return i( idValue_offset() + idLength());
 }
 
-prefix_ senf::MACAddress senf::MIHFIdTLVParser::asMACAddress()
+prefix_ std::string senf::MIHFIdTLVParser::valueAsString()
     const
 {
-    return MACAddress::from_data( 
-            getNAIDecodedIterator( i(1+length_().bytes()), i(1+length_().bytes()+12) ));
+    return std::string( valueBegin(), valueEnd());
 }
 
-prefix_ senf::INet4Address senf::MIHFIdTLVParser::asINet4Address()
+prefix_ senf::MACAddress senf::MIHFIdTLVParser::valueAsMACAddress()
     const
 {
-    return INet4Address::from_data( 
-            getNAIDecodedIterator( i(1+length_().bytes()), i(1+length_().bytes()+8) ));
+    if (idLength() != 6*2) throw WrapException<std::bad_cast>(std::bad_cast())
+        << "length of MIHF_ID does not match for a MAC address";
+    return MACAddress::from_data( getNAIDecodedIterator( valueBegin(), valueEnd()));
 }
 
-prefix_ senf::INet6Address senf::MIHFIdTLVParser::asINet6Address()
+prefix_ senf::INet4Address senf::MIHFIdTLVParser::valueAsINet4Address()
     const
 {
-    return INet6Address::from_data( 
-            getNAIDecodedIterator( i(1+length_().bytes()), i(1+length_().bytes()+32) ));
+    if (idLength() != 4*2) throw WrapException<std::bad_cast>(std::bad_cast())
+        << "length of MIHF_ID does not match for a INet4 address";
+    return INet4Address::from_data( getNAIDecodedIterator( valueBegin(), valueEnd()));
 }
 
-prefix_ senf::EUI64 senf::MIHFIdTLVParser::asEUI64()
+prefix_ senf::INet6Address senf::MIHFIdTLVParser::valueAsINet6Address()
     const
 {
-    return EUI64::from_data( 
-            getNAIDecodedIterator( i(1+length_().bytes()), i(1+length_().bytes()+16) ));
+    if (idLength() != 16*2) throw WrapException<std::bad_cast>(std::bad_cast())
+        << "length of MIHF_ID does not match for a INet6 address";
+    return INet6Address::from_data( getNAIDecodedIterator( valueBegin(), valueEnd()));
 }
 
-///////////////////////////////cci.e////////////////////////////////////////
+prefix_ senf::EUI64 senf::MIHFIdTLVParser::valueAsEUI64()
+    const
+{
+    if (idLength() != 8*2) throw WrapException<std::bad_cast>(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)
+    const
+{
+    return id == valueAsString();
+}
+
+prefix_ bool senf::MIHFIdTLVParser::valueEquals( senf::MACAddress const & addr)
+    const
+{
+    return idLength()==12 && addr==valueAsMACAddress();
+}
+
+prefix_ bool senf::MIHFIdTLVParser::valueEquals( senf::INet4Address const & addr)
+    const
+{
+    return idLength()==8 && addr==valueAsINet4Address();
+}
+
+prefix_ bool senf::MIHFIdTLVParser::valueEquals( senf::INet6Address const & addr)
+    const
+{
+    return idLength()==32 && addr==valueAsINet6Address();
+}
+
+prefix_ bool senf::MIHFIdTLVParser::valueEquals( senf::EUI64 const & addr)
+    const
+{
+    return idLength()==16 && addr==valueAsEUI64();
+}
+
+prefix_ bool senf::MIHFIdTLVParser::valueEquals( MIHFId const & id)
+    const
+{
+    return boost::apply_visitor( ValueEqualsVisitor(*this), id);
+}
+
+
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
+// MIHBaseTLVParser
+
+prefix_ void senf::MIHBaseTLVParser::maxLength(MIHTLVLengthParser::value_type maxl)
+    const
+{
+    protect(), length_().capacity(maxl);
+}
+
+prefix_ void senf::MIHBaseTLVParser::finalize()
+{
+    protect(), length_().finalize();
+};
+
+
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #undef prefix_