commit 4c7caadb72ea8ce5ff21ccf079c7b71c298e6feb
author Muktadir R Chowdhury <mrchwdhr@memphis.edu> Thu Sep 03 15:49:22 2015 -0500
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Fri Dec 04 13:25:43 2015 -0800
tree e8e9a089eaf653a72332eff5c1d1bb3ff9cfa5e0
parent f9f3910dd25b9cd6e1fe6676a0e4d79bb9400cdf

nlsrc: adapt to ndn-cxx SegmentFetcher API change

Refs: #2734
Change-Id: I76f1f1a6b95d2df18a8deef545be5027ad6bbc7c

.jenkins.d/10-ndn-cxx.sh

diff --git a/.jenkins.d/10-ndn-cxx.sh b/.jenkins.d/10-ndn-cxx.sh
index 1e0fdd7..d22bfb6 100755
--- a/.jenkins.d/10-ndn-cxx.sh
+++ b/.jenkins.d/10-ndn-cxx.sh
@@ -7,19 +7,26 @@
 
 pushd /tmp >/dev/null
 
-NDN_CXX_FOLDER=ndn-cxx-0.4.0-beta2-11-ge3e2505
+INSTALLED_VERSION=$((cd ndn-cxx && git rev-parse HEAD) 2>/dev/null || echo NONE)
 
-sudo rm -Rf "$NDN_CXX_FOLDER"
+sudo rm -Rf ndn-cxx-latest
+
+git clone --depth 1 git://github.com/named-data/ndn-cxx ndn-cxx-latest
+
+LATEST_VERSION=$((cd ndn-cxx-latest && git rev-parse HEAD) 2>/dev/null || echo UNKNOWN)
+
+if [[ $INSTALLED_VERSION != $LATEST_VERSION ]]; then
+    sudo rm -Rf ndn-cxx
+    mv ndn-cxx-latest ndn-cxx
+else
+    sudo rm -Rf ndn-cxx-latest
+fi
 
 sudo rm -Rf /usr/local/include/ndn-cxx
 sudo rm -f /usr/local/lib/libndn-cxx*
 sudo rm -f /usr/local/lib/pkgconfig/libndn-cxx*
 
-mkdir "$NDN_CXX_FOLDER"
-pushd "$NDN_CXX_FOLDER" > /dev/null
-
-git init
-git fetch https://github.com/named-data/ndn-cxx master && git checkout e3e2505aa03e0b298e1a8dfc9876f1f8dafcaaba
+pushd ndn-cxx >/dev/null
 
 ./waf configure -j1 --color=yes --enable-shared --disable-static --without-osx-keychain
 ./waf -j1 --color=yes

tools/nlsrc.cpp

diff --git a/tools/nlsrc.cpp b/tools/nlsrc.cpp
index 3d43a62..d50d6bd 100644
--- a/tools/nlsrc.cpp
+++ b/tools/nlsrc.cpp
@@ -221,7 +221,7 @@
 
   ndn::util::SegmentFetcher::fetch(m_face,
                                    interest,
-                                   ndn::util::DontVerifySegment(),
+                                   m_validator,
                                    std::bind(&Nlsrc::onFetchSuccess<T>,
                                              this, _1, recordLsa),
                                    std::bind(&Nlsrc::onTimeout, this, _1, _2));

tools/nlsrc.hpp

diff --git a/tools/nlsrc.hpp b/tools/nlsrc.hpp
index b62cca0..b2e4bf0 100644
--- a/tools/nlsrc.hpp
+++ b/tools/nlsrc.hpp
@@ -26,6 +26,7 @@
 #include <boost/noncopyable.hpp>
 #include <ndn-cxx/face.hpp>
 #include <ndn-cxx/security/key-chain.hpp>
+#include <ndn-cxx/security/validator-null.hpp>
 
 #include <deque>
 #include <map>
@@ -146,6 +147,7 @@
 private:
   ndn::KeyChain m_keyChain;
   ndn::Face& m_face;
+  ndn::ValidatorNull m_validator;
 
   std::deque<std::function<void()>> m_fetchSteps;