fw: rename BroadcastStrategy to MulticastStrategy
BroadcastStrategy is temporarily retained for backwards compatibility.
This commit also updates nfd.conf and ndn-autoconfig to use MulticastStrategy
in place of BroadcastStrategy.
refs #3011
Change-Id: I011f1cf75db26b3c93552f8322a0bba4ce8dd033
diff --git a/daemon/fw/broadcast-strategy.cpp b/daemon/fw/broadcast-strategy.cpp
index 63aa4f3..3c40186 100644
--- a/daemon/fw/broadcast-strategy.cpp
+++ b/daemon/fw/broadcast-strategy.cpp
@@ -28,15 +28,14 @@
namespace nfd {
namespace fw {
-const Name BroadcastStrategy::STRATEGY_NAME("ndn:/localhost/nfd/strategy/broadcast/%FD%01");
+NFD_LOG_INIT("BroadcastStrategy");
+
+const Name BroadcastStrategy::STRATEGY_NAME("ndn:/localhost/nfd/strategy/broadcast/%FD%02");
NFD_REGISTER_STRATEGY(BroadcastStrategy);
BroadcastStrategy::BroadcastStrategy(Forwarder& forwarder, const Name& name)
- : Strategy(forwarder, name)
-{
-}
-
-BroadcastStrategy::~BroadcastStrategy()
+ : MulticastStrategy(forwarder, name)
+ , m_isFirstUse(true)
{
}
@@ -46,18 +45,13 @@
shared_ptr<fib::Entry> fibEntry,
shared_ptr<pit::Entry> pitEntry)
{
- const fib::NextHopList& nexthops = fibEntry->getNextHops();
-
- for (fib::NextHopList::const_iterator it = nexthops.begin(); it != nexthops.end(); ++it) {
- shared_ptr<Face> outFace = it->getFace();
- if (pitEntry->canForwardTo(*outFace)) {
- this->sendInterest(pitEntry, outFace);
- }
+ if (m_isFirstUse) {
+ NFD_LOG_WARN("The broadcast strategy has been renamed as multicast strategy. "
+ "Use ndn:/localhost/nfd/strategy/multicast to select the multicast strategy.");
+ m_isFirstUse = false;
}
- if (!pitEntry->hasUnexpiredOutRecords()) {
- this->rejectPendingInterest(pitEntry);
- }
+ this->MulticastStrategy::afterReceiveInterest(inFace, interest, fibEntry, pitEntry);
}
} // namespace fw