From 6e437f5103b910e4c693bda4edf65de5dfe066db Mon Sep 17 00:00:00 2001 From: Mathieu Lacage Date: Fri, 4 May 2007 15:04:07 +0200 Subject: [PATCH] move code around --- SConstruct | 112 ++++++++++-------- .../application-list.cc | 0 src/{node => applications}/application-list.h | 0 src/{node => applications}/application.cc | 2 +- src/{node => applications}/application.h | 0 .../onoff-application.cc | 10 +- .../onoff-application.h | 0 src/{node => internet-node}/arp-cache.cc | 0 src/{node => internet-node}/arp-cache.h | 6 +- src/{node => internet-node}/arp-header.cc | 0 src/{node => internet-node}/arp-header.h | 4 +- .../arp-ipv4-interface.cc | 4 +- .../arp-ipv4-interface.h | 0 src/{node => internet-node}/arp.cc | 5 +- src/{node => internet-node}/arp.h | 4 +- src/{node => internet-node}/ascii-trace.cc | 8 +- src/{node => internet-node}/ascii-trace.h | 0 src/{node => internet-node}/header-utils.cc | 0 src/{node => internet-node}/header-utils.h | 4 +- src/{node => internet-node}/i-arp-private.cc | 0 src/{node => internet-node}/i-arp-private.h | 2 +- src/{node => internet-node}/i-ipv4-impl.cc | 0 src/{node => internet-node}/i-ipv4-impl.h | 2 +- src/{node => internet-node}/i-ipv4-private.cc | 0 src/{node => internet-node}/i-ipv4-private.h | 0 src/{node => internet-node}/i-udp-impl.cc | 0 src/{node => internet-node}/i-udp-impl.h | 2 +- src/{node => internet-node}/internet-node.cc | 4 +- src/{node => internet-node}/internet-node.h | 2 +- src/{node => internet-node}/ipv4-checksum.cc | 0 src/{node => internet-node}/ipv4-checksum.h | 0 .../ipv4-end-point-demux.cc | 0 .../ipv4-end-point-demux.h | 2 +- src/{node => internet-node}/ipv4-end-point.cc | 0 src/{node => internet-node}/ipv4-end-point.h | 2 +- src/{node => internet-node}/ipv4-header.cc | 0 src/{node => internet-node}/ipv4-header.h | 2 +- src/{node => internet-node}/ipv4-interface.cc | 4 +- src/{node => internet-node}/ipv4-interface.h | 2 +- src/{node => internet-node}/ipv4-l4-demux.cc | 2 +- src/{node => internet-node}/ipv4-l4-demux.h | 0 .../ipv4-l4-protocol.cc | 0 .../ipv4-l4-protocol.h | 0 .../ipv4-loopback-interface.cc | 4 +- .../ipv4-loopback-interface.h | 0 src/{node => internet-node}/ipv4.cc | 7 +- src/{node => internet-node}/ipv4.h | 2 +- src/{node => internet-node}/l3-demux.cc | 2 +- src/{node => internet-node}/l3-demux.h | 0 src/{node => internet-node}/l3-protocol.cc | 0 src/{node => internet-node}/l3-protocol.h | 0 src/{node => internet-node}/pcap-trace.cc | 4 +- src/{node => internet-node}/pcap-trace.h | 0 src/{node => internet-node}/sgi-hashmap.h | 0 src/{node => internet-node}/udp-header.cc | 0 src/{node => internet-node}/udp-header.h | 2 +- src/{node => internet-node}/udp-socket.cc | 2 +- src/{node => internet-node}/udp-socket.h | 2 +- src/{node => internet-node}/udp.cc | 2 +- src/{node => internet-node}/udp.h | 2 +- 60 files changed, 114 insertions(+), 100 deletions(-) rename src/{node => applications}/application-list.cc (100%) rename src/{node => applications}/application-list.h (100%) rename src/{node => applications}/application.cc (99%) rename src/{node => applications}/application.h (100%) rename src/{node => applications}/onoff-application.cc (98%) rename src/{node => applications}/onoff-application.h (100%) rename src/{node => internet-node}/arp-cache.cc (100%) rename src/{node => internet-node}/arp-cache.h (96%) rename src/{node => internet-node}/arp-header.cc (100%) rename src/{node => internet-node}/arp-header.h (97%) rename src/{node => internet-node}/arp-ipv4-interface.cc (97%) rename src/{node => internet-node}/arp-ipv4-interface.h (100%) rename src/{node => internet-node}/arp.cc (99%) rename src/{node => internet-node}/arp.h (96%) rename src/{node => internet-node}/ascii-trace.cc (97%) rename src/{node => internet-node}/ascii-trace.h (100%) rename src/{node => internet-node}/header-utils.cc (100%) rename src/{node => internet-node}/header-utils.h (95%) rename src/{node => internet-node}/i-arp-private.cc (100%) rename src/{node => internet-node}/i-arp-private.h (97%) rename src/{node => internet-node}/i-ipv4-impl.cc (100%) rename src/{node => internet-node}/i-ipv4-impl.h (98%) rename src/{node => internet-node}/i-ipv4-private.cc (100%) rename src/{node => internet-node}/i-ipv4-private.h (100%) rename src/{node => internet-node}/i-udp-impl.cc (100%) rename src/{node => internet-node}/i-udp-impl.h (98%) rename src/{node => internet-node}/internet-node.cc (98%) rename src/{node => internet-node}/internet-node.h (98%) rename src/{node => internet-node}/ipv4-checksum.cc (100%) rename src/{node => internet-node}/ipv4-checksum.h (100%) rename src/{node => internet-node}/ipv4-end-point-demux.cc (100%) rename src/{node => internet-node}/ipv4-end-point-demux.h (98%) rename src/{node => internet-node}/ipv4-end-point.cc (100%) rename src/{node => internet-node}/ipv4-end-point.h (98%) rename src/{node => internet-node}/ipv4-header.cc (100%) rename src/{node => internet-node}/ipv4-header.h (98%) rename src/{node => internet-node}/ipv4-interface.cc (98%) rename src/{node => internet-node}/ipv4-interface.h (99%) rename src/{node => internet-node}/ipv4-l4-demux.cc (99%) rename src/{node => internet-node}/ipv4-l4-demux.h (100%) rename src/{node => internet-node}/ipv4-l4-protocol.cc (100%) rename src/{node => internet-node}/ipv4-l4-protocol.h (100%) rename src/{node => internet-node}/ipv4-loopback-interface.cc (96%) rename src/{node => internet-node}/ipv4-loopback-interface.h (100%) rename src/{node => internet-node}/ipv4.cc (99%) rename src/{node => internet-node}/ipv4.h (99%) rename src/{node => internet-node}/l3-demux.cc (99%) rename src/{node => internet-node}/l3-demux.h (100%) rename src/{node => internet-node}/l3-protocol.cc (100%) rename src/{node => internet-node}/l3-protocol.h (100%) rename src/{node => internet-node}/pcap-trace.cc (97%) rename src/{node => internet-node}/pcap-trace.h (100%) rename src/{node => internet-node}/sgi-hashmap.h (100%) rename src/{node => internet-node}/udp-header.cc (100%) rename src/{node => internet-node}/udp-header.h (98%) rename src/{node => internet-node}/udp-socket.cc (99%) rename src/{node => internet-node}/udp-socket.h (99%) rename src/{node => internet-node}/udp.cc (99%) rename src/{node => internet-node}/udp.h (98%) diff --git a/SConstruct b/SConstruct index 7483596b2..15826ec1e 100644 --- a/SConstruct +++ b/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() diff --git a/src/node/application-list.cc b/src/applications/application-list.cc similarity index 100% rename from src/node/application-list.cc rename to src/applications/application-list.cc diff --git a/src/node/application-list.h b/src/applications/application-list.h similarity index 100% rename from src/node/application-list.h rename to src/applications/application-list.h diff --git a/src/node/application.cc b/src/applications/application.cc similarity index 99% rename from src/node/application.cc rename to src/applications/application.cc index 810ee1ee9..c44075b27 100644 --- a/src/node/application.cc +++ b/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" diff --git a/src/node/application.h b/src/applications/application.h similarity index 100% rename from src/node/application.h rename to src/applications/application.h diff --git a/src/node/onoff-application.cc b/src/applications/onoff-application.cc similarity index 98% rename from src/node/onoff-application.cc rename to src/applications/onoff-application.cc index d3026271a..7682faa4b 100644 --- a/src/node/onoff-application.cc +++ b/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; diff --git a/src/node/onoff-application.h b/src/applications/onoff-application.h similarity index 100% rename from src/node/onoff-application.h rename to src/applications/onoff-application.h diff --git a/src/node/arp-cache.cc b/src/internet-node/arp-cache.cc similarity index 100% rename from src/node/arp-cache.cc rename to src/internet-node/arp-cache.cc diff --git a/src/node/arp-cache.h b/src/internet-node/arp-cache.h similarity index 96% rename from src/node/arp-cache.h rename to src/internet-node/arp-cache.h index ddee3b840..5923d2ca9 100644 --- a/src/node/arp-cache.h +++ b/src/internet-node/arp-cache.h @@ -24,9 +24,9 @@ #include #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 { diff --git a/src/node/arp-header.cc b/src/internet-node/arp-header.cc similarity index 100% rename from src/node/arp-header.cc rename to src/internet-node/arp-header.cc diff --git a/src/node/arp-header.h b/src/internet-node/arp-header.h similarity index 97% rename from src/node/arp-header.h rename to src/internet-node/arp-header.h index 588b8bc24..86b2ec960 100644 --- a/src/node/arp-header.h +++ b/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 { diff --git a/src/node/arp-ipv4-interface.cc b/src/internet-node/arp-ipv4-interface.cc similarity index 97% rename from src/node/arp-ipv4-interface.cc rename to src/internet-node/arp-ipv4-interface.cc index 20c0360a3..ee168bfd8 100644 --- a/src/node/arp-ipv4-interface.cc +++ b/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 { diff --git a/src/node/arp-ipv4-interface.h b/src/internet-node/arp-ipv4-interface.h similarity index 100% rename from src/node/arp-ipv4-interface.h rename to src/internet-node/arp-ipv4-interface.h diff --git a/src/node/arp.cc b/src/internet-node/arp.cc similarity index 99% rename from src/node/arp.cc rename to src/internet-node/arp.cc index e6d951b61..8c702adf4 100644 --- a/src/node/arp.cc +++ b/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"); diff --git a/src/node/arp.h b/src/internet-node/arp.h similarity index 96% rename from src/node/arp.h rename to src/internet-node/arp.h index 29d4c5498..ef909b2c8 100644 --- a/src/node/arp.h +++ b/src/internet-node/arp.h @@ -22,8 +22,8 @@ #define ARP_H #include -#include "ipv4-address.h" -#include "mac-address.h" +#include "ns3/ipv4-address.h" +#include "ns3/mac-address.h" #include "l3-protocol.h" namespace ns3 { diff --git a/src/node/ascii-trace.cc b/src/internet-node/ascii-trace.cc similarity index 97% rename from src/node/ascii-trace.cc rename to src/internet-node/ascii-trace.cc index 3ded1a0f5..761dcdfb0 100644 --- a/src/node/ascii-trace.cc +++ b/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 { diff --git a/src/node/ascii-trace.h b/src/internet-node/ascii-trace.h similarity index 100% rename from src/node/ascii-trace.h rename to src/internet-node/ascii-trace.h diff --git a/src/node/header-utils.cc b/src/internet-node/header-utils.cc similarity index 100% rename from src/node/header-utils.cc rename to src/internet-node/header-utils.cc diff --git a/src/node/header-utils.h b/src/internet-node/header-utils.h similarity index 95% rename from src/node/header-utils.h rename to src/internet-node/header-utils.h index bdfd9a45d..e65e7533c 100644 --- a/src/node/header-utils.h +++ b/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 { diff --git a/src/node/i-arp-private.cc b/src/internet-node/i-arp-private.cc similarity index 100% rename from src/node/i-arp-private.cc rename to src/internet-node/i-arp-private.cc diff --git a/src/node/i-arp-private.h b/src/internet-node/i-arp-private.h similarity index 97% rename from src/node/i-arp-private.h rename to src/internet-node/i-arp-private.h index 4d8641d15..41e57d976 100644 --- a/src/node/i-arp-private.h +++ b/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 { diff --git a/src/node/i-ipv4-impl.cc b/src/internet-node/i-ipv4-impl.cc similarity index 100% rename from src/node/i-ipv4-impl.cc rename to src/internet-node/i-ipv4-impl.cc diff --git a/src/node/i-ipv4-impl.h b/src/internet-node/i-ipv4-impl.h similarity index 98% rename from src/node/i-ipv4-impl.h rename to src/internet-node/i-ipv4-impl.h index 2ab427422..b3240a089 100644 --- a/src/node/i-ipv4-impl.h +++ b/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 { diff --git a/src/node/i-ipv4-private.cc b/src/internet-node/i-ipv4-private.cc similarity index 100% rename from src/node/i-ipv4-private.cc rename to src/internet-node/i-ipv4-private.cc diff --git a/src/node/i-ipv4-private.h b/src/internet-node/i-ipv4-private.h similarity index 100% rename from src/node/i-ipv4-private.h rename to src/internet-node/i-ipv4-private.h diff --git a/src/node/i-udp-impl.cc b/src/internet-node/i-udp-impl.cc similarity index 100% rename from src/node/i-udp-impl.cc rename to src/internet-node/i-udp-impl.cc diff --git a/src/node/i-udp-impl.h b/src/internet-node/i-udp-impl.h similarity index 98% rename from src/node/i-udp-impl.h rename to src/internet-node/i-udp-impl.h index 625295f3f..5acbac900 100644 --- a/src/node/i-udp-impl.h +++ b/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 { diff --git a/src/node/internet-node.cc b/src/internet-node/internet-node.cc similarity index 98% rename from src/node/internet-node.cc rename to src/internet-node/internet-node.cc index fe33d6421..2f18becea 100644 --- a/src/node/internet-node.cc +++ b/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" diff --git a/src/node/internet-node.h b/src/internet-node/internet-node.h similarity index 98% rename from src/node/internet-node.h rename to src/internet-node/internet-node.h index 5e5f585b2..835acb870 100644 --- a/src/node/internet-node.h +++ b/src/internet-node/internet-node.h @@ -27,7 +27,7 @@ #include #include -#include "node.h" +#include "ns3/node.h" namespace ns3 { diff --git a/src/node/ipv4-checksum.cc b/src/internet-node/ipv4-checksum.cc similarity index 100% rename from src/node/ipv4-checksum.cc rename to src/internet-node/ipv4-checksum.cc diff --git a/src/node/ipv4-checksum.h b/src/internet-node/ipv4-checksum.h similarity index 100% rename from src/node/ipv4-checksum.h rename to src/internet-node/ipv4-checksum.h diff --git a/src/node/ipv4-end-point-demux.cc b/src/internet-node/ipv4-end-point-demux.cc similarity index 100% rename from src/node/ipv4-end-point-demux.cc rename to src/internet-node/ipv4-end-point-demux.cc diff --git a/src/node/ipv4-end-point-demux.h b/src/internet-node/ipv4-end-point-demux.h similarity index 98% rename from src/node/ipv4-end-point-demux.h rename to src/internet-node/ipv4-end-point-demux.h index aa0b2530e..7de2c17d1 100644 --- a/src/node/ipv4-end-point-demux.h +++ b/src/internet-node/ipv4-end-point-demux.h @@ -24,7 +24,7 @@ #include #include -#include "ipv4-address.h" +#include "ns3/ipv4-address.h" namespace ns3 { diff --git a/src/node/ipv4-end-point.cc b/src/internet-node/ipv4-end-point.cc similarity index 100% rename from src/node/ipv4-end-point.cc rename to src/internet-node/ipv4-end-point.cc diff --git a/src/node/ipv4-end-point.h b/src/internet-node/ipv4-end-point.h similarity index 98% rename from src/node/ipv4-end-point.h rename to src/internet-node/ipv4-end-point.h index b90304f4c..f606aa63b 100644 --- a/src/node/ipv4-end-point.h +++ b/src/internet-node/ipv4-end-point.h @@ -23,7 +23,7 @@ #define IPV4_END_POINT_H #include -#include "ipv4-address.h" +#include "ns3/ipv4-address.h" #include "ns3/callback.h" namespace ns3 { diff --git a/src/node/ipv4-header.cc b/src/internet-node/ipv4-header.cc similarity index 100% rename from src/node/ipv4-header.cc rename to src/internet-node/ipv4-header.cc diff --git a/src/node/ipv4-header.h b/src/internet-node/ipv4-header.h similarity index 98% rename from src/node/ipv4-header.h rename to src/internet-node/ipv4-header.h index a09863491..f8c036aba 100644 --- a/src/node/ipv4-header.h +++ b/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 { diff --git a/src/node/ipv4-interface.cc b/src/internet-node/ipv4-interface.cc similarity index 98% rename from src/node/ipv4-interface.cc rename to src/internet-node/ipv4-interface.cc index 6fc5aacbe..e8bc9b116 100644 --- a/src/node/ipv4-interface.cc +++ b/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 { diff --git a/src/node/ipv4-interface.h b/src/internet-node/ipv4-interface.h similarity index 99% rename from src/node/ipv4-interface.h rename to src/internet-node/ipv4-interface.h index 31948f247..ef2b56408 100644 --- a/src/node/ipv4-interface.h +++ b/src/internet-node/ipv4-interface.h @@ -24,7 +24,7 @@ #define IPV4_INTERFACE_H #include -#include "ipv4-address.h" +#include "ns3/ipv4-address.h" namespace ns3 { diff --git a/src/node/ipv4-l4-demux.cc b/src/internet-node/ipv4-l4-demux.cc similarity index 99% rename from src/node/ipv4-l4-demux.cc rename to src/internet-node/ipv4-l4-demux.cc index a341aad4d..dfcde73bd 100644 --- a/src/node/ipv4-l4-demux.cc +++ b/src/internet-node/ipv4-l4-demux.cc @@ -25,9 +25,9 @@ #include #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 { diff --git a/src/node/ipv4-l4-demux.h b/src/internet-node/ipv4-l4-demux.h similarity index 100% rename from src/node/ipv4-l4-demux.h rename to src/internet-node/ipv4-l4-demux.h diff --git a/src/node/ipv4-l4-protocol.cc b/src/internet-node/ipv4-l4-protocol.cc similarity index 100% rename from src/node/ipv4-l4-protocol.cc rename to src/internet-node/ipv4-l4-protocol.cc diff --git a/src/node/ipv4-l4-protocol.h b/src/internet-node/ipv4-l4-protocol.h similarity index 100% rename from src/node/ipv4-l4-protocol.h rename to src/internet-node/ipv4-l4-protocol.h diff --git a/src/node/ipv4-loopback-interface.cc b/src/internet-node/ipv4-loopback-interface.cc similarity index 96% rename from src/node/ipv4-loopback-interface.cc rename to src/internet-node/ipv4-loopback-interface.cc index 8cb002efc..37a4eaf37 100644 --- a/src/node/ipv4-loopback-interface.cc +++ b/src/internet-node/ipv4-loopback-interface.cc @@ -20,9 +20,9 @@ * Mathieu Lacage , */ #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 { diff --git a/src/node/ipv4-loopback-interface.h b/src/internet-node/ipv4-loopback-interface.h similarity index 100% rename from src/node/ipv4-loopback-interface.h rename to src/internet-node/ipv4-loopback-interface.h diff --git a/src/node/ipv4.cc b/src/internet-node/ipv4.cc similarity index 99% rename from src/node/ipv4.cc rename to src/internet-node/ipv4.cc index 14a1b2867..d049edcd7 100644 --- a/src/node/ipv4.cc +++ b/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"); diff --git a/src/node/ipv4.h b/src/internet-node/ipv4.h similarity index 99% rename from src/node/ipv4.h rename to src/internet-node/ipv4.h index adf6d60c6..84b63bf95 100644 --- a/src/node/ipv4.h +++ b/src/internet-node/ipv4.h @@ -26,7 +26,7 @@ #include #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 { diff --git a/src/node/l3-demux.cc b/src/internet-node/l3-demux.cc similarity index 99% rename from src/node/l3-demux.cc rename to src/internet-node/l3-demux.cc index 9d49d5ff4..51b2704a3 100644 --- a/src/node/l3-demux.cc +++ b/src/internet-node/l3-demux.cc @@ -24,9 +24,9 @@ #include #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 { diff --git a/src/node/l3-demux.h b/src/internet-node/l3-demux.h similarity index 100% rename from src/node/l3-demux.h rename to src/internet-node/l3-demux.h diff --git a/src/node/l3-protocol.cc b/src/internet-node/l3-protocol.cc similarity index 100% rename from src/node/l3-protocol.cc rename to src/internet-node/l3-protocol.cc diff --git a/src/node/l3-protocol.h b/src/internet-node/l3-protocol.h similarity index 100% rename from src/node/l3-protocol.h rename to src/internet-node/l3-protocol.h diff --git a/src/node/pcap-trace.cc b/src/internet-node/pcap-trace.cc similarity index 97% rename from src/node/pcap-trace.cc rename to src/internet-node/pcap-trace.cc index 467476490..e3263fd4c 100644 --- a/src/node/pcap-trace.cc +++ b/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 { diff --git a/src/node/pcap-trace.h b/src/internet-node/pcap-trace.h similarity index 100% rename from src/node/pcap-trace.h rename to src/internet-node/pcap-trace.h diff --git a/src/node/sgi-hashmap.h b/src/internet-node/sgi-hashmap.h similarity index 100% rename from src/node/sgi-hashmap.h rename to src/internet-node/sgi-hashmap.h diff --git a/src/node/udp-header.cc b/src/internet-node/udp-header.cc similarity index 100% rename from src/node/udp-header.cc rename to src/internet-node/udp-header.cc diff --git a/src/node/udp-header.h b/src/internet-node/udp-header.h similarity index 98% rename from src/node/udp-header.h rename to src/internet-node/udp-header.h index cbb36d2e9..47efe8fa9 100644 --- a/src/node/udp-header.h +++ b/src/internet-node/udp-header.h @@ -24,7 +24,7 @@ #include #include "ns3/header.h" -#include "ipv4-address.h" +#include "ns3/ipv4-address.h" namespace ns3 { diff --git a/src/node/udp-socket.cc b/src/internet-node/udp-socket.cc similarity index 99% rename from src/node/udp-socket.cc rename to src/internet-node/udp-socket.cc index 6fdc6fe4c..3ef89a090 100644 --- a/src/node/udp-socket.cc +++ b/src/internet-node/udp-socket.cc @@ -18,10 +18,10 @@ * * Author: Mathieu Lacage */ +#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 { diff --git a/src/node/udp-socket.h b/src/internet-node/udp-socket.h similarity index 99% rename from src/node/udp-socket.h rename to src/internet-node/udp-socket.h index 728e51170..c75ff9ae6 100644 --- a/src/node/udp-socket.h +++ b/src/internet-node/udp-socket.h @@ -23,7 +23,7 @@ #include #include "ns3/callback.h" -#include "socket.h" +#include "ns3/socket.h" namespace ns3 { diff --git a/src/node/udp.cc b/src/internet-node/udp.cc similarity index 99% rename from src/node/udp.cc rename to src/internet-node/udp.cc index 19277e6fe..9261aa9a6 100644 --- a/src/node/udp.cc +++ b/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" diff --git a/src/node/udp.h b/src/internet-node/udp.h similarity index 98% rename from src/node/udp.h rename to src/internet-node/udp.h index 04fab4a7f..191dd2b73 100644 --- a/src/node/udp.h +++ b/src/internet-node/udp.h @@ -25,7 +25,7 @@ #include #include "ns3/packet.h" -#include "ipv4-address.h" +#include "ns3/ipv4-address.h" #include "ipv4-end-point-demux.h" #include "ipv4-l4-protocol.h"