ipv6, mipv6: cosmetic source cleanup

Author: avarga

src/inet/networklayer/icmpv6/Icmpv6.cc

@@ -442,7 +442,7 @@ void Icmpv6::insertChecksum(ChecksumMode checksumMode, const Ptr<Icmpv6Header>&
             break;
         }
         default:
-            throw cRuntimeError("Unknown checksum mode");
+            throw cRuntimeError("Unknown checksum mode %d", (int)checksumMode);
     }
 }
 
@@ -464,7 +464,7 @@ bool Icmpv6::verifyChecksum(const Packet *packet)
             return checksum == 0 && icmpHeader->isCorrect();
         }
         default:
-            throw cRuntimeError("Unknown checksum mode");
+            throw cRuntimeError("Unknown checksum mode %d", (int)icmpHeader->getChecksumMode());
     }
 }
 

src/inet/networklayer/icmpv6/Icmpv6HeaderSerializer.cc

@@ -137,9 +137,6 @@ void deserializeIpv6NdOptions(Ipv6NdMessage& msg, Ipv6NdOptions& options, Memory
                 options.appendOption(option);
                 break;
             }
-//            case IPv6ND_REDIRECTED_HEADER: {
-//                break;
-//            }
             case IPv6ND_MTU: {
                 auto option = new Ipv6NdMtu();
                 option->setReserved(stream.readUint16Be());
@@ -301,7 +298,7 @@ void Icmpv6HeaderSerializer::serialize(MemoryOutputStream& stream, const Ptr<con
         }
 
         default:
-            throw cRuntimeError("Cannot serialize ICMPv6 packet: type %d  not supported.", pkt->getType());
+            throw cRuntimeError("Cannot serialize ICMPv6 packet: type %d not supported", pkt->getType());
     }
 }
 

src/inet/networklayer/icmpv6/Ipv6NeighbourDiscovery.cc

@@ -168,7 +168,7 @@ void Ipv6NeighbourDiscovery::handleMessageWhenUp(cMessage *msg)
             processArTimeout(msg);
         }
         else
-            throw cRuntimeError("Unrecognized Timer"); // stops sim w/ error msg.
+            throw cRuntimeError("Unrecognized self-message kind %d (%s)", msg->getKind(), msg->getName());
     }
     else if (auto packet = dynamic_cast<Packet *>(msg)) {
         auto protocol = packet->getTag<PacketProtocolTag>()->getProtocol();
@@ -183,7 +183,7 @@ void Ipv6NeighbourDiscovery::handleMessageWhenUp(cMessage *msg)
         }
     }
     else
-        throw cRuntimeError("Unknown message type received.\n");
+        throw cRuntimeError("Received message '%s' (%s) with unexpected type", msg->getName(), msg->getClassName());
 }
 
 void Ipv6NeighbourDiscovery::processNDMessage(Packet *packet, const Icmpv6Header *icmpv6Header)
@@ -210,7 +210,7 @@ void Ipv6NeighbourDiscovery::processNDMessage(Packet *packet, const Icmpv6Header
             break;
 
         default:
-            throw cRuntimeError("Unrecognized ND message!");
+            throw cRuntimeError("Unrecognized ND message type %d", (int)icmpv6Header->getType());
     }
 }
 
@@ -226,7 +226,6 @@ void Ipv6NeighbourDiscovery::processIpv6Datagram(Packet *packet)
     Ipv6NdControlInfo *ctrl = check_and_cast<Ipv6NdControlInfo *>(packet->getControlInfo());
     int nextHopIfID = ctrl->getInterfaceId();
     Ipv6Address nextHopAddr = ctrl->getNextHop();
-//    bool fromHL = ctrl->getFromHL();
 
     if (nextHopIfID == -1 || nextHopAddr.isUnspecified()) {
         EV_INFO << "Determining Next Hop" << endl;
@@ -316,7 +315,7 @@ void Ipv6NeighbourDiscovery::processIpv6Datagram(Packet *packet)
             }
             break;
         default:
-            throw cRuntimeError("Unknown Neighbour cache entry state.");
+            throw cRuntimeError("Unknown neighbour cache entry state %d", (int)nce->reachabilityState);
             break;
     }
 }
@@ -346,7 +345,6 @@ const MacAddress& Ipv6NeighbourDiscovery::resolveNeighbour(const Ipv6Address& ne
     Enter_Method("resolveNeighbor(%s,if=%d)", nextHop.str().c_str(), interfaceId);
 
     Neighbour *nce = neighbourCache.lookup(nextHop, interfaceId);
-//    NetworkInterface *ie = ift->getInterfaceById(interfaceId);
 
     if (!nce || nce->reachabilityState == Ipv6NeighbourCache::INCOMPLETE)
         return MacAddress::UNSPECIFIED_ADDRESS;
@@ -379,7 +377,7 @@ void Ipv6NeighbourDiscovery::reachabilityConfirmed(const Ipv6Address& neighbour,
 
     Neighbour *nce = neighbourCache.lookup(neighbour, interfaceId);
     if (!nce)
-        throw cRuntimeError("Model error: not found in cache");
+        throw cRuntimeError("Model error: neighbour %s (if=%d) not found in cache", neighbour.str().c_str(), interfaceId);
 
     cMessage *msg = nce->nudTimeoutEvent;
     if (msg != nullptr) {
@@ -536,7 +534,7 @@ void Ipv6NeighbourDiscovery::processNudTimeout(cMessage *timeoutMsg)
     if (nce->numProbesSent == (int)ie->getProtocolData<Ipv6InterfaceData>()->_getMaxUnicastSolicit()) {
         EV_DETAIL << "Max number of probes have been sent." << endl;
         EV_DETAIL << "Neighbour is Unreachable, removing NCE." << endl;
-        neighbourCache.remove(nceKey->address, nceKey->interfaceID); // remove nce from cache, cancel and delete timeoutMsg;
+        neighbourCache.remove(nceKey->address, nceKey->interfaceID);
         return;
     }
 
@@ -996,7 +994,7 @@ void Ipv6NeighbourDiscovery::createAndSendRsPacket(NetworkInterface *ie)
         myIPv6Address = ie->getProtocolData<Ipv6InterfaceData>()->getLinkLocalAddress(); // so we use the link local address instead
 
     if (ie->getProtocolData<Ipv6InterfaceData>()->isTentativeAddress(myIPv6Address))
-        myIPv6Address = Ipv6Address::UNSPECIFIED_ADDRESS; // set my Ipv6 address to unspecified.
+        myIPv6Address = Ipv6Address::UNSPECIFIED_ADDRESS;
 
     Ipv6Address destAddr = Ipv6Address::ALL_ROUTERS_2; // all_routers multicast
     auto rs = makeShared<Ipv6RouterSolicitation>();
@@ -1070,7 +1068,6 @@ void Ipv6NeighbourDiscovery::startRouterDiscovery(NetworkInterface *ie)
        a random delay since the interface became (re)enabled (e.g., as part
        of Duplicate Address Detection [ADDRCONF]) there is no need to delay
        again before sending the first Router Solicitation message.*/
-//    simtime_t rndInterval = uniform(0, ie->getProtocolData<Ipv6InterfaceData>()->_getMaxRtrSolicitationDelay());
     scheduleAfter(ie->getProtocolData<Ipv6InterfaceData>()->_getRtrSolicitationInterval(), rdTimeoutMsg);
 }
 
@@ -1294,7 +1291,7 @@ void Ipv6NeighbourDiscovery::createAndSendRaPacket(const Ipv6Address& destAddr,
             Ipv6InterfaceData::AdvPrefix advPrefix = ie->getProtocolData<Ipv6InterfaceData>()->getAdvPrefix(i);
             auto prefixInfo = new Ipv6NdPrefixInformation();
 
-            EV_DETAIL << "\n+=+=+=+= Appendign Prefix Info Option to RA +=+=+=+=\n";
+            EV_DETAIL << "Appending prefix info option to RA" << endl;
             EV_DETAIL << "Prefix Value: " << advPrefix.prefix << endl;
             EV_DETAIL << "Prefix Length: " << advPrefix.prefixLength << endl;
             EV_DETAIL << "L-Flag: " << advPrefix.advOnLinkFlag << endl;
@@ -1318,11 +1315,10 @@ void Ipv6NeighbourDiscovery::createAndSendRaPacket(const Ipv6Address& destAddr,
             prefixInfo->setAutoAddressConfFlag(advPrefix.advAutonomousFlag);
 
             if (rt6->isHomeAgent())
-                prefixInfo->setRouterAddressFlag(true); // set the R-bit if the node is a HA
+                prefixInfo->setRouterAddressFlag(true);
 
             // - In the Preferred Lifetime field: the entry's AdvPreferredLifetime.
             prefixInfo->setPreferredLifetime(SIMTIME_DBL(advPrefix.advPreferredLifetime));
-            // Now we pop the prefix info into the RA.
             ra->getOptionsForUpdate().appendOption(prefixInfo);
             ra->addChunkLength(IPv6ND_PREFIX_INFORMATION_OPTION_LENGTH);
         }
@@ -1362,8 +1358,6 @@ void Ipv6NeighbourDiscovery::processRaPacket(Packet *packet, const Ipv6RouterAdv
         processRaForRouterUpdates(packet, ra); // See RFC2461: Section 6.3.4
 
         // Possible options
-//        MacAddress macAddress = ra->getSourceLinkLayerAddress();
-//        uint mtu = ra->getMTU();
         for (size_t i = 0; i < ra->getOptions().getOptionArraySize(); i++) {
             auto option = ra->getOptions().getOption(i);
             if (option->getType() != IPv6ND_PREFIX_INFORMATION)
@@ -1548,7 +1542,6 @@ void Ipv6NeighbourDiscovery::processRaPrefixInfo(const Ipv6RouterAdvertisement *
                 << ra->getOptions().getOptionArraySize() << endl;
         uint prefixLength = prefixInfo.getPrefixLength();
         simtime_t validLifetime = prefixInfo.getValidLifetime();
-//        uint preferredLifetime = prefixInfo.getPreferredLifetime();
         Ipv6Address prefix = prefixInfo.getPrefix();
 
         // - If the prefix is the link-local prefix, silently ignore the Prefix
@@ -1865,7 +1858,6 @@ void Ipv6NeighbourDiscovery::processNsForTentativeAddress(Packet *packet, const
 {
     // Control Information
     Ipv6Address nsSrcAddr = packet->getTag<L3AddressInd>()->getSrcAddress().toIpv6();
-//    Ipv6Address nsDestAddr = nsCtrlInfo->getDestAddr();
 
     ASSERT(nsSrcAddr.isUnicast() || nsSrcAddr.isUnspecified());
     // solicitation is processed as described in RFC2462:section 5.4.3
@@ -1891,9 +1883,6 @@ void Ipv6NeighbourDiscovery::processNsForTentativeAddress(Packet *packet, const
 
 void Ipv6NeighbourDiscovery::processNsForNonTentativeAddress(Packet *packet, const Ipv6NeighbourSolicitation *ns, NetworkInterface *ie)
 {
-    // Neighbour Solicitation Information
-//    MacAddress nsMacAddr = ns->getSourceLinkLayerAddress();
-
     // target addr is not tentative addr
     // solicitation processed as described in RFC2461:section 7.2.3
     if (packet->getTag<L3AddressInd>()->getSrcAddress().toIpv6().isUnspecified()) {
@@ -1977,7 +1966,7 @@ void Ipv6NeighbourDiscovery::sendSolicitedNa(Packet *packet, const Ipv6Neighbour
     /*If the (NS)Target Address is either an anycast address or a unicast
        address for which the node is providing proxy service, or the Target
        Link-Layer Address option is not included,*/
-    // TODOANYCAST will not be implemented here!
+    // TODO: anycast target address handling is not implemented
 
     MacAddress sourceLinkLayerAddress;
     if (auto sla = check_and_cast_nullable<const Ipv6NdSourceLinkLayerAddress *>(ns->getOptions().findOption(IPv6ND_SOURCE_LINK_LAYER_ADDR_OPTION)))
@@ -2447,8 +2436,6 @@ void Ipv6NeighbourDiscovery::processRaPrefixInfoForAddrAutoConf(const Ipv6NdPref
     simtime_t preferredLifetime = prefixInfo.getPreferredLifetime();
     simtime_t validLifetime = prefixInfo.getValidLifetime();
 
-//    EV << "/// prefix: " << prefix << std::endl; // CB
-
     // RFC 2461: Section 5.5.3
     // First condition tested, the autonomous flag is already set
 
@@ -2518,9 +2505,7 @@ void Ipv6NeighbourDiscovery::processRaPrefixInfoForAddrAutoConf(const Ipv6NdPref
         EV_INFO << "Assigning new address to: " << ie->getInterfaceName() << endl;
 
         // we are for sure either in the home network or in a new foreign network
-        // -> remove CoA
-//         CoA = ie->ipv6()->removeCoAAddr();
-        // moved code from above to processDADTimeout()
+        // -> remove CoA; moved code from above to processDADTimeout()
 
         // 27.9.07 - CB
         if (returnedHome) {
@@ -2571,7 +2556,6 @@ void Ipv6NeighbourDiscovery::processRaPrefixInfoForAddrAutoConf(const Ipv6NdPref
                 dadGlobalList[ie->getInterfaceId()].validLifetime = validLifetime;
                 dadGlobalList[ie->getInterfaceId()].preferredLifetime = preferredLifetime;
                 dadGlobalList[ie->getInterfaceId()].addr = newAddr;
-//                dadGlobalList[ie->getInterfaceId()].returnedHome = returnedHome;
                 dadGlobalList[ie->getInterfaceId()].CoA = CoA;
             }
         }
@@ -2580,10 +2564,6 @@ void Ipv6NeighbourDiscovery::processRaPrefixInfoForAddrAutoConf(const Ipv6NdPref
 
 void Ipv6NeighbourDiscovery::routersUnreachabilityDetection(const NetworkInterface *ie)
 {
-    // remove all entries from the destination cache for this interface
-//    rt6->purgeDestCacheForInterfaceID( ie->interfaceId() );
-    // invalidate entries in the destination cache for this interface
-//    neighbourCache.invalidateEntriesForInterfaceID( ie->interfaceId() );
     // remove default routes on this interface
     rt6->deleteDefaultRoutes(ie->getInterfaceId());
     rt6->deletePrefixes(ie->getInterfaceId());
@@ -2596,13 +2576,7 @@ void Ipv6NeighbourDiscovery::routersUnreachabilityDetection(const NetworkInterfa
                     << (*it).first.interfaceID << ") to unreachable" << endl;
             ++it;
 
-//            if (rtrLnkAddress.isLinkLocal())
             timeoutDefaultRouter(rtrLnkAddress, ie->getInterfaceId());
-
-            // reset reachability state of this router
-//            Neighbour* nbor = neighbourCache.lookup( (*it).first.address, (*it).first.interfaceID );
-//            nbor->reachabilityState = Ipv6NeighbourCache::STALE;
-//            initiateNeighbourUnreachabilityDetection(nbor);
         }
         else
             ++it;
@@ -2611,7 +2585,6 @@ void Ipv6NeighbourDiscovery::routersUnreachabilityDetection(const NetworkInterfa
 
 void Ipv6NeighbourDiscovery::invalidateNeigbourCache()
 {
-//    Enter_Method("Invalidating Neigbour Cache Entries");
     neighbourCache.invalidateAllEntries();
 }
 

src/inet/networklayer/icmpv6/Mldv1.cc

@@ -196,7 +196,7 @@ void Mldv1::handleMessageWhenUp(cMessage *msg)
             processMldMessage(packet);
         }
         else
-            throw cRuntimeError("Unknown message type received.");
+            throw cRuntimeError("Received packet '%s' (%s) with unexpected protocol", packet->getName(), packet->getClassName());
     }
     else if (auto indication = dynamic_cast<Indication *>(msg)) {
         // The IPv6 layer reports an ICMPv6 error for an MLD message we sent;

src/inet/networklayer/icmpv6/Mldv2.cc

@@ -371,7 +371,7 @@ void Mldv2::handleMessageWhenUp(cMessage *msg)
         if (packet->getTag<PacketProtocolTag>()->getProtocol() == &Protocol::mld)
             processMldMessage(packet);
         else
-            throw cRuntimeError("Mldv2: Unknown message type received.");
+            throw cRuntimeError("Received packet '%s' (%s) with unexpected protocol", packet->getName(), packet->getClassName());
     }
     else if (auto indication = dynamic_cast<Indication *>(msg)) {
         // The IPv6 layer reports an ICMPv6 error for an MLD message we sent; discard it.

src/inet/networklayer/ipv6/Ipv6.cc

@@ -522,7 +522,6 @@ void Ipv6::routePacket(Packet *packet, const NetworkInterface *destIE, const Net
     if (interfaceId == -1)
         if (!determineOutputInterface(destAddress, nextHop, interfaceId, packet, fromHL))
             // no interface found; sent to ND or to ICMP for error processing
-//            throw cRuntimeError("No interface found!");//return;
             return;
     // don't raise error if sent to ND or ICMP!
 
@@ -866,7 +865,7 @@ void Ipv6::localDeliverFinish(Packet *packet)
         EV_INFO << "Transport layer gate not connected - dropping packet!\n";
         sendIcmpError(origPacket, ICMPv6_PARAMETER_PROBLEM, UNRECOGNIZED_NEXT_HDR_TYPE);
         origPacket = nullptr; // for not delete
-        delete packet; // delete decapsulated packet
+        delete packet;
     }
     else {
         // the packet was delivered to one or more sockets above (a copy per socket) and

src/inet/networklayer/ipv6/Ipv6InterfaceData.cc

@@ -233,7 +233,7 @@ Ipv6InterfaceData::~Ipv6InterfaceData()
 
 std::string Ipv6InterfaceData::str() const
 {
-    // FIXME FIXME FIXME FIXME info() should never print a newline
+    // FIXME info() should never print a newline
     std::ostringstream os;
     os << "Ipv6:{" << endl;
     for (int i = 0; i < getNumAddresses(); i++) {
@@ -273,22 +273,12 @@ std::string Ipv6InterfaceData::str() const
     // uncomment the following as needed!
     os << "\tNode:";
     os << " dupAddrDetectTrans=" << nodeVars.dupAddrDetectTransmits;
-//    os << " curHopLimit=" << hostVars.curHopLimit;
-//    os << " retransTimer=" << hostVars.retransTimer;
-//    os << " baseReachableTime=" << hostVars.baseReachableTime;
     os << " reachableTime=" << hostVars.reachableTime << endl;
 
     if (rtrVars.advSendAdvertisements) {
         os << "\tRouter:";
         os << " maxRtrAdvInt=" << rtrVars.maxRtrAdvInterval;
         os << " minRtrAdvInt=" << rtrVars.minRtrAdvInterval << endl;
-//        os << " advManagedFlag=" << rtrVars.advManagedFlag;
-//        os << " advOtherFlag=" << rtrVars.advOtherFlag;
-//        os << " advLinkMTU=" << rtrVars.advLinkMTU;
-//        os << " advReachableTime=" << rtrVars.advReachableTime;
-//        os << " advRetransTimer=" << rtrVars.advRetransTimer;
-//        os << " advCurHopLimit=" << rtrVars.advCurHopLimit;
-//        os << " advDefaultLifetime=" << rtrVars.advDefaultLifetime;
     }
 
     os << "   }" << endl;
@@ -568,9 +558,9 @@ void Ipv6InterfaceData::changeMulticastGroupMembership(Ipv6Address multicastAddr
         McastSourceFilterMode newFilterMode, const Ipv6AddressVector& newSourceList)
 {
     if (ownerp && !ownerp->isMulticast())
-        throw cRuntimeError("Ipv6InterfaceData::changeMulticastGroupMembership(): multicast interface expected, received %s.", ownerp->getInterfaceFullPath().c_str());
+        throw cRuntimeError("Ipv6InterfaceData::changeMulticastGroupMembership(): multicast interface expected, received %s", ownerp->getInterfaceFullPath().c_str());
     if (!multicastAddress.isMulticast())
-        throw cRuntimeError("Ipv6InterfaceData::changeMulticastGroupMembership(): multicast address expected, received %s.", multicastAddress.str().c_str());
+        throw cRuntimeError("Ipv6InterfaceData::changeMulticastGroupMembership(): multicast address expected, received %s", multicastAddress.str().c_str());
 
     HostMulticastGroupData *entry = findHostGroupData(multicastAddress);
     if (!entry) {
@@ -584,7 +574,7 @@ void Ipv6InterfaceData::changeMulticastGroupMembership(Ipv6Address multicastAddr
     for (const auto& elem : oldSourceList) {
         auto count = counts->find(elem);
         if (count == counts->end())
-            throw cRuntimeError("Inconsistent reference counts in Ipv6InterfaceData.");
+            throw cRuntimeError("Inconsistent reference counts in Ipv6InterfaceData");
         else if (count->second == 1)
             counts->erase(count);
         else
@@ -691,7 +681,7 @@ bool Ipv6InterfaceData::hasMulticastListener(const Ipv6Address& multicastAddress
 void Ipv6InterfaceData::addMulticastListener(const Ipv6Address& multicastAddress)
 {
     if (!multicastAddress.isMulticast())
-        throw cRuntimeError("Ipv6InterfaceData::addMulticastListener(): multicast address expected, received %s.", multicastAddress.str().c_str());
+        throw cRuntimeError("Ipv6InterfaceData::addMulticastListener(): multicast address expected, received %s", multicastAddress.str().c_str());
 
     RouterMulticastGroupData *groupData = findRouterGroupData(multicastAddress);
     if (!groupData) {
@@ -711,7 +701,7 @@ void Ipv6InterfaceData::addMulticastListener(const Ipv6Address& multicastAddress
 void Ipv6InterfaceData::addMulticastListener(const Ipv6Address& multicastAddress, const Ipv6Address& sourceAddress)
 {
     if (!multicastAddress.isMulticast())
-        throw cRuntimeError("Ipv6InterfaceData::addMulticastListener(): multicast address expected, received %s.", multicastAddress.str().c_str());
+        throw cRuntimeError("Ipv6InterfaceData::addMulticastListener(): multicast address expected, received %s", multicastAddress.str().c_str());
 
     RouterMulticastGroupData *groupData = findRouterGroupData(multicastAddress);
     if (!groupData) {
@@ -756,7 +746,7 @@ void Ipv6InterfaceData::removeMulticastListener(const Ipv6Address& multicastAddr
 void Ipv6InterfaceData::setMulticastListeners(Ipv6Address multicastAddress, McastSourceFilterMode filterMode, const Ipv6AddressVector& sourceList)
 {
     if (!multicastAddress.isMulticast())
-        throw cRuntimeError("Ipv6InterfaceData::setMulticastListeners(): multicast address expected, received %s.", multicastAddress.str().c_str());
+        throw cRuntimeError("Ipv6InterfaceData::setMulticastListeners(): multicast address expected, received %s", multicastAddress.str().c_str());
 
     RouterMulticastGroupData *groupData = findRouterGroupData(multicastAddress);
     if (!groupData) {

src/inet/networklayer/ipv6/Ipv6InterfaceData.h

@@ -421,9 +421,6 @@ class INET_API Ipv6InterfaceData : public InterfaceProtocolData
          *  Default: 3 * MaxRtrAdvInterval
          */
         simtime_t advDefaultLifetime; // integer seconds in ND rfc but for MIPv6 really need better granularity
-//        bool fastRA;
-//        uint maxFastRAS;
-//        mutable uint fastRACounter;
 
         // These are either learned from routers or configured manually(router)
         AdvPrefixList advPrefixList;