commit 4063184af0365da4f6fc173d645bb248ac0d4b4e
author Junxiao Shi <git@mail1.yoursunny.com> Sat Mar 01 13:52:37 2014 -0700
committer Junxiao Shi <git@mail1.yoursunny.com> Mon Mar 03 09:27:13 2014 -0700
tree f151471642fbd961422348bf72d8e23158f1bcc3
parent 624f6c610f754dd427ebf75e8c9870ccc4b4f3c3

table: NameTree::findLongestPrefixMatch predicate

refs #1313

Change-Id: I759c8ddf9bc0fe5b970c979f69131a98b1ef32e4

daemon/fw/forwarder.cpp

diff --git a/daemon/fw/forwarder.cpp b/daemon/fw/forwarder.cpp
index 417a4cb..a812198 100644
--- a/daemon/fw/forwarder.cpp
+++ b/daemon/fw/forwarder.cpp
@@ -90,9 +90,7 @@
   }
 
   // PIT insert
-  std::pair<shared_ptr<pit::Entry>, bool>
-    pitInsertResult = m_pit.insert(interest);
-  shared_ptr<pit::Entry> pitEntry = pitInsertResult.first;
+  shared_ptr<pit::Entry> pitEntry = m_pit.insert(interest).first;
 
   // detect loop and record Nonce
   bool isLoop = ! pitEntry->addNonce(interest.getNonce());
@@ -131,9 +129,7 @@
   }
 
   // FIB lookup
-  shared_ptr<fib::Entry> fibEntry
-    = m_fib.findLongestPrefixMatch(interest.getName());
-  // TODO use Fib::findParent(pitEntry)
+  shared_ptr<fib::Entry> fibEntry = m_fib.findLongestPrefixMatch(*pitEntry);
 
   // dispatch to strategy
   this->dispatchToStrategy(inFace, interest, fibEntry, pitEntry);