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.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