commit b7079a11a3f2354e635a784484ecd28697dc02a7
author Vince Lehman <vslehman@memphis.edu> Tue Nov 04 12:45:50 2014 -0600
committer Vince Lehman <vslehman@memphis.edu> Tue Nov 04 12:47:41 2014 -0600
tree 11bb9b3ba1876a51b2164c1880bc0ee6c17ffb50
parent 0a7da61b458da4639533ceb1e85f48b086a6bc80

route: Replace deprecated nfd::Controller(Face&)

refs: #2133

Change-Id: Ie369f50a6a2f9101dda3ec0b28a3f2705c24cde8

src/nlsr.hpp

diff --git a/src/nlsr.hpp b/src/nlsr.hpp
index de6f061..60728fd 100644
--- a/src/nlsr.hpp
+++ b/src/nlsr.hpp
@@ -81,7 +81,7 @@
     , m_isRouteCalculationScheduled(false)
     , m_isRoutingTableCalculating(false)
     , m_routingTable(scheduler)
-    , m_fib(m_nlsrFace, scheduler, m_adjacencyList, m_confParam)
+    , m_fib(m_nlsrFace, scheduler, m_adjacencyList, m_confParam, m_keyChain)
     , m_namePrefixTable(*this)
     , m_syncLogicHandler(m_nlsrFace, m_nlsrLsdb, m_confParam)
     , m_helloProtocol(*this, scheduler)

src/route/fib.hpp

diff --git a/src/route/fib.hpp b/src/route/fib.hpp
index d1737d2..f5f77ed 100644
--- a/src/route/fib.hpp
+++ b/src/route/fib.hpp
@@ -44,11 +44,12 @@
 class Fib
 {
 public:
-  Fib(ndn::Face& face, ndn::Scheduler& scheduler, AdjacencyList& adjacencyList, ConfParameter& conf)
+  Fib(ndn::Face& face, ndn::Scheduler& scheduler, AdjacencyList& adjacencyList, ConfParameter& conf,
+      ndn::KeyChain& keyChain)
     : m_scheduler(scheduler)
     , m_table()
     , m_refreshTime(0)
-    , m_controller(face)
+    , m_controller(face, keyChain)
     , m_faceController(face.getIoService(), m_controller)
     , m_faceMap()
     , m_adjacencyList(adjacencyList)

tests/test-fib.cpp

diff --git a/tests/test-fib.cpp b/tests/test-fib.cpp
index 4ade674..acb2c7b 100644
--- a/tests/test-fib.cpp
+++ b/tests/test-fib.cpp
@@ -54,8 +54,8 @@
 
     conf.setMaxFacesPerPrefix(2);
 
-    fib = ndn::make_shared<Fib>(ndn::ref(*face), ndn::ref(g_scheduler),ndn::ref(adjacencies),
-                                ndn::ref(conf));
+    fib = ndn::make_shared<Fib>(ndn::ref(*face), ndn::ref(g_scheduler), ndn::ref(adjacencies),
+                                ndn::ref(conf), keyChain);
 
     fib->m_faceMap.update(router1FaceUri, router1FaceId);
     fib->m_faceMap.update(router2FaceUri, router2FaceId);
@@ -64,6 +64,7 @@
 
 public:
   shared_ptr<ndn::DummyFace> face;
+  ndn::KeyChain keyChain;
   shared_ptr<Fib> fib;
 
   AdjacencyList adjacencies;