Module layout rework for static-routing, list-routing, global-routing

examples/csma/csma-multicast.cc

@@ -36,6 +36,8 @@
 #include "ns3/simulator-module.h"
 #include "ns3/node-module.h"
 #include "ns3/helper-module.h"
+#include "ns3/ipv4-static-routing-helper.h"
+#include "ns3/ipv4-list-routing-helper.h"
 
 using namespace ns3;
 

examples/emulation/emu-ping.cc

@@ -58,6 +58,8 @@
 #include "ns3/emu-module.h"
 #include "ns3/v4ping-module.h"
 #include "ns3/helper-module.h"
+#include "ns3/ipv4-static-routing-helper.h"
+#include "ns3/ipv4-list-routing-helper.h"
 
 using namespace ns3;
 

examples/ipv6/fragmentation-ipv6.cc

@@ -32,6 +32,7 @@
 #include "ns3/core-module.h"
 #include "ns3/simulator-module.h"
 #include "ns3/helper-module.h"
+#include "ns3/ipv6-static-routing-helper.h"
 
 #include "ns3/ipv6-routing-table-entry.h"
 

examples/ipv6/icmpv6-redirect.cc

@@ -44,6 +44,7 @@
 #include "ns3/core-module.h"
 #include "ns3/simulator-module.h"
 #include "ns3/helper-module.h"
+#include "ns3/ipv6-static-routing-helper.h"
 
 #include "ns3/ipv6-routing-table-entry.h"
 

examples/ipv6/radvd-two-prefix.cc

@@ -41,6 +41,7 @@
 #include "ns3/radvd.h"
 #include "ns3/radvd-interface.h"
 #include "ns3/radvd-prefix.h"
+#include "ns3/ipv6-static-routing-helper.h"
 
 using namespace ns3;
 

examples/routing/global-injection-slash32.cc

@@ -34,6 +34,8 @@
 #include "ns3/ipv4-list-routing.h"
 #include "ns3/ipv4-routing-table-entry.h"
 #include "ns3/global-router-interface.h"
+#include "ns3/ipv4-static-routing-helper.h"
+#include "ns3/ipv4-list-routing-helper.h"
 
 using namespace ns3;
 using std::cout;

examples/routing/nix-simple.cc

@@ -18,6 +18,8 @@
 #include "ns3/simulator-module.h"
 #include "ns3/node-module.h"
 #include "ns3/helper-module.h"
+#include "ns3/ipv4-static-routing-helper.h"
+#include "ns3/ipv4-list-routing-helper.h"
 
 /*
  *  Simple point to point links:

examples/routing/nms-p2p-nix.cc

@@ -23,6 +23,8 @@
 #include "ns3/packet-sink.h"
 #include "ns3/point-to-point-net-device.h"
 #include "ns3/simulator.h"
+#include "ns3/ipv4-static-routing-helper.h"
+#include "ns3/ipv4-list-routing-helper.h"
 
 using namespace std;
 using namespace ns3;

examples/routing/simple-routing-ping6.cc

@@ -32,6 +32,7 @@
 #include "ns3/core-module.h"
 #include "ns3/simulator-module.h"
 #include "ns3/helper-module.h"
+#include "ns3/ipv6-static-routing-helper.h"
 
 #include "ns3/ipv6-routing-table-entry.h"
 

examples/routing/static-routing-slash32.cc

@@ -29,6 +29,7 @@
 #include "ns3/simulator-module.h"
 #include "ns3/node-module.h"
 #include "ns3/helper-module.h"
+#include "ns3/ipv4-static-routing-helper.h"
 
 using namespace ns3;
 

examples/socket/socket-bound-static-routing.cc

@@ -39,6 +39,8 @@
 #include "ns3/simulator-module.h"
 #include "ns3/node-module.h"
 #include "ns3/helper-module.h"
+#include "ns3/ipv4-static-routing-helper.h"
+#include "ns3/ipv4-list-routing-helper.h"
 
 using namespace ns3;
 

examples/socket/socket-bound-tcp-static-routing.cc

@@ -39,6 +39,8 @@
 #include "ns3/simulator-module.h"
 #include "ns3/node-module.h"
 #include "ns3/helper-module.h"
+#include "ns3/ipv4-static-routing-helper.h"
+#include "ns3/ipv4-list-routing-helper.h"
 
 using namespace ns3;
 

examples/topology-read/topology-example-sim.cc

@@ -31,6 +31,8 @@
 #include "ns3/node-module.h"
 #include "ns3/helper-module.h"
 #include "ns3/simulator-module.h"
+#include "ns3/ipv4-static-routing-helper.h"
+#include "ns3/ipv4-list-routing-helper.h"
 
 #include "ns3/topology-read-module.h"
 #include <list>

examples/wimax/wimax-multicast.cc

@@ -61,6 +61,8 @@
 #include "ns3/global-route-manager.h"
 #include "ns3/constant-position-mobility-model.h"
 #include "ns3/random-waypoint-mobility-model.h"
+#include "ns3/ipv4-static-routing-helper.h"
+#include "ns3/ipv4-list-routing-helper.h"
 
 #include "ns3/vector.h"
 

examples/wireless/multirate.cc

@@ -58,6 +58,8 @@
 #include "ns3/wifi-module.h"
 #include "ns3/flow-monitor-helper.h"
 #include "ns3/olsr-helper.h"
+#include "ns3/ipv4-static-routing-helper.h"
+#include "ns3/ipv4-list-routing-helper.h"
 
 #include <iostream>
 #include <fstream>

examples/wireless/wifi-simple-adhoc-grid.cc

@@ -77,6 +77,8 @@
 #include "ns3/contrib-module.h"
 #include "ns3/wifi-module.h"
 #include "ns3/olsr-helper.h"
+#include "ns3/ipv4-static-routing-helper.h"
+#include "ns3/ipv4-list-routing-helper.h"
 
 #include <iostream>
 #include <fstream>

src/helper/internet-stack-helper.cc

@@ -164,11 +164,11 @@
 #include "ns3/core-config.h"
 #include "ns3/arp-l3-protocol.h"
 #include "internet-stack-helper.h"
-#include "ipv4-list-routing-helper.h"
-#include "ipv4-static-routing-helper.h"
-#include "ipv4-global-routing-helper.h"
-#include "ipv6-list-routing-helper.h"
-#include "ipv6-static-routing-helper.h"
+#include "ns3/ipv4-list-routing-helper.h"
+#include "ns3/ipv4-static-routing-helper.h"
+#include "ns3/ipv4-global-routing-helper.h"
+#include "ns3/ipv6-list-routing-helper.h"
+#include "ns3/ipv6-static-routing-helper.h"
 #include "trace-helper.h"
 #include <limits>
 #include <map>

src/helper/ipv6-interface-container.cc

@@ -22,7 +22,7 @@
 #include "ns3/names.h"
 
 #include "ipv6-interface-container.h"
-#include "ipv6-static-routing-helper.h"
+#include "ns3/ipv6-static-routing-helper.h"
 
 namespace ns3 
 {

src/helper/wscript

@@ -1,7 +1,7 @@
 ## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-
 
 def build(bld):
-    helper = bld.create_ns3_module('helper', ['internet-stack', 'wifi', 'point-to-point', 'csma', 'global-routing', 'onoff', 'packet-sink', 'udp-echo', 'spectrum'])
+    helper = bld.create_ns3_module('helper', ['internet-stack', 'wifi', 'point-to-point', 'csma', 'onoff', 'packet-sink', 'udp-echo', 'spectrum'])
     helper.source = [
         'node-container.cc',
         'net-device-container.cc',
@@ -11,7 +11,6 @@ def build(bld):
         'mobility-helper.cc',
         'ns2-mobility-helper.cc',
         'ipv4-address-helper.cc',
-        'ipv4-static-routing-helper.cc',
         'internet-stack-helper.cc',
         'application-container.cc',
         'on-off-helper.cc',
@@ -26,8 +25,6 @@ def build(bld):
         'nqos-wifi-mac-helper.cc',
         'qos-wifi-mac-helper.cc',
         'ipv4-nix-vector-helper.cc',
-        'ipv4-global-routing-helper.cc',
-        'ipv4-list-routing-helper.cc',
         'ipv4-routing-helper.cc',
         'aodv-helper.cc',
         'mesh-helper.cc',
@@ -36,8 +33,6 @@ def build(bld):
         'athstats-helper.cc',
         'ipv6-address-helper.cc',
         'ipv6-interface-container.cc',
-        'ipv6-static-routing-helper.cc',
-        'ipv6-list-routing-helper.cc',
         'ipv6-routing-helper.cc',
         'ping6-helper.cc',
         'animation-interface.cc',
@@ -65,7 +60,6 @@ def build(bld):
         'mobility-helper.h',
         'ns2-mobility-helper.h',
         'ipv4-address-helper.h',
-        'ipv4-static-routing-helper.h',
         'internet-stack-helper.h',
         'application-container.h',
         'on-off-helper.h',
@@ -80,8 +74,6 @@ def build(bld):
         'nqos-wifi-mac-helper.h',
         'qos-wifi-mac-helper.h',
         'ipv4-nix-vector-helper.h',
-	'ipv4-global-routing-helper.h',
-        'ipv4-list-routing-helper.h',
         'ipv4-routing-helper.h',
         'aodv-helper.h',
         'mesh-helper.h',
@@ -91,8 +83,6 @@ def build(bld):
         'athstats-helper.h',
         'ipv6-address-helper.h',
         'ipv6-interface-container.h',
-        'ipv6-static-routing-helper.h',
-        'ipv6-list-routing-helper.h',
         'ipv6-routing-helper.h',
         'ping6-helper.h',
         'animation-interface.h',

src/routing/global-routing/helper/ipv4-global-routing-helper.h

@@ -20,8 +20,8 @@
 #ifndef IPV4_GLOBAL_ROUTING_HELPER_H
 #define IPV4_GLOBAL_ROUTING_HELPER_H
 
-#include "node-container.h"
-#include "ipv4-routing-helper.h"
+#include "ns3/node-container.h"
+#include "ns3/ipv4-routing-helper.h"
 
 namespace ns3 {
 

src/routing/global-routing/wscript

@@ -3,17 +3,19 @@
 def build(bld):
     module = bld.create_ns3_module('global-routing', ['node'])
     module.source = [
-        'global-router-interface.cc',
-        'global-route-manager.cc',
-        'global-route-manager-impl.cc',
-        'candidate-queue.cc',
-        'ipv4-global-routing.cc',
+        'model/global-router-interface.cc',
+        'model/global-route-manager.cc',
+        'model/global-route-manager-impl.cc',
+        'model/candidate-queue.cc',
+        'model/ipv4-global-routing.cc',
+        'helper/ipv4-global-routing-helper.cc',
         ]
     headers = bld.new_task_gen('ns3header')
     headers.module = 'global-routing'
     headers.source = [
-        'global-router-interface.h',
-        'global-route-manager.h',
-        'ipv4-global-routing.h',
+        'model/global-router-interface.h',
+        'model/global-route-manager.h',
+        'model/ipv4-global-routing.h',
+	'helper/ipv4-global-routing-helper.h',
         ]
 

src/routing/list-routing/helper/ipv4-list-routing-helper.h

@@ -20,7 +20,7 @@
 #ifndef IPV4_LIST_ROUTING_HELPER_H
 #define IPV4_LIST_ROUTING_HELPER_H
 
-#include "ipv4-routing-helper.h"
+#include "ns3/ipv4-routing-helper.h"
 #include <stdint.h>
 #include <list>
 

src/routing/list-routing/helper/ipv6-list-routing-helper.h

@@ -24,7 +24,7 @@
 
 #include <list>
 
-#include "ipv6-routing-helper.h"
+#include "ns3/ipv6-routing-helper.h"
 
 namespace ns3 {
 

src/routing/list-routing/wscript

@@ -3,13 +3,17 @@
 def build(bld):
     module = bld.create_ns3_module('list-routing', ['node'])
     module.source = [
-        'ipv4-list-routing.cc',
-        'ipv6-list-routing.cc',
+        'model/ipv4-list-routing.cc',
+        'model/ipv6-list-routing.cc',
+        'helper/ipv4-list-routing-helper.cc',
+        'helper/ipv6-list-routing-helper.cc',
         ]
     headers = bld.new_task_gen('ns3header')
     headers.module = 'list-routing'
     headers.source = [
-        'ipv4-list-routing.h',
-        'ipv6-list-routing.h',
+        'model/ipv4-list-routing.h',
+        'model/ipv6-list-routing.h',
+        'helper/ipv4-list-routing-helper.h',
+        'helper/ipv6-list-routing-helper.h',
         ]
 

src/routing/olsr/examples/olsr-hna.cc

@@ -60,6 +60,8 @@
 #include "ns3/ipv4-list-routing.h"
 #include "ns3/olsr-routing-protocol.h"
 #include "ns3/olsr-helper.h"
+#include "ns3/ipv4-static-routing-helper.h"
+#include "ns3/ipv4-list-routing-helper.h"
 
 #include <iostream>
 #include <fstream>

src/routing/olsr/examples/simple-point-to-point-olsr.cc

@@ -45,6 +45,8 @@
 #include "ns3/node-module.h"
 #include "ns3/helper-module.h"
 #include "ns3/olsr-helper.h"
+#include "ns3/ipv4-static-routing-helper.h"
+#include "ns3/ipv4-list-routing-helper.h"
 
 using namespace ns3;
 

src/routing/static-routing/helper/ipv4-static-routing-helper.h

@@ -25,9 +25,9 @@
 #include "ns3/ipv4-address.h"
 #include "ns3/node.h"
 #include "ns3/net-device.h"
-#include "ipv4-routing-helper.h"
-#include "node-container.h"
-#include "net-device-container.h"
+#include "ns3/ipv4-routing-helper.h"
+#include "ns3/node-container.h"
+#include "ns3/net-device-container.h"
 
 namespace ns3 {
 

src/routing/static-routing/helper/ipv6-static-routing-helper.h

@@ -26,9 +26,9 @@
 #include "ns3/node.h"
 #include "ns3/net-device.h"
 
-#include "node-container.h"
-#include "net-device-container.h"
-#include "ipv6-routing-helper.h"
+#include "ns3/node-container.h"
+#include "ns3/net-device-container.h"
+#include "ns3/ipv6-routing-helper.h"
 
 namespace ns3 {
 

src/routing/static-routing/wscript

@@ -3,17 +3,21 @@
 def build(bld):
     module = bld.create_ns3_module('static-routing', ['node'])
     module.source = [
-        'ipv4-static-routing.cc',
-        'ipv4-routing-table-entry.cc',
-        'ipv6-static-routing.cc',
-        'ipv6-routing-table-entry.cc',
+        'model/ipv4-static-routing.cc',
+        'model/ipv4-routing-table-entry.cc',
+        'model/ipv6-static-routing.cc',
+        'model/ipv6-routing-table-entry.cc',
+        'helper/ipv4-static-routing-helper.cc',
+        'helper/ipv6-static-routing-helper.cc',
         ]
     headers = bld.new_task_gen('ns3header')
     headers.module = 'static-routing'
     headers.source = [
-        'ipv4-static-routing.h',
-        'ipv4-routing-table-entry.h',
-        'ipv6-static-routing.h',
-        'ipv6-routing-table-entry.h',
+        'model/ipv4-static-routing.h',
+        'model/ipv4-routing-table-entry.h',
+        'model/ipv6-static-routing.h',
+        'model/ipv6-routing-table-entry.h',
+        'helper/ipv4-static-routing-helper.h',
+        'helper/ipv6-static-routing-helper.h',
         ]