Upgrade to NFD 22.02 and ndn-cxx 0.8.0 and fixes for NS-3.35

cawka · cawka · commit f007a99d99d3 · 2022-05-05T15:57:08.000-04:00
Change-Id: Ia26204f1ecddc93729e5565d5dbbb2a3d1d9637e
diff --git a/.waf-tools/version.py b/.waf-tools/version.py
@@ -23,7 +23,7 @@ def getVersion(conf, submodule, **kw):
         p = Utils.subprocess.Popen(cmd, stdout=Utils.subprocess.PIPE,
                                    cwd=submodule.abspath(),
                                    stderr=None, stdin=None)
-        out = str(p.communicate()[0].strip())
+        out = p.communicate()[0].strip().decode('utf-8')
         didGetVersion = (p.returncode == 0 and out != "")
         if didGetVersion:
             if out.startswith(tagPrefix):
@@ -33,7 +33,7 @@ def getVersion(conf, submodule, **kw):
     except OSError:
         pass
 
-    versionFile = submodule.find_node('VERSION')
+    versionFile = submodule.find_node('VERSION.info')
 
     if not didGetVersion and versionFile is not None:
         try:
@@ -49,7 +49,7 @@ def getVersion(conf, submodule, **kw):
         except (OSError, IOError):
             Logs.warn("VERSION file exists, but not readable")
     else:
-        versionFile = submodule.make_node('VERSION')
+        versionFile = submodule.make_node('VERSION.info')
 
     if versionFile:
         try:
diff --git a/NFD b/NFD
@@ -1 +1 @@
-Subproject commit d1d38c8558ce6ce71d9ba81ca6cf5dcfd0342820
+Subproject commit 361b381b9b552ff3341aa160858bea1d470d2122
diff --git a/apps/ndn-producer.cpp b/apps/ndn-producer.cpp
@@ -110,17 +110,18 @@ Producer::OnInterest(shared_ptr<const Interest> interest)
 
   data->setContent(make_shared< ::ndn::Buffer>(m_virtualPayloadSize));
 
-  Signature signature;
   SignatureInfo signatureInfo(static_cast< ::ndn::tlv::SignatureTypeValue>(255));
 
   if (m_keyLocator.size() > 0) {
     signatureInfo.setKeyLocator(m_keyLocator);
   }
 
-  signature.setInfo(signatureInfo);
-  signature.setValue(::ndn::makeNonNegativeIntegerBlock(::ndn::tlv::SignatureValue, m_signature));
+  data->setSignatureInfo(signatureInfo);
 
-  data->setSignature(signature);
+  ::ndn::EncodingEstimator estimator;
+  ::ndn::EncodingBuffer encoder(estimator.appendVarNumber(m_signature), 0);
+  encoder.appendVarNumber(m_signature);
+  data->setSignatureValue(encoder.getBuffer());
 
   NS_LOG_INFO("node(" << GetNode()->GetId() << ") responding with Data: " << data->getName());
 
diff --git a/examples/lfid.cpp b/examples/lfid.cpp
@@ -30,7 +30,7 @@
 #include "ns3/ndnSIM/model/ndn-l3-protocol.hpp"
 #include "ns3/ndnSIM/model/ndn-net-device-transport.hpp"
 //#include "ns3/ndnSIM/NFD/daemon/fw/random-strategy.hpp"
-#include "ns3/ndnSIM/NFD/daemon/fw/best-route-strategy2.hpp"
+#include "ns3/ndnSIM/NFD/daemon/fw/best-route-strategy.hpp"
 #include "ns3/ndnSIM/utils/topology/annotated-topology-reader.hpp"
 
 namespace ns3 {
@@ -120,7 +120,7 @@ main(int argc, char* argv[])
 
   // IMPORTANT: Some strategy needs to be installed for displayRoutes() to work.
   ndn::StrategyChoiceHelper strategyHelper;
-  strategyHelper.InstallAll<nfd::fw::BestRouteStrategy2>("/");
+  strategyHelper.InstallAll<nfd::fw::BestRouteStrategy>("/");
 
   // TODO: Needs RandomStrategy for test to work!
   // Uncomment after NFD version has been updated.
diff --git a/examples/ndn-csma.cpp b/examples/ndn-csma.cpp
@@ -55,7 +55,7 @@ main(int argc, char* argv[])
   // setting default parameters for PointToPoint links and channels
   Config::SetDefault("ns3::CsmaChannel::DataRate", StringValue("1Mbps"));
   Config::SetDefault("ns3::CsmaChannel::Delay", StringValue("10ms"));
-  Config::SetDefault("ns3::QueueBase::MaxSize", StringValue("20p"));
+  Config::SetDefault("ns3::DropTailQueue<Packet>::MaxSize", StringValue("20p"));
 
   // Read optional command-line parameters (e.g., enable visualizer with ./waf --run=<> --visualize
   CommandLine cmd;
diff --git a/examples/ndn-different-strategy-per-prefix.cpp b/examples/ndn-different-strategy-per-prefix.cpp
@@ -64,7 +64,7 @@ main(int argc, char* argv[])
   // Setting default parameters for PointToPoint links and channels
   Config::SetDefault("ns3::PointToPointNetDevice::DataRate", StringValue("1Mbps"));
   Config::SetDefault("ns3::PointToPointChannel::Delay", StringValue("10ms"));
-  Config::SetDefault("ns3::QueueBase::MaxSize", StringValue("10p"));
+  Config::SetDefault("ns3::DropTailQueue<Packet>::MaxSize", StringValue("10p"));
 
   // Read optional command-line parameters
   CommandLine cmd;
diff --git a/examples/ndn-grid-multiple-strategies.cpp b/examples/ndn-grid-multiple-strategies.cpp
@@ -64,7 +64,7 @@ main(int argc, char* argv[])
   // Setting default parameters for PointToPoint links and channels
   Config::SetDefault("ns3::PointToPointNetDevice::DataRate", StringValue("1Mbps"));
   Config::SetDefault("ns3::PointToPointChannel::Delay", StringValue("10ms"));
-  Config::SetDefault("ns3::QueueBase::MaxSize", StringValue("10p"));
+  Config::SetDefault("ns3::DropTailQueue<Packet>::MaxSize", StringValue("10p"));
 
   // Read optional command-line parameters (e.g., enable visualizer with ./waf --run=<> --visualize
   CommandLine cmd;
diff --git a/examples/ndn-grid.cpp b/examples/ndn-grid.cpp
@@ -57,7 +57,7 @@ main(int argc, char* argv[])
   // Setting default parameters for PointToPoint links and channels
   Config::SetDefault("ns3::PointToPointNetDevice::DataRate", StringValue("1Mbps"));
   Config::SetDefault("ns3::PointToPointChannel::Delay", StringValue("10ms"));
-  Config::SetDefault("ns3::QueueBase::MaxSize", StringValue("10p"));
+  Config::SetDefault("ns3::DropTailQueue<Packet>::MaxSize", StringValue("10p"));
 
   // Read optional command-line parameters (e.g., enable visualizer with ./waf --run=<> --visualize
   CommandLine cmd;
diff --git a/examples/ndn-grid.py b/examples/ndn-grid.py
@@ -51,7 +51,7 @@
 
 Config.SetDefault("ns3::PointToPointNetDevice::DataRate", StringValue("10Mbps"))
 Config.SetDefault("ns3::PointToPointChannel::Delay", StringValue("10ms"))
-Config::SetDefault("ns3::QueueBase::MaxSize", StringValue("20p"))
+Config::SetDefault("ns3::DropTailQueue<Packet>::MaxSize", StringValue("20p"))
 
 import sys; cmd = CommandLine(); cmd.Parse(sys.argv);
 
diff --git a/examples/ndn-load-balancer/random-load-balancer-strategy.cpp b/examples/ndn-load-balancer/random-load-balancer-strategy.cpp
@@ -49,8 +49,7 @@ RandomLoadBalancerStrategy::~RandomLoadBalancerStrategy()
 static bool
 canForwardToNextHop(const Face& inFace, shared_ptr<pit::Entry> pitEntry, const fib::NextHop& nexthop)
 {
-  return !wouldViolateScope(inFace, pitEntry->getInterest(), nexthop.getFace()) &&
-    canForwardToLegacy(*pitEntry, nexthop.getFace());
+  return !wouldViolateScope(inFace, pitEntry->getInterest(), nexthop.getFace());
 }
 
 static bool
@@ -61,7 +60,7 @@ hasFaceForForwarding(const Face& inFace, const fib::NextHopList& nexthops, const
 }
 
 void
-RandomLoadBalancerStrategy::afterReceiveInterest(const FaceEndpoint& ingress, const Interest& interest,
+RandomLoadBalancerStrategy::afterReceiveInterest(const Interest& interest, const FaceEndpoint& ingress,
                                                  const shared_ptr<pit::Entry>& pitEntry)
 {
   NFD_LOG_TRACE("afterReceiveInterest");
@@ -92,7 +91,7 @@ RandomLoadBalancerStrategy::afterReceiveInterest(const FaceEndpoint& ingress, co
     }
   } while (!canForwardToNextHop(ingress.face, pitEntry, *selected));
 
-  this->sendInterest(pitEntry, FaceEndpoint(selected->getFace(), 0), interest);
+  this->sendInterest(interest, selected->getFace(), pitEntry);
 }
 
 const Name&
diff --git a/examples/ndn-load-balancer/random-load-balancer-strategy.hpp b/examples/ndn-load-balancer/random-load-balancer-strategy.hpp
@@ -42,7 +42,7 @@ class RandomLoadBalancerStrategy : public Strategy {
   ~RandomLoadBalancerStrategy() override;
 
   void
-  afterReceiveInterest(const FaceEndpoint& ingress, const Interest& interest,
+  afterReceiveInterest(const Interest& interest, const FaceEndpoint& ingress,
                        const shared_ptr<pit::Entry>& pitEntry) override;
 
   static const Name&
diff --git a/examples/ndn-simple-for-nrt-helper.cpp b/examples/ndn-simple-for-nrt-helper.cpp
@@ -61,7 +61,7 @@ main(int argc, char* argv[])
   // setting default parameters for PointToPoint links and channels
   Config::SetDefault("ns3::PointToPointNetDevice::DataRate", StringValue("1Mbps"));
   Config::SetDefault("ns3::PointToPointChannel::Delay", StringValue("10ms"));
-  Config::SetDefault("ns3::QueueBase::MaxSize", StringValue("20p"));
+  Config::SetDefault("ns3::DropTailQueue<Packet>::MaxSize", StringValue("20p"));
 
   // Read optional command-line parameters (e.g., enable visualizer with ./waf --run=<> --visualize
   CommandLine cmd;
diff --git a/examples/ndn-simple-for-nrt-helper/requester-app.cpp b/examples/ndn-simple-for-nrt-helper/requester-app.cpp
@@ -72,7 +72,7 @@ class RequesterApp : public App
     m_delegation = delegation;
 
     m_link = ::ndn::Link(Name(m_name).append("/LINK"));
-    m_link.addDelegation(1, m_delegation);
+    m_link.addDelegation(m_delegation);
     ndn::StackHelper::getKeyChain().sign(m_link, ::ndn::security::SigningInfo(::ndn::security::SigningInfo::SIGNER_TYPE_SHA256));
 
     NS_LOG_DEBUG("Created Link Object "<< m_link);
@@ -90,7 +90,7 @@ class RequesterApp : public App
     auto interest = make_shared<Interest>(m_name);
     interest->setInterestLifetime(time::seconds(1));
     if (m_delegation.size() > 0) {
-      interest->setForwardingHint(m_link.getDelegationList());
+      interest->setForwardingHint({m_link.getDelegationList().begin(), m_link.getDelegationList().end()});
     }
 
     NS_LOG_DEBUG("Sending an Interest for "<< *interest);
diff --git a/examples/ndn-simple-mpi.cpp b/examples/ndn-simple-mpi.cpp
@@ -74,7 +74,7 @@ main(int argc, char* argv[])
   // setting default parameters for PointToPoint links and channels
   Config::SetDefault("ns3::PointToPointNetDevice::DataRate", StringValue("1Gbps"));
   Config::SetDefault("ns3::PointToPointChannel::Delay", StringValue("1ms"));
-  Config::SetDefault("ns3::QueueBase::MaxSize", StringValue("10p"));
+  Config::SetDefault("ns3::DropTailQueue<Packet>::MaxSize", StringValue("10p"));
 
   bool nullmsg = false;
 
diff --git a/examples/ndn-simple-wifi.cpp b/examples/ndn-simple-wifi.cpp
@@ -62,17 +62,16 @@ main(int argc, char* argv[])
   //////////////////////
   WifiHelper wifi;
   // wifi.SetRemoteStationManager ("ns3::AarfWifiManager");
-  wifi.SetStandard(WIFI_PHY_STANDARD_80211a);
+  wifi.SetStandard(WIFI_STANDARD_80211a);
   wifi.SetRemoteStationManager("ns3::ConstantRateWifiManager", "DataMode",
                                StringValue("OfdmRate24Mbps"));
 
-  YansWifiChannelHelper wifiChannel; // = YansWifiChannelHelper::Default ();
+  YansWifiChannelHelper wifiChannel;
   wifiChannel.SetPropagationDelay("ns3::ConstantSpeedPropagationDelayModel");
   wifiChannel.AddPropagationLoss("ns3::ThreeLogDistancePropagationLossModel");
   wifiChannel.AddPropagationLoss("ns3::NakagamiPropagationLossModel");
 
-  // YansWifiPhy wifiPhy = YansWifiPhy::Default();
-  YansWifiPhyHelper wifiPhyHelper = YansWifiPhyHelper::Default();
+  YansWifiPhyHelper wifiPhyHelper;
   wifiPhyHelper.SetChannel(wifiChannel.Create());
   wifiPhyHelper.Set("TxPowerStart", DoubleValue(5));
   wifiPhyHelper.Set("TxPowerEnd", DoubleValue(5));
diff --git a/examples/ndn-simple-with-content-freshness.cpp b/examples/ndn-simple-with-content-freshness.cpp
@@ -48,7 +48,7 @@ main(int argc, char* argv[])
   // setting default parameters for PointToPoint links and channels
   Config::SetDefault("ns3::PointToPointNetDevice::DataRate", StringValue("1Mbps"));
   Config::SetDefault("ns3::PointToPointChannel::Delay", StringValue("10ms"));
-  Config::SetDefault("ns3::QueueBase::MaxSize", StringValue("20p"));
+  Config::SetDefault("ns3::DropTailQueue<Packet>::MaxSize", StringValue("20p"));
 
   // Read optional command-line parameters (e.g., enable visualizer with ./waf --run=<> --visualize
   CommandLine cmd;
diff --git a/examples/ndn-simple-with-link-failure.cpp b/examples/ndn-simple-with-link-failure.cpp
@@ -55,7 +55,7 @@ main(int argc, char* argv[])
   // setting default parameters for PointToPoint links and channels
   Config::SetDefault("ns3::PointToPointNetDevice::DataRate", StringValue("1Mbps"));
   Config::SetDefault("ns3::PointToPointChannel::Delay", StringValue("10ms"));
-  Config::SetDefault("ns3::QueueBase::MaxSize", StringValue("20p"));
+  Config::SetDefault("ns3::DropTailQueue<Packet>::MaxSize", StringValue("20p"));
 
   // Read optional command-line parameters (e.g., enable visualizer with ./waf --run=<> --visualize
   CommandLine cmd;
diff --git a/examples/ndn-simple-with-pcap.cpp b/examples/ndn-simple-with-pcap.cpp
@@ -67,7 +67,7 @@ main(int argc, char* argv[])
   // setting default parameters for PointToPoint links and channels
   Config::SetDefault("ns3::PointToPointNetDevice::DataRate", StringValue("1Mbps"));
   Config::SetDefault("ns3::PointToPointChannel::Delay", StringValue("10ms"));
-  Config::SetDefault("ns3::QueueBase::MaxSize", StringValue("20p"));
+  Config::SetDefault("ns3::DropTailQueue<Packet>::MaxSize", StringValue("20p"));
 
   // Read optional command-line parameters (e.g., enable visualizer with ./waf --run=<> --visualize
   CommandLine cmd;
diff --git a/examples/ndn-simple.cpp b/examples/ndn-simple.cpp
@@ -52,7 +52,7 @@ main(int argc, char* argv[])
   // setting default parameters for PointToPoint links and channels
   Config::SetDefault("ns3::PointToPointNetDevice::DataRate", StringValue("1Mbps"));
   Config::SetDefault("ns3::PointToPointChannel::Delay", StringValue("10ms"));
-  Config::SetDefault("ns3::QueueBase::MaxSize", StringValue("20p"));
+  Config::SetDefault("ns3::DropTailQueue<Packet>::MaxSize", StringValue("20p"));
 
   // Read optional command-line parameters (e.g., enable visualizer with ./waf --run=<> --visualize
   CommandLine cmd;
diff --git a/examples/ndn-simple.py b/examples/ndn-simple.py
@@ -47,7 +47,7 @@
 # Set default parameters for PointToPoint links and channels
 Config.SetDefault("ns3::PointToPointNetDevice::DataRate", StringValue("10Mbps"))
 Config.SetDefault("ns3::PointToPointChannel::Delay", StringValue("10ms"))
-Config.SetDefault("ns3::QueueBase::MaxSize", StringValue("20p"))
+Config.SetDefault("ns3::DropTailQueue<Packet>::MaxSize", StringValue("20p"))
 
 # Read optional command-line parameters (e.g., enable visualizer with ./waf --pyrun=<> --visualize
 import sys; cmd = CommandLine(); cmd.Parse(sys.argv);
diff --git a/examples/ndn-triangle-calculate-routes.cpp b/examples/ndn-triangle-calculate-routes.cpp
@@ -33,7 +33,7 @@ main(int argc, char* argv[])
   // setting default parameters for PointToPoint links and channels
   Config::SetDefault("ns3::PointToPointNetDevice::DataRate", StringValue("1Mbps"));
   Config::SetDefault("ns3::PointToPointChannel::Delay", StringValue("10ms"));
-  Config::SetDefault("ns3::QueueBase::MaxSize", StringValue("20p"));
+  Config::SetDefault("ns3::DropTailQueue<Packet>::MaxSize", StringValue("20p"));
 
   // Read optional command-line parameters (e.g., enable visualizer with ./waf --run=<> --visualize
   CommandLine cmd;
diff --git a/examples/ndn-zipf-mandelbrot.cpp b/examples/ndn-zipf-mandelbrot.cpp
@@ -58,7 +58,7 @@ main(int argc, char* argv[])
   // Setting default parameters for PointToPoint links and channels
   Config::SetDefault("ns3::PointToPointNetDevice::DataRate", StringValue("1Mbps"));
   Config::SetDefault("ns3::PointToPointChannel::Delay", StringValue("1ms"));
-  Config::SetDefault("ns3::QueueBase::MaxSize", StringValue("10p"));
+  Config::SetDefault("ns3::DropTailQueue<Packet>::MaxSize", StringValue("10p"));
 
   // Read optional command-line parameters (e.g., enable visualizer with ./waf --run=<> --visualize
   CommandLine cmd;
diff --git a/model/ndn-app-link-service.cpp b/model/ndn-app-link-service.cpp
@@ -47,7 +47,7 @@ AppLinkService::~AppLinkService()
 }
 
 void
-AppLinkService::doSendInterest(const Interest& interest, const nfd::EndpointId& endpoint)
+AppLinkService::doSendInterest(const Interest& interest)
 {
   NS_LOG_FUNCTION(this << &interest);
 
@@ -56,7 +56,7 @@ AppLinkService::doSendInterest(const Interest& interest, const nfd::EndpointId&
 }
 
 void
-AppLinkService::doSendData(const Data& data, const nfd::EndpointId& endpoint)
+AppLinkService::doSendData(const Data& data)
 {
   NS_LOG_FUNCTION(this << &data);
 
@@ -65,7 +65,7 @@ AppLinkService::doSendData(const Data& data, const nfd::EndpointId& endpoint)
 }
 
 void
-AppLinkService::doSendNack(const lp::Nack& nack, const nfd::EndpointId& endpoint)
+AppLinkService::doSendNack(const lp::Nack& nack)
 {
   NS_LOG_FUNCTION(this << &nack);
 
diff --git a/model/ndn-app-link-service.hpp b/model/ndn-app-link-service.hpp
@@ -60,13 +60,13 @@ class AppLinkService : public nfd::face::LinkService
 
 private:
   virtual void
-  doSendInterest(const Interest& interest, const nfd::EndpointId& endpoint) override;
+  doSendInterest(const Interest& interest) override;
 
   virtual void
-  doSendData(const Data& data, const nfd::EndpointId& endpoint) override;
+  doSendData(const Data& data) override;
 
   virtual void
-  doSendNack(const lp::Nack& nack, const nfd::EndpointId& endpoint) override;
+  doSendNack(const lp::Nack& nack) override;
 
   virtual void
   doReceivePacket(const Block& packet, const nfd::EndpointId& endpoint) override
diff --git a/model/ndn-block-header.cpp b/model/ndn-block-header.cpp
@@ -140,7 +140,7 @@ BlockHeader::Print(std::ostream& os) const
           ::ndn::Buffer::const_iterator first, last;
           std::tie(first, last) = p.get<lp::FragmentField>(0);
           try {
-            Block fragmentBlock(&*first, std::distance(first, last));
+            Block fragmentBlock(::ndn::make_span(&*first, std::distance(first, last)));
             decodeAndPrint(fragmentBlock);
           }
           catch (const tlv::Error& error) {
diff --git a/model/ndn-common.hpp b/model/ndn-common.hpp
@@ -27,7 +27,6 @@
 
 #include <ndn-cxx/interest.hpp>
 #include <ndn-cxx/encoding/block.hpp>
-#include <ndn-cxx/signature.hpp>
 #include <ndn-cxx/signature-info.hpp>
 #include <ndn-cxx/name.hpp>
 #include <ndn-cxx/data.hpp>
@@ -62,7 +61,6 @@ using std::make_shared;
 using ::ndn::Interest;
 using ::ndn::Data;
 using ::ndn::KeyLocator;
-using ::ndn::Signature;
 using ::ndn::SignatureInfo;
 using ::ndn::Block;
 using ::ndn::KeyChain;
diff --git a/model/ndn-net-device-transport.cpp b/model/ndn-net-device-transport.cpp
@@ -106,7 +106,7 @@ NetDeviceTransport::doClose()
 }
 
 void
-NetDeviceTransport::doSend(const Block& packet, const nfd::EndpointId& endpoint)
+NetDeviceTransport::doSend(const Block& packet)
 {
   NS_LOG_FUNCTION(this << "Sending packet from netDevice with URI"
                   << this->getLocalUri());
diff --git a/model/ndn-net-device-transport.hpp b/model/ndn-net-device-transport.hpp
@@ -62,7 +62,7 @@ class NetDeviceTransport : public nfd::face::Transport
   doClose() override;
 
   virtual void
-  doSend(const Block& packet, const nfd::EndpointId& endpoint) override;
+  doSend(const Block& packet) override;
 
   void
   receiveFromNetDevice(Ptr<NetDevice> device,
diff --git a/model/null-transport.hpp b/model/null-transport.hpp
@@ -54,7 +54,7 @@ class NullTransport : public nfd::face::Transport
   }
 
   void
-  doSend(const Block& packet, const nfd::EndpointId& endpoint) final
+  doSend(const Block& packet) final
   {
   }
 };
diff --git a/ndn-cxx b/ndn-cxx
@@ -1 +1 @@
-Subproject commit f2a5806bf49432ee7d1f98e98b1bc66b31a4aa54
+Subproject commit f849c5ef310da8375f3546e354ba9c9b1155bc59
diff --git a/tests/unit-tests/NFD/ncc.t.cpp b/tests/unit-tests/NFD/ncc.t.cpp
@@ -33,7 +33,7 @@ class NccFixture : public ScenarioHelperWithCleanupFixture
   {
     Config::SetDefault("ns3::PointToPointNetDevice::DataRate", StringValue("10Mbps"));
     Config::SetDefault("ns3::PointToPointChannel::Delay", StringValue("1ms"));
-    Config::SetDefault("ns3::QueueBase::MaxSize", StringValue("500p"));
+    Config::SetDefault("ns3::DropTailQueue<Packet>::MaxSize", StringValue("500p"));
 
       //            Creating a 3 node topology                //
       //                                                      //
diff --git a/tests/unit-tests/helper/lfid-routing-helper.t.cpp b/tests/unit-tests/helper/lfid-routing-helper.t.cpp
@@ -24,7 +24,7 @@
 #include "model/ndn-l3-protocol.hpp"
 #include "model/ndn-net-device-transport.hpp"
 
-#include "NFD/daemon/fw/best-route-strategy2.hpp"
+#include "NFD/daemon/fw/best-route-strategy.hpp"
 
 #include "ns3/channel.h"
 #include "ns3/net-device.h"
@@ -73,7 +73,7 @@ BOOST_AUTO_TEST_CASE(CalculateRouteAbilene)
 
   // IMPORTANT: Some strategy needs to be installed for test to work.
   ndn::StrategyChoiceHelper str;
-  str.InstallAll<nfd::fw::BestRouteStrategy2>("/");
+  str.InstallAll<nfd::fw::BestRouteStrategy>("/");
 
   int numNexthops = 0;
 
diff --git a/tests/unit-tests/helper/ndn-global-routing-helper.t.cpp b/tests/unit-tests/helper/ndn-global-routing-helper.t.cpp
diff --git a/tests/unit-tests/helper/ndn-link-control-helper.t.cpp b/tests/unit-tests/helper/ndn-link-control-helper.t.cpp
diff --git a/tests/unit-tests/helper/ndn-network-region-table-helper.t.cpp b/tests/unit-tests/helper/ndn-network-region-table-helper.t.cpp
diff --git a/tests/unit-tests/helper/ndn-stack-helper.t.cpp b/tests/unit-tests/helper/ndn-stack-helper.t.cpp
diff --git a/tests/unit-tests/helper/ndn-strategy-choice-helper.t.cpp b/tests/unit-tests/helper/ndn-strategy-choice-helper.t.cpp
diff --git a/tests/unit-tests/model/ndn-block-header.t.cpp b/tests/unit-tests/model/ndn-block-header.t.cpp
diff --git a/tests/unit-tests/ndn-cxx/face.t.cpp b/tests/unit-tests/ndn-cxx/face.t.cpp
diff --git a/tests/unit-tests/utils/tracers/ndn-app-delay-tracer.t.cpp b/tests/unit-tests/utils/tracers/ndn-app-delay-tracer.t.cpp
diff --git a/tests/unit-tests/utils/tracers/ndn-l3-rate-tracer.t.cpp b/tests/unit-tests/utils/tracers/ndn-l3-rate-tracer.t.cpp
diff --git a/utils/dummy-keychain.cpp b/utils/dummy-keychain.cpp
diff --git a/utils/dummy-keychain.hpp b/utils/dummy-keychain.hpp
diff --git a/utils/tracers/ndn-app-delay-tracer.cpp b/utils/tracers/ndn-app-delay-tracer.cpp
diff --git a/wscript b/wscript

Original file line number	Diff line number	Diff line change
`@@ -49,8 +49,7 @@ RandomLoadBalancerStrategy::~RandomLoadBalancerStrategy()`
`49`	`49`	`static bool`
`50`	`50`	`canForwardToNextHop(const Face& inFace, shared_ptr<pit::Entry> pitEntry, const fib::NextHop& nexthop)`
`51`	`51`	`{`
`52`		`- return !wouldViolateScope(inFace, pitEntry->getInterest(), nexthop.getFace()) &&`
`53`		`- canForwardToLegacy(*pitEntry, nexthop.getFace());`
	`52`	`+ return !wouldViolateScope(inFace, pitEntry->getInterest(), nexthop.getFace());`
`54`	`53`	`}`
`55`	`54`
`56`	`55`	`static bool`
`@@ -61,7 +60,7 @@ hasFaceForForwarding(const Face& inFace, const fib::NextHopList& nexthops, const`
`61`	`60`	`}`
`62`	`61`
`63`	`62`	`void`
`64`		`-RandomLoadBalancerStrategy::afterReceiveInterest(const FaceEndpoint& ingress, const Interest& interest,`
	`63`	`+RandomLoadBalancerStrategy::afterReceiveInterest(const Interest& interest, const FaceEndpoint& ingress,`
`65`	`64`	`const shared_ptr<pit::Entry>& pitEntry)`
`66`	`65`	`{`
`67`	`66`	`NFD_LOG_TRACE("afterReceiveInterest");`
`@@ -92,7 +91,7 @@ RandomLoadBalancerStrategy::afterReceiveInterest(const FaceEndpoint& ingress, co`
`92`	`91`	`}`
`93`	`92`	`} while (!canForwardToNextHop(ingress.face, pitEntry, *selected));`
`94`	`93`
`95`		`- this->sendInterest(pitEntry, FaceEndpoint(selected->getFace(), 0), interest);`
	`94`	`+ this->sendInterest(interest, selected->getFace(), pitEntry);`
`96`	`95`	`}`
`97`	`96`
`98`	`97`	`const Name&`