commit 2bc2df0fb34c1f313487312417308a3f3a49e607
author Muktadir R Chowdhury <mrchwdhr@memphis.edu> Tue Apr 05 16:55:41 2016 -0500
committer Muktadir R Chowdhury <mrchwdhr@memphis.edu> Tue Jun 07 16:17:33 2016 -0500
tree 0c02852c966635cb7db2eaa494595986997ef17f
parent 4f512fb24e8105e2b394ae7528f6236905b50ab4

util: SegmentFetcher don't restart from segment 0 upon Nack

Change-Id: I167186961a82a4349fab5b4431c26a3fdb904bb8
refs: #3554

src/util/segment-fetcher.cpp

diff --git a/src/util/segment-fetcher.cpp b/src/util/segment-fetcher.cpp
index a9c0418..70ad632 100644
--- a/src/util/segment-fetcher.cpp
+++ b/src/util/segment-fetcher.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /**
- * Copyright (c) 2013-2015 Regents of the University of California.
+ * Copyright (c) 2013-2016 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -178,9 +178,17 @@
   interest.refreshNonce();
   BOOST_ASSERT(interest.hasNonce());
 
+  bool isSegmentZeroExpected = true;
+  if (!interest.getName().empty()) {
+    name::Component lastComponent = interest.getName().get(-1);
+    isSegmentZeroExpected = !lastComponent.isSegment();
+  }
+
   m_face.expressInterest(interest,
-                         bind(&SegmentFetcher::afterSegmentReceived, this, _1, _2, true, self),
-                         bind(&SegmentFetcher::afterNackReceived, this, _1, _2, ++reExpressCount, self),
+                         bind(&SegmentFetcher::afterSegmentReceived, this, _1, _2,
+                              isSegmentZeroExpected, self),
+                         bind(&SegmentFetcher::afterNackReceived, this, _1, _2,
+                              ++reExpressCount, self),
                          bind(m_errorCallback, INTEREST_TIMEOUT, "Timeout"));
 }