move code around

SConstruct

@@ -192,62 +192,90 @@ ns3.add (node)
 node.add_deps (['core', 'common', 'simulator'])
 node.add_sources ([
     'node.cc',
+    'ipv4-address.cc',
+    'net-device.cc',
+    'mac-address.cc',
+    'llc-snap-header.cc',
+    'ipv4-route.cc',
+    'queue.cc',
+    'drop-tail.cc',
+    'channel.cc',
+    'node-list.cc',
+    'socket.cc',
+    'i-udp.cc',
+    'i-ipv4.cc',
+    ])
+node.add_inst_headers ([
+    'node.h',
+    'ipv4-address.h',
+    'net-device.h',
+    'mac-address.h',
+    'ipv4-route.h',
+    'queue.h',
+    'drop-tail.h',
+    'llc-snap-header.h',
+    'channel.h',
+    'node-list.h',
+    'socket.h',
+    'i-udp.h',
+    'i-ipv4.h',
+    ])
+
+applications = build.Ns3Module ('applications', 'src/applications')
+ns3.add (applications)
+applications.add_deps (['node'])
+applications.add_sources ([
+    'application-list.cc',
+    'application.cc',
+    'onoff-application.cc',
+])
+applications.add_inst_headers ([
+    'application-list.h',
+    'application.h',
+    'onoff-application.h',
+])
+
+inode = build.Ns3Module ('internet-node', 'src/internet-node')
+ns3.add (inode)
+inode.add_deps (['node', 'applications'])
+inode.add_sources ([
+    'internet-node.cc',
     'l3-demux.cc',
     'l3-protocol.cc',
     'ipv4-l4-demux.cc',
     'ipv4-l4-protocol.cc',
-    'ipv4-address.cc',
-    'internet-node.cc',
-    'net-device.cc',
-    'mac-address.cc',
     'ipv4-header.cc',
     'udp-header.cc',
     'ipv4-checksum.cc',
-    'ipv4-route.cc',
     'ipv4-interface.cc',
     'ipv4.cc',
     'ipv4-end-point.cc',
     'udp.cc',
     'arp-header.cc',
-    'application.cc',
-    'application-list.cc',
-    'onoff-application.cc',
     'arp-cache.cc',
     'arp-ipv4-interface.cc',
     'arp.cc',
     'ipv4-loopback-interface.cc',
-    'llc-snap-header.cc',
     'header-utils.cc',
-    'queue.cc',
-    'drop-tail.cc',
-    'channel.cc',
-    'node-list.cc',
-    'ascii-trace.cc',
-    'socket.cc',
     'udp-socket.cc',
-    'pcap-trace.cc',
     'ipv4-end-point-demux.cc',
-    'i-udp.cc',
     'i-udp-impl.cc',
     'i-arp-private.cc',
-    'i-ipv4.cc',
     'i-ipv4-impl.cc',
     'i-ipv4-private.cc',
-    ])
-node.add_headers ([
+    'ascii-trace.cc',
+    'pcap-trace.cc',
+])
+inode.add_headers ([
     'ipv4-header.h',
     'udp-header.h',
     'ipv4-checksum.h',
-    'application.h',
-    'application-list.h',
-    'onoff-application.h',
     'arp-header.h',
     'arp-cache-cache.h',
     'arp.h',
     'ipv4-loopback-interface.h',
     'l3-demux.h',
     'header-utils.h',
-    'protocol.h',
     'queue.h',
     'arp-ipv4-interface.h',
     'udp-socket.h',
@@ -262,32 +290,18 @@ node.add_headers ([
     'ipv4-l4-demux.h',
     'ipv4-end-point-demux.h',
     'ipv4-end-point.h',
-    ])
-node.add_inst_headers ([
-    'node.h',
-    'internet-node.h',
-    'ipv4-address.h',
-    'net-device.h',
-    'ipv4-interface.h',
-    'mac-address.h',
-    'ipv4-route.h',
-    'queue.h',
-    'drop-tail.h',
-    'llc-snap-header.h',
-    'arp-header.h',
     'ipv4-header.h',
     'udp-header.h',
-    'channel.h',
-    'node-list.h',
-    'application.h',
-    'application-list.h',
-    'onoff-application.h',
+    'ipv4-interface.h',
+    'sgi-hashmap.h'
+])
+inode.add_inst_headers ([
+    'internet-node.h',
     'ascii-trace.h',
-    'socket.h',
     'pcap-trace.h',
-    'i-udp.h',
-    'i-ipv4.h',
-    ])
+])
+
+
 
 p2p = build.Ns3Module ('p2p', 'src/devices/p2p')
 ns3.add (p2p)
@@ -380,13 +394,13 @@ sample_test.add_source('main-test.cc')
 sample_simple = build.Ns3Module('sample-simple', 'samples')
 sample_simple.set_executable()
 ns3.add(sample_simple)
-sample_simple.add_deps(['core', 'simulator', 'node'])
+sample_simple.add_deps(['core', 'simulator', 'node', 'internet-node'])
 sample_simple.add_source('main-simple.cc')
 
 sample_sp2p = build.Ns3Module('sample-simple-p2p', 'samples')
 sample_sp2p.set_executable()
 #n3.add(sample_sp2p)
-sample_sp2p.add_deps(['core', 'simulator', 'node', 'p2p'])
+sample_sp2p.add_deps(['core', 'simulator', 'node', 'internet-node', 'p2p'])
 sample_sp2p.add_source('main-simple-p2p.cc')
 
 sample_default_value = build.Ns3Module('sample-default-value', 'samples')
@@ -399,7 +413,7 @@ sample_default_value.add_source('main-default-value.cc')
 example_simple_p2p = build.Ns3Module('simple-p2p', 'examples')
 example_simple_p2p.set_executable()
 ns3.add(example_simple_p2p)
-example_simple_p2p.add_deps(['core', 'simulator', 'node', 'p2p'])
+example_simple_p2p.add_deps(['core', 'simulator', 'node', 'p2p', 'internet-node'])
 example_simple_p2p.add_source('simple-p2p.cc')
 
 ns3.generate_dependencies()

src/applications/application.cc

@@ -22,7 +22,7 @@
 // George F. Riley, Georgia Tech, Fall 2006
 
 #include "application.h"
-#include "node.h"
+#include "ns3/node.h"
 #include "ns3/nstime.h"
 #include "ns3/random-variable.h"
 #include "ns3/simulator.h"

src/applications/onoff-application.cc

@@ -22,15 +22,15 @@
 // George F. Riley, Georgia Tech, Spring 2007
 // Adapted from ApplicationOnOff in GTNetS.
 
-#include "ipv4-address.h"
-#include "node.h"
+#include "ns3/ipv4-address.h"
+#include "ns3/node.h"
 #include "ns3/nstime.h"
 #include "ns3/data-rate.h"
-#include "onoff-application.h"
 #include "ns3/random-variable.h"
-#include "socket.h"
+#include "ns3/socket.h"
 #include "ns3/simulator.h"
-#include "i-udp.h"
+#include "ns3/i-udp.h"
+#include "onoff-application.h"
 
 using namespace std;
 

src/internet-node/arp-cache.h

@@ -24,9 +24,9 @@
 #include <stdint.h>
 #include "ns3/packet.h"
 #include "ns3/nstime.h"
-#include "net-device.h"
-#include "ipv4-address.h"
-#include "mac-address.h"
+#include "ns3/net-device.h"
+#include "ns3/ipv4-address.h"
+#include "ns3/mac-address.h"
 #include "sgi-hashmap.h"
 
 namespace ns3 {

src/internet-node/arp-header.h

@@ -23,8 +23,8 @@
 #define ARP_HEADER_H
 
 #include "ns3/header.h"
-#include "mac-address.h"
-#include "ipv4-address.h"
+#include "ns3/mac-address.h"
+#include "ns3/ipv4-address.h"
 
 namespace ns3 {
 

src/internet-node/arp-ipv4-interface.cc

@@ -22,11 +22,11 @@
 
 #include "ns3/packet.h"
 #include "ns3/composite-trace-resolver.h"
+#include "ns3/node.h"
+#include "ns3/net-device.h"
 
 #include "arp-ipv4-interface.h"
 #include "i-arp-private.h"
-#include "node.h"
-#include "net-device.h"
 #include "ipv4.h"
 
 namespace ns3 {

src/internet-node/arp.cc

@@ -21,12 +21,13 @@
 #include "ns3/packet.h"
 #include "ns3/debug.h"
 #include "ns3/empty-trace-resolver.h"
+#include "ns3/node.h"
+#include "ns3/net-device.h"
+
 #include "arp.h"
 #include "arp-header.h"
 #include "arp-cache.h"
-#include "net-device.h"
 #include "ipv4-interface.h"
-#include "node.h"
 #include "i-ipv4-private.h"
 
 NS_DEBUG_COMPONENT_DEFINE ("Arp");

src/internet-node/arp.h

@@ -22,8 +22,8 @@
 #define ARP_H
 
 #include <list>
-#include "ipv4-address.h"
-#include "mac-address.h"
+#include "ns3/ipv4-address.h"
+#include "ns3/mac-address.h"
 #include "l3-protocol.h"
 
 namespace ns3 {

src/internet-node/ascii-trace.cc

@@ -23,15 +23,15 @@
 #include "ns3/trace-context.h"
 #include "ns3/trace-root.h"
 #include "ns3/simulator.h"
+#include "ns3/node.h"
+#include "ns3/queue.h"
+#include "ns3/node-list.h"
+#include "ns3/llc-snap-header.h"
 
-#include "node.h"
 #include "ipv4.h"
-#include "queue.h"
-#include "llc-snap-header.h"
 #include "arp-header.h"
 #include "udp-header.h"
 #include "ipv4-header.h"
-#include "node-list.h"
 
 namespace ns3 {
 

src/internet-node/header-utils.h

@@ -22,8 +22,8 @@
 #define HEADER_UTILS_H
 
 #include "ns3/buffer.h"
-#include "ipv4-address.h"
-#include "mac-address.h"
+#include "ns3/ipv4-address.h"
+#include "ns3/mac-address.h"
 
 namespace ns3 {
 

src/internet-node/i-arp-private.h

@@ -22,7 +22,7 @@
 #define I_ARP_PRIVATE_H
 
 #include "ns3/ns-unknown.h"
-#include "ipv4-address.h"
+#include "ns3/ipv4-address.h"
 
 namespace ns3 {
 

src/internet-node/i-ipv4-impl.h

@@ -21,7 +21,7 @@
 #ifndef I_IPV4_IMPL_H
 #define I_IPV4_IMPL_H
 
-#include "i-ipv4.h"
+#include "ns3/i-ipv4.h"
 
 namespace ns3 {
 

src/internet-node/i-udp-impl.h

@@ -21,7 +21,7 @@
 #ifndef I_UDP_IMPL_H
 #define I_UDP_IMPL_H
 
-#include "i-udp.h"
+#include "ns3/i-udp.h"
 
 namespace ns3 {
 

src/internet-node/internet-node.cc

@@ -22,15 +22,15 @@
 // George F. Riley, Georgia Tech, Fall 2006
 
 #include "ns3/composite-trace-resolver.h"
+#include "ns3/application-list.h"
+#include "ns3/net-device.h"
 
-#include "application-list.h"
 #include "l3-demux.h"
 #include "ipv4-l4-demux.h"
 #include "internet-node.h"
 #include "udp.h"
 #include "ipv4.h"
 #include "arp.h"
-#include "net-device.h"
 #include "i-udp-impl.h"
 #include "i-arp-private.h"
 #include "i-ipv4-impl.h"

src/internet-node/internet-node.h

@@ -27,7 +27,7 @@
 #include <list>
 #include <string>
 
-#include "node.h"
+#include "ns3/node.h"
 
 namespace ns3 {
 

src/internet-node/ipv4-end-point-demux.h

@@ -24,7 +24,7 @@
 
 #include <stdint.h>
 #include <list>
-#include "ipv4-address.h"
+#include "ns3/ipv4-address.h"
 
 namespace ns3 {
 

src/internet-node/ipv4-end-point.h

@@ -23,7 +23,7 @@
 #define IPV4_END_POINT_H
 
 #include <stdint.h>
-#include "ipv4-address.h"
+#include "ns3/ipv4-address.h"
 #include "ns3/callback.h"
 
 namespace ns3 {

src/internet-node/ipv4-header.h

@@ -23,7 +23,7 @@
 #define IPV4_HEADER_H
 
 #include "ns3/header.h"
-#include "ipv4-address.h"
+#include "ns3/ipv4-address.h"
 
 namespace ns3 {
 

src/internet-node/ipv4-interface.cc

@@ -20,8 +20,8 @@
  */
 
 #include "ipv4-interface.h"
-#include "ipv4-address.h"
-#include "net-device.h"
+#include "ns3/ipv4-address.h"
+#include "ns3/net-device.h"
 
 namespace ns3 {
 

src/internet-node/ipv4-interface.h

@@ -24,7 +24,7 @@
 #define IPV4_INTERFACE_H
 
 #include <list>
-#include "ipv4-address.h"
+#include "ns3/ipv4-address.h"
 
 namespace ns3 {
 

src/internet-node/ipv4-l4-demux.cc

@@ -25,9 +25,9 @@
 #include <sstream>
 #include "ns3/composite-trace-resolver.h"
 #include "ns3/iid-manager.h"
+#include "ns3/node.h"
 #include "ipv4-l4-demux.h"
 #include "ipv4-l4-protocol.h"
-#include "node.h"
 
 namespace ns3 {
 

src/internet-node/ipv4-loopback-interface.cc

@@ -20,9 +20,9 @@
  *  Mathieu Lacage <mathieu.lacage@sophia.inria.fr>,
  */
 #include "ns3/empty-trace-resolver.h"
+#include "ns3/net-device.h"
+#include "ns3/node.h"
 #include "ipv4-loopback-interface.h"
-#include "net-device.h"
-#include "node.h"
 #include "i-ipv4-private.h"
 
 namespace ns3 {

src/internet-node/ipv4.cc

@@ -24,17 +24,16 @@
 #include "ns3/composite-trace-resolver.h"
 #include "ns3/array-trace-resolver.h"
 #include "ns3/callback.h"
+#include "ns3/ipv4-address.h"
+#include "ns3/ipv4-route.h"
+#include "ns3/node.h"
 
 #include "ipv4.h"
 #include "ipv4-l4-protocol.h"
-#include "ipv4-address.h"
 #include "ipv4-header.h"
 #include "ipv4-interface.h"
-#include "ipv4-route.h"
 #include "ipv4-loopback-interface.h"
 #include "arp-ipv4-interface.h"
-// the two following headers are needed for Ipv4::ForwardUp
-#include "node.h"
 #include "ipv4-l4-demux.h"
 
 NS_DEBUG_COMPONENT_DEFINE ("Ipv4");

src/internet-node/ipv4.h

@@ -26,7 +26,7 @@
 #include <stdint.h>
 #include "ns3/callback-trace-source.h"
 #include "ns3/array-trace-resolver.h"
-#include "ipv4-address.h"
+#include "ns3/ipv4-address.h"
 #include "l3-protocol.h"
 
 namespace ns3 {

src/internet-node/l3-demux.cc

@@ -24,9 +24,9 @@
 #include <string>
 #include "ns3/composite-trace-resolver.h"
 #include "ns3/iid-manager.h"
+#include "ns3/node.h"
 #include "l3-demux.h"
 #include "l3-protocol.h"
-#include "node.h"
 
 namespace ns3 {
 

src/internet-node/pcap-trace.cc

@@ -26,10 +26,10 @@
 #include "ns3/trace-context.h"
 #include "ns3/callback.h"
 #include "ns3/pcap-writer.h"
+#include "ns3/node-list.h"
+#include "ns3/node.h"
 
 #include "ipv4.h"
-#include "node-list.h"
-#include "node.h"
 
 
 namespace ns3 {

src/internet-node/udp-header.h

@@ -24,7 +24,7 @@
 
 #include <stdint.h>
 #include "ns3/header.h"
-#include "ipv4-address.h"
+#include "ns3/ipv4-address.h"
 
 namespace ns3 {
 

src/internet-node/udp-socket.cc

@@ -18,10 +18,10 @@
  *
  * Author: Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
  */
+#include "ns3/node.h"
 #include "udp-socket.h"
 #include "udp.h"
 #include "ipv4-end-point.h"
-#include "node.h"
 #include "ipv4-l4-demux.h"
 
 namespace ns3 {

src/internet-node/udp-socket.h

@@ -23,7 +23,7 @@
 
 #include <stdint.h>
 #include "ns3/callback.h"
-#include "socket.h"
+#include "ns3/socket.h"
 
 namespace ns3 {
 

src/internet-node/udp.cc

@@ -22,12 +22,12 @@
 #include "ns3/assert.h"
 #include "ns3/packet.h"
 #include "ns3/empty-trace-resolver.h"
+#include "ns3/node.h"
 
 #include "udp.h"
 #include "udp-header.h"
 #include "ipv4-end-point-demux.h"
 #include "ipv4-end-point.h"
-#include "node.h"
 #include "ipv4.h"
 #include "i-ipv4-private.h"
 #include "l3-demux.h"

src/internet-node/udp.h

@@ -25,7 +25,7 @@
 #include <stdint.h>
 
 #include "ns3/packet.h"
-#include "ipv4-address.h"
+#include "ns3/ipv4-address.h"
 #include "ipv4-end-point-demux.h"
 #include "ipv4-l4-protocol.h"