X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPackets%2FMPEGDVBBundle%2FSNDUPacket.cc;h=53c3bd30bff98c63223587f4ffb561c83afdb36f;hb=7ee689fe38d66aa3a0004d55e8708750d35adc0b;hp=e6761b335106be048015e31755f00657e706a706;hpb=5367b304d03eba5b7738b46b86532b0141b60d95;p=senf.git

diff --git a/senf/Packets/MPEGDVBBundle/SNDUPacket.cc b/senf/Packets/MPEGDVBBundle/SNDUPacket.cc
index e6761b3..53c3bd3 100644
--- a/senf/Packets/MPEGDVBBundle/SNDUPacket.cc
+++ b/senf/Packets/MPEGDVBBundle/SNDUPacket.cc
@@ -28,24 +28,22 @@
 
 // Custom includes
 #include <iomanip>
-#include <senf/Packets/DefaultBundle/EthernetPacket.hh>
-
 
 #define prefix_
-///////////////////////////////cc.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
 prefix_ boost::uint32_t senf::SNDUPacketParser::calcCrc()
     const
 {
     return std::for_each(
-            data().begin(), 
-            boost::prior(data().end(), 4), 
+            data().begin(),
+            boost::prior(data().end(), 4),
             ule_crc32() ).checksum();
 }
 
 //prefix_ senf::SNDUPacketType::key_t senf::SNDUPacketType::nextPacketKey(packet p)
 //{
-//    return p->type(); 
+//    return p->type();
 //}
 
 prefix_ void senf::SNDUPacketType::init(packet p)
@@ -57,20 +55,26 @@ 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 
-senf::SNDUPacketType::nextPacketRange(packet p) 
+prefix_ senf::PacketInterpreterBase::optional_range
+senf::SNDUPacketType::nextPacketRange(packet p)
 {
     if (p.data().size() < 8)
         return no_range();
-    
+
     size_type sz = 2 + 2;  // D-Bit + 15 bits length + 16 bits type field
     if (! p->d_bit() )
         sz += 6;  // + 6 Byte NPA destination address
@@ -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_