X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPackets%2FPacketInterpreter.ct;h=3499dd32f8b458a25c8108c5a66b066f2c2172cf;hb=HEAD;hp=49a34e1649e714c45247a0773654488b437308df;hpb=601d1f509f5bb24df167a4dd5a20da67a0af9af8;p=senf.git diff --git a/senf/Packets/PacketInterpreter.ct b/senf/Packets/PacketInterpreter.ct index 49a34e1..3499dd3 100644 --- a/senf/Packets/PacketInterpreter.ct +++ b/senf/Packets/PacketInterpreter.ct @@ -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 PacketInterpreter non-inline template implementation */ @@ -29,9 +34,9 @@ #include "Packet.hh" #define prefix_ -///////////////////////////////ct.p//////////////////////////////////////// +//-///////////////////////////////////////////////////////////////////////////////////////////////// -/////////////////////////////////////////////////////////////////////////// +//-///////////////////////////////////////////////////////////////////////////////////////////////// // senf::PacketInterpreterBase // Interpreter chain access @@ -43,16 +48,16 @@ senf::PacketInterpreterBase::parseNextAs() optional_range r (nextPacketRange()); if (!r) throw InvalidPacketChainException(); - + if (next()) impl().truncateInterpreters(next().get()); - typename PacketInterpreter::ptr pi + typename PacketInterpreter::ptr pi (PacketInterpreter::create(&impl(),r->begin(),r->end(),Append)); return pi; } -/////////////////////////////////////////////////////////////////////////// +//-///////////////////////////////////////////////////////////////////////////////////////////////// // senf::PacketInterpreter // Create completely new packet @@ -73,15 +78,14 @@ prefix_ typename senf::PacketInterpreter::ptr senf::PacketInterpreter::create(size_type size, senf::NoInit_t) { detail::PacketImpl::Guard p (new detail::PacketImpl(size,0)); - ptr pi (create(p.p,p.p->begin(),p.p->end(),Append)); - return pi; + return create(p.p,p.p->begin(),p.p->end(),Append); } // Create packet as new packet after a given packet template prefix_ typename senf::PacketInterpreter::ptr -senf::PacketInterpreter::createAfter(PacketInterpreterBase::ptr packet, +senf::PacketInterpreter::createAfter(PacketInterpreterBase::ptr const & packet, size_type size) { if (size < initSize()) @@ -94,7 +98,7 @@ senf::PacketInterpreter::createAfter(PacketInterpreterBase::ptr pack template prefix_ typename senf::PacketInterpreter::ptr -senf::PacketInterpreter::createAfter(PacketInterpreterBase::ptr packet, +senf::PacketInterpreter::createAfter(PacketInterpreterBase::ptr const & packet, size_type size, senf::NoInit_t) { optional_range r (packet->nextPacketRange()); @@ -112,13 +116,13 @@ senf::PacketInterpreter::createAfter(PacketInterpreterBase::ptr pack template template prefix_ typename senf::PacketInterpreter::ptr -senf::PacketInterpreter::createAfter(PacketInterpreterBase::ptr packet, +senf::PacketInterpreter::createAfter(PacketInterpreterBase::ptr const & packet, ForwardReadableRange const & range) { optional_range r (packet->nextPacketRange()); if (!r) throw InvalidPacketChainException(); - + if (packet->next()) packet->impl().truncateInterpreters(packet->next().get()); @@ -132,7 +136,7 @@ senf::PacketInterpreter::createAfter(PacketInterpreterBase::ptr pack template prefix_ typename senf::PacketInterpreter::ptr -senf::PacketInterpreter::createBefore(PacketInterpreterBase::ptr packet) +senf::PacketInterpreter::createBefore(PacketInterpreterBase::ptr const & packet) { ptr pi (createBefore(packet, senf::noinit)); pi->data().insert(pi->data().begin(),initHeadSize(),byte(0x00u)); @@ -143,21 +147,40 @@ senf::PacketInterpreter::createBefore(PacketInterpreterBase::ptr pac template prefix_ typename senf::PacketInterpreter::ptr -senf::PacketInterpreter::createBefore(PacketInterpreterBase::ptr packet, senf::NoInit_t) +senf::PacketInterpreter::createBefore(PacketInterpreterBase::ptr const & packet, senf::NoInit_t) { if (packet->prev()) packet->impl().truncateInterpretersBackwards(packet->prev().get()); - + return create(&packet->impl(),packet->data().begin(),packet->data().end(),Prepend); } -//////////////////////////////////////// +template +prefix_ typename senf::PacketInterpreter::ptr +senf::PacketInterpreter::createInsertBefore(PacketInterpreterBase::ptr const & packet) +{ + ptr pi (createInsertBefore(packet, senf::noinit)); + pi->data().insert(pi->data().begin(),initHeadSize(),byte(0x00u)); + pi->data().insert(pi->data().end(),initSize()-initHeadSize(),byte(0x00u)); + pi->init(); + return pi; +} + +template +prefix_ typename senf::PacketInterpreter::ptr +senf::PacketInterpreter::createInsertBefore(PacketInterpreterBase::ptr const & packet, + senf::NoInit_t) +{ + return create(&packet->impl(),packet->data().begin(),packet->data().end(),packet); +} + +//-///////////////////////////////////////////////////////////////////////////////////////////////// // private members // virtual interface template -prefix_ typename senf::PacketInterpreter::optional_range +prefix_ senf::PacketInterpreterBase::optional_range senf::PacketInterpreter::v_nextPacketRange() { return type::nextPacketRange(ConcretePacket(ptr(this))); @@ -200,21 +223,21 @@ prefix_ senf::TypeIdValue senf::PacketInterpreter::v_type() } template -prefix_ typename senf::PacketInterpreter::factory_t +prefix_ senf::PacketInterpreterBase::factory_t senf::PacketInterpreter::v_factory() { return factory(); } template -prefix_ typename senf::PacketInterpreter::factory_t +prefix_ senf::PacketInterpreterBase::factory_t senf::PacketInterpreter::v_nextPacketType() { return type::nextPacketType(ConcretePacket(ptr(this))); } -/////////////////////////////////////////////////////////////////////////// +//-///////////////////////////////////////////////////////////////////////////////////////////////// // senf::PacketInterpreterBase::Factory template @@ -229,7 +252,7 @@ senf::PacketInterpreterBase::Factory::create(ForwardReadableRange const & range) template prefix_ senf::PacketInterpreterBase::ptr -senf::PacketInterpreterBase::Factory::createAfter(PacketInterpreterBase::ptr packet, +senf::PacketInterpreterBase::Factory::createAfter(PacketInterpreterBase::ptr const & packet, ForwardReadableRange const & range) const { @@ -238,7 +261,7 @@ senf::PacketInterpreterBase::Factory::createAfter(PacketInterpreterBase::ptr pac return pi; } -/////////////////////////////////////////////////////////////////////////// +//-///////////////////////////////////////////////////////////////////////////////////////////////// // senf::PacketInterpreter::FactoryImpl // Create completely new packet @@ -279,7 +302,7 @@ senf::PacketInterpreter::FactoryImpl::create(size_type size, senf::N template prefix_ typename senf::PacketInterpreterBase::ptr -senf::PacketInterpreter::FactoryImpl::createAfter(PacketInterpreterBase::ptr packet) +senf::PacketInterpreter::FactoryImpl::createAfter(PacketInterpreterBase::ptr const & packet) const { return senf::PacketInterpreter::createAfter(packet); @@ -287,7 +310,7 @@ senf::PacketInterpreter::FactoryImpl::createAfter(PacketInterpreterB template prefix_ typename senf::PacketInterpreterBase::ptr -senf::PacketInterpreter::FactoryImpl::createAfter(PacketInterpreterBase::ptr packet, +senf::PacketInterpreter::FactoryImpl::createAfter(PacketInterpreterBase::ptr const & packet, senf::NoInit_t) const { @@ -296,7 +319,7 @@ senf::PacketInterpreter::FactoryImpl::createAfter(PacketInterpreterB template prefix_ typename senf::PacketInterpreterBase::ptr -senf::PacketInterpreter::FactoryImpl::createAfter(PacketInterpreterBase::ptr packet, +senf::PacketInterpreter::FactoryImpl::createAfter(PacketInterpreterBase::ptr const & packet, size_type size) const { @@ -305,7 +328,7 @@ senf::PacketInterpreter::FactoryImpl::createAfter(PacketInterpreterB template prefix_ typename senf::PacketInterpreterBase::ptr -senf::PacketInterpreter::FactoryImpl::createAfter(PacketInterpreterBase::ptr packet, +senf::PacketInterpreter::FactoryImpl::createAfter(PacketInterpreterBase::ptr const & packet, size_type size, senf::NoInit_t) const { @@ -317,7 +340,7 @@ senf::PacketInterpreter::FactoryImpl::createAfter(PacketInterpreterB template prefix_ typename senf::PacketInterpreterBase::ptr senf::PacketInterpreter::FactoryImpl:: -createBefore(PacketInterpreterBase::ptr packet) +createBefore(PacketInterpreterBase::ptr const & packet) const { return senf::PacketInterpreter::createBefore(packet); @@ -326,34 +349,51 @@ createBefore(PacketInterpreterBase::ptr packet) template prefix_ senf::PacketInterpreterBase::ptr senf::PacketInterpreter::FactoryImpl:: -createBefore(PacketInterpreterBase::ptr packet, senf::NoInit_t) +createBefore(PacketInterpreterBase::ptr const & packet, senf::NoInit_t) const { return senf::PacketInterpreter::createBefore(packet,senf::noinit); } +template +prefix_ senf::PacketInterpreterBase::ptr +senf::PacketInterpreter::FactoryImpl:: +createInsertBefore(PacketInterpreterBase::ptr const & packet) + const +{ + return senf::PacketInterpreter::createInsertBefore(packet); +} + +template +prefix_ senf::PacketInterpreterBase::ptr +senf::PacketInterpreter::FactoryImpl:: +createInsertBefore(PacketInterpreterBase::ptr const & packet, senf::NoInit_t) + const +{ + return senf::PacketInterpreter::createInsertBefore(packet,senf::noinit); +} + // Parse next packet in chain template prefix_ typename senf::PacketInterpreterBase::ptr -senf::PacketInterpreter::FactoryImpl::parseNext(PacketInterpreterBase::ptr packet) +senf::PacketInterpreter::FactoryImpl::parseNext(PacketInterpreterBase::ptr const & packet, PacketInterpreterBase::optional_range const & range) const { - optional_range r (packet->nextPacketRange()); - if (!r) + if (!range) throw InvalidPacketChainException(); - + if (packet->next()) packet->impl().truncateInterpreters(packet->next().get()); - return senf::PacketInterpreter::create(&packet->impl(),r->begin(),r->end(),Append); + return senf::PacketInterpreter::create(&packet->impl(),range->begin(),range->end(),Append); } template -const typename senf::PacketInterpreter::FactoryImpl +const typename senf::PacketInterpreter::FactoryImpl senf::PacketInterpreter::factory_; -///////////////////////////////ct.e//////////////////////////////////////// +//-///////////////////////////////////////////////////////////////////////////////////////////////// #undef prefix_