commit dcffdaafb5c273b790f18f06dd77be5c557b69dd
author Junxiao Shi <git@mail1.yoursunny.com> Tue Jul 26 02:23:56 2016 +0000
committer Junxiao Shi <git@mail1.yoursunny.com> Tue Jul 26 02:23:56 2016 +0000
tree b4596ba81bd0ddb24ddf183c03189fc05fe0a4c5
parent 80f9fcdaa17aa9acf322e6bca34b41cc57415ad7

fw: decouple Forwarder and FaceTable

refs #3679

Change-Id: I449e20e58a0a67a7172bdf3ab02b0d655149690f

daemon/fw/face-table.cpp

diff --git a/daemon/fw/face-table.cpp b/daemon/fw/face-table.cpp
index ef5b916..ed082bf 100644
--- a/daemon/fw/face-table.cpp
+++ b/daemon/fw/face-table.cpp
@@ -33,17 +33,11 @@
 
 NFD_LOG_INIT("FaceTable");
 
-FaceTable::FaceTable(Forwarder& forwarder)
-  : m_forwarder(forwarder)
-  , m_lastFaceId(face::FACEID_RESERVED_MAX)
+FaceTable::FaceTable()
+  : m_lastFaceId(face::FACEID_RESERVED_MAX)
 {
 }
 
-FaceTable::~FaceTable()
-{
-
-}
-
 Face*
 FaceTable::get(FaceId id) const
 {
@@ -90,9 +84,6 @@
   NFD_LOG_INFO("Added face id=" << faceId << " remote=" << face->getRemoteUri()
                                           << " local=" << face->getLocalUri());
 
-  face->afterReceiveInterest.connect(bind(&Forwarder::startProcessInterest, &m_forwarder, ref(*face), _1));
-  face->afterReceiveData.connect(bind(&Forwarder::startProcessData, &m_forwarder, ref(*face), _1));
-  face->afterReceiveNack.connect(bind(&Forwarder::startProcessNack, &m_forwarder, ref(*face), _1));
   connectFaceClosedSignal(*face, bind(&FaceTable::remove, this, faceId));
 
   this->afterAdd(*face);
@@ -107,8 +98,6 @@
 
   this->beforeRemove(*face);
 
-  m_forwarder.getFib().removeNextHopFromAllEntries(*face);
-
   m_faces.erase(i);
   face->setId(face::INVALID_FACEID);