X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPackets%2FMPEGDVBBundle%2FSNDUPacket.cc;h=53c3bd30bff98c63223587f4ffb561c83afdb36f;hb=e3179a2123ad51d0d9eb63834a581145c4f77c92;hp=2aa625324b394ba778722e5db3c4b361e0da0747;hpb=9cb871b939efe93e35dd96808d25089399acfc46;p=senf.git

diff --git a/senf/Packets/MPEGDVBBundle/SNDUPacket.cc b/senf/Packets/MPEGDVBBundle/SNDUPacket.cc
index 2aa6253..53c3bd3 100644
--- a/senf/Packets/MPEGDVBBundle/SNDUPacket.cc
+++ b/senf/Packets/MPEGDVBBundle/SNDUPacket.cc
@@ -28,11 +28,9 @@
 
 // Custom includes
 #include <iomanip>
-#include <senf/Packets/DefaultBundle/EthernetPacket.hh>
-
 
 #define prefix_
-///////////////////////////////cc.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
 prefix_ boost::uint32_t senf::SNDUPacketParser::calcCrc()
     const
@@ -57,12 +55,18 @@ prefix_ senf::PacketInterpreterBase::factory_t senf::SNDUPacketType::nextPacketT
 {
     if (p.data().size() < 8)
         return no_factory();
-    PkReg_Entry const * e;
-    if (p->type() < 1536)
-        e = PacketRegistry<senf::ULEExtHeaderTypes>::lookup( p->type(), nothrow );
-    else
-        e = PacketRegistry<senf::EtherTypes>::lookup( p->type(), nothrow );
-    return e ? e->factory() : no_factory();
+    PacketInterpreterBase::factory_t f (no_factory());
+    if (p->type() < 1536) {
+        PacketRegistry<senf::ULEExtHeaderTypes>::Entry const * e (
+            PacketRegistry<senf::ULEExtHeaderTypes>::lookup( p->type(), nothrow ));
+        if (e) f = e->factory();
+    }
+    else {
+        PacketRegistry<senf::EtherTypes>::Entry const * e (
+            PacketRegistry<senf::ULEExtHeaderTypes>::lookup( p->type(), nothrow ));
+        if (e) f = e->factory();
+    }
+    return f;
 }
 
 prefix_ senf::PacketInterpreterBase::optional_range
@@ -101,7 +105,7 @@ prefix_ senf::PacketParserBase::size_type senf::SNDUPacketType::initHeadSize()
     return 2 + 2;  // D-Bit + 15 bits length + 16 bits type field
 }
 
-///////////////////////////////cc.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #undef prefix_