X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPackets%2F80221Bundle%2FMIHPacket.cc;h=f4efbeb2c13bc035027cb81c12e807de9c0fbc36;hb=ff305084cba283649a2c97e73d2608c3e4598683;hp=3f549c54967ab9415cfb6a292ed7c70c52efbf45;hpb=4d90b955bf3590e215488395d1c9cec827476e07;p=senf.git

diff --git a/senf/Packets/80221Bundle/MIHPacket.cc b/senf/Packets/80221Bundle/MIHPacket.cc
index 3f549c5..f4efbeb 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)
@@ -77,7 +78,20 @@ prefix_ senf::PacketInterpreterBase::factory_t senf::MIHPacketType::nextPacketTy
     return e ? e->factory() : MIHGenericPayloadPacket::factory();
 }
 
-///////////////////////////////////////////////////////////////////////////
+prefix_ std::pair<bool, std::string> senf::MIHPacketType::validate(packet p)
+{
+    if (p.data().size() < initSize())
+        return std::make_pair(false, "truncated MIH message");
+    if (p->version() != 1)
+        return std::make_pair(false, "invalid MIH version: " + senf::str(p->version()) );
+    if (p->payloadLength() != p.size()-8)
+        return std::make_pair(false, "wrong MIH length: " + senf::str(p->payloadLength()) );
+    if (p.next(senf::nothrow))
+        return MIHMessageRegistry::instance().validate( p->messageId(), p.next());
+    return std::make_pair(true, "");
+}
+
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // MIHGenericPayloadPacketType
 
 prefix_ void senf::MIHGenericPayloadPacketType::dump(packet p, std::ostream &os)
@@ -94,12 +108,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->finalize();
+    for (tlvContainer_t::iterator i (tlvs.begin()); i != tlvs.end(); ++i) {
+        MIHGenericTLVParser p (*i);
+        p.finalize();
+    }
 }
 
 
-///////////////////////////////cc.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #undef prefix_