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
diff --git a/daemon/fw/broadcast-strategy.hpp b/daemon/fw/broadcast-strategy.hpp
index 0807bde..c923a04 100644
--- a/daemon/fw/broadcast-strategy.hpp
+++ b/daemon/fw/broadcast-strategy.hpp
@@ -1,12 +1,12 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/**
- * Copyright (c) 2014, Regents of the University of California,
- * Arizona Board of Regents,
- * Colorado State University,
- * University Pierre & Marie Curie, Sorbonne University,
- * Washington University in St. Louis,
- * Beijing Institute of Technology,
- * The University of Memphis
+ * Copyright (c) 2014-2015, Regents of the University of California,
+ * Arizona Board of Regents,
+ * Colorado State University,
+ * University Pierre & Marie Curie, Sorbonne University,
+ * Washington University in St. Louis,
+ * Beijing Institute of Technology,
+ * The University of Memphis.
*
* This file is part of NFD (Named Data Networking Forwarding Daemon).
* See AUTHORS.md for complete list of NFD authors and contributors.
@@ -26,23 +26,19 @@
#ifndef NFD_DAEMON_FW_BROADCAST_STRATEGY_HPP
#define NFD_DAEMON_FW_BROADCAST_STRATEGY_HPP
-#include "strategy.hpp"
+#include "multicast-strategy.hpp"
namespace nfd {
namespace fw {
-/** \class BroadcastStrategy
- * \brief a forwarding strategy that forwards Interest
- * to all nexthops
+/** \brief identical to MulticastStrategy, for backwards compatibility
+ * \deprecated use MulticastStrategy instead
*/
-class BroadcastStrategy : public Strategy
+class BroadcastStrategy : public MulticastStrategy
{
public:
BroadcastStrategy(Forwarder& forwarder, const Name& name = STRATEGY_NAME);
- virtual
- ~BroadcastStrategy();
-
virtual void
afterReceiveInterest(const Face& inFace,
const Interest& interest,
@@ -51,6 +47,9 @@
public:
static const Name STRATEGY_NAME;
+
+private:
+ bool m_isFirstUse;
};
} // namespace fw
diff --git a/daemon/fw/multicast-strategy.cpp b/daemon/fw/multicast-strategy.cpp
new file mode 100644
index 0000000..a2559e4
--- /dev/null
+++ b/daemon/fw/multicast-strategy.cpp
@@ -0,0 +1,60 @@
+/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
+/**
+ * Copyright (c) 2014-2015, Regents of the University of California,
+ * Arizona Board of Regents,
+ * Colorado State University,
+ * University Pierre & Marie Curie, Sorbonne University,
+ * Washington University in St. Louis,
+ * Beijing Institute of Technology,
+ * The University of Memphis.
+ *
+ * This file is part of NFD (Named Data Networking Forwarding Daemon).
+ * See AUTHORS.md for complete list of NFD authors and contributors.
+ *
+ * NFD is free software: you can redistribute it and/or modify it under the terms
+ * of the GNU General Public License as published by the Free Software Foundation,
+ * either version 3 of the License, or (at your option) any later version.
+ *
+ * NFD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE. See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * NFD, e.g., in COPYING.md file. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "multicast-strategy.hpp"
+
+namespace nfd {
+namespace fw {
+
+const Name MulticastStrategy::STRATEGY_NAME("ndn:/localhost/nfd/strategy/multicast/%FD%01");
+NFD_REGISTER_STRATEGY(MulticastStrategy);
+
+MulticastStrategy::MulticastStrategy(Forwarder& forwarder, const Name& name)
+ : Strategy(forwarder, name)
+{
+}
+
+void
+MulticastStrategy::afterReceiveInterest(const Face& inFace,
+ const Interest& interest,
+ 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 (!pitEntry->hasUnexpiredOutRecords()) {
+ this->rejectPendingInterest(pitEntry);
+ }
+}
+
+} // namespace fw
+} // namespace nfd
diff --git a/daemon/fw/multicast-strategy.hpp b/daemon/fw/multicast-strategy.hpp
new file mode 100644
index 0000000..77075c3
--- /dev/null
+++ b/daemon/fw/multicast-strategy.hpp
@@ -0,0 +1,54 @@
+/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
+/**
+ * Copyright (c) 2014-2015, Regents of the University of California,
+ * Arizona Board of Regents,
+ * Colorado State University,
+ * University Pierre & Marie Curie, Sorbonne University,
+ * Washington University in St. Louis,
+ * Beijing Institute of Technology,
+ * The University of Memphis.
+ *
+ * This file is part of NFD (Named Data Networking Forwarding Daemon).
+ * See AUTHORS.md for complete list of NFD authors and contributors.
+ *
+ * NFD is free software: you can redistribute it and/or modify it under the terms
+ * of the GNU General Public License as published by the Free Software Foundation,
+ * either version 3 of the License, or (at your option) any later version.
+ *
+ * NFD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE. See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * NFD, e.g., in COPYING.md file. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef NFD_DAEMON_FW_MULTICAST_STRATEGY_HPP
+#define NFD_DAEMON_FW_MULTICAST_STRATEGY_HPP
+
+#include "strategy.hpp"
+
+namespace nfd {
+namespace fw {
+
+/** \brief a forwarding strategy that forwards Interest to all FIB nexthops
+ */
+class MulticastStrategy : public Strategy
+{
+public:
+ MulticastStrategy(Forwarder& forwarder, const Name& name = STRATEGY_NAME);
+
+ virtual void
+ afterReceiveInterest(const Face& inFace,
+ const Interest& interest,
+ shared_ptr<fib::Entry> fibEntry,
+ shared_ptr<pit::Entry> pitEntry) DECL_OVERRIDE;
+
+public:
+ static const Name STRATEGY_NAME;
+};
+
+} // namespace fw
+} // namespace nfd
+
+#endif // NFD_DAEMON_FW_MULTICAST_STRATEGY_HPP
diff --git a/daemon/mgmt/tables-config-section.cpp b/daemon/mgmt/tables-config-section.cpp
index c7661ce..f0b9eaf 100644
--- a/daemon/mgmt/tables-config-section.cpp
+++ b/daemon/mgmt/tables-config-section.cpp
@@ -84,9 +84,9 @@
// strategy_choice
// {
// / /localhost/nfd/strategy/best-route
- // /localhost /localhost/nfd/strategy/broadcast
+ // /localhost /localhost/nfd/strategy/multicast
// /localhost/nfd /localhost/nfd/strategy/best-route
- // /ndn/broadcast /localhost/nfd/strategy/broadcast
+ // /ndn/broadcast /localhost/nfd/strategy/multicast
// }
// }
@@ -133,9 +133,9 @@
// strategy_choice
// {
// / /localhost/nfd/strategy/best-route
- // /localhost /localhost/nfd/strategy/broadcast
+ // /localhost /localhost/nfd/strategy/multicast
// /localhost/nfd /localhost/nfd/strategy/best-route
- // /ndn/broadcast /localhost/nfd/strategy/broadcast
+ // /ndn/broadcast /localhost/nfd/strategy/multicast
// }
std::map<Name, Name> choices;