commit 6be9387a4fa0086e9c79c3be3155db038031ddce
author Md Ashiqur Rahman <marahman@email.arizona.edu> Wed Aug 07 01:25:31 2019 +0000
committer Davide Pesavento <davidepesa@gmail.com> Mon Aug 12 12:00:30 2019 -0700
tree d2801c30e8cf188dd019d454725c3f60d41f3296
parent 9aafc2a086c77d892a8aa4199edc33f4b127b0b6

Revert "fib: add EndpointId field in NextHop record"

This reverts commit 3ad49db6eaef0d3f4a0a9bdd3356c6bb9845db57.

refs: #4973

Change-Id: I3216a55a8c4ed52cd9181f790f8ab72e44330a38

daemon/fw/ncc-strategy.cpp

diff --git a/daemon/fw/ncc-strategy.cpp b/daemon/fw/ncc-strategy.cpp
index c427cd1..4969a14 100644
--- a/daemon/fw/ncc-strategy.cpp
+++ b/daemon/fw/ncc-strategy.cpp
@@ -83,7 +83,7 @@
   size_t nUpstreams = nexthops.size();
 
   shared_ptr<Face> bestFace = meInfo.getBestFace();
-  if (bestFace != nullptr && fibEntry.hasNextHop(*bestFace, 0) &&
+  if (bestFace != nullptr && fibEntry.hasNextHop(*bestFace) &&
       !wouldViolateScope(ingress.face, interest, *bestFace) &&
       canForwardToLegacy(*pitEntry, *bestFace)) {
     // TODO Should we use `randlow = 100 + nrand48(h->seed) % 4096U;` ?
@@ -112,7 +112,7 @@
   }
 
   shared_ptr<Face> previousFace = meInfo.previousFace.lock();
-  if (previousFace != nullptr && fibEntry.hasNextHop(*previousFace, 0) &&
+  if (previousFace != nullptr && fibEntry.hasNextHop(*previousFace) &&
       !wouldViolateScope(ingress.face, interest, *previousFace) &&
       canForwardToLegacy(*pitEntry, *previousFace)) {
     --nUpstreams;
@@ -158,7 +158,7 @@
   MeasurementsEntryInfo& meInfo = this->getMeasurementsEntryInfo(pitEntry);
 
   shared_ptr<Face> previousFace = meInfo.previousFace.lock();
-  if (previousFace != nullptr && fibEntry.hasNextHop(*previousFace, 0) &&
+  if (previousFace != nullptr && fibEntry.hasNextHop(*previousFace) &&
       !wouldViolateScope(*inFace, interest, *previousFace) &&
       canForwardToLegacy(*pitEntry, *previousFace)) {
     this->sendInterest(pitEntry, FaceEndpoint(*previousFace, 0), interest);