X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Packets%2FMPEGDVBBundle%2FTLVPacket.ct;h=ea91f809aa569fb033a417f99067c05ef89149a7;hb=a58be9dbd48369f2c0469b5c214406d26f1feefa;hp=0aa77d11f94ca2641d380c69930f417ab04e8ff4;hpb=8e973da50bdd625d2cbdd218143a4fcd920f9109;p=senf.git

diff --git a/Packets/MPEGDVBBundle/TLVPacket.ct b/Packets/MPEGDVBBundle/TLVPacket.ct
index 0aa77d1..ea91f80 100644
--- a/Packets/MPEGDVBBundle/TLVPacket.ct
+++ b/Packets/MPEGDVBBundle/TLVPacket.ct
@@ -1,9 +1,9 @@
-// $Id: TLVPacket.ct 469 2007-10-19 11:20:08Z tho $
+// $Id$
 //
 // Copyright (C) 2007
-// Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS)
-// Kompetenzzentrum fuer Satelitenkommunikation (SatCom)
-//     Thorsten Horstmann <thorsten.horstmann@fokus.fraunhofer.de>
+// Fraunhofer Institute for Open Communication Systems (FOKUS)
+// Competence Center NETwork research (NET), St. Augustin, GERMANY
+//     Thorsten Horstmann <tho@berlios.de>
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -31,8 +31,8 @@
 #define prefix_
 ///////////////////////////////ct.p////////////////////////////////////////
 
-template <class LengthParser>
-prefix_ void senf::TLVPacketType<LengthParser>::dump(packet p, std::ostream & os)
+template <class TypeParser, class LengthParser>
+prefix_ void senf::TLVPacketType<TypeParser, LengthParser>::dump(packet p, std::ostream & os)
 {
     os << "TLVPacket:"
        << std::dec
@@ -40,24 +40,29 @@ prefix_ void senf::TLVPacketType<LengthParser>::dump(packet p, std::ostream & os
        << "  length: " << unsigned(p->length()) << "\n";
 }
 
-template <class LengthParser>
-prefix_ void senf::TLVPacketType<LengthParser>::finalize(packet p)
+template <class TypeParser, class LengthParser>
+prefix_ void senf::TLVPacketType<TypeParser, LengthParser>::finalize(packet p)
 {
-    PacketData::size_type size = p.next().data().size();
-    if ( size > LengthParser::max_value )
-        throw(UnsuportedTLVPacketException());
-    p->length() = size;
+    try {
+        PacketData::size_type size = p.next().data().size();
+        if ( size > LengthParser::max_value )
+            throw(UnsuportedTLVPacketException());
+        p->length() = size;
+    }
+    catch (InvalidPacketChainException & ex) {
+        ;
+    }
 }
 
-template <class LengthParser>
-prefix_ senf::PacketParserBase::size_type senf::TLVPacketType<LengthParser>::initSize()
+template <class TypeParser, class LengthParser>
+prefix_ senf::PacketParserBase::size_type senf::TLVPacketType<TypeParser, LengthParser>::initSize()
 {
-    return 4 + senf::init_bytes<LengthParser>::value;
+    return senf::init_bytes<TypeParser>::value + senf::init_bytes<LengthParser>::value;
 }
 
-template <class LengthParser>
+template <class TypeParser, class LengthParser>
 prefix_ senf::PacketInterpreterBase::optional_range 
-senf::TLVPacketType<LengthParser>::nextPacketRange(packet p) 
+senf::TLVPacketType<TypeParser, LengthParser>::nextPacketRange(packet p) 
 {
     if (p.data().size() < 5)
         return no_range();