SunnyQjm/ndn-traffic-generator
1
0 Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove usage of removed Interest.Scope field

Browse Source 
Change-Id: I0754b42284f4be3b7ab48116b1f925018ffc9f76
Refs: #2345
This commit is contained in:
Alexander Afanasyev committed 2015-06-07 14:58:51 -07:00
1 parent d0b59982c4
commit 4afb7cf1d3
2 files changed
-9
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

ndn-traffic-client.conf.sample
-1
View File
@@ -33,7 +33,6 @@
#ChildSelector=NNI [0-1]
#MustBeFresh=NNI [0-1]
#NonceDuplicationPercentage=NNI [0-100]
#Scope=NNI
#InterestLifetime=NNI [Milliseconds]
#ExpectedContent=String
#
src/ndn-traffic-client.cpp
-8
View File
@@ -74,7 +74,6 @@ public:
, m_childSelector(-1)
, m_mustBeFresh(-1)
, m_nonceDuplicationPercentage(-1)
, m_scope(-1)
, m_interestLifetime(getDefaultInterestLifetime())
, m_nInterestsSent(0)
, m_nInterestsReceived(0)
@@ -123,8 +122,6 @@ public:
if (m_nonceDuplicationPercentage > 0)
detail += "NonceDuplicationPercentage=" +
std::to_string(m_nonceDuplicationPercentage) + ", ";
if (m_scope >= 0)
detail += "Scope=" + std::to_string(m_scope) + ", ";
if (m_interestLifetime >= time::milliseconds(0))
detail += "InterestLifetime=" + std::to_string(m_interestLifetime.count()) + ", ";
if (!m_expectedContent.empty())
@@ -196,8 +193,6 @@ public:
m_mustBeFresh = std::stoi(value);
else if (parameter == "NonceDuplicationPercentage")
m_nonceDuplicationPercentage = std::stoi(value);
else if (parameter == "Scope")
m_scope = std::stoi(value);
else if (parameter == "InterestLifetime")
m_interestLifetime = time::milliseconds(std::stoi(value));
else if (parameter == "ExpectedContent")
@@ -235,7 +230,6 @@ public:
int m_childSelector;
int m_mustBeFresh;
int m_nonceDuplicationPercentage;
int m_scope;
time::milliseconds m_interestLifetime;
int m_nInterestsSent;
int m_nInterestsReceived;
@@ -698,8 +692,6 @@ public:
}
else
interest.setNonce(getNewNonce());
if (m_trafficPatterns[patternId].m_scope >= 0)
interest.setScope(m_trafficPatterns[patternId].m_scope);
if (m_trafficPatterns[patternId].m_interestLifetime >= time::milliseconds(0))
interest.setInterestLifetime(m_trafficPatterns[patternId].m_interestLifetime);