X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPackets%2F80221Bundle%2FTLVParser.cci;h=6a893be3df0d159073abe08e11563d4bd9d7cf0a;hb=0e83cd2ee1ebc409cf73d8774b01bf01f3df22f4;hp=467a732d512f161dbeb3774d64abae507662831e;hpb=f723d7852a8195072eee387ea9ca77156b58438b;p=senf.git

diff --git a/senf/Packets/80221Bundle/TLVParser.cci b/senf/Packets/80221Bundle/TLVParser.cci
index 467a732..6a893be 100644
--- a/senf/Packets/80221Bundle/TLVParser.cci
+++ b/senf/Packets/80221Bundle/TLVParser.cci
@@ -39,42 +39,93 @@ prefix_ senf::MIHTLVLengthParser::size_type senf::MIHTLVLengthParser::bytes() co
 }
 
 ///////////////////////////////////////////////////////////////////////////
-// MIHFId_TLVParser
+// MIHFIdTLVParser::binaryNAIDecoder
 
-prefix_ std::string senf::MIHFId_TLVParser::asString()
+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::valueAsString()
     const
 {
     return std::string( i(1+length_().bytes()), i(1+length_().bytes()+length()) );
 }
 
-prefix_ senf::MACAddress senf::MIHFId_TLVParser::asMACAddress()
+prefix_ senf::MACAddress senf::MIHFIdTLVParser::valueAsMACAddress()
     const
 {
     return MACAddress::from_data( 
             getNAIDecodedIterator( i(1+length_().bytes()), i(1+length_().bytes()+12) ));
 }
 
-prefix_ senf::INet4Address senf::MIHFId_TLVParser::asINet4Address()
+prefix_ senf::INet4Address senf::MIHFIdTLVParser::valueAsINet4Address()
     const
 {
     return INet4Address::from_data( 
             getNAIDecodedIterator( i(1+length_().bytes()), i(1+length_().bytes()+8) ));
 }
 
-prefix_ senf::INet6Address senf::MIHFId_TLVParser::asINet6Address()
+prefix_ senf::INet6Address senf::MIHFIdTLVParser::valueAsINet6Address()
     const
 {
     return INet6Address::from_data( 
             getNAIDecodedIterator( i(1+length_().bytes()), i(1+length_().bytes()+32) ));
 }
 
-prefix_ senf::EUI64 senf::MIHFId_TLVParser::asEUI64()
+prefix_ senf::EUI64 senf::MIHFIdTLVParser::valueAsEUI64()
     const
 {
     return EUI64::from_data( 
             getNAIDecodedIterator( i(1+length_().bytes()), i(1+length_().bytes()+16) ));
 }
 
+prefix_ bool senf::MIHFIdTLVParser::valueEquals( std::string const &id) 
+    const
+{
+    return id == valueAsString();
+}
+
+prefix_ bool senf::MIHFIdTLVParser::valueEquals( senf::MACAddress const & addr)
+    const
+{
+    return length()==12 && addr==valueAsMACAddress();
+}
+
+prefix_ bool senf::MIHFIdTLVParser::valueEquals( senf::INet4Address const & addr)
+    const
+{
+    return length()==8 && addr==valueAsINet4Address();
+}
+
+prefix_ bool senf::MIHFIdTLVParser::valueEquals( senf::INet6Address const & addr)
+    const
+{
+    return length()==32 && addr==valueAsINet6Address();
+}
+
+prefix_ bool senf::MIHFIdTLVParser::valueEquals( senf::EUI64 const & addr)
+    const
+{
+    return length()==16 && addr==valueAsEUI64();
+}
+
+prefix_ bool senf::MIHFIdTLVParser::valueEquals( MIHFId const & id)
+    const
+{
+    return boost::apply_visitor( ValueEqualsVisitor(*this), id);
+}
+
+
+
 ///////////////////////////////cci.e////////////////////////////////////////
 #undef prefix_