// Competence Center NETwork research (NET), St. Augustin, GERMANY
// Stefan Bund <g0dil@berlios.de>
// Philipp Batroff <philipp.batroff@fokus.fraunhofer.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
#include "IPv6Extensions.hh"
//#include "IPv6Extensions.ih"
-#include <senf/Utils/hexdump.hh>
+
// Custom includes
+#include <senf/Utils/hexdump.hh>
//#include "IPv6Extensions.mpp"
#define prefix_
-///////////////////////////////cc.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
namespace {
- senf::PacketRegistry<senf::IpTypes>::RegistrationProxy<senf::IPv6Extension_Fragment>
- registerIPv6ExtensionType_Fragment (44);
- senf::PacketRegistry<senf::IpTypes>::RegistrationProxy<senf::IPv6Extension_Routing>
- registerIPv6ExtensionType_Routing (43);
- senf::PacketRegistry<senf::IpTypes>::RegistrationProxy<senf::IPv6Extension_HopByHop>
- registerIPv6ExtensionType_HopByHop (0u);
- senf::PacketRegistry<senf::IpTypes>::RegistrationProxy<senf::IPv6Extension_Destination>
- 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::IPv6ExtensionType_HopByHop::dump(packet p, std::ostream & os)
+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"
- << " 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 << " AltAction : " << (unsigned) optIter->altAction()
- << "\n ChangeFlag : " << (unsigned) optIter->changeFlag()
- << "\n Option Type : " << (unsigned) optIter->optionType()
- << "\n OptionLength : " << (unsigned) optIter->optionLength() <<"\n";
- senf::hexdump(boost::begin(optIter->value()) , 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"
projects / senf.git / blobdiff