commit 1de901f161d0caf173bb70a1766a85680b120f64
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Thu Mar 09 12:43:57 2017 -0800
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Sat Mar 11 13:50:28 2017 -0800
tree 25561f3446b0e1ec7b151deca0876fce5c496725
parent 9f936665197bff76a0de76fc427cbdb73fd1d4a5

Remove use of deprecated code

Change-Id: I197471c48c54c5671bb8f641c4332b3ac7893824
Refs: #3988

nsync/sync-logic.cc

diff --git a/nsync/sync-logic.cc b/nsync/sync-logic.cc
index 900c424..b1482cf 100644
--- a/nsync/sync-logic.cc
+++ b/nsync/sync-logic.cc
@@ -218,7 +218,7 @@
 }
 
 void
-SyncLogic::onSyncData(const ndn::Interest& interest, Data& data)
+SyncLogic::onSyncData(const ndn::Interest& interest, const Data& data)
 {
   OnDataValidated onValidated = bind(&SyncLogic::onSyncDataValidated, this, _1);
   OnDataValidationFailed onValidationFailed = bind(&SyncLogic::onSyncDataValidationFailed, this, _1);
@@ -624,6 +624,7 @@
 
   m_face->expressInterest(interest,
                           bind(&SyncLogic::onSyncData, this, _1, _2),
+                          bind(&SyncLogic::onSyncTimeout, this, _1), // Nack
                           bind(&SyncLogic::onSyncTimeout, this, _1));
 }
 
@@ -652,6 +653,7 @@
 
   m_face->expressInterest(interest,
                           bind(&SyncLogic::onSyncData, this, _1, _2),
+                          bind(&SyncLogic::onSyncTimeout, this, _1), // Nack
                           bind(&SyncLogic::onSyncTimeout, this, _1));
 }
 

nsync/sync-logic.h

diff --git a/nsync/sync-logic.h b/nsync/sync-logic.h
index 33578fb..6ac330b 100644
--- a/nsync/sync-logic.h
+++ b/nsync/sync-logic.h
@@ -127,7 +127,7 @@
   onSyncRegisterFailed(const ndn::Name& prefix, const std::string& msg);
 
   void
-  onSyncData(const ndn::Interest& interest, ndn::Data& data);
+  onSyncData(const ndn::Interest& interest, const ndn::Data& data);
 
   void
   onSyncTimeout(const ndn::Interest& interest);

nsync/sync-socket.cc

diff --git a/nsync/sync-socket.cc b/nsync/sync-socket.cc
index 68eaa7d..ef6b9fb 100644
--- a/nsync/sync-socket.cc
+++ b/nsync/sync-socket.cc
@@ -112,13 +112,15 @@
   m_face->expressInterest(interest,
                           bind(&SyncSocket::onData, this, _1, _2,
                                onValidated, onValidationFailed),
+                          bind(&SyncSocket::onDataTimeout, this, _1, retry, // Nack
+                               onValidated, onValidationFailed),
                           bind(&SyncSocket::onDataTimeout, this, _1, retry,
                                onValidated, onValidationFailed));
 
 }
 
 void
-SyncSocket::onData(const ndn::Interest& interest, Data& data,
+SyncSocket::onData(const ndn::Interest& interest, const Data& data,
                    const OnDataValidated& onValidated,
                    const OnDataValidationFailed& onValidationFailed)
 {
@@ -145,6 +147,12 @@
                                    _1,
                                    retry - 1,
                                    onValidated,
+                                   onValidationFailed),
+                              bind(&SyncSocket::onDataTimeout,
+                                   this,
+                                   _1,
+                                   retry - 1,
+                                   onValidated,
                                    onValidationFailed));
 
     }

nsync/sync-socket.h

diff --git a/nsync/sync-socket.h b/nsync/sync-socket.h
index dce6fde..35b59c3 100644
--- a/nsync/sync-socket.h
+++ b/nsync/sync-socket.h
@@ -106,7 +106,7 @@
   }
 
   void
-  onData(const ndn::Interest& interest, ndn::Data& data,
+  onData(const ndn::Interest& interest, const ndn::Data& data,
          const ndn::OnDataValidated& onValidated,
          const ndn::OnDataValidationFailed& onValidationFailed);
 

src/hello-protocol.cpp

diff --git a/src/hello-protocol.cpp b/src/hello-protocol.cpp
index 5e29223..b10afb0 100644
--- a/src/hello-protocol.cpp
+++ b/src/hello-protocol.cpp
@@ -45,6 +45,8 @@
                                        std::bind(&HelloProtocol::onContent,
                                                  this,
                                                  _1, _2),
+                                       std::bind(&HelloProtocol::processInterestTimedOut, // Nack
+                                                 this, _1),
                                        std::bind(&HelloProtocol::processInterestTimedOut,
                                                  this, _1));
 }

src/validator.hpp

diff --git a/src/validator.hpp b/src/validator.hpp
index 04b2ea5..4387ea5 100644
--- a/src/validator.hpp
+++ b/src/validator.hpp
@@ -107,10 +107,14 @@
         // Attempt to fetch the certificate
         m_face->expressInterest(interest,
                                 std::bind(&Validator::onData, this, _1, _2, request),
+                                std::bind(&Validator::onTimeout, // Nack
+                                          this, _1, request->m_nRetries,
+                                          onFailure,
+                                          request),
                                 std::bind(&Validator::onTimeout,
-                                     this, _1, request->m_nRetries,
-                                     onFailure,
-                                     request));
+                                          this, _1, request->m_nRetries,
+                                          onFailure,
+                                          request));
       }
     }
   }

tools/nlsrc.cpp

diff --git a/tools/nlsrc.cpp b/tools/nlsrc.cpp
index 0b07f3c..1edb5f7 100644
--- a/tools/nlsrc.cpp
+++ b/tools/nlsrc.cpp
@@ -157,6 +157,7 @@
 
   m_face.expressInterest(interest,
                          std::bind(&Nlsrc::onControlResponse, this, info, _2),
+                         std::bind(&Nlsrc::onTimeout, this, ERROR_CODE_TIMEOUT, "Nack"),
                          std::bind(&Nlsrc::onTimeout, this, ERROR_CODE_TIMEOUT, "Timeout"));
 }