X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPackets%2FPacket.cci;h=4ec12890d29e8a12adc3e8d8f4374b97cf27e80c;hb=refs%2Fheads%2Fmaster;hp=862c04cd29a9e6fbccf685fa719e9dbaa2a62e87;hpb=26610f603ebdd465307b9621f532c1fe19fd5571;p=senf.git

diff --git a/senf/Packets/Packet.cci b/senf/Packets/Packet.cci
index 862c04c..4ec1289 100644
--- a/senf/Packets/Packet.cci
+++ b/senf/Packets/Packet.cci
@@ -2,23 +2,28 @@
 //
 // 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
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
-// (at your option) any later version.
+// The contents of this file are subject to the Fraunhofer FOKUS Public License
+// Version 1.0 (the "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at 
+// http://senf.berlios.de/license.html
 //
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
+// The Fraunhofer FOKUS Public License Version 1.0 is based on, 
+// but modifies the Mozilla Public License Version 1.1.
+// See the full license text for the amendments.
 //
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the
-// Free Software Foundation, Inc.,
-// 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+// Software distributed under the License is distributed on an "AS IS" basis, 
+// WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License 
+// for the specific language governing rights and limitations under the License.
+//
+// The Original Code is Fraunhofer FOKUS code.
+//
+// The Initial Developer of the Original Code is Fraunhofer-Gesellschaft e.V. 
+// (registered association), Hansastraße 27 c, 80686 Munich, Germany.
+// All Rights Reserved.
+//
+// Contributor(s):
+//   Stefan Bund <g0dil@berlios.de>
 
 /** \file
     \brief Packet inline non-template implementation */
@@ -27,21 +32,21 @@
 #include <senf/Utils/senfassert.hh>
 
 #define prefix_ inline
-///////////////////////////////cci.p///////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::Packet
 
 // protected members
 
-prefix_  senf::Packet::Packet(PacketInterpreterBase::ptr packet)
+prefix_  senf::Packet::Packet(PacketInterpreterBase::ptr const & packet)
     : packet_(packet)
 {}
 
-prefix_ senf::PacketInterpreterBase::ptr senf::Packet::ptr()
+prefix_ senf::PacketInterpreterBase::ptr const & senf::Packet::ptr()
     const
 {
-    SENF_ASSERT(packet_);
+    SENF_ASSERT(packet_, "Invalid operation (dereferencing) on in-valid() Packet");
     return packet_;
 }
 
@@ -64,7 +69,9 @@ prefix_ senf::Packet senf::Packet::next(NoThrow_t)
     const
 {
     PacketInterpreterBase::ptr p (ptr()->next());
-    return !p && ptr()->nextPacketRange() ? checkNext() : Packet(p);
+    if (p) return Packet(p);
+    PacketInterpreterBase::optional_range r (ptr()->nextPacketRange());
+    return (r && ! r->empty()) ? Packet(getNext(r)) : Packet();
 }
 
 prefix_ senf::Packet senf::Packet::next()
@@ -99,13 +106,20 @@ prefix_ senf::Packet senf::Packet::last()
     const
 {
     Packet p (ptr()->last());
-    return p.next(nothrow) ? checkLast() : p;
+    return p.next(nothrow) ? getLast() : p;
 }
 
 prefix_ senf::Packet senf::Packet::parseNextAs(factory_t factory)
     const
 {
-    return Packet(ptr()->parseNextAs(factory));
+    return Packet(ptr()->parseNextAs(factory, ptr()->nextPacketRange()));
+}
+
+prefix_ senf::PacketInterpreterBase::ptr
+senf::Packet::parseNextAs(factory_t factory, PacketInterpreterBase::optional_range const & range)
+    const
+{
+    return ptr()->parseNextAs(factory, range);
 }
 
 prefix_ senf::Packet senf::Packet::append(Packet const & packet)
@@ -128,7 +142,6 @@ prefix_ senf::Packet::size_type senf::Packet::size()
     return data().size();
 }
 
-
 // Other methods
 
 prefix_ bool senf::Packet::operator==(Packet const & other)
@@ -152,13 +165,6 @@ prefix_ void senf::Packet::finalizeAll()
     ptr()->finalizeTo(last().ptr());
 }
 
-prefix_ void senf::Packet::dump(std::ostream & os)
-    const
-{
-    last(); // Make sure the packet is complete
-    ptr()->dump(os);
-}
-
 prefix_ senf::TypeIdValue senf::Packet::typeId()
     const
 {
@@ -189,6 +195,23 @@ prefix_ bool senf::Packet::valid()
     return *this;
 }
 
+prefix_ bool senf::Packet::is_shared()
+    const
+{
+    return ptr()->is_shared() || (ptr()->impl().refcount() > 1);
+}
+
+prefix_ void senf::Packet::reparse()
+    const
+{
+    ptr()->reparse();
+}
+
+prefix_ void senf::Packet::clearAnnotations()
+{
+    ptr()->clearAnnotations();
+}
+
 template <class PacketType, class Parser>
 prefix_ Parser senf::operator<<(Parser target, ConcretePacket<PacketType> const & packet)
 {
@@ -196,7 +219,7 @@ prefix_ Parser senf::operator<<(Parser target, ConcretePacket<PacketType> const
     return target;
 }
 
-///////////////////////////////cci.e///////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #undef prefix_