From 804ddc729e236733cd43e655fe3d818d69e66d63 Mon Sep 17 00:00:00 2001 From: Tom Henderson Date: Sat, 3 Oct 2009 15:22:37 -0700 Subject: [PATCH] make mixed-wireless examples use InternetStackHelper::Reset --- examples/mixed-wireless.cc | 2 +- examples/mixed-wireless.py | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/examples/mixed-wireless.cc b/examples/mixed-wireless.cc index db1bf6dae..2cb2c6fd2 100644 --- a/examples/mixed-wireless.cc +++ b/examples/mixed-wireless.cc @@ -164,7 +164,7 @@ main (int argc, char *argv[]) internet.Install (backbone); // re-initialize for non-olsr routing. - internet = InternetStackHelper (); + internet.Reset (); // // Assign IPv4 addresses to the device drivers (actually to the associated diff --git a/examples/mixed-wireless.py b/examples/mixed-wireless.py index 338311029..e3c372906 100644 --- a/examples/mixed-wireless.py +++ b/examples/mixed-wireless.py @@ -130,6 +130,8 @@ def main(argv): olsr = ns3.OlsrHelper() internet.SetRoutingHelper(olsr); internet.Install(backbone); + # re-initialize for non-olsr routing. + internet.Reset() # # Assign IPv4 addresses to the device drivers(actually to the associated # IPv4 interfaces) we just created.