X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPackets%2F80221Bundle%2FMIHPacket.cc;h=50b4439360d681970b46d26ceb18362bb9b3f67c;hb=57daeae6f2e924ce3f16f9677c3474f531cba9e5;hp=619b58d43c33ba9575c83466fa288d383af8b296;hpb=482523171f06cf239fd7e8c991f81711c02cf0ba;p=senf.git

diff --git a/senf/Packets/80221Bundle/MIHPacket.cc b/senf/Packets/80221Bundle/MIHPacket.cc
index 619b58d..50b4439 100644
--- a/senf/Packets/80221Bundle/MIHPacket.cc
+++ b/senf/Packets/80221Bundle/MIHPacket.cc
@@ -28,15 +28,16 @@
 
 // Custom includes
 #include <boost/io/ios_state.hpp>
+#include <senf/Utils/String.hh>
 #include <senf/Packets/DefaultBundle/EthernetPacket.hh>
 
 #define prefix_
-///////////////////////////////cc.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
 SENF_PACKET_REGISTRY_REGISTER( senf::EtherTypes, 0x8917, senf::MIHPacket);
 
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // MIHPacketType
 
 prefix_ void senf::MIHPacketType::dump(packet p, std::ostream &os)
@@ -51,9 +52,9 @@ prefix_ void senf::MIHPacketType::dump(packet p, std::ostream &os)
        << senf::fieldName("  more fragments")    << p->moreFragment() << "\n"
        << senf::fieldName("  fragment number")   << p->fragmentNr() << "\n"
        << senf::fieldName("  message ID (MID)")  << unsigned( p->messageId()) << "\n"
-       << senf::fieldName("    sid")             << unsigned( p->sid()) << "\n"        
+       << senf::fieldName("    sid")             << unsigned( p->sid()) << "\n"
        << senf::fieldName("    opcode")          << unsigned( p->opcode()) << "\n"
-       << senf::fieldName("    aid")             << unsigned( p->aid()) << "\n"      
+       << senf::fieldName("    aid")             << unsigned( p->aid()) << "\n"
        << senf::fieldName("  transaction id")    << unsigned( p->transactionId()) << "\n"
        << senf::fieldName("  payload length")    << unsigned( p->payloadLength()) << "\n";
     p->src_mihfId().dump( os);
@@ -62,8 +63,8 @@ prefix_ void senf::MIHPacketType::dump(packet p, std::ostream &os)
 
 prefix_ void senf::MIHPacketType::finalize(packet p)
 {
-    p->src_mihfId().finalizeLength();
-    p->dst_mihfId().finalizeLength();
+    p->src_mihfId().finalize();
+    p->dst_mihfId().finalize();
     p->payloadLength_() << p.size() - 8;
     p->messageId() << key(p.next(nothrow));
 }
@@ -72,11 +73,28 @@ prefix_ senf::PacketInterpreterBase::factory_t senf::MIHPacketType::nextPacketTy
 {
     if (p.data().size() < initSize())
         return no_factory();
-    PkReg_Entry const * e (PacketRegistry<MIHMessageRegistry>::lookup( p->messageId(), nothrow ));
+    PacketRegistry<MIHMessageRegistry>::Entry const * e (
+        PacketRegistry<MIHMessageRegistry>::lookup( p->messageId(), nothrow ));
     return e ? e->factory() : MIHGenericPayloadPacket::factory();
 }
 
-///////////////////////////////////////////////////////////////////////////
+prefix_ void senf::MIHPacketType::validate(packet p)
+{
+    try {
+        if (p.data().size() < initSize())
+            throw InvalidMIHPacketException("truncated MIH message");
+        if (p->version() != 1)
+            throw InvalidMIHPacketException("invalid MIH version: ") << senf::str(p->version());
+        if (p->payloadLength() != p.size()-8)
+            throw InvalidMIHPacketException("wrong MIH length: ") << senf::str(p->payloadLength());
+        if (p.next(senf::nothrow))
+            MIHMessageRegistry::instance().validate( p->messageId(), p.next());
+    } catch (senf::TruncatedPacketException e) {
+        throw InvalidMIHPacketException("truncated MIH message");
+    }
+}
+
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // MIHGenericPayloadPacketType
 
 prefix_ void senf::MIHGenericPayloadPacketType::dump(packet p, std::ostream &os)
@@ -85,7 +103,7 @@ prefix_ void senf::MIHGenericPayloadPacketType::dump(packet p, std::ostream &os)
     os << "MIH Payload (service specific TLVs):\n";
     typedef parser::tlvList_t::container tlvListContainer_t;
     tlvListContainer_t tlvListContainer (p->tlvList());
-    for (tlvListContainer_t::iterator i = tlvListContainer.begin(); i != tlvListContainer.end(); ++i)
+    for (tlvListContainer_t::const_iterator i = tlvListContainer.begin(); i != tlvListContainer.end(); ++i)
         i->dump( os);
 }
 
@@ -93,12 +111,14 @@ prefix_ void senf::MIHGenericPayloadPacketType::finalize(packet p)
 {
     typedef parser::tlvList_t::container tlvContainer_t;
     tlvContainer_t tlvs (p->tlvList() );
-    for (tlvContainer_t::iterator i (tlvs.begin()); i != tlvs.end(); ++i)
-        i->finalizeLength();
+    for (tlvContainer_t::iterator i (tlvs.begin()); i != tlvs.end(); ++i) {
+        MIHGenericTLVParser p (*i);
+        p.finalize();
+    }
 }
 
 
-///////////////////////////////cc.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #undef prefix_