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/table/fib.cpp

diff --git a/daemon/table/fib.cpp b/daemon/table/fib.cpp
index 2f3deab..62938e0 100644
--- a/daemon/table/fib.cpp
+++ b/daemon/table/fib.cpp
@@ -133,28 +133,16 @@
 }
 
 void
-Fib::eraseIfEmpty(Entry& entry)
+Fib::removeNextHop(Entry& entry, const Face& face)
 {
+  entry.removeNextHop(face);
+
   if (!entry.hasNextHops()) {
     name_tree::Entry* nte = m_nameTree.getEntry(entry);
     this->erase(nte, false);
   }
 }
 
-void
-Fib::removeNextHop(Entry& entry, const Face& face, EndpointId endpointId)
-{
-  entry.removeNextHop(face, endpointId);
-  this->eraseIfEmpty(entry);
-}
-
-void
-Fib::removeNextHopByFace(Entry& entry, const Face& face)
-{
-  entry.removeNextHopByFace(face);
-  this->eraseIfEmpty(entry);
-}
-
 Fib::Range
 Fib::getRange() const
 {