commit c1ebbe98b1e2393f5162743c24080731584aeb2d
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Thu Jan 16 22:24:34 2014 -0800
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Fri Jan 17 14:48:08 2014 -0800
tree 33c928f13a1535fa3debfbf9cff0f74a63361ae5
parent a1a0c24543f2c39014bb9c222b2b670459447282

tools: Disabling hardcoded Scope(1) for ndncatchunks tool

Change-Id: I44e38cae5eebbada90ab6f1115a9a18bccd0d711

tools/ndncatchunks.cpp

diff --git a/tools/ndncatchunks.cpp b/tools/ndncatchunks.cpp
index 6bfb07a..10bcbe2 100644
--- a/tools/ndncatchunks.cpp
+++ b/tools/ndncatchunks.cpp
@@ -31,9 +31,11 @@
 class Consumer
 {
 public:
-  Consumer (const std::string &data_name, int pipe_size, int total_seg)
+  Consumer (const std::string &data_name, int pipe_size, int total_seg, int scope = -1, bool mustBeFresh = false)
     : m_data_name (data_name), m_pipe_size (pipe_size), m_total_seg (total_seg),
       m_next_seg (0), m_total_size (0), m_output (false)
+	  , m_scope(scope)
+      , m_mustBeFresh(mustBeFresh)
   {
   }
 
@@ -61,6 +63,9 @@
   int m_next_seg;
   int m_total_size;
   bool m_output;  // set to false by default
+
+  int m_scope;
+  bool m_mustBeFresh;
 };
 
 void
@@ -71,9 +76,10 @@
       for (int i = 0; i < m_pipe_size; i++)
 	{
 	  ndn::Interest inst (ndn::Name(m_data_name).appendSegment (m_next_seg++));
-	  inst.setScope (1);
-	  inst.setInterestLifetime (1000);
-	  inst.setMustBeFresh (true);
+	  inst.setInterestLifetime (4000);
+	  if (m_scope >= 0)
+		  inst.setScope (m_scope);
+	  inst.setMustBeFresh (m_mustBeFresh);
 	  
 	  m_face.expressInterest (inst,
 				  ndn::func_lib::bind (&Consumer::on_data, this, _1, _2),
@@ -111,9 +117,10 @@
     {
       // Send interest for next segment
       ndn::Interest inst (ndn::Name(m_data_name).appendSegment (m_next_seg++));
-      inst.setScope (1);
-      inst.setInterestLifetime (1000);
-      inst.setMustBeFresh (true);
+	  if (m_scope >= 0)
+	      inst.setScope (m_scope);
+      inst.setInterestLifetime (4000);
+      inst.setMustBeFresh (m_mustBeFresh);
       
       m_face.expressInterest (inst,
 			      ndn::func_lib::bind (&Consumer::on_data, this, _1, _2),