X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPackets%2F80221Bundle%2FMIHPacket.cc;h=50b4439360d681970b46d26ceb18362bb9b3f67c;hb=bd52d6b1c3b258c030c7302f5e926aeb5b5b0715;hp=a33bc6564d5cc50cedcb3bebc2dcf8400f55eba3;hpb=d0c31526ac12869eed085891e3ae13e8b21072e6;p=senf.git

diff --git a/senf/Packets/80221Bundle/MIHPacket.cc b/senf/Packets/80221Bundle/MIHPacket.cc
index a33bc65..50b4439 100644
--- a/senf/Packets/80221Bundle/MIHPacket.cc
+++ b/senf/Packets/80221Bundle/MIHPacket.cc
@@ -78,21 +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)
+prefix_ void senf::MIHPacketType::validate(packet p)
 {
     try {
         if (p.data().size() < initSize())
-            return std::make_pair(false, "truncated MIH message");
+            throw InvalidMIHPacketException("truncated MIH message");
         if (p->version() != 1)
-            return std::make_pair(false, "invalid MIH version: " + senf::str(p->version()) );
+            throw InvalidMIHPacketException("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()) );
+            throw InvalidMIHPacketException("wrong MIH length: ") << senf::str(p->payloadLength());
         if (p.next(senf::nothrow))
-            return MIHMessageRegistry::instance().validate( p->messageId(), p.next());
+            MIHMessageRegistry::instance().validate( p->messageId(), p.next());
     } catch (senf::TruncatedPacketException e) {
-        return std::make_pair(false, "truncated MIH message");
+        throw InvalidMIHPacketException("truncated MIH message");
     }
-    return std::make_pair(true, "");
 }
 
 //-/////////////////////////////////////////////////////////////////////////////////////////////////