From 9bfcd30731aab20a0630c8478557dded2e3e2658 Mon Sep 17 00:00:00 2001
From: Lalith Suresh <suresh.lalith@gmail.com>
Date: Sun, 6 Mar 2011 20:04:16 +0000
Subject: [PATCH] Fixes Click examples breakage

---
 src/click/examples/nsclick-raw-wlan.cc               | 5 ++++-
 src/click/examples/nsclick-routing.cc                | 9 ++++++---
 src/click/examples/nsclick-simple-lan.cc             | 5 ++++-
 src/click/examples/nsclick-udp-client-server-csma.cc | 5 ++++-
 src/click/examples/nsclick-udp-client-server-wifi.cc | 5 ++++-
 5 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/src/click/examples/nsclick-raw-wlan.cc b/src/click/examples/nsclick-raw-wlan.cc
index 1eddb377f..06ae094a0 100644
--- a/src/click/examples/nsclick-raw-wlan.cc
+++ b/src/click/examples/nsclick-raw-wlan.cc
@@ -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));
 
diff --git a/src/click/examples/nsclick-routing.cc b/src/click/examples/nsclick-routing.cc
index f9f72db37..a5b1e8652 100644
--- a/src/click/examples/nsclick-routing.cc
+++ b/src/click/examples/nsclick-routing.cc
@@ -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");
diff --git a/src/click/examples/nsclick-simple-lan.cc b/src/click/examples/nsclick-simple-lan.cc
index 5cfd4366b..2defb6356 100644
--- a/src/click/examples/nsclick-simple-lan.cc
+++ b/src/click/examples/nsclick-simple-lan.cc
@@ -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));
 
diff --git a/src/click/examples/nsclick-udp-client-server-csma.cc b/src/click/examples/nsclick-udp-client-server-csma.cc
index 783f1d99a..01bab31da 100644
--- a/src/click/examples/nsclick-udp-client-server-csma.cc
+++ b/src/click/examples/nsclick-udp-client-server-csma.cc
@@ -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);
 
diff --git a/src/click/examples/nsclick-udp-client-server-wifi.cc b/src/click/examples/nsclick-udp-client-server-wifi.cc
index 14c48f94f..8bd9a9ffb 100644
--- a/src/click/examples/nsclick-udp-client-server-wifi.cc
+++ b/src/click/examples/nsclick-udp-client-server-wifi.cc
@@ -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