diff --git a/RELEASE_NOTES b/RELEASE_NOTES index f574a7635..ae7fd5d66 100644 --- a/RELEASE_NOTES +++ b/RELEASE_NOTES @@ -73,6 +73,7 @@ since ns-3.10, in many cases referencing the Bugzilla bug number. - bug 445 - Is the class name Scalar in nstime.h appropriate? - bug 1044 - Seconds (1e-9) creates Time that is not IsPositive () - bug 1056 - CSMA: padding not handled correctly for LLC encapsulation + - bug 1058 - documentation help to avoid InternetStackHelper pitfall Known issues ------------ diff --git a/examples/routing/global-injection-slash32.cc b/examples/routing/global-injection-slash32.cc index 3f0764065..5fcc0a6d2 100644 --- a/examples/routing/global-injection-slash32.cc +++ b/examples/routing/global-injection-slash32.cc @@ -69,7 +69,7 @@ main (int argc, char *argv[]) Ipv4ListRoutingHelper staticonly; Ipv4ListRoutingHelper staticRouting; staticonly.Add(staticRouting, 0); - internet.SetRoutingHelper(staticonly); + internet.SetRoutingHelper(staticonly); // has effect on the next Install () internet.Install(NodeContainer(nC)); // We create the channels first without any IP addressing information diff --git a/examples/wireless/mixed-wireless.cc b/examples/wireless/mixed-wireless.cc index 87b417503..1c7acdc20 100644 --- a/examples/wireless/mixed-wireless.cc +++ b/examples/wireless/mixed-wireless.cc @@ -162,7 +162,7 @@ main (int argc, char *argv[]) // Add the IPv4 protocol stack to the nodes in our container // InternetStackHelper internet; - internet.SetRoutingHelper (olsr); + internet.SetRoutingHelper (olsr); // has effect on the next Install () internet.Install (backbone); // re-initialize for non-olsr routing. diff --git a/examples/wireless/mixed-wireless.py b/examples/wireless/mixed-wireless.py index d5bf3db12..0e889b08f 100644 --- a/examples/wireless/mixed-wireless.py +++ b/examples/wireless/mixed-wireless.py @@ -135,7 +135,7 @@ def main(argv): print "Enabling OLSR routing on all backbone nodes" internet = ns.internet.InternetStackHelper() olsr = ns.olsr.OlsrHelper() - internet.SetRoutingHelper(olsr); + internet.SetRoutingHelper(olsr); # has effect on the next Install () internet.Install(backbone); # re-initialize for non-olsr routing. internet.Reset() diff --git a/examples/wireless/multirate.cc b/examples/wireless/multirate.cc index 58b0c4534..073de2a45 100644 --- a/examples/wireless/multirate.cc +++ b/examples/wireless/multirate.cc @@ -383,7 +383,7 @@ Experiment::Run (const WifiHelper &wifi, const YansWifiPhyHelper &wifiPhy, if (enableRouting) { - internet.SetRoutingHelper(list); + internet.SetRoutingHelper(list); // has effect on the next Install () } internet.Install (c); diff --git a/examples/wireless/wifi-simple-adhoc-grid.cc b/examples/wireless/wifi-simple-adhoc-grid.cc index 7b13aae8c..282b865fa 100644 --- a/examples/wireless/wifi-simple-adhoc-grid.cc +++ b/examples/wireless/wifi-simple-adhoc-grid.cc @@ -198,7 +198,7 @@ int main (int argc, char *argv[]) list.Add (olsr, 10); InternetStackHelper internet; - internet.SetRoutingHelper (list); + internet.SetRoutingHelper (list); // has effect on the next Install () internet.Install (c); Ipv4AddressHelper ipv4; diff --git a/src/aodv/examples/aodv.cc b/src/aodv/examples/aodv.cc index b41e6d98e..0f3f30cec 100644 --- a/src/aodv/examples/aodv.cc +++ b/src/aodv/examples/aodv.cc @@ -192,7 +192,7 @@ AodvExample::InstallInternetStack () AodvHelper aodv; // you can configure AODV attributes here using aodv.Set(name, value) InternetStackHelper stack; - stack.SetRoutingHelper (aodv); + stack.SetRoutingHelper (aodv); // has effect on the next Install () stack.Install (nodes); Ipv4AddressHelper address; address.SetBase ("10.0.0.0", "255.0.0.0"); diff --git a/src/dsdv/examples/dsdv-manet.cc b/src/dsdv/examples/dsdv-manet.cc index 2079c4343..574a53f2f 100644 --- a/src/dsdv/examples/dsdv-manet.cc +++ b/src/dsdv/examples/dsdv-manet.cc @@ -285,7 +285,7 @@ DsdvManetExample::InstallInternetStack (std::string tr_name) dsdv.Set ("PeriodicUpdateInterval", TimeValue (Seconds (m_periodicUpdateInterval))); dsdv.Set ("SettlingTime", TimeValue (Seconds (m_settlingTime))); InternetStackHelper stack; - stack.SetRoutingHelper (dsdv); + stack.SetRoutingHelper (dsdv); // has effect on the next Install () stack.Install (nodes); Ipv4AddressHelper address; address.SetBase ("10.1.1.0", "255.255.255.0"); diff --git a/src/mpi/examples/nms-p2p-nix-distributed.cc b/src/mpi/examples/nms-p2p-nix-distributed.cc index 9509b6312..f5e736f5c 100644 --- a/src/mpi/examples/nms-p2p-nix-distributed.cc +++ b/src/mpi/examples/nms-p2p-nix-distributed.cc @@ -134,7 +134,7 @@ main (int argc, char *argv[]) if (nix) { - stack.SetRoutingHelper (list); + stack.SetRoutingHelper (list); // has effect on the next Install () } // Create Campus Networks diff --git a/src/mpi/examples/simple-distributed.cc b/src/mpi/examples/simple-distributed.cc index c92178223..a095a3be4 100644 --- a/src/mpi/examples/simple-distributed.cc +++ b/src/mpi/examples/simple-distributed.cc @@ -154,7 +154,7 @@ main (int argc, char *argv[]) if (nix) { - stack.SetRoutingHelper (list); + stack.SetRoutingHelper (list); // has effect on the next Install () } stack.InstallAll (); diff --git a/src/nix-vector-routing/examples/nix-simple.cc b/src/nix-vector-routing/examples/nix-simple.cc index e7ddfb892..27d383272 100644 --- a/src/nix-vector-routing/examples/nix-simple.cc +++ b/src/nix-vector-routing/examples/nix-simple.cc @@ -75,7 +75,7 @@ main (int argc, char *argv[]) list.Add (nixRouting, 10); InternetStackHelper stack; - stack.SetRoutingHelper (list); + stack.SetRoutingHelper (list); // has effect on the next Install () stack.Install (allNodes); NetDeviceContainer devices12; diff --git a/src/nix-vector-routing/examples/nms-p2p-nix.cc b/src/nix-vector-routing/examples/nms-p2p-nix.cc index b51215652..dfca7357a 100644 --- a/src/nix-vector-routing/examples/nms-p2p-nix.cc +++ b/src/nix-vector-routing/examples/nms-p2p-nix.cc @@ -116,7 +116,7 @@ main (int argc, char *argv[]) if (nix) { - stack.SetRoutingHelper (list); + stack.SetRoutingHelper (list); // has effect on the next Install () } // Create Campus Networks diff --git a/src/olsr/examples/olsr-hna.cc b/src/olsr/examples/olsr-hna.cc index b6c53ef27..b13db244d 100644 --- a/src/olsr/examples/olsr-hna.cc +++ b/src/olsr/examples/olsr-hna.cc @@ -188,7 +188,7 @@ int main (int argc, char *argv[]) list.Add (olsr, 10); InternetStackHelper internet_olsr; - internet_olsr.SetRoutingHelper (list); + internet_olsr.SetRoutingHelper (list); // has effect on the next Install () internet_olsr.Install (olsrNodes); InternetStackHelper internet_csma; diff --git a/src/olsr/examples/simple-point-to-point-olsr.cc b/src/olsr/examples/simple-point-to-point-olsr.cc index d3a691d17..2e64cb9b9 100644 --- a/src/olsr/examples/simple-point-to-point-olsr.cc +++ b/src/olsr/examples/simple-point-to-point-olsr.cc @@ -95,7 +95,7 @@ main (int argc, char *argv[]) list.Add (olsr, 10); InternetStackHelper internet; - internet.SetRoutingHelper (list); + internet.SetRoutingHelper (list); // has effect on the next Install () internet.Install (c); // We create the channels first without any IP addressing information diff --git a/src/topology-read/examples/topology-example-sim.cc b/src/topology-read/examples/topology-example-sim.cc index 082a7b5ac..21e9ea6c6 100644 --- a/src/topology-read/examples/topology-example-sim.cc +++ b/src/topology-read/examples/topology-example-sim.cc @@ -112,7 +112,7 @@ int main (int argc, char *argv[]) listRH.Add (staticRouting, 0); listRH.Add (nixRouting, 10); - stack.SetRoutingHelper (listRH); + stack.SetRoutingHelper (listRH); // has effect on the next Install () stack.Install (nodes); NS_LOG_INFO ("creating ip4 addresses");