Packets/80221Bundle: set messageId on finalize

[senf.git] / Packets / PacketInterpreter.cc

diff --git a/Packets/PacketInterpreter.cc b/Packets/PacketInterpreter.cc
index 3e33c0c..fcd6783 100644 (file)
--- a/Packets/PacketInterpreter.cc
+++ b/Packets/PacketInterpreter.cc
@@ -1,8 +1,8 @@
 // $Id$
 //
-// Copyright (C) 2007 
-// Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS)
-// Kompetenzzentrum fuer Satelitenkommunikation (SatCom)
+// Copyright (C) 2007
+// Fraunhofer Institute for Open Communication Systems (FOKUS)
+// Competence Center NETwork research (NET), St. Augustin, GERMANY
 //     Stefan Bund <g0dil@berlios.de>
 //
 // This program is free software; you can redistribute it and/or modify
@@ -74,18 +74,27 @@ prefix_ senf::PacketInterpreterBase::ptr senf::PacketInterpreterBase::append(ptr
 
 prefix_ void senf::PacketInterpreterBase::dump(std::ostream & os)
 {
+    if (detail::AnnotationIndexerBase::maxAnnotations > 0) {
+        os << "Annotations:\n";
+        impl().dumpAnnotations(os);
+    }
     v_dump(os);
     for (ptr i (next()); i; i = i->next())
         i->v_dump(os);
 }
 
-prefix_ void senf::PacketInterpreterBase::finalize()
+prefix_ void senf::PacketInterpreterBase::finalizeThis()
 {
-    for (ptr i (last()) ; i.get() != this ; i = i->prev())
-        i->v_finalize();
     v_finalize();
 }
 
+prefix_ void senf::PacketInterpreterBase::finalizeTo(ptr other)
+{
+    for (ptr i (other); i.get() != this && i.get(); i = i->prev())
+        i->finalizeThis();
+    finalizeThis();
+}
+
 ///////////////////////////////////////////////////////////////////////////
 // senf::PacketInterpreterBase::Factory