F5/unison
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes Click examples breakage

Browse Source
This commit is contained in:
Lalith Suresh
2011-03-06 20:04:16 +00:00
parent 508d3b794b
commit 9bfcd30731
5 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/click/examples/nsclick-raw-wlan.cc
View File

@@ -27,6 +27,9 @@
#include "ns3/core-module.h"
#include "ns3/network-module.h"
#include "ns3/internet-module.h"
#include "ns3/applications-module.h"
#include "ns3/wifi-module.h"
#include "ns3/click-internet-stack-helper.h"
#include "ns3/log.h"
#include "ns3/mobility-helper.h"
@@ -101,7 +104,7 @@ int main (int argc, char *argv[])
// Install Click on node A
ClickInternetStackHelper clickinternet;
clickinternet.SetClickFile (wifiNodes.Get (0), "src/routing/click/examples/nsclick-wifi-single-interface.click");
clickinternet.SetClickFile (wifiNodes.Get (0), "src/click/examples/nsclick-wifi-single-interface.click");
clickinternet.SetRoutingTableElement(wifiNodes.Get (0), "rt");
clickinternet.Install (wifiNodes.Get (0));

9
src/click/examples/nsclick-routing.cc
View File

@@ -32,6 +32,9 @@
#include "ns3/core-module.h"
#include "ns3/network-module.h"
#include "ns3/internet-module.h"
#include "ns3/applications-module.h"
#include "ns3/csma-module.h"
#include "ns3/ipv4-click-routing.h"
#include "ns3/ipv4-l3-click-protocol.h"
#include "ns3/click-internet-stack-helper.h"
@@ -61,9 +64,9 @@ main (int argc, char *argv[])
// Install Click on the nodes
//
ClickInternetStackHelper clickinternet;
clickinternet.SetClickFile (n.Get (0), "src/routing/click/examples/nsclick-routing-node0.click");
clickinternet.SetClickFile (n.Get (1), "src/routing/click/examples/nsclick-ip-router.click");
clickinternet.SetClickFile (n.Get (2), "src/routing/click/examples/nsclick-routing-node2.click");
clickinternet.SetClickFile (n.Get (0), "src/click/examples/nsclick-routing-node0.click");
clickinternet.SetClickFile (n.Get (1), "src/click/examples/nsclick-ip-router.click");
clickinternet.SetClickFile (n.Get (2), "src/click/examples/nsclick-routing-node2.click");
clickinternet.SetRoutingTableElement (n.Get (0), "kernel/rt");
clickinternet.SetRoutingTableElement (n.Get (1), "u/rt");
clickinternet.SetRoutingTableElement (n.Get (2), "kernel/rt");

5
src/click/examples/nsclick-simple-lan.cc
View File

@@ -27,6 +27,9 @@
#include "ns3/core-module.h"
#include "ns3/network-module.h"
#include "ns3/csma-module.h"
#include "ns3/internet-module.h"
#include "ns3/applications-module.h"
#include "ns3/click-internet-stack-helper.h"
#include "ns3/log.h"
@@ -55,7 +58,7 @@ int main (int argc, char *argv[])
// Install Click on node A
ClickInternetStackHelper clickinternet;
clickinternet.SetClickFile (csmaNodes.Get (0), "src/routing/click/examples/nsclick-lan-single-interface.click");
clickinternet.SetClickFile (csmaNodes.Get (0), "src/click/examples/nsclick-lan-single-interface.click");
clickinternet.SetRoutingTableElement (csmaNodes.Get (0), "rt");
clickinternet.Install (csmaNodes.Get (0));

5
src/click/examples/nsclick-udp-client-server-csma.cc
View File

@@ -35,6 +35,9 @@
#include <fstream>
#include "ns3/core-module.h"
#include "ns3/network-module.h"
#include "ns3/internet-module.h"
#include "ns3/csma-module.h"
#include "ns3/applications-module.h"
#include "ns3/ipv4-click-routing.h"
#include "ns3/click-internet-stack-helper.h"
@@ -72,7 +75,7 @@ main (int argc, char *argv[])
// Install Click on the nodes
//
ClickInternetStackHelper clickinternet;
clickinternet.SetClickFile (n, "src/routing/click/examples/nsclick-lan-single-interface.click");
clickinternet.SetClickFile (n, "src/click/examples/nsclick-lan-single-interface.click");
clickinternet.SetRoutingTableElement (n, "rt");
clickinternet.Install (n);

5
src/click/examples/nsclick-udp-client-server-wifi.cc
View File

@@ -32,7 +32,10 @@
#include <fstream>
#include "ns3/core-module.h"
#include "ns3/internet-module.h"
#include "ns3/applications-module.h"
#include "ns3/network-module.h"
#include "ns3/wifi-module.h"
#include "ns3/ipv4-click-routing.h"
#include "ns3/click-internet-stack-helper.h"
#include "ns3/mobility-helper.h"
@@ -129,7 +132,7 @@ main (int argc, char *argv[])
// Install Click on the nodes
//
ClickInternetStackHelper clickinternet;
clickinternet.SetClickFile (n, "src/routing/click/examples/nsclick-wifi-single-interface.click");
clickinternet.SetClickFile (n, "src/click/examples/nsclick-wifi-single-interface.click");
clickinternet.SetRoutingTableElement (n, "rt");
clickinternet.Install (n);
// 4th node can listen to traffic in promisc mode