X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPackets%2FDefaultBundle%2FIPv6Extensions.cc;h=5d370d8456b4a580642cf44f7f852878369d19db;hb=8a6697d11e9a6557d9a5c42b4052666fce32bc10;hp=543a3b33882119e3c87ad154a23cdc17b1fada38;hpb=8c6873a925c79e6bb640f82895b31f4cbd84ef30;p=senf.git diff --git a/senf/Packets/DefaultBundle/IPv6Extensions.cc b/senf/Packets/DefaultBundle/IPv6Extensions.cc index 543a3b3..5d370d8 100644 --- a/senf/Packets/DefaultBundle/IPv6Extensions.cc +++ b/senf/Packets/DefaultBundle/IPv6Extensions.cc @@ -2,94 +2,141 @@ // // 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. // -// 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 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 // -// 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. +// 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. +// +// 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 */ #include "IPv6Extensions.hh" //#include "IPv6Extensions.ih" -#include + // Custom includes //#include "IPv6Extensions.mpp" #define prefix_ -///////////////////////////////cc.p//////////////////////////////////////// +//-///////////////////////////////////////////////////////////////////////////////////////////////// namespace { - senf::PacketRegistry::RegistrationProxy - registerIPv6ExtensionType_Fragment (44); - senf::PacketRegistry::RegistrationProxy - registerIPv6ExtensionType_Routing (43); - senf::PacketRegistry::RegistrationProxy - registerIPv6ExtensionType_HopByHop (0u); - senf::PacketRegistry::RegistrationProxy - registerIPv6ExtensionType_Destination (60u); + SENF_PACKET_REGISTRY_REGISTER( senf::IpTypes, 44, senf::IPv6FragmentPacket ); + SENF_PACKET_REGISTRY_REGISTER( senf::IpTypes, 43, senf::IPv6RoutingPacket ); + SENF_PACKET_REGISTRY_REGISTER( senf::IpTypes, 0u, senf::IPv6HopByHopOptionsPacket ); + SENF_PACKET_REGISTRY_REGISTER( senf::IpTypes, 60u, senf::IPv6DestinationOptionsPacket ); } -prefix_ void senf::IPv6ExtensionType_Fragment::dump(packet p, std::ostream & os) +prefix_ void senf::IPv6FragmentPacketType::dump(packet p, std::ostream & os) { os << "Internet protocol Version 6 fragment extension:\n" - << " next header : " << unsigned(p->nextHeader()) << "\n" - << " fragment offset : " << std::hex << unsigned(p->fragmentOffset()) << "\n" - << " more fragments : " << (p->moreFragments()?"yes":"no") << "\n" - << " id : " << std::hex << unsigned(p->id()) << "\n"; + << senf::fieldName("next header") << unsigned(p->nextHeader()) << "\n" + << senf::fieldName("fragment offset") + << "0x" << std::hex << unsigned(p->fragmentOffset()) << "\n" + << senf::fieldName("more fragments") << (p->moreFragments()?"yes":"no") << "\n" + << senf::fieldName("id") + << "0x" << std::hex << unsigned(p->id()) << "\n"; } -prefix_ void senf::IPv6ExtensionType_Routing::dump(packet p, std::ostream & os) +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" - << " next header : " << unsigned (p->nextHeader()) << "\n" - << " header length : " << unsigned (p->headerLength()) << "\n" - << " routing type : " << unsigned (p->routingType()) << "\n" - << " segments left : " << unsigned (p->segmentsLeft()) << "\n"; - IPv6Extension_Routing::Parser::hopAddresses_t::container hopAddresses (p->hopAddresses()); - os << " further Hop Addresses : \n"; - if ( p->segmentsLeft() != 0 ){ - for (IPv6Extension_Routing::Parser::hopAddresses_t::container::iterator i (hopAddresses.begin()); i != hopAddresses.end(); ++i) - os << *i << "\n"; - } + << senf::fieldName("next header") << unsigned(p->nextHeader()) << "\n" + << senf::fieldName("header length") << unsigned(p->headerLength()) << "\n" + << senf::fieldName("routing type") << unsigned(p->routingType()) << "\n" + << senf::fieldName("segments left") << unsigned(p->segmentsLeft()) << "\n" + << " further Hop Addresses:\n"; + typedef IPv6RoutingPacket::Parser::hopAddresses_t::container addrContainer_t; + addrContainer_t hopAddresses (p->hopAddresses()); + if ( p->segmentsLeft() != 0 ) + for (addrContainer_t::iterator i (hopAddresses.begin()); i != hopAddresses.end(); ++i) + 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::IPv6ExtensionType_HopByHop::dump(packet p, std::ostream & os) +prefix_ void senf::IPv6HopByHopOptionsPacketType::dump(packet p, std::ostream & os) { os << "Internet protocol Version 6 Hop-By-Hop extension:\n" - << " next header : " << unsigned (p->nextHeader()) << "\n" - << " header length : " << unsigned (p->headerLength()) << "\n"; - os << "OptionTypes:\n"; - IPv6Extension_HopByHop::Parser::options_t::container options (p->options()); - IPv6Extension_HopByHop::Parser::options_t::container::iterator optIter(options.begin()); - for(;optIter != options.end(); ++ optIter){ - os << "Option Type:\t" << (unsigned) optIter->optionType() - << "\nOptionLength:\t" << (unsigned) optIter->optionLength() <<"\n"; - senf::hexdump(boost::next(boost::begin(optIter->value())), boost::next( boost::end(optIter->value())), os ); - } + << senf::fieldName("next header") << unsigned(p->nextHeader()) << "\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()); + 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 + } } -prefix_ void senf::IPv6ExtensionType_Destination::dump(packet p, std::ostream & os) +prefix_ void senf::IPv6DestinationOptionsPacketType::dump(packet p, std::ostream & os) { os << "Internet protocol Version 6 Destination Options extension:\n" - << " next header : " << unsigned (p->nextHeader()) << "\n" - << " header length : " << unsigned (p->headerLength()) << "\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"