Packets/80221Bundle: fixed error in MIHF_ID-TLV; restructured TLV finalize()

[senf.git] / senf / Packets / 80221Bundle / TLVParser.cc

diff --git a/senf/Packets/80221Bundle/TLVParser.cc b/senf/Packets/80221Bundle/TLVParser.cc
index 45622fb..db7ef8b 100644 (file)
--- a/senf/Packets/80221Bundle/TLVParser.cc
+++ b/senf/Packets/80221Bundle/TLVParser.cc
@@ -49,11 +49,42 @@ prefix_ void senf::MIHFIdTLVParser::dump(std::ostream & os)
     os << indent << "type:   " << unsigned (type()) << std::endl
        << indent << "length: " << unsigned (length()) << std::endl
        << indent << "value:\n";
-    std::string src_mihfId (asString());
+    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::finalize()
+{
+    protect(), idLength_().finalize();
+    length_() << idLength() + idLength_().bytes();
+    MIHBaseTLVParser::finalize();
+}
+
+prefix_ void senf::MIHFIdTLVParser::maxIdLength(boost::uint8_t maxLength)
+{
+    // the maximum length of a MIHF_ID is 253 octets (see F.3.11 in 802.21)
+    if (maxLength > 253) 
+        throw std::length_error("maximum length of a MIHF_ID is 253 octets");
+    protect(), idLength_().maxValue( maxLength);
+    maxLengthValue( maxLength + senf::bytes(idLength_()));
+}
+
+prefix_ senf::safe_data_iterator senf::MIHFIdTLVParser::resizeValueField(
+        MIHTLVLengthParser::value_type size) 
+{
+    MIHTLVLengthParser::value_type current_length ( idLength());
+    idLength_() << size;
+    length_() << size + idLength_().bytes();
+
+    safe_data_iterator si (data(), valueBegin());
+    if (current_length > size)
+        data().erase( si, boost::next(si, current_length-size));
+    else
+        data().insert( si, size-current_length, 0);
+    return si;
+}
+
+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)
@@ -63,30 +94,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));
+    safe_data_iterator si = resizeValueField(6*2);
+    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);
+    safe_data_iterator si = resizeValueField(4*2);
     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);
+    safe_data_iterator si = resizeValueField(16*2);
     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);
+    safe_data_iterator si = resizeValueField(8*2);
     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
 {
@@ -95,15 +131,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();
 }
@@ -201,25 +237,6 @@ prefix_ void senf::MIHValidTimeIntervalTLVParser::dump(std::ostream & os)
        << ( value()==0 ? " (infinite)" : " seconds") << std::endl;
 }
 
-
-///////////////////////////////////////////////////////////////////////////
-// senf::MIHBaseTLVParser
-
-prefix_ senf::safe_data_iterator senf::MIHBaseTLVParser::resizeValueField(
-        MIHTLVLengthParser::value_type size) 
-{
-    MIHTLVLengthParser::value_type current_length ( length());
-    length_() << size;
-
-    safe_data_iterator si (data(), boost::next(i(), 1 + length_().bytes() ));
-    if (current_length > size)
-        data().erase( si, boost::next(si, current_length-size));
-    else
-        data().insert( si, size-current_length, 0);
-    return si;
-}
-
-
 ///////////////////////////////////////////////////////////////////////////
 // senf::MIHTLVLengthParser
 
@@ -323,7 +340,7 @@ prefix_ void senf::MIHTLVLengthParser::finalize()
     if (b != 5) resize_(5);
 }
 
-prefix_ void senf::MIHTLVLengthParser:: maxValue(MIHTLVLengthParser::value_type v)
+prefix_ void senf::MIHTLVLengthParser::maxValue(MIHTLVLengthParser::value_type v)
 {
     if (v <= 128)
         return;