X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPackets%2FDefaultBundle%2FICMPv6TypePacket.cc;h=c5950f14ffb6d50c45f29244259de5a941530495;hb=9bc655e14d2d8c204ed835896cb51e42d49bd68f;hp=c7f18c01bbcf858d7aac0040fa2a2208fd505aaf;hpb=3e7160dbb6e67038c78594c85c48d25b6c787d5f;p=senf.git diff --git a/senf/Packets/DefaultBundle/ICMPv6TypePacket.cc b/senf/Packets/DefaultBundle/ICMPv6TypePacket.cc index c7f18c0..c5950f1 100644 --- a/senf/Packets/DefaultBundle/ICMPv6TypePacket.cc +++ b/senf/Packets/DefaultBundle/ICMPv6TypePacket.cc @@ -31,14 +31,19 @@ ///////////////////////////////cc.p//////////////////////////////////////// namespace { - SENF_PACKET_REGISTRY_REGISTER( senf::ICMPTypes, 1, senf::ICMPv6ErrDestUnreachable ); - SENF_PACKET_REGISTRY_REGISTER( senf::ICMPTypes, 2, senf::ICMPv6ErrTooBig ); - SENF_PACKET_REGISTRY_REGISTER( senf::ICMPTypes, 3, senf::ICMPv6ErrTimeExceeded ); - SENF_PACKET_REGISTRY_REGISTER( senf::ICMPTypes, 4, senf::ICMPv6ErrParamProblem ); - SENF_PACKET_REGISTRY_REGISTER( senf::ICMPTypes, 128, senf::ICMPv6EchoRequest ); - SENF_PACKET_REGISTRY_REGISTER( senf::ICMPTypes, 129, senf::ICMPv6EchoReply ); - SENF_PACKET_REGISTRY_REGISTER( senf::ICMPTypes, 130, senf::MLDv2ListenerQuery ); - SENF_PACKET_REGISTRY_REGISTER( senf::ICMPTypes, 143, senf::MLDv2ListenerReport ); + SENF_PACKET_REGISTRY_REGISTER( senf::ICMPTypes, 1, senf::ICMPv6ErrDestUnreachable ); + SENF_PACKET_REGISTRY_REGISTER( senf::ICMPTypes, 2, senf::ICMPv6ErrTooBig ); + SENF_PACKET_REGISTRY_REGISTER( senf::ICMPTypes, 3, senf::ICMPv6ErrTimeExceeded ); + SENF_PACKET_REGISTRY_REGISTER( senf::ICMPTypes, 4, senf::ICMPv6ErrParamProblem ); + SENF_PACKET_REGISTRY_REGISTER( senf::ICMPTypes, 128, senf::ICMPv6EchoRequest ); + SENF_PACKET_REGISTRY_REGISTER( senf::ICMPTypes, 129, senf::ICMPv6EchoReply ); + SENF_PACKET_REGISTRY_REGISTER( senf::ICMPTypes, 130, senf::MLDv2ListenerQuery ); + SENF_PACKET_REGISTRY_REGISTER( senf::ICMPTypes, 133, senf::NDPRouterSolicitationMessage ); + SENF_PACKET_REGISTRY_REGISTER( senf::ICMPTypes, 134, senf::NDPRouterAdvertisementMessage ); + SENF_PACKET_REGISTRY_REGISTER( senf::ICMPTypes, 135, senf::NDPNeighborSolicitationMessage ); + SENF_PACKET_REGISTRY_REGISTER( senf::ICMPTypes, 136, senf::NDPNeighborAdvertisementMessage); + SENF_PACKET_REGISTRY_REGISTER( senf::ICMPTypes, 137, senf::NDPRedirectMessage ); + SENF_PACKET_REGISTRY_REGISTER( senf::ICMPTypes, 143, senf::MLDv2ListenerReport ); } prefix_ void senf::ICMPv6EchoRequestType::dump(packet p, std::ostream & os) @@ -57,25 +62,25 @@ prefix_ void senf::ICMPv6EchoReplyType::dump(packet p, std::ostream & os) prefix_ void senf::ICMPv6ErrDestUnreachableType::dump(packet p, std::ostream & os) { - os << "ICMPv6 Error Destination Unreachable (no further fields available here)\n"; + os << "ICMPv6 Error Destination Unreachable (no further fields available here)\n"; } prefix_ void senf::ICMPv6ErrTooBigType::dump(packet p, std::ostream & os) { os << "ICMPv6 Error Packet Too Big:\n" - << senf::fieldName("MTU") << unsigned(p->mtu() ) << "\n"; + << senf::fieldName("MTU") << unsigned(p->mtu() ) << "\n"; } prefix_ void senf::ICMPv6ErrTimeExceededType::dump(packet p, std::ostream & os) { os << "ICMPv6 Error Time Exceeded:\n" - << senf::fieldName("Unused(32Bit)") << unsigned(p->unused() ) << "\n"; + << senf::fieldName("Unused(32Bit)") << unsigned(p->unused() ) << "\n"; } prefix_ void senf::ICMPv6ErrParamProblemType::dump(packet p, std::ostream & os) { os << "ICMPv6 Error Parameter Problem:\n" - << senf::fieldName("Pointer") << unsigned(p->pointer() ) << "\n"; + << senf::fieldName("Pointer") << unsigned(p->pointer() ) << "\n"; } prefix_ void senf::MLDv2ListenerQueryType::dump(packet p, std::ostream & os) @@ -92,16 +97,16 @@ prefix_ void senf::MLDv2ListenerQueryType::dump(packet p, std::ostream & os) senf::MLDv2ListenerQuery::Parser::srcAddresses_t::container c (p->srcAddresses()); senf::MLDv2ListenerQuery::Parser::srcAddresses_t::container::iterator i (c.begin()); for (unsigned int nr =1; i != c.end(); ++i, ++nr) - os << " " << nr << ".) " << *i << "\n"; - os << "\n"; + os << " " << nr << ".) " << *i << "\n"; + os << "\n"; } prefix_ void senf::MLDv2ListenerReportType::dump(packet p, std::ostream & os) { os << "ICMPv6 Multicast Listener Report Message:\n" - << senf::fieldName("Reserved") << unsigned(p->reserved() ) + << senf::fieldName("Reserved") << unsigned(p->reserved() ) <<"\n Multicast Address Records:\n"; - + senf::MLDv2ListenerReport::Parser::mcastAddrRecords_t::container cAddrR (p->mcastAddrRecords() ); senf::MLDv2ListenerReport::Parser::mcastAddrRecords_t::container::iterator iAddrR (cAddrR.begin() ); for (; iAddrR != cAddrR.end(); ++iAddrR) { @@ -120,5 +125,72 @@ prefix_ void senf::MLDv2ListenerReportType::dump(packet p, std::ostream & os) } } +prefix_ void senf::NDPRouterSolicitationMessageType::dump(packet p, std::ostream & os) +{ + os << "ICMPv6 Neighbor Discovery Router Solicitation Message:\n" + << senf::fieldName("Reserved(32Bit)") << unsigned(p->reserved()) << "\n"; + senf::NDPRouterSolicitationMessage::Parser::options_t::container optC(p->options() ); + senf::NDPRouterSolicitationMessage::Parser::options_t::container::const_iterator listIter (optC.begin()); + for (; listIter != optC.end(); ++listIter) { + listIter->dump(os); + } +} + +prefix_ void senf::NDPRouterAdvertisementMessageType::dump(packet p, std::ostream & os) +{ + os << "ICMPv6 Neighbor Discovery Router Advertisement Message:\n" + << senf::fieldName("Current Hop Limit") << unsigned(p->curHopLimit()) << "\n" + << senf::fieldName("Managed Address Configuration") << unsigned(p->m()) << "\n" + << senf::fieldName("Other Configuration") << unsigned(p->o()) << "\n" + << senf::fieldName("Reserved(6Bit)") << unsigned(p->reserved()) << "\n" + << senf::fieldName("Router Lifetime") << unsigned(p->routerLifetime()) << "\n" + << senf::fieldName("Reachable Time") << unsigned(p->reachableTime()) << "\n" + << senf::fieldName("Retrans Timer") << unsigned(p->retransTimer()) << "\n"; + senf::NDPRouterAdvertisementMessage::Parser::options_t::container optC(p->options() ); + senf::NDPRouterAdvertisementMessage::Parser::options_t::container::const_iterator listIter (optC.begin()); + for (; listIter != optC.end(); ++listIter) { + listIter->dump(os); + } +} + +prefix_ void senf::NDPNeighborSolicitationMessageType::dump(packet p, std::ostream & os) +{ + os << "ICMPv6 Neighbor Discovery Neighbor Solicitation Message:\n" + << senf::fieldName("Reserved(32Bit)") << unsigned(p->reserved()) << "\n" + << senf::fieldName("Target Address") << p->target() << "\n"; + senf::NDPNeighborSolicitationMessage::Parser::options_t::container optC(p->options() ); + senf::NDPNeighborSolicitationMessage::Parser::options_t::container::const_iterator listIter (optC.begin()); + for (; listIter != optC.end(); ++listIter) { + listIter->dump(os); + } +} + +prefix_ void senf::NDPNeighborAdvertisementMessageType::dump(packet p, std::ostream & os) +{ + os << "ICMPv6 Neighbor Discovery Neighbor Advertisement Message:\n" + << senf::fieldName("Router Flag") << unsigned(p->r()) << "\n" + << senf::fieldName("Solicited Flag") << unsigned(p->s()) << "\n" + << senf::fieldName("Override Flag") << unsigned(p->o()) << "\n" + << senf::fieldName("Reserved(29Bit)") << unsigned(p->reserved()) << "\n" + << senf::fieldName("Target Address") << p->target() << "\n"; + senf::NDPNeighborAdvertisementMessage::Parser::options_t::container optC(p->options() ); + senf::NDPNeighborAdvertisementMessage::Parser::options_t::container::const_iterator listIter (optC.begin()); + for (; listIter != optC.end(); ++listIter) { + listIter->dump(os); + } +} + +prefix_ void senf::NDPRedirectMessageType::dump(packet p, std::ostream & os) +{ + os << "ICMPv6 Neighbor Discovery Redirect Message:\n" + << senf::fieldName("Reserved(32Bit)") << unsigned(p->reserved()) << "\n" + << senf::fieldName("Target Address") << p->target() << "\n" + << senf::fieldName("Destination Address") << p->destination() << "\n"; + senf::NDPRedirectMessage::Parser::options_t::container optC(p->options() ); + senf::NDPRedirectMessage::Parser::options_t::container::const_iterator listIter (optC.begin()); + for (; listIter != optC.end(); ++listIter) { + listIter->dump(os); + } +} ///////////////////////////////cc.e//////////////////////////////////////// #undef prefix_