NFD+model+apps+helper+tests: Upgrade NFD and related changes
Based on NFD:commit:2fc649bfc67b93b4191cfbee5bcd70330bfb48f0 (version 0.3.4)
Change-Id: I89f5182600467171797af4f8f83e1edffe14ad95
Refs: #3125
diff --git a/docs/source/examples.rst b/docs/source/examples.rst
index 521b0e2..640625b 100644
--- a/docs/source/examples.rst
+++ b/docs/source/examples.rst
@@ -376,7 +376,7 @@
For every received interest, producer replies with a data packet, containing 1024 bytes of
virtual payload.
-In this scenario, we choose the broadcast strategy to be installed for the name prefix
+In this scenario, we choose the multicast strategy to be installed for the name prefix
"/prefix1" in all the nodes, while for the name prefix "/prefix2", the best-route strategy
will be installed in all the topology nodes.
@@ -396,7 +396,7 @@
---------------------------------------------------------------------
This scenario simulates a grid topology (using PointToPointGrid module). The first six nodes
-use the best route forwarding strategy, whereas the three remaining nodes use the broadcast
+use the best route forwarding strategy, whereas the three remaining nodes use the multicast
forwarding strategy.
Consumer requests data from producer with frequency 100 interests per second (interests
diff --git a/docs/source/fw.rst b/docs/source/fw.rst
index c98e134..4e57e1f 100644
--- a/docs/source/fw.rst
+++ b/docs/source/fw.rst
@@ -35,9 +35,9 @@
| | guaranteed to be equivalent. |
+--------------------------------------------+----------------------------------------------------------------------------------------------+
+--------------------------------------------+----------------------------------------------------------------------------------------------+
-| ``/localhost/nfd/strategy/broadcast`` | :nfd:`Broadcast Strategy <nfd::fw::BroadcastStrategy>` |
+| ``/localhost/nfd/strategy/multicast`` | :nfd:`Multicast Strategy <nfd::fw::MulticastStrategy>` |
| | |
-| | The broadcast strategy forwards every Interest to all |
+| | The multicast strategy forwards every Interest to all |
| | upstreams, indicated by the supplied FIB entry. |
+--------------------------------------------+----------------------------------------------------------------------------------------------+
+--------------------------------------------+----------------------------------------------------------------------------------------------+
@@ -59,11 +59,11 @@
+====================+===============================================+
| ``/`` | ``/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/multicast`` | ``/localhost/nfd/strategy/multicast`` |
+--------------------+-----------------------------------------------+
@@ -73,7 +73,7 @@
.. code-block:: c++
StrategyChoiceHelper::Install(nodes, prefix,
- "/localhost/nfd/strategy/broadcast");
+ "/localhost/nfd/strategy/multicast");
.. _Writing your own custom strategy:
diff --git a/docs/source/helpers.rst b/docs/source/helpers.rst
index 91bcf4d..f251d7c 100644
--- a/docs/source/helpers.rst
+++ b/docs/source/helpers.rst
@@ -116,11 +116,11 @@
+====================+==============================+===============================================+
| ``/`` | :nfd:`fw::BestRouteStrategy` | ``/localhost/nfd/strategy/best-route`` |
+--------------------+------------------------------+-----------------------------------------------+
-| ``/localhost`` | :nfd:`fw::BroadcastStrategy` | ``/localhost/nfd/strategy/broadcast`` |
+| ``/localhost`` | :nfd:`fw::MulticastStrategy` | ``/localhost/nfd/strategy/multicast`` |
+--------------------+------------------------------+-----------------------------------------------+
| ``/localhost/nfd`` | :nfd:`fw::BestRouteStrategy` | ``/localhost/nfd/strategy/best-route`` |
+--------------------+------------------------------+-----------------------------------------------+
-| ``/ndn/broadcast`` | :nfd:`fw::BroadcastStrategy` | ``/localhost/nfd/strategy/broadcast`` |
+| ``/ndn/multicast`` | :nfd:`fw::MulticastStrategy` | ``/localhost/nfd/strategy/multicast`` |
+--------------------+------------------------------+-----------------------------------------------+