X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPackets%2FPacket.cc;h=049e6f547b3d15073ced8bc5f6ecac3ca20a9d3f;hb=57daeae6f2e924ce3f16f9677c3474f531cba9e5;hp=06d646353ffc3aae49879190dff58a7855482718;hpb=601d1f509f5bb24df167a4dd5a20da67a0af9af8;p=senf.git

diff --git a/senf/Packets/Packet.cc b/senf/Packets/Packet.cc
index 06d6463..049e6f5 100644
--- a/senf/Packets/Packet.cc
+++ b/senf/Packets/Packet.cc
@@ -30,23 +30,19 @@
 
 //#include "Packet.mpp"
 #define prefix_
-///////////////////////////////cc.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
-prefix_ senf::Packet senf::Packet::checkNext()
+prefix_ senf::Packet senf::Packet::getNext()
     const
 {
-    PacketInterpreterBase::optional_range r (ptr()->nextPacketRange());
-    if (r && ! r->empty()) {
-        factory_t factory (ptr()->nextPacketType());
-        if (factory)
-            return parseNextAs(factory);
-        else
-            return parseNextAs<DataPacket>();
-    }
-    return Packet();
+    factory_t factory (ptr()->nextPacketType());
+    if (factory)
+        return parseNextAs(factory);
+    else
+        return parseNextAs<DataPacket>();
 }
 
-prefix_ senf::Packet senf::Packet::checkLast()
+prefix_ senf::Packet senf::Packet::getLast()
     const
 {
     Packet p (*this);
@@ -58,7 +54,14 @@ prefix_ senf::Packet senf::Packet::checkLast()
     return p;
 }
 
-///////////////////////////////cc.e////////////////////////////////////////
+prefix_ void senf::Packet::dump(std::ostream & os)
+    const
+{
+    last(); // Make sure the packet is complete
+    ptr()->dump(os);
+}
+
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #undef prefix_
 //#include "Packet.mpp"