Packets/80221Bundle: fixed MIH message validation unit test @ ubuntu hardy

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

diff --git a/senf/Packets/80221Bundle/MIHPacket.cc b/senf/Packets/80221Bundle/MIHPacket.cc
index e7fba5c..a33bc65 100644 (file)
--- 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);
@@ -72,11 +73,29 @@ 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_ std::pair<bool, std::string> senf::MIHPacketType::validate(packet p)
+{
+    try {
+        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());
+    } catch (senf::TruncatedPacketException e) {
+        return std::make_pair(false, "truncated MIH message");
+    }
+    return std::make_pair(true, "");
+}
+
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // MIHGenericPayloadPacketType
 
 prefix_ void senf::MIHGenericPayloadPacketType::dump(packet p, std::ostream &os)
@@ -93,12 +112,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_
 
 \f