X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Packets%2FPacketImpl.cc;h=5b0ad43ae37df6e16a4c5e1444e44d22beac8cf1;hb=6fecbc9f068fc7c391f5f23d2c7ff37f61f1ff2d;hp=8dfd75e10c653b5a1a5ffde744aa4463df23bee6;hpb=2d6585ff852e9d282c17003ba1db0b73eb3a8500;p=senf.git

diff --git a/Packets/PacketImpl.cc b/Packets/PacketImpl.cc
index 8dfd75e..5b0ad43 100644
--- a/Packets/PacketImpl.cc
+++ b/Packets/PacketImpl.cc
@@ -1,6 +1,8 @@
-// Copyright (C) 2007 
-// Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS)
-// Kompetenzzentrum fuer Satelitenkommunikation (SatCom)
+// $Id$
+//
+// 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
@@ -32,8 +34,34 @@
 ///////////////////////////////cc.p////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////////////////////
+// senf::detail::AnnotationIndexerBase
+
+unsigned senf::detail::AnnotationIndexerBase::maxAnnotations (0);
+
+prefix_ void senf::detail::AnnotationIndexerBase::dump(PacketImpl * p, std::ostream & os)
+{
+    for(std::vector<AnnotationIndexerBase*>::const_iterator 
+            i (registry().begin()), i_end (registry().end());
+        i != i_end; ++i)
+        (*i)->v_dump(p,os);
+}
+
+///////////////////////////////////////////////////////////////////////////
 // senf::detail::PacketImpl
 
+prefix_ senf::detail::PacketImpl::~PacketImpl()
+{
+    // We increment refcount_ to ensure, release() won't call delete again
+    ++refcount_;
+    eraseInterpreters(interpreters_.begin(), interpreters_.end());
+    Annotations::const_iterator  i (annotations_.begin());
+    Annotations::const_iterator const i_end (annotations_.end());
+    std::vector<bool>::iterator small (AnnotationIndexerBase::small().begin());
+    for (; i != i_end; ++i, ++small)
+        if (! *small && i->p)
+            delete i->p;
+}
+
 // interpreter chain
 
 prefix_ void senf::detail::PacketImpl::appendInterpreter(PacketInterpreterBase * p)
@@ -57,7 +85,7 @@ prefix_ void senf::detail::PacketImpl::clear(PacketData * self)
         truncateInterpreters(n);
     iterator first (boost::next(begin(),self->begin_));
     data_.erase(first, boost::next(begin(),self->end_));
-    updateIterators(self,first,-self->size());
+    updateIterators(self,self->begin_,-self->size());
 }
 
 // private members
@@ -73,7 +101,7 @@ prefix_ void senf::detail::PacketImpl::eraseInterpreters(interpreter_list::itera
     }
 }
 
-prefix_ void senf::detail::PacketImpl::updateIterators(PacketData * self, iterator pos,
+prefix_ void senf::detail::PacketImpl::updateIterators(PacketData * self, difference_type pos,
                                                        difference_type n)
 {
     // I hate to change the PacketData representation from here, I would have preferred to let
@@ -101,7 +129,7 @@ prefix_ void senf::detail::PacketImpl::updateIterators(PacketData * self, iterat
     // c)
     interpreter_list::iterator const i_end (interpreters_.end());
     if (++i != i_end)
-        if (std::distance(begin(), pos) < difference_type(i->begin_))
+        if (pos <= difference_type(i->begin_))
             // pos is before the packet, it must then be before all futher packets ...
             for (; i != i_end; ++i) {
                 i->begin_ += n;