X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPackets%2F80221Bundle%2FTLVParser.cc;h=80d2ce76f5f3162886b6b51c9ddb59445b745b8a;hb=3d7b1c7de10871dab0a8b64aa465b79abe8579c5;hp=8f9d942caa3ed09efcfa366642384cf4541985cc;hpb=482523171f06cf239fd7e8c991f81711c02cf0ba;p=senf.git

diff --git a/senf/Packets/80221Bundle/TLVParser.cc b/senf/Packets/80221Bundle/TLVParser.cc
index 8f9d942..80d2ce7 100644
--- a/senf/Packets/80221Bundle/TLVParser.cc
+++ b/senf/Packets/80221Bundle/TLVParser.cc
@@ -29,12 +29,15 @@
 // 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
@@ -42,14 +45,15 @@ SENF_PACKET_TLV_REGISTRY_REGISTER( senf::MIHFDstIdTLVParser );
 prefix_ void senf::MIHFIdTLVParser::dump(std::ostream & os)
     const
 {
-    os << senf::fieldName("  type")   << unsigned (type())   << "\n"
-       << senf::fieldName("  length") << unsigned (length()) << "\n"
-       << "    value:\n";
-    std::string src_mihfId (asString());
+    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::setString(std::string const &id)
+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)
@@ -59,30 +63,35 @@ prefix_ void senf::MIHFIdTLVParser::setString(std::string const &id)
     std::copy( id.begin(), id.end(), si);
 }
 
-prefix_ void senf::MIHFIdTLVParser::setMACAddress(senf::MACAddress const &mac)
+prefix_ void senf::MIHFIdTLVParser::value(senf::MACAddress const & addr)
 {
     safe_data_iterator si = resizeValueField(12);
-    std::copy( mac.begin(), mac.end(), getNAIEncodedOutputIterator(si));
+    std::copy( addr.begin(), addr.end(), getNAIEncodedOutputIterator(si));
 }
 
-prefix_ void senf::MIHFIdTLVParser::setINet4Address(senf::INet4Address const &addr)
+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::setINet6Address(senf::INet6Address const &addr)
+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::setEUI64(senf::EUI64 const &addr)
+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
 {
@@ -91,15 +100,15 @@ prefix_ senf::MIHFId senf::MIHFIdTLVParser::valueAs(MIHFId::Type type)
     case MIHFId::Empty:
         return MIHFId();
     case MIHFId::MACAddress:
-        return MIHFId( asMACAddress());
+        return MIHFId( valueAsMACAddress());
     case MIHFId::INet4Address:
-        return MIHFId( asINet4Address());
+        return MIHFId( valueAsINet4Address());
     case MIHFId::INet6Address:
-        return MIHFId( asINet6Address());
+        return MIHFId( valueAsINet6Address());
     case MIHFId::String:
-        return MIHFId( asINet6Address());
+        return MIHFId( valueAsString());
     case MIHFId::EUI64:
-        return MIHFId( asINet6Address());
+        return MIHFId( valueAsEUI64());
     }
     return MIHFId();
 }
@@ -111,7 +120,8 @@ prefix_ senf::MIHFId senf::MIHFIdTLVParser::valueAs(MIHFId::Type type)
 prefix_ void senf::MIHFSrcIdTLVParser::dump(std::ostream & os)
     const
 {
-    os << "  source MIHF_Id TLV:\n";
+    senf::format::IndentHelper indent;
+    os << indent << "source MIHF_Id TLV:\n";
     MIHFIdTLVParser::dump(os);
 }
 
@@ -121,12 +131,84 @@ prefix_ void senf::MIHFSrcIdTLVParser::dump(std::ostream & os)
 prefix_ void senf::MIHFDstIdTLVParser::dump(std::ostream & os)
     const
 {
-    os << "  destination MIHF_Id TLV:\n";
+    senf::format::IndentHelper indent;
+    os << indent << "destination MIHF_Id TLV:\n";
     MIHFIdTLVParser::dump(os);
 }
 
 ///////////////////////////////////////////////////////////////////////////
-// MIHBaseTLVParser
+// 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;
+}
+
+///////////////////////////////////////////////////////////////////////////
+// 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)