Repair two critical bug with Interest/NACK processing
- There was wrong selection of FIB face order in CcnxForwardingStrategy
- Stop reacting on NACK if there are no incoming faces (i.e., loop
detected after interest is already satisfied)
diff --git a/examples/ccnx-grid.cc b/examples/ccnx-grid.cc
index 9891a91..1ef2cfb 100644
--- a/examples/ccnx-grid.cc
+++ b/examples/ccnx-grid.cc
@@ -71,10 +71,13 @@
Packet::EnablePrinting();
std::string animationFile = "";
+ std::string strategy = "ns3::CcnxFloodingStrategy";
+
CommandLine cmd;
cmd.AddValue ("nGrid", "Number of grid nodes", nGrid);
cmd.AddValue ("finish", "Finish time", finishTime);
cmd.AddValue ("netanim", "NetAnim filename", animationFile);
+ cmd.AddValue ("strategy", "CCNx forwarding strategy", strategy);
cmd.Parse (argc, argv);
PointToPointHelper p2p;
@@ -89,8 +92,7 @@
// Install CCNx stack
NS_LOG_INFO ("Installing CCNx stack");
CcnxStackHelper ccnxHelper;
- //ccnxHelper.SetForwardingStrategy ("ns3::CcnxBestRouteStrategy");
- ccnxHelper.SetForwardingStrategy ("ns3::CcnxFloodingStrategy");
+ ccnxHelper.SetForwardingStrategy (strategy);
ccnxHelper.EnableLimits (true, Seconds(0.1));
ccnxHelper.InstallAll ();