X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPackets%2F80221Bundle%2FTLVParser.cc;h=80d2ce76f5f3162886b6b51c9ddb59445b745b8a;hb=0e83cd2ee1ebc409cf73d8774b01bf01f3df22f4;hp=43ba4c2d66c0f6c1ba2b9f70305724767f3d68b3;hpb=f723d7852a8195072eee387ea9ca77156b58438b;p=senf.git

diff --git a/senf/Packets/80221Bundle/TLVParser.cc b/senf/Packets/80221Bundle/TLVParser.cc
index 43ba4c2..80d2ce7 100644
--- a/senf/Packets/80221Bundle/TLVParser.cc
+++ b/senf/Packets/80221Bundle/TLVParser.cc
@@ -29,12 +29,186 @@
 // Custom includes
 #include <iomanip>
 #include <senf/Utils/hexdump.hh>
+#include <senf/Utils/Format.hh>
 
 #define prefix_
 ///////////////////////////////cc.p////////////////////////////////////////
 
+SENF_PACKET_TLV_REGISTRY_REGISTER( senf::MIHFSrcIdTLVParser );
+SENF_PACKET_TLV_REGISTRY_REGISTER( senf::MIHFDstIdTLVParser );
+SENF_PACKET_TLV_REGISTRY_REGISTER( senf::MIHStatusTLVParser );
+SENF_PACKET_TLV_REGISTRY_REGISTER( senf::MIHValidTimeIntervalTLVParser );
+
+///////////////////////////////////////////////////////////////////////////
+// senf::MIHFIdTLVParser
+
+prefix_ void senf::MIHFIdTLVParser::dump(std::ostream & os)
+    const
+{
+    senf::format::IndentHelper indent;
+    os << indent << "type:   " << unsigned (type()) << std::endl
+       << indent << "length: " << unsigned (length()) << std::endl
+       << indent << "value:\n";
+    std::string src_mihfId (valueAsString());
+    hexdump(src_mihfId.begin(), src_mihfId.end(), os);
+}
+
+prefix_ void senf::MIHFIdTLVParser::value(std::string const & id)
+{
+    size_type str_size (id.size());
+    // the maximum length of a MIHF_ID is 253 octets (see F.3.11 in 802.21)
+    if (str_size > 253) 
+        throw std::length_error("maximum length of a MIHF_ID is 253 octets");
+    safe_data_iterator si = resizeValueField( str_size);   
+    std::copy( id.begin(), id.end(), si);
+}
+
+prefix_ void senf::MIHFIdTLVParser::value(senf::MACAddress const & addr)
+{
+    safe_data_iterator si = resizeValueField(12);
+    std::copy( addr.begin(), addr.end(), getNAIEncodedOutputIterator(si));
+}
+
+prefix_ void senf::MIHFIdTLVParser::value(senf::INet4Address const & addr)
+{
+    safe_data_iterator si = resizeValueField(8);
+    std::copy( addr.begin(), addr.end(), getNAIEncodedOutputIterator(si));
+}
+
+prefix_ void senf::MIHFIdTLVParser::value(senf::INet6Address const & addr)
+{
+    safe_data_iterator si = resizeValueField(32);
+    std::copy( addr.begin(), addr.end(), getNAIEncodedOutputIterator(si));
+}
+
+prefix_ void senf::MIHFIdTLVParser::value(senf::EUI64 const & addr)
+{
+    safe_data_iterator si = resizeValueField(16);
+    std::copy( addr.begin(), addr.end(), getNAIEncodedOutputIterator(si));
+}
+
+prefix_ void senf::MIHFIdTLVParser::value( MIHFId const & id)
+{
+    boost::apply_visitor( ValueSetterVisitor(*this), id);
+}
+
+prefix_ senf::MIHFId senf::MIHFIdTLVParser::valueAs(MIHFId::Type type)
+    const
+{
+    if (length() == 0) return MIHFId();
+    switch (type) {
+    case MIHFId::Empty:
+        return MIHFId();
+    case MIHFId::MACAddress:
+        return MIHFId( valueAsMACAddress());
+    case MIHFId::INet4Address:
+        return MIHFId( valueAsINet4Address());
+    case MIHFId::INet6Address:
+        return MIHFId( valueAsINet6Address());
+    case MIHFId::String:
+        return MIHFId( valueAsString());
+    case MIHFId::EUI64:
+        return MIHFId( valueAsEUI64());
+    }
+    return MIHFId();
+}
+
+
+///////////////////////////////////////////////////////////////////////////
+// senf::MIHFSrcIdTLVParser
+
+prefix_ void senf::MIHFSrcIdTLVParser::dump(std::ostream & os)
+    const
+{
+    senf::format::IndentHelper indent;
+    os << indent << "source MIHF_Id TLV:\n";
+    MIHFIdTLVParser::dump(os);
+}
+
+///////////////////////////////////////////////////////////////////////////
+// senf::MIHFDstIdTLVParser
+
+prefix_ void senf::MIHFDstIdTLVParser::dump(std::ostream & os)
+    const
+{
+    senf::format::IndentHelper indent;
+    os << indent << "destination MIHF_Id TLV:\n";
+    MIHFIdTLVParser::dump(os);
+}
+
+///////////////////////////////////////////////////////////////////////////
+// senf::MIHStatusTLVParser
+
+prefix_ void senf::MIHStatusTLVParser::dump(std::ostream & os)
+    const
+{
+    senf::format::IndentHelper indent;
+    os << indent << "Status TLV:" << std::endl;
+    indent.increase();
+    os << indent <<   "type:   " << unsigned( type()) << std::endl
+       << indent <<   "length: " << unsigned( length()) << " byte(s)" << std::endl
+       << indent <<   "value:  " << unsigned( value());
+    switch (value()) {
+    case Success:
+        os << " (Success)" << std::endl;
+        return;
+    case UnspecifiedFailure:  
+        os << " (Unspecified Failure)" << std::endl;
+        return;
+    case Rejected:
+        os << " (Rejected)" << std::endl;
+        return;
+    case AuthorizationFailure:
+        os << " (Authorization Failure)" << std::endl;
+        return;
+    case NetworkError:
+        os << " (Network Error)" << std::endl;
+        return;
+    }
+    os << " (???; invalid value!)" << std::endl;
+}
+
 ///////////////////////////////////////////////////////////////////////////
-// MIHBaseTLVParser
+// senf::MIHRegisterReqCodeTLVParser
+
+prefix_ void senf::MIHRegisterReqCodeTLVParser::dump(std::ostream & os)
+    const
+{
+    senf::format::IndentHelper indent;
+    os << indent << "Register Request Code TLV:" << std::endl;
+    indent.increase();
+    os << indent <<   "type:   " << unsigned( type()) << std::endl
+       << indent <<   "length: " << unsigned( length()) << " byte(s)" << std::endl
+       << indent <<   "value:  " << unsigned( value());
+    switch (value()) {
+    case Registration:
+        os << " (Registration)" << std::endl;
+        return;
+    case ReRegistration:
+        os << " (Re-Registration)" << std::endl;
+        return;
+    }
+    os << " (???; invalid value!)" << std::endl;
+}
+
+///////////////////////////////////////////////////////////////////////////
+// senf::MIHValidTimeIntervalTLVParser
+
+prefix_ void senf::MIHValidTimeIntervalTLVParser::dump(std::ostream & os)
+    const
+{
+    senf::format::IndentHelper indent;
+    os << indent << "Valid Time Interval TLV:" << std::endl;
+    indent.increase();
+    os << indent <<   "type:   " << unsigned( type()) << std::endl
+       << indent <<   "length: " << unsigned( length()) << " byte(s)" << std::endl
+       << indent <<   "value:  " << unsigned( value())
+       << ( value()==0 ? " (infinite)" : " seconds") << std::endl;
+}
+
+
+///////////////////////////////////////////////////////////////////////////
+// senf::MIHBaseTLVParser
 
 prefix_ senf::safe_data_iterator senf::MIHBaseTLVParser::resizeValueField(
         MIHTLVLengthParser::value_type size) 
@@ -52,7 +226,7 @@ prefix_ senf::safe_data_iterator senf::MIHBaseTLVParser::resizeValueField(
 
 
 ///////////////////////////////////////////////////////////////////////////
-// MIHTLVLengthParser
+// senf::MIHTLVLengthParser
 
 prefix_ senf::MIHTLVLengthParser::value_type senf::MIHTLVLengthParser::value() const 
 {
@@ -72,7 +246,6 @@ prefix_ senf::MIHTLVLengthParser::value_type senf::MIHTLVLengthParser::value() c
     };
 }
 
-
 prefix_ void senf::MIHTLVLengthParser::value(value_type const & v) 
 {
     switch (bytes() ) {
@@ -101,7 +274,6 @@ prefix_ void senf::MIHTLVLengthParser::value(value_type const & v)
     underflow_flag() = (v <= 128);
 }
 
-
 prefix_ senf::MIHTLVLengthParser::value_type senf::MIHTLVLengthParser::maxValue()
     const
 {
@@ -121,21 +293,18 @@ prefix_ senf::MIHTLVLengthParser::value_type senf::MIHTLVLengthParser::maxValue(
     };
 }
 
-
 prefix_ senf::MIHTLVLengthParser const & senf::MIHTLVLengthParser::operator= (value_type other) 
 {
     value(other);
     return *this; 
 }
 
-
 prefix_ void senf::MIHTLVLengthParser::init() const 
 {
     defaultInit();
     extended_length_flag() = false;
 }
 
-
 prefix_ void senf::MIHTLVLengthParser::finalize()
 {
     value_type v = value();
@@ -159,7 +328,6 @@ prefix_ void senf::MIHTLVLengthParser::finalize()
     if (b != 5) resize_(5);
 }
 
-
 prefix_ void senf::MIHTLVLengthParser:: maxValue(MIHTLVLengthParser::value_type v)
 {
     if (v <= 128)
@@ -180,7 +348,6 @@ prefix_ void senf::MIHTLVLengthParser:: maxValue(MIHTLVLengthParser::value_type
     if (b < 5) resize_(5);
 }
 
-
 prefix_ void senf::MIHTLVLengthParser::resize_(size_type size)
 {
     value_type v = value();