commit 117f5ef083e6984d111ad8627272c4e25b99b300
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Wed Jun 03 15:07:24 2015 -0700
committer Alex Afanasyev <alexander.afanasyev@ucla.edu> Wed Jun 10 18:50:38 2015 -0700
tree 1abe4710abe78503ad5e8e72763d280c079f9b89
parent aa8fd16f0a36596757e2b951d1ad0dd07faccc78

encoding: Remove SCOPE from Interests and all references to it in the related code

Change-Id: I2b19d0bb7ea5fdcea0da3996b946bb7797a9ea2d
Refs: #2345

tools/ndncatchunks3.cpp

diff --git a/tools/ndncatchunks3.cpp b/tools/ndncatchunks3.cpp
index d84758a..25c466b 100644
--- a/tools/ndncatchunks3.cpp
+++ b/tools/ndncatchunks3.cpp
@@ -30,14 +30,13 @@
 public:
   Consumer(const std::string& dataName,
            size_t pipeSize, size_t nTotalSegments,
-           int scope = -1, bool mustBeFresh = true)
+           bool mustBeFresh = true)
     : m_dataName(dataName)
     , m_pipeSize(pipeSize)
     , m_nTotalSegments(nTotalSegments)
     , m_nextSegment(0)
     , m_totalSize(0)
     , m_isOutputEnabled(false)
-    , m_scope(scope)
     , m_mustBeFresh(mustBeFresh)
   {
   }
@@ -66,7 +65,6 @@
   size_t m_totalSize;
   bool m_isOutputEnabled;  // set to false by default
 
-  int m_scope;
   bool m_mustBeFresh;
 };
 
@@ -79,8 +77,6 @@
         {
           Interest interest(Name(m_dataName).appendSegment(m_nextSegment++));
           interest.setInterestLifetime(time::milliseconds(4000));
-          if (m_scope >= 0)
-            interest.setScope(m_scope);
           interest.setMustBeFresh(m_mustBeFresh);
 
           m_face.expressInterest(interest,
@@ -119,8 +115,6 @@
     {
       // Send interest for next segment
       Interest interest(Name(m_dataName).appendSegment(m_nextSegment++));
-      if (m_scope >= 0)
-        interest.setScope(m_scope);
       interest.setInterestLifetime(time::milliseconds(4000));
       interest.setMustBeFresh(m_mustBeFresh);