X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPackets%2FDefaultBundle%2FICMPv6TypePacket.cc;h=4d393d615f5d3d861a9f872b6a10521377b3b503;hb=394ced7000128fef7e753caea1deda8d55dec8e2;hp=2cd182b2f3ea72827a7cfc19f2c8cbb7cd56c8ef;hpb=209950ee5f6898978cd68614ef339ae3531c5c53;p=senf.git

diff --git a/senf/Packets/DefaultBundle/ICMPv6TypePacket.cc b/senf/Packets/DefaultBundle/ICMPv6TypePacket.cc
index 2cd182b..4d393d6 100644
--- a/senf/Packets/DefaultBundle/ICMPv6TypePacket.cc
+++ b/senf/Packets/DefaultBundle/ICMPv6TypePacket.cc
@@ -22,13 +22,12 @@
 
 // Definition of non-inline non-template functions
 
-// Custom includes
-#include <senf/Packets/Packets.hh>
-#include "ICMPv6Packet.hh"
 #include "ICMPv6TypePacket.hh"
 
+// Custom includes
+
 #define prefix_
-///////////////////////////////cc.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
 namespace {
     SENF_PACKET_REGISTRY_REGISTER( senf::ICMPTypes, 1,   senf::ICMPv6ErrDestUnreachable       );
@@ -46,6 +45,24 @@ namespace {
     SENF_PACKET_REGISTRY_REGISTER( senf::ICMPTypes, 143, senf::MLDv2ListenerReport            );
 }
 
+prefix_ void senf::ICMPv6ErrDestUnreachableParser::setErrCode(int code)
+{
+    ICMPv6Packet icmpv6 (Packet().rfind<ICMPv6Packet>(senf::nothrow));
+    icmpv6->code() = code;
+}
+
+prefix_ void senf::ICMPv6ErrParamProblemParser::setErrCode(int code)
+{
+    ICMPv6Packet icmpv6 (packet().rfind<ICMPv6Packet>(senf::nothrow));
+    icmpv6->code() = code;
+}
+
+prefix_ void senf::ICMPv6ErrTimeExceededParser::setErrCode(int code)
+{
+    ICMPv6Packet icmpv6 (packet().rfind<ICMPv6Packet>(senf::nothrow));
+    icmpv6->code() = code;
+}
+
 prefix_ void senf::ICMPv6EchoRequestType::dump(packet p, std::ostream & os)
 {
     os << "ICMPv6 Echo Request:\n"
@@ -62,25 +79,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)
@@ -94,32 +111,32 @@ prefix_ void senf::MLDv2ListenerQueryType::dump(packet p, std::ostream & os)
        << senf::fieldName("Querier's Robustness Variable") << unsigned(p->qrv()) << "\n"
        << senf::fieldName("Querier's Query Interval Code") << unsigned(p->qqic()) << "\n"
        << "  Source Addresses:\n";
-    senf::MLDv2ListenerQuery::Parser::srcAddresses_t::container c (p->srcAddresses());
-    senf::MLDv2ListenerQuery::Parser::srcAddresses_t::container::iterator i (c.begin());
+    parser::srcAddresses_t::container c (p->srcAddresses());
+    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() );
+
+    MLDv2ListenerReport::Parser::mcastAddrRecords_t::container cAddrR (p->mcastAddrRecords() );
+    MLDv2ListenerReport::Parser::mcastAddrRecords_t::container::iterator iAddrR (cAddrR.begin() );
     for (; iAddrR != cAddrR.end(); ++iAddrR) {
         os << senf::fieldName("  Record Type")         << unsigned(iAddrR->recordType()) << "\n"
            << senf::fieldName("  Multicast Address")   << iAddrR->mcAddress() << "\n"
            << "    Source Addresses\n:";
-        senf::MLDv2AddressRecordParser::srcAddresses_t::container cSrcAddr (iAddrR->srcAddresses());
-        senf::MLDv2AddressRecordParser::srcAddresses_t::container::iterator iSrcAddr (cSrcAddr.begin());
+        MLDv2AddressRecordParser::srcAddresses_t::container cSrcAddr (iAddrR->srcAddresses());
+        MLDv2AddressRecordParser::srcAddresses_t::container::iterator iSrcAddr (cSrcAddr.begin());
         for (;iSrcAddr != cSrcAddr.end();++iSrcAddr)
             os << "      " << *iSrcAddr << "\n";
         os << "    Auxiliary Data:\n";
-        senf::MLDv2AddressRecordParser::auxData_t::container cAuxD ( iAddrR->auxData() );
-        senf::MLDv2AddressRecordParser::auxData_t::container::iterator iAuxD (cAuxD.begin() );
+        MLDv2AddressRecordParser::auxData_t::container cAuxD ( iAddrR->auxData() );
+        MLDv2AddressRecordParser::auxData_t::container::iterator iAuxD (cAuxD.begin() );
         for (;iAuxD != cAuxD.end(); ++iAuxD)
             os << "      " << *iAuxD << "\n";
     }
@@ -129,6 +146,11 @@ prefix_ void senf::NDPRouterSolicitationMessageType::dump(packet p, std::ostream
 {
     os << "ICMPv6 Neighbor Discovery Router Solicitation Message:\n"
        << senf::fieldName("Reserved(32Bit)")           << unsigned(p->reserved()) << "\n";
+    parser::options_t::container optC (p->options());
+    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)
@@ -141,6 +163,11 @@ prefix_ void senf::NDPRouterAdvertisementMessageType::dump(packet p, std::ostrea
        << senf::fieldName("Router Lifetime")               << unsigned(p->routerLifetime()) << "\n"
        << senf::fieldName("Reachable Time")                << unsigned(p->reachableTime()) << "\n"
        << senf::fieldName("Retrans Timer")                 << unsigned(p->retransTimer()) << "\n";
+    parser::options_t::container optC (p->options());
+    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)
@@ -148,6 +175,11 @@ prefix_ void senf::NDPNeighborSolicitationMessageType::dump(packet p, std::ostre
     os << "ICMPv6 Neighbor Discovery Neighbor Solicitation Message:\n"
        << senf::fieldName("Reserved(32Bit)")          << unsigned(p->reserved()) << "\n"
        << senf::fieldName("Target Address")           << p->target() << "\n";
+    parser::options_t::container optC (p->options());
+    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)
@@ -158,6 +190,11 @@ prefix_ void senf::NDPNeighborAdvertisementMessageType::dump(packet p, std::ostr
        << senf::fieldName("Override Flag")         << unsigned(p->o()) << "\n"
        << senf::fieldName("Reserved(29Bit)")       << unsigned(p->reserved()) << "\n"
        << senf::fieldName("Target Address")        << p->target() << "\n";
+    parser::options_t::container optC(p->options() );
+    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)
@@ -166,6 +203,11 @@ prefix_ void senf::NDPRedirectMessageType::dump(packet p, std::ostream & os)
        << senf::fieldName("Reserved(32Bit)")       << unsigned(p->reserved()) << "\n"
        << senf::fieldName("Target Address")        << p->target() << "\n"
        << senf::fieldName("Destination Address")   << p->destination() << "\n";
+    parser::options_t::container optC(p->options() );
+    parser::options_t::container::const_iterator listIter (optC.begin());
+    for (; listIter != optC.end(); ++listIter) {
+        listIter->dump(os);
+    }
 }
-///////////////////////////////cc.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #undef prefix_