commit 51c802519a74cc86aba9e16120bb87a2e86ab229
author Yingdi Yu <yuyingdi@gmail.com> Mon Feb 10 19:32:05 2014 -0800
committer Yingdi Yu <yuyingdi@gmail.com> Tue Feb 11 17:33:40 2014 -0800
tree f2be3076d31436beb4c9a47510663c5d14830b2f
parent 531803bae995976d913c323c454e26f18994daa7

api: Use new callback interfaces

Change-Id: I1871df54c3061c0c8d5765ff69207b8307bc7569

src/sync-logic.cc

diff --git a/src/sync-logic.cc b/src/sync-logic.cc
index 6f3d21d..ec4d63e 100644
--- a/src/sync-logic.cc
+++ b/src/sync-logic.cc
@@ -79,7 +79,7 @@
 { 
   m_syncRegisteredPrefixId = m_face->setInterestFilter (m_syncPrefix, 
                                                         bind(&SyncLogic::onSyncInterest, this, _1, _2), 
-                                                        bind(&SyncLogic::onSyncRegisterFailed, this, _1));
+                                                        bind(&SyncLogic::onSyncRegisterFailed, this, _1, _2));
   
 
   m_reexpressingInterestId = m_scheduler.scheduleEvent (time::seconds (0), // no need to add jitter
@@ -108,7 +108,7 @@
 { 
   m_syncRegisteredPrefixId = m_face->setInterestFilter (m_syncPrefix, 
                                                         bind(&SyncLogic::onSyncInterest, this, _1, _2), 
-                                                        bind(&SyncLogic::onSyncRegisterFailed, this, _1));
+                                                        bind(&SyncLogic::onSyncRegisterFailed, this, _1, _2));
 
   m_reexpressingInterestId = m_scheduler.scheduleEvent (time::seconds (0), // no need to add jitter
                                                         bind (&SyncLogic::sendSyncInterest, this));
@@ -117,12 +117,6 @@
 SyncLogic::~SyncLogic ()
 { 
   m_face->unsetInterestFilter(m_syncRegisteredPrefixId); 
-}
-
-void
-SyncLogic::stop()
-{
-  m_face->unsetInterestFilter(m_syncRegisteredPrefixId);
   m_scheduler.cancelEvent (m_reexpressingInterestId);
   m_scheduler.cancelEvent (m_delayedInterestProcessingId);
 }
@@ -160,10 +154,9 @@
 }
 
 void
-SyncLogic::onSyncInterest (const shared_ptr<const Name>& prefix, 
-                           const shared_ptr<const ndn::Interest>& interest)
+SyncLogic::onSyncInterest (const Name& prefix, const ndn::Interest& interest)
 {
-  Name name = interest->getName();
+  Name name = interest.getName();
 
   _LOG_DEBUG_ID("respondSyncInterest: " << name);
 
@@ -193,20 +186,21 @@
 }
 
 void
-SyncLogic::onSyncRegisterFailed(const shared_ptr<const Name>& prefix)
+SyncLogic::onSyncRegisterFailed(const Name& prefix, const string& msg)
 {
-  _LOG_DEBUG_ID("Sync prefix registration failed!");
+  _LOG_DEBUG_ID("Sync prefix registration failed! " << msg);
 }
 
 void
-SyncLogic::onSyncData(const shared_ptr<const ndn::Interest>& interest, 
-                      const shared_ptr<Data>& data,
-                      const OnDataValidated& onValidated,
-                      const OnDataValidationFailed& onValidationFailed)
-{ m_validator->validate(data, onValidated, onValidationFailed); }
+SyncLogic::onSyncData(const ndn::Interest& interest, Data& data)
+{
+  OnDataValidated onValidated = bind(&SyncLogic::onSyncDataValidated, this, _1);
+  OnDataValidationFailed onValidationFailed = bind(&SyncLogic::onSyncDataValidationFailed, this, _1);
+  m_validator->validate(data, onValidated, onValidationFailed); 
+}
 
 void
-SyncLogic::onSyncTimeout(const shared_ptr<const ndn::Interest>& interest)
+SyncLogic::onSyncTimeout(const ndn::Interest& interest)
 { 
   // It is OK. Others will handle the time out situation. 
 }
@@ -588,11 +582,8 @@
   ndn::Interest interest(m_outstandingInterestName);
   interest.setMustBeFresh(true);
 
-  OnDataValidated onValidated = bind(&SyncLogic::onSyncDataValidated, this, _1);
-  OnDataValidationFailed onValidationFailed = bind(&SyncLogic::onSyncDataValidationFailed, this, _1);
-
   m_face->expressInterest(interest,
-                          bind(&SyncLogic::onSyncData, this, _1, _2, onValidated, onValidationFailed),
+                          bind(&SyncLogic::onSyncData, this, _1, _2),
                           bind(&SyncLogic::onSyncTimeout, this, _1));
 }
 
@@ -617,11 +608,8 @@
   ndn::Interest interest(interestName);
   interest.setMustBeFresh(true);
 
-  OnDataValidated onValidated = bind(&SyncLogic::onSyncDataValidated, this, _1);
-  OnDataValidationFailed onValidationFailed = bind(&SyncLogic::onSyncDataValidationFailed, this, _1);
-
   m_face->expressInterest(interest,
-                          bind(&SyncLogic::onSyncData, this, _1, _2, onValidated, onValidationFailed),
+                          bind(&SyncLogic::onSyncData, this, _1, _2),
                           bind(&SyncLogic::onSyncTimeout, this, _1));
 }