fw: process HopLimit
refs #4806
Change-Id: I20682570409a576a6f35784f34d33ef27bf801cd
diff --git a/tests/daemon/face/lp-reliability.t.cpp b/tests/daemon/face/lp-reliability.t.cpp
index 99223df..525ab97 100644
--- a/tests/daemon/face/lp-reliability.t.cpp
+++ b/tests/daemon/face/lp-reliability.t.cpp
@@ -171,7 +171,7 @@
BOOST_CHECK_EQUAL(linkService->getCounters().nAcknowledged, 0);
BOOST_CHECK_EQUAL(linkService->getCounters().nRetransmitted, 0);
BOOST_CHECK_EQUAL(linkService->getCounters().nRetxExhausted, 0);
- BOOST_CHECK_EQUAL(linkService->getCounters().nDroppedInterests, 0);
+ BOOST_CHECK_EQUAL(linkService->getCounters().nInterestsExceededRetx, 0);
}
BOOST_AUTO_TEST_CASE(SendUnfragmentedRetx)
@@ -190,7 +190,7 @@
BOOST_CHECK_EQUAL(linkService->getCounters().nAcknowledged, 0);
BOOST_CHECK_EQUAL(linkService->getCounters().nRetransmitted, 0);
BOOST_CHECK_EQUAL(linkService->getCounters().nRetxExhausted, 0);
- BOOST_CHECK_EQUAL(linkService->getCounters().nDroppedInterests, 0);
+ BOOST_CHECK_EQUAL(linkService->getCounters().nInterestsExceededRetx, 0);
// T+500ms
// 1024 rto: 1000ms, txSeq: 2, started T+0ms, retx 0
@@ -212,7 +212,7 @@
BOOST_CHECK_EQUAL(linkService->getCounters().nAcknowledged, 0);
BOOST_CHECK_EQUAL(linkService->getCounters().nRetransmitted, 0);
BOOST_CHECK_EQUAL(linkService->getCounters().nRetxExhausted, 0);
- BOOST_CHECK_EQUAL(linkService->getCounters().nDroppedInterests, 0);
+ BOOST_CHECK_EQUAL(linkService->getCounters().nInterestsExceededRetx, 0);
// T+1250ms
// 1024 rto: 1000ms, txSeq: 4, started T+1000ms, retx 1
@@ -230,7 +230,7 @@
BOOST_CHECK_EQUAL(linkService->getCounters().nAcknowledged, 0);
BOOST_CHECK_EQUAL(linkService->getCounters().nRetransmitted, 0);
BOOST_CHECK_EQUAL(linkService->getCounters().nRetxExhausted, 0);
- BOOST_CHECK_EQUAL(linkService->getCounters().nDroppedInterests, 0);
+ BOOST_CHECK_EQUAL(linkService->getCounters().nInterestsExceededRetx, 0);
// T+2250ms
// 1024 rto: 1000ms, txSeq: 6, started T+2000ms, retx 2
@@ -249,7 +249,7 @@
BOOST_CHECK_EQUAL(linkService->getCounters().nAcknowledged, 0);
BOOST_CHECK_EQUAL(linkService->getCounters().nRetransmitted, 0);
BOOST_CHECK_EQUAL(linkService->getCounters().nRetxExhausted, 0);
- BOOST_CHECK_EQUAL(linkService->getCounters().nDroppedInterests, 0);
+ BOOST_CHECK_EQUAL(linkService->getCounters().nInterestsExceededRetx, 0);
// T+3250ms
// 1024 rto: 1000ms, txSeq: 8, started T+3000ms, retx 3
@@ -268,7 +268,7 @@
BOOST_CHECK_EQUAL(linkService->getCounters().nAcknowledged, 0);
BOOST_CHECK_EQUAL(linkService->getCounters().nRetransmitted, 0);
BOOST_CHECK_EQUAL(linkService->getCounters().nRetxExhausted, 0);
- BOOST_CHECK_EQUAL(linkService->getCounters().nDroppedInterests, 0);
+ BOOST_CHECK_EQUAL(linkService->getCounters().nInterestsExceededRetx, 0);
// T+4250ms
// 1024 rto: expired, removed
@@ -286,7 +286,7 @@
BOOST_CHECK_EQUAL(linkService->getCounters().nAcknowledged, 0);
BOOST_CHECK_EQUAL(linkService->getCounters().nRetransmitted, 0);
BOOST_CHECK_EQUAL(linkService->getCounters().nRetxExhausted, 1);
- BOOST_CHECK_EQUAL(linkService->getCounters().nDroppedInterests, 1);
+ BOOST_CHECK_EQUAL(linkService->getCounters().nInterestsExceededRetx, 1);
// T+4750ms
// 1024 rto: expired, removed
@@ -299,7 +299,7 @@
BOOST_CHECK_EQUAL(linkService->getCounters().nAcknowledged, 0);
BOOST_CHECK_EQUAL(linkService->getCounters().nRetransmitted, 0);
BOOST_CHECK_EQUAL(linkService->getCounters().nRetxExhausted, 2);
- BOOST_CHECK_EQUAL(linkService->getCounters().nDroppedInterests, 2);
+ BOOST_CHECK_EQUAL(linkService->getCounters().nInterestsExceededRetx, 2);
}
BOOST_AUTO_TEST_CASE(SendFragmentedRetx)
@@ -329,7 +329,7 @@
BOOST_CHECK_EQUAL(linkService->getCounters().nAcknowledged, 0);
BOOST_CHECK_EQUAL(linkService->getCounters().nRetransmitted, 0);
BOOST_CHECK_EQUAL(linkService->getCounters().nRetxExhausted, 0);
- BOOST_CHECK_EQUAL(linkService->getCounters().nDroppedInterests, 0);
+ BOOST_CHECK_EQUAL(linkService->getCounters().nInterestsExceededRetx, 0);
// T+0ms
// 2048 rto: 1000ms, txSeq: 2, started T+0ms, retx 0
@@ -360,7 +360,7 @@
BOOST_CHECK_EQUAL(linkService->getCounters().nAcknowledged, 0);
BOOST_CHECK_EQUAL(linkService->getCounters().nRetransmitted, 0);
BOOST_CHECK_EQUAL(linkService->getCounters().nRetxExhausted, 0);
- BOOST_CHECK_EQUAL(linkService->getCounters().nDroppedInterests, 0);
+ BOOST_CHECK_EQUAL(linkService->getCounters().nInterestsExceededRetx, 0);
// T+250ms
// 2048 rto: 1000ms, txSeq: 2, started T+0ms, retx 0
@@ -394,7 +394,7 @@
BOOST_CHECK_EQUAL(linkService->getCounters().nAcknowledged, 0);
BOOST_CHECK_EQUAL(linkService->getCounters().nRetransmitted, 0);
BOOST_CHECK_EQUAL(linkService->getCounters().nRetxExhausted, 0);
- BOOST_CHECK_EQUAL(linkService->getCounters().nDroppedInterests, 0);
+ BOOST_CHECK_EQUAL(linkService->getCounters().nInterestsExceededRetx, 0);
// T+500ms
// 2048 rto: 1000ms, txSeq: 2, started T+0ms, retx 0
@@ -428,7 +428,7 @@
BOOST_CHECK_EQUAL(linkService->getCounters().nAcknowledged, 0);
BOOST_CHECK_EQUAL(linkService->getCounters().nRetransmitted, 0);
BOOST_CHECK_EQUAL(linkService->getCounters().nRetxExhausted, 0);
- BOOST_CHECK_EQUAL(linkService->getCounters().nDroppedInterests, 0);
+ BOOST_CHECK_EQUAL(linkService->getCounters().nInterestsExceededRetx, 0);
// T+750ms
// 2048 rto: 1000ms, txSeq: 2, started T+0ms, retx 0
@@ -462,7 +462,7 @@
BOOST_CHECK_EQUAL(linkService->getCounters().nAcknowledged, 0);
BOOST_CHECK_EQUAL(linkService->getCounters().nRetransmitted, 0);
BOOST_CHECK_EQUAL(linkService->getCounters().nRetxExhausted, 0);
- BOOST_CHECK_EQUAL(linkService->getCounters().nDroppedInterests, 0);
+ BOOST_CHECK_EQUAL(linkService->getCounters().nInterestsExceededRetx, 0);
// T+850ms
// 2048 rto: expired, removed
@@ -476,7 +476,7 @@
BOOST_CHECK_EQUAL(linkService->getCounters().nAcknowledged, 0);
BOOST_CHECK_EQUAL(linkService->getCounters().nRetransmitted, 0);
BOOST_CHECK_EQUAL(linkService->getCounters().nRetxExhausted, 1);
- BOOST_CHECK_EQUAL(linkService->getCounters().nDroppedInterests, 1);
+ BOOST_CHECK_EQUAL(linkService->getCounters().nInterestsExceededRetx, 1);
}
BOOST_AUTO_TEST_CASE(AckUnknownTxSeq)
@@ -491,7 +491,7 @@
BOOST_CHECK_EQUAL(linkService->getCounters().nAcknowledged, 0);
BOOST_CHECK_EQUAL(linkService->getCounters().nRetransmitted, 0);
BOOST_CHECK_EQUAL(linkService->getCounters().nRetxExhausted, 0);
- BOOST_CHECK_EQUAL(linkService->getCounters().nDroppedInterests, 0);
+ BOOST_CHECK_EQUAL(linkService->getCounters().nInterestsExceededRetx, 0);
lp::Packet ackPkt;
ackPkt.add<lp::AckField>(10101010);
@@ -505,7 +505,7 @@
BOOST_CHECK_EQUAL(linkService->getCounters().nAcknowledged, 0);
BOOST_CHECK_EQUAL(linkService->getCounters().nRetransmitted, 0);
BOOST_CHECK_EQUAL(linkService->getCounters().nRetxExhausted, 0);
- BOOST_CHECK_EQUAL(linkService->getCounters().nDroppedInterests, 0);
+ BOOST_CHECK_EQUAL(linkService->getCounters().nInterestsExceededRetx, 0);
}
BOOST_AUTO_TEST_CASE(LossByGreaterAcks)
@@ -537,7 +537,7 @@
BOOST_CHECK_EQUAL(linkService->getCounters().nAcknowledged, 0);
BOOST_CHECK_EQUAL(linkService->getCounters().nRetransmitted, 0);
BOOST_CHECK_EQUAL(linkService->getCounters().nRetxExhausted, 0);
- BOOST_CHECK_EQUAL(linkService->getCounters().nDroppedInterests, 0);
+ BOOST_CHECK_EQUAL(linkService->getCounters().nInterestsExceededRetx, 0);
lp::Packet ackPkt1;
ackPkt1.add<lp::AckField>(0);
@@ -565,7 +565,7 @@
BOOST_CHECK_EQUAL(linkService->getCounters().nAcknowledged, 1);
BOOST_CHECK_EQUAL(linkService->getCounters().nRetransmitted, 0);
BOOST_CHECK_EQUAL(linkService->getCounters().nRetxExhausted, 0);
- BOOST_CHECK_EQUAL(linkService->getCounters().nDroppedInterests, 0);
+ BOOST_CHECK_EQUAL(linkService->getCounters().nInterestsExceededRetx, 0);
lp::Packet ackPkt2;
ackPkt2.add<lp::AckField>(2);
@@ -593,7 +593,7 @@
BOOST_CHECK_EQUAL(linkService->getCounters().nAcknowledged, 2);
BOOST_CHECK_EQUAL(linkService->getCounters().nRetransmitted, 0);
BOOST_CHECK_EQUAL(linkService->getCounters().nRetxExhausted, 0);
- BOOST_CHECK_EQUAL(linkService->getCounters().nDroppedInterests, 0);
+ BOOST_CHECK_EQUAL(linkService->getCounters().nInterestsExceededRetx, 0);
lp::Packet ackPkt3;
ackPkt3.add<lp::AckField>(1);
@@ -622,7 +622,7 @@
BOOST_CHECK_EQUAL(linkService->getCounters().nAcknowledged, 3);
BOOST_CHECK_EQUAL(linkService->getCounters().nRetransmitted, 0);
BOOST_CHECK_EQUAL(linkService->getCounters().nRetxExhausted, 0);
- BOOST_CHECK_EQUAL(linkService->getCounters().nDroppedInterests, 0);
+ BOOST_CHECK_EQUAL(linkService->getCounters().nInterestsExceededRetx, 0);
lp::Packet ackPkt4;
ackPkt4.add<lp::AckField>(4);
@@ -645,7 +645,7 @@
BOOST_CHECK_EQUAL(linkService->getCounters().nAcknowledged, 3);
BOOST_CHECK_EQUAL(linkService->getCounters().nRetransmitted, 1);
BOOST_CHECK_EQUAL(linkService->getCounters().nRetxExhausted, 0);
- BOOST_CHECK_EQUAL(linkService->getCounters().nDroppedInterests, 0);
+ BOOST_CHECK_EQUAL(linkService->getCounters().nInterestsExceededRetx, 0);
}
BOOST_AUTO_TEST_CASE(SkipFragmentsRemovedInRtt)
@@ -707,7 +707,7 @@
BOOST_CHECK_EQUAL(linkService->getCounters().nAcknowledged, 1);
BOOST_CHECK_EQUAL(linkService->getCounters().nRetransmitted, 0);
BOOST_CHECK_EQUAL(linkService->getCounters().nRetxExhausted, 0);
- BOOST_CHECK_EQUAL(linkService->getCounters().nDroppedInterests, 0);
+ BOOST_CHECK_EQUAL(linkService->getCounters().nInterestsExceededRetx, 0);
}
BOOST_AUTO_TEST_CASE(ProcessIncomingPacket)