X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPackets%2FPacket.cci;h=4ec12890d29e8a12adc3e8d8f4374b97cf27e80c;hb=refs%2Fheads%2Fmaster;hp=3bd0522dbe0e490c556d26ec94275a8af06711e8;hpb=92d091c2e5b387ca0c9930c7bc88d9b45630a845;p=senf.git diff --git a/senf/Packets/Packet.cci b/senf/Packets/Packet.cci index 3bd0522..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 // -// 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 /** \file \brief Packet inline non-template implementation */ @@ -66,7 +71,7 @@ prefix_ senf::Packet senf::Packet::next(NoThrow_t) PacketInterpreterBase::ptr p (ptr()->next()); if (p) return Packet(p); PacketInterpreterBase::optional_range r (ptr()->nextPacketRange()); - return (r && ! r->empty()) ? getNext() : Packet(); + return (r && ! r->empty()) ? Packet(getNext(r)) : Packet(); } prefix_ senf::Packet senf::Packet::next() @@ -107,7 +112,14 @@ prefix_ senf::Packet senf::Packet::last() 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) @@ -192,12 +204,12 @@ prefix_ bool senf::Packet::is_shared() prefix_ void senf::Packet::reparse() const { - return ptr()->reparse(); + ptr()->reparse(); } prefix_ void senf::Packet::clearAnnotations() { - return ptr()->clearAnnotations(); + ptr()->clearAnnotations(); } template