X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPackets%2FDefaultBundle%2FIPv6Extensions.cc;h=5d370d8456b4a580642cf44f7f852878369d19db;hb=8a6697d11e9a6557d9a5c42b4052666fce32bc10;hp=d579277416c4a32204e9524f2f534986593c6270;hpb=5a7344d1bc318ab9105b71d65a0cc86337dcd4d5;p=senf.git diff --git a/senf/Packets/DefaultBundle/IPv6Extensions.cc b/senf/Packets/DefaultBundle/IPv6Extensions.cc index d579277..5d370d8 100644 --- a/senf/Packets/DefaultBundle/IPv6Extensions.cc +++ b/senf/Packets/DefaultBundle/IPv6Extensions.cc @@ -2,24 +2,29 @@ // // Copyright (C) 2007 // Fraunhofer Institute for Open Communication Systems (FOKUS) -// Competence Center NETwork research (NET), St. Augustin, GERMANY -// Stefan Bund -// Philipp Batroff // -// 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 +// Philipp Batroff /** \file \brief IPv6Extensions non-inline non-template implementation */ @@ -28,11 +33,10 @@ //#include "IPv6Extensions.ih" // Custom includes -#include //#include "IPv6Extensions.mpp" #define prefix_ -///////////////////////////////cc.p//////////////////////////////////////// +//-///////////////////////////////////////////////////////////////////////////////////////////////// namespace { SENF_PACKET_REGISTRY_REGISTER( senf::IpTypes, 44, senf::IPv6FragmentPacket ); @@ -52,6 +56,16 @@ prefix_ void senf::IPv6FragmentPacketType::dump(packet p, std::ostream & os) << "0x" << std::hex << unsigned(p->id()) << "\n"; } +prefix_ void senf::IPv6FragmentPacketType::finalize(packet p) +{ + try { + p->nextHeader() << key(p.next()); + } + catch (InvalidPacketChainException & ex) { + p->nextHeader() << 59; // No next header + } +} + prefix_ void senf::IPv6RoutingPacketType::dump(packet p, std::ostream & os) { os << "Internet protocol Version 6 routing extension:\n" @@ -67,21 +81,35 @@ prefix_ void senf::IPv6RoutingPacketType::dump(packet p, std::ostream & os) os << " " << *i << "\n"; } +prefix_ void senf::IPv6RoutingPacketType::finalize(packet p) +{ + try { + p->nextHeader() << key(p.next()); + } + catch (InvalidPacketChainException & ex) { + p->nextHeader() << 59; // No next header + } +} + prefix_ void senf::IPv6HopByHopOptionsPacketType::dump(packet p, std::ostream & os) { os << "Internet protocol Version 6 Hop-By-Hop extension:\n" << senf::fieldName("next header") << unsigned(p->nextHeader()) << "\n" - << senf::fieldName("header length") << unsigned(p->headerLength()) << "\n"; + << senf::fieldName("header length") << unsigned(p->headerLength()) <<" ("<< unsigned((1+p->headerLength())*8)<< ")\n"; os << " OptionTypes:\n"; typedef IPv6HopByHopOptionsPacket::Parser::options_t::container optContainer_t; optContainer_t options (p->options()); - optContainer_t::iterator optIter(options.begin()); - for(; optIter != options.end(); ++optIter) { - os << senf::fieldName(" AltAction") << unsigned(optIter->altAction()) << "\n" - << senf::fieldName(" ChangeFlag") << unsigned(optIter->changeFlag()) << "\n" - << senf::fieldName(" Option Type") << unsigned(optIter->optionType()) << "\n" - << senf::fieldName(" length") << unsigned(optIter->length()) <<"\n"; - senf::hexdump(boost::begin(optIter->value()) , boost::end(optIter->value()), os ); + for (optContainer_t::const_iterator i = options.begin(); i != options.end(); ++i) + i->dump( os); +} + +prefix_ void senf::IPv6HopByHopOptionsPacketType::finalize(packet p) +{ + try { + p->nextHeader() << key(p.next()); + } + catch (InvalidPacketChainException & ex) { + p->nextHeader() << 59; // No next header } } @@ -90,9 +118,25 @@ prefix_ void senf::IPv6DestinationOptionsPacketType::dump(packet p, std::ostream os << "Internet protocol Version 6 Destination Options extension:\n" << senf::fieldName("next header") << unsigned (p->nextHeader()) << "\n" << senf::fieldName("header length") << unsigned (p->headerLength()) << "\n"; + os << " OptionTypes:\n"; + typedef IPv6DestinationOptionsPacket::Parser::options_t::container optContainer_t; + optContainer_t options (p->options()); + for (optContainer_t::const_iterator i = options.begin(); i != options.end(); ++i) + i->dump( os); } -///////////////////////////////cc.e//////////////////////////////////////// +prefix_ void senf::IPv6DestinationOptionsPacketType::finalize(packet p) +{ + try { + p->nextHeader() << key(p.next()); + } + catch (InvalidPacketChainException & ex) { + p->nextHeader() << 59; // No next header + } +} + + +//-///////////////////////////////////////////////////////////////////////////////////////////////// #undef prefix_ //#include "IPv6Extensions.mpp"