commit c3c7f041280d38ebe6c4de0d38b1b059c6d430e3
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Fri Aug 21 11:38:00 2015 -0700
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Tue Sep 01 17:00:01 2015 -0700
tree c8b90bd7e0277f90011d2c2535c1626031a9ea31
parent f542c0bd530a60bd00a653ab25fcb13dfd48b161

NFD+model+apps+helper+tests: Upgrade NFD and related changes

Based on NFD:commit:2fc649bfc67b93b4191cfbee5bcd70330bfb48f0 (version 0.3.4)

Change-Id: I89f5182600467171797af4f8f83e1edffe14ad95
Refs: #3125

examples/ndn-different-strategy-per-prefix.cpp

diff --git a/examples/ndn-different-strategy-per-prefix.cpp b/examples/ndn-different-strategy-per-prefix.cpp
index 54789e6..40f30be 100644
--- a/examples/ndn-different-strategy-per-prefix.cpp
+++ b/examples/ndn-different-strategy-per-prefix.cpp
@@ -94,7 +94,7 @@
   std::string prefix2 = "/prefix2";
 
   // Install different forwarding strategies for prefix1, prefix2
-  StrategyChoiceHelper::InstallAll(prefix1, "/localhost/nfd/strategy/broadcast");
+  StrategyChoiceHelper::InstallAll(prefix1, "/localhost/nfd/strategy/multicast");
   StrategyChoiceHelper::InstallAll(prefix2, "/localhost/nfd/strategy/best-route");
 
   // Install NDN applications

examples/ndn-grid-multiple-strategies.cpp

diff --git a/examples/ndn-grid-multiple-strategies.cpp b/examples/ndn-grid-multiple-strategies.cpp
index 06f3a1c..3f14548 100644
--- a/examples/ndn-grid-multiple-strategies.cpp
+++ b/examples/ndn-grid-multiple-strategies.cpp
@@ -35,7 +35,7 @@
  * This scenario simulates a grid topology (using PointToPointGrid module)
  *
  * The first six nodes use the best route forwarding strategy, whereas
- * the three remaining nodes use the broadcast forwarding strategy.
+ * the three remaining nodes use the multicast forwarding strategy.
  *
  * (consumer) -- ( ) ----- ( )
  *     |          |         |
@@ -99,7 +99,7 @@
                                       "/localhost/nfd/strategy/best-route");
       else
         StrategyChoiceHelper::Install(grid.GetNode(row, column), "/prefix",
-                                      "/localhost/nfd/strategy/broadcast");
+                                      "/localhost/nfd/strategy/multicast");
     }
   }
 

examples/ndn-simple.cpp

diff --git a/examples/ndn-simple.cpp b/examples/ndn-simple.cpp
index 88c0c55..52e6928 100644
--- a/examples/ndn-simple.cpp
+++ b/examples/ndn-simple.cpp
@@ -73,7 +73,7 @@
   ndnHelper.InstallAll();
 
   // Choosing forwarding strategy
-  ndn::StrategyChoiceHelper::InstallAll("/prefix", "/localhost/nfd/strategy/broadcast");
+  ndn::StrategyChoiceHelper::InstallAll("/prefix", "/localhost/nfd/strategy/multicast");
 
   // Installing applications
 

examples/ndn-simple.py

diff --git a/examples/ndn-simple.py b/examples/ndn-simple.py
index 295c1af..f8bf1ca 100644
--- a/examples/ndn-simple.py
+++ b/examples/ndn-simple.py
@@ -67,7 +67,7 @@
 ndnHelper.InstallAll()
 
 # Choosing forwarding strategy
-ndn.StrategyChoiceHelper.InstallAll("/prefix", "/localhost/nfd/strategy/broadcast")
+ndn.StrategyChoiceHelper.InstallAll("/prefix", "/localhost/nfd/strategy/multicast")
 
 # Installing applications