commit c91fc337dd4c965a2c8f0d402cd1d8c8a4af10c2
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Fri Feb 10 17:44:41 2017 -0800
committer Yukai Tu <ytu@cs.ucla.edu> Thu Mar 16 16:52:04 2017 -0700
tree e46e602611cb52e62ccf3f4ed62b5f7fd0a0e4dd
parent 729b289338e57c24f624075d616083e2e7740578

object-manager+fetcher: Use segmentNumber for file segments

Change-Id: Ib78ee034dba2a1ea9d140b091181694049655bb9

src/fetcher.cpp

diff --git a/src/fetcher.cpp b/src/fetcher.cpp
index 56899de..5a11074 100644
--- a/src/fetcher.cpp
+++ b/src/fetcher.cpp
@@ -31,6 +31,7 @@
 _LOG_INIT(Fetcher);
 
 Fetcher::Fetcher(Face& face,
+                 bool isSegment,
                  const SegmentCallback& segmentCallback,
                  const FinishCallback& finishCallback,
                  const OnFetchCompleteCallback& onFetchComplete,
@@ -67,6 +68,7 @@
   , m_nextScheduledRetry(time::steady_clock::now())
 
   , m_ioService(m_face.getIoService())
+  , m_isSegment(isSegment)
 {
 }
 
@@ -110,15 +112,21 @@
 
     // cout << ">>> " << m_minSendSeqNo+1 << endl;
 
-    Interest interest(
-      Name(m_forwardingHint).append(m_name).appendNumber(m_minSendSeqNo + 1)); // Alex: this lifetime should be changed to RTO
-    _LOG_DEBUG("interest Name: " << interest);
-    interest.setInterestLifetime(time::seconds(1));
+    Name name = Name(m_forwardingHint).append(m_name);
+    if (m_isSegment) {
+       name.appendSegment(m_minSendSeqNo + 1);
+    }
+    else {
+       name.appendNumber(m_minSendSeqNo + 1);
+    }
+    Interest interest(name);
+    interest.setInterestLifetime(time::seconds(1));  // Alex: this lifetime should be changed to RTO
+    _LOG_DEBUG("interest: " << interest);
     m_face.expressInterest(interest,
                            bind(&Fetcher::OnData, this, m_minSendSeqNo + 1, _1, _2),
                            bind(&Fetcher::OnTimeout, this, m_minSendSeqNo + 1, _1));
 
-    _LOG_DEBUG(" >>> i ok");
+    _LOG_TRACE(" >>> i ok");
 
     m_activePipeline++;
   }