commit 2864b9df7d5cb025b6c7c9b522859cec70d1a55e
author Teng Liang <philoliang2011@gmail.com> Thu Mar 17 11:17:38 2016 -0700
committer Teng Liang <philoliang2011@gmail.com> Fri Mar 25 10:08:46 2016 -0700
tree 4b698f8d4ade976d94ac52c970a035a8a6f5102d
parent 799390a4e4470bc38ddcc93f1e37e6aa1d150437

ndnpeek: switch to Face::expressInterest that handles nack

Change-Id: Ic290f8817c9a3b2a9d098fa0c1bc5c38fc2367cd
refs: #3263

tools/peek/ndn-peek.cpp

diff --git a/tools/peek/ndn-peek.cpp b/tools/peek/ndn-peek.cpp
index 5c9df4d..f1d1d6f 100644
--- a/tools/peek/ndn-peek.cpp
+++ b/tools/peek/ndn-peek.cpp
@@ -72,6 +72,7 @@
     , m_timeout(-1)
     , m_prefixName("")
     , m_didReceiveData(false)
+    , m_didReceiveNack(false)
   {
   }
 
@@ -174,7 +175,7 @@
   }
 
   void
-  onData(const Interest& interest, Data& data)
+  onData(const Interest& interest, const Data& data)
   {
     m_didReceiveData = true;
 
@@ -195,6 +196,27 @@
   }
 
   void
+  onNack(const Interest& interest, const lp::Nack& nack)
+  {
+    m_didReceiveNack = true;
+    lp::NackHeader header = nack.getHeader();
+
+    if (isVerbose) {
+      std::cerr << "NACK, RTT: "
+                << time::duration_cast<time::milliseconds>(time::steady_clock::now() - m_expressInterestTime).count()
+                << "ms" << std::endl;
+    }
+
+    if (wantPayloadOnly) {
+      std::cout << header.getReason() << std::endl;
+    }
+    else {
+      const Block& block = header.wireEncode();
+      std::cout.write(reinterpret_cast<const char*>(block.wire()), block.size());
+    }
+  }
+
+  void
   onTimeout(const Interest& interest)
   {
   }
@@ -205,6 +227,7 @@
     try {
       m_face.expressInterest(createInterestPacket(),
                              bind(&NdnPeek::onData, this, _1, _2),
+                             bind(&NdnPeek::onNack, this, _1, _2),
                              bind(&NdnPeek::onTimeout, this, _1));
       m_expressInterestTime = time::steady_clock::now();
       if (m_timeout < time::milliseconds::zero()) {
@@ -218,11 +241,17 @@
       return 1;
     }
 
+    if (m_didReceiveNack)
+      return 4;
+
     if (isVerbose && !m_didReceiveData) {
       std::cerr << "TIMEOUT" << std::endl;
       return 3;
     }
 
+    if (!m_didReceiveData)
+      return 3;
+
     return 0;
   }
 
@@ -242,6 +271,7 @@
   time::steady_clock::TimePoint m_expressInterestTime;
   shared_ptr<Link> m_link;
   bool m_didReceiveData;
+  bool m_didReceiveNack;
   Face m_face;
 };