commit b510e3e2388a5ba0acd41bb4e552f157cc282282
author Jeff Thompson <jefft0@gmail.com> Mon Oct 07 18:53:20 2013 -0700
committer Jeff Thompson <jefft0@gmail.com> Mon Oct 07 18:53:20 2013 -0700
tree fc99e81ebb4d967b11d9a55e1f8d75694624a7c6
parent 62992e43c0a6067fa9b343961c2c34609ab8db65

Face: in OnInterest callback for registerPrefix, added registeredPrefixId argument.

ndn-cpp/node.cpp

diff --git a/ndn-cpp/node.cpp b/ndn-cpp/node.cpp
index b0df607..30c0573 100644
--- a/ndn-cpp/node.cpp
+++ b/ndn-cpp/node.cpp
@@ -268,7 +268,7 @@
     
     RegisteredPrefix *entry = getEntryForRegisteredPrefix(interest->getName());
     if (entry)
-      entry->getOnInterest()(entry->getPrefix(), interest, *transport_);
+      entry->getOnInterest()(entry->getPrefix(), interest, *transport_, entry->getRegisteredPrefixId());
   }
   else if (decoder.peekDTag(ndn_BinaryXml_DTag_ContentObject)) {
     shared_ptr<Data> data(new Data());

ndn-cpp/node.hpp

diff --git a/ndn-cpp/node.hpp b/ndn-cpp/node.hpp
index 9130815..24a2672 100644
--- a/ndn-cpp/node.hpp
+++ b/ndn-cpp/node.hpp
@@ -30,7 +30,7 @@
  * An OnInterest function object is used to pass a callback to registerPrefix.
  */
 typedef func_lib::function<void
-  (const ptr_lib::shared_ptr<const Name>&, const ptr_lib::shared_ptr<const Interest>&, Transport&)> OnInterest;
+  (const ptr_lib::shared_ptr<const Name>&, const ptr_lib::shared_ptr<const Interest>&, Transport&, uint64_t)> OnInterest;
 
 /**
  * An OnRegisterFailed function object is used to report when registerPrefix fails.

tests/test-publish-async.cpp

diff --git a/tests/test-publish-async.cpp b/tests/test-publish-async.cpp
index 2e99357..27797cc 100644
--- a/tests/test-publish-async.cpp
+++ b/tests/test-publish-async.cpp
@@ -73,7 +73,8 @@
   
   // onInterest.
   void operator()
-     (const shared_ptr<const Name>& prefix, const shared_ptr<const Interest>& interest, Transport& transport) 
+     (const shared_ptr<const Name>& prefix, const shared_ptr<const Interest>& interest, Transport& transport,
+      uint64_t registeredPrefixId) 
   {
     ++responseCount_;