Mercurial Mercurial > ns-3-dev / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixes Click examples breakage
authorLalith Suresh <suresh.lalith@gmail.com>
Sun, 06 Mar 2011 20:04:16 +0000
changeset 6869 691d93df56ae
parent 6868 5001084c970a
child 6870 c43c01d942e3
Fixes Click examples breakage
src/click/examples/nsclick-raw-wlan.cc file | annotate | diff | comparison | revisions
src/click/examples/nsclick-routing.cc file | annotate | diff | comparison | revisions
src/click/examples/nsclick-simple-lan.cc file | annotate | diff | comparison | revisions
src/click/examples/nsclick-udp-client-server-csma.cc file | annotate | diff | comparison | revisions
src/click/examples/nsclick-udp-client-server-wifi.cc file | annotate | diff | comparison | revisions 
--- a/src/click/examples/nsclick-raw-wlan.cc	Sun Mar 06 13:10:03 2011 +0000
+++ b/src/click/examples/nsclick-raw-wlan.cc	Sun Mar 06 20:04:16 2011 +0000
@@ -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 @@
 
   // 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));
 
--- a/src/click/examples/nsclick-routing.cc	Sun Mar 06 13:10:03 2011 +0000
+++ b/src/click/examples/nsclick-routing.cc	Sun Mar 06 20:04:16 2011 +0000
@@ -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 @@
 // 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");
--- a/src/click/examples/nsclick-simple-lan.cc	Sun Mar 06 13:10:03 2011 +0000
+++ b/src/click/examples/nsclick-simple-lan.cc	Sun Mar 06 20:04:16 2011 +0000
@@ -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 @@
 
   // 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));
 
--- a/src/click/examples/nsclick-udp-client-server-csma.cc	Sun Mar 06 13:10:03 2011 +0000
+++ b/src/click/examples/nsclick-udp-client-server-csma.cc	Sun Mar 06 20:04:16 2011 +0000
@@ -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 @@
 // 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);
 
--- a/src/click/examples/nsclick-udp-client-server-wifi.cc	Sun Mar 06 13:10:03 2011 +0000
+++ b/src/click/examples/nsclick-udp-client-server-wifi.cc	Sun Mar 06 20:04:16 2011 +0000
@@ -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 @@
   // 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
ns-3-dev