Skip to content

Commit 452c99c

Browse files
avargaavarga
committed
Ipv6 ND: descriptive packet names instead of "...packet"; re-record ~tNlb fingerprints
Rename the Neighbour Discovery packet object-names in Ipv6NeighbourDiscovery.cc to drop the redundant "packet" suffix and match their message classes: RSpacket -> RouterSolicitation, RApacket -> RouterAdvertisement, NSpacket -> NeighbourSolicitation, NApacket -> NeighbourAdvertisement. The cMessage name is parsim-packed (the 'b' fingerprint ingredient), so although the change is purely cosmetic (on-wire data is unchanged), it moves the ~tNlb fingerprint of every IPv6 example that carries ND traffic. Re-recorded those 14 baselines (pim dm/sm_ipv6, mipv6, mipv6roaming, nclients_ipv6, hierarchical99 IPv6, udpclientserver_ipv6, dymo IPv6). tplx / ~tNl / ~tND / tyf are unaffected.
1 parent 49ef43a commit 452c99c

3 files changed

Lines changed: 19 additions & 19 deletions

File tree

‎src/inet/networklayer/icmpv6/Ipv6NeighbourDiscovery.cc‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1011,7 +1011,7 @@ void Ipv6NeighbourDiscovery::createAndSendRsPacket(NetworkInterface *ie)
10111011
}
10121012

10131013
// Construct a Router Solicitation message
1014-
auto packet = new Packet("RSpacket");
1014+
auto packet = new Packet("RouterSolicitation");
10151015
Icmpv6::insertChecksum(checksumMode, rs, packet);
10161016
packet->insertAtFront(rs);
10171017
sendPacketToIpv6Module(packet, destAddr, myIPv6Address, ie->getInterfaceId());
@@ -1327,7 +1327,7 @@ void Ipv6NeighbourDiscovery::createAndSendRaPacket(const Ipv6Address& destAddr,
13271327
ra->addChunkLength(IPv6ND_PREFIX_INFORMATION_OPTION_LENGTH);
13281328
}
13291329

1330-
auto packet = new Packet("RApacket");
1330+
auto packet = new Packet("RouterAdvertisement");
13311331
Icmpv6::insertChecksum(checksumMode, ra, packet);
13321332
packet->insertAtFront(ra);
13331333
sendPacketToIpv6Module(packet, destAddr, sourceAddr, ie->getInterfaceId());
@@ -1776,7 +1776,7 @@ void Ipv6NeighbourDiscovery::createAndSendNsPacket(const Ipv6Address& nsTargetAd
17761776
ns->getOptionsForUpdate().appendOption(sla);
17771777
ns->addChunkLength(IPv6ND_LINK_LAYER_ADDRESS_OPTION_LENGTH);
17781778
}
1779-
auto packet = new Packet("NSpacket");
1779+
auto packet = new Packet("NeighbourSolicitation");
17801780
Icmpv6::insertChecksum(checksumMode, ns, packet);
17811781
packet->insertAtFront(ns);
17821782
sendPacketToIpv6Module(packet, dgDestAddr, dgSrcAddr, ie->getInterfaceId());
@@ -2030,7 +2030,7 @@ void Ipv6NeighbourDiscovery::sendSolicitedNa(Packet *packet, const Ipv6Neighbour
20302030
// off the respective ones.
20312031
Ipv6Address myIPv6Addr = ie->getProtocolData<Ipv6InterfaceData>()->getPreferredAddress();
20322032

2033-
auto naPacket = new Packet("NApacket");
2033+
auto naPacket = new Packet("NeighbourAdvertisement");
20342034
Icmpv6::insertChecksum(checksumMode, na, packet);
20352035
naPacket->insertAtFront(na);
20362036
sendPacketToIpv6Module(naPacket, naDestAddr, myIPv6Addr, ie->getInterfaceId());
@@ -2103,7 +2103,7 @@ void Ipv6NeighbourDiscovery::sendUnsolicitedNa(NetworkInterface *ie)
21032103
// Neighbor Unreachability Detection algorithm ensures that all nodes
21042104
// obtain a reachable link-layer address, though the delay may be
21052105
// slightly longer.
2106-
auto packet = new Packet("NApacket");
2106+
auto packet = new Packet("NeighbourAdvertisement");
21072107
Icmpv6::insertChecksum(checksumMode, na, packet);
21082108
packet->insertAtFront(na);
21092109
sendPacketToIpv6Module(packet, Ipv6Address::ALL_NODES_2, myIPv6Addr, ie->getInterfaceId());

‎tests/fingerprint/examples.csv‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -453,14 +453,14 @@
453453
/examples/ospfv3/v3_square_2_areas/, -f omnetpp.ini -c General -r 0, 200s, 7f39-edb0/tplx;1259-4e60/~tNl;2a17-4280/tyf, PASS, EthernetMac
454454

455455
/examples/pim/dm/, -f omnetpp.ini -c General -r 0, 300s, 5542-465a/tplx;320d-ec2e/~tNl;7540-425c/~tND;ed5b-ae9d/tyf, PASS, igmp EthernetMac Ipv4
456-
/examples/pim/dm_ipv6/, -f omnetpp.ini -c General -r 0, 120s, 46b7-8d71/~tNlb, PASS, MLD EthernetMac Ipv6
456+
/examples/pim/dm_ipv6/, -f omnetpp.ini -c General -r 0, 120s, b431-ae5e/~tNlb, PASS, MLD EthernetMac Ipv6
457457
/examples/pim/iptv/, -f omnetpp.ini -c PIM_SM -r 0, 35s, 9fdf-a54f/tplx;c356-8a7d/~tNl;fddd-28bc/~tND;11d1-62c7/tyf, PASS, igmp ospf EthernetMac Ipv4
458458
/examples/pim/iptv/, -f omnetpp.ini -c PIM_DM -r 0, 35s, 25e4-e1ff/tplx;280f-57ab/~tNl;6e8e-78ba/~tND;96bd-4dca/tyf, PASS, igmp ospf EthernetMac Ipv4
459459
/examples/pim/sm/, -f omnetpp.ini -c Scenario1 -r 0, 100s, 3f92-7b84/tplx;1cf9-ee08/~tNl;7bc2-d697/~tND;ba86-0da1/tyf, PASS, igmp EthernetMac Ipv4
460460
/examples/pim/sm/, -f omnetpp.ini -c Scenario2 -r 0, 150s, b64f-022b/tplx;5022-893e/~tNl;9384-a10d/~tND;ce2a-7241/tyf, PASS, igmp EthernetMac Ipv4
461461
/examples/pim/sm/, -f omnetpp.ini -c Scenario3 -r 0, 300s, a4d4-39b0/tplx;2e76-520f/~tNl;eb91-fabc/~tND;4f37-e2c3/tyf, PASS, igmp EthernetMac Ipv4
462462
/examples/pim/sm/, -f omnetpp.ini -c Scenario4 -r 0, 100s, 1bbc-ce82/tplx;90c6-efdf/~tNl;3c6f-feb9/~tND;015c-b31f/tyf, PASS, igmp EthernetMac Ipv4
463-
/examples/pim/sm_ipv6/, -f omnetpp.ini -c General -r 0, 120s, 5db3-139d/~tNlb, PASS, MLD EthernetMac Ipv6
463+
/examples/pim/sm_ipv6/, -f omnetpp.ini -c General -r 0, 120s, 0949-5302/~tNlb, PASS, MLD EthernetMac Ipv6
464464
/examples/pim/ssm_ipv6/, -f omnetpp.ini -c General -r 0, 60s, 7e74-c43f/~tNl, PASS, MLD EthernetMac Ipv6
465465

466466
/examples/seaport/, -f omnetpp.ini -c General -r 0, 1000s, 32cb-156a/tplx;fcf4-00cd/~tNl;e3e9-834d/tyf, PASS, igmp EthernetMac Ipv4

‎tests/fingerprint/mipv6-refactoring.csv‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,29 +8,29 @@
88
# empty-shim step, which kept these fingerprints bit-for-bit identical.
99

1010
# MIPv6 example — the primary test
11-
/examples/ipv6/mipv6/, -f omnetpp.ini -c Handover -r 0, 70s, 85e6-5d61/~tNlb, PASS, wireless EthernetMac
12-
/examples/ipv6/mipv6/, -f omnetpp.ini -c RouteOptimizationTwoCNs -r 0, 60s, af07-3741/~tNlb, PASS, wireless EthernetMac
13-
/examples/ipv6/mipv6roaming/, -f omnetpp.ini -c Roaming -r 0, 70s, f4e4-0f9e/~tNlb, PASS, wireless EthernetMac
11+
/examples/ipv6/mipv6/, -f omnetpp.ini -c Handover -r 0, 70s, b458-831b/~tNlb, PASS, wireless EthernetMac
12+
/examples/ipv6/mipv6/, -f omnetpp.ini -c RouteOptimizationTwoCNs -r 0, 60s, 40e8-2339/~tNlb, PASS, wireless EthernetMac
13+
/examples/ipv6/mipv6roaming/, -f omnetpp.ini -c Roaming -r 0, 70s, ff00-1b0a/~tNlb, PASS, wireless EthernetMac
1414

1515
# IPv6 examples
1616
# MLD example — new PASS row; ~tNl locks the MLD Report/Query/Done/MAS-Query packet exchange (traffic+lengths);
1717
# ~tNlb excluded: EthernetHub (WireJunction) adds a pointer-typed 'originalSender' cPar to the signal which
1818
# causes parsimPack() to abort — use ~tNl (no parsim serialization) instead; tyf excluded as unreliable
1919
/examples/ipv6/mld/, -f omnetpp.ini -c MldDemo -r 0, 30s, 0afa-a0ac/~tNl, PASS, EthernetMac MLD
2020
/examples/ipv6/mld/, -f omnetpp.ini -c MldV2Ssm -r 0, 30s, c4a8-20a4/~tNl, PASS, EthernetMac MLD
21-
/examples/ipv6/nclients/, -f omnetpp.ini -c ETH -r 0, 1000s, d546-2263/~tNlb, PASS, EthernetMac
22-
/examples/ipv6/nclients/, -f omnetpp.ini -c PPP -r 0, 1000s, f908-b0c5/~tNlb, PASS,
23-
/examples/ipv6/nclients/, -f omnetpp.ini -c PPP_SCTP -r 0, 100s, 48f9-b74a/~tNlb, PASS,
21+
/examples/ipv6/nclients/, -f omnetpp.ini -c ETH -r 0, 1000s, 8e48-31ae/~tNlb, PASS, EthernetMac
22+
/examples/ipv6/nclients/, -f omnetpp.ini -c PPP -r 0, 1000s, ca94-a2f6/~tNlb, PASS,
23+
/examples/ipv6/nclients/, -f omnetpp.ini -c PPP_SCTP -r 0, 100s, 06b9-ff17/~tNlb, PASS,
2424

2525
# IPv6 networking examples
26-
/examples/inet/hierarchical99/, -f networklayer.ini -c IPv6 -r 0, 10000s, 3fd2-976a/~tNlb, PASS, EthernetMac
27-
/examples/inet/udpclientserver/, -f omnetpp.ini -c udp_OK_ipv6 -r 0, 10s, 7fe6-c71d/~tNlb, PASS,
28-
/examples/inet/udpclientserver/, -f omnetpp.ini -c udp_Port_Unav_ipv6 -r 0, 10s, 84fc-d602/~tNlb, PASS,
29-
/examples/inet/udpclientserver/, -f omnetpp.ini -c udp_Host_Unav_ipv6 -r 0, 10s, b010-62f0/~tNlb, PASS,
26+
/examples/inet/hierarchical99/, -f networklayer.ini -c IPv6 -r 0, 10000s, 8d4d-9e11/~tNlb, PASS, EthernetMac
27+
/examples/inet/udpclientserver/, -f omnetpp.ini -c udp_OK_ipv6 -r 0, 10s, 8feb-3936/~tNlb, PASS,
28+
/examples/inet/udpclientserver/, -f omnetpp.ini -c udp_Port_Unav_ipv6 -r 0, 10s, 9661-c1f5/~tNlb, PASS,
29+
/examples/inet/udpclientserver/, -f omnetpp.ini -c udp_Host_Unav_ipv6 -r 0, 10s, 6360-9ed1/~tNlb, PASS,
3030

3131
# DYMO with IPv6
32-
/examples/manetrouting/dymo/, -f omnetpp.ini -c IPv6 -r 0, 10s, 84e9-900a/~tNlb, PASS, wireless adhoc
33-
/examples/manetrouting/dymo/, -f omnetpp.ini -c MultiIPv6 -r 0, 10s, 84e9-900a/~tNlb, PASS, wireless adhoc
32+
/examples/manetrouting/dymo/, -f omnetpp.ini -c IPv6 -r 0, 10s, bbf0-c890/~tNlb, PASS, wireless adhoc
33+
/examples/manetrouting/dymo/, -f omnetpp.ini -c MultiIPv6 -r 0, 10s, bbf0-c890/~tNlb, PASS, wireless adhoc
3434

3535
# EIGRP with IPv6
3636
/examples/eigrp/testing_scenario6/, -f omnetpp.ini -c EIGRP-IPv6_exp1_bandwidth-change -r 0, 3min, c645-565e/~tNlb, PASS, eigrp EthernetMac

0 commit comments

Comments
 (0)