From ca7b93cc3df2ad884cab2ef04f0707caff0cd261 Mon Sep 17 00:00:00 2001 From: Tom Henderson Date: Mon, 21 Feb 2011 09:11:37 -0800 Subject: [PATCH] Merge node and common modules into new network module --- examples/animation/dumbbell-animation.cc | 2 +- examples/animation/grid-animation.cc | 2 +- examples/animation/star-animation.cc | 2 +- examples/csma/csma-broadcast.cc | 2 +- examples/csma/csma-multicast.cc | 2 +- examples/csma/csma-one-subnet.cc | 2 +- examples/csma/csma-packet-socket.cc | 2 +- examples/csma/csma-ping.cc | 2 +- examples/csma/csma-raw-ip-socket.cc | 2 +- examples/csma/csma-star.cc | 2 +- examples/emulation/emu-ping.cc | 2 +- examples/energy/energy-model-example.cc | 3 +- examples/error-model/simple-error-model.cc | 4 +- examples/matrix-topology/matrix-topology.cc | 2 +- examples/mesh/mesh.cc | 2 +- examples/mpi/nms-p2p-nix-distributed.cc | 2 +- examples/mpi/simple-distributed.cc | 2 +- examples/mpi/third-distributed.cc | 2 +- examples/routing/aodv.cc | 3 +- examples/routing/dynamic-global-routing.cc | 2 +- examples/routing/global-injection-slash32.cc | 2 +- examples/routing/global-routing-slash32.cc | 2 +- examples/routing/mixed-global-routing.cc | 2 +- examples/routing/nix-simple.cc | 2 +- examples/routing/nms-p2p-nix.cc | 2 +- examples/routing/simple-alternate-routing.cc | 2 +- examples/routing/simple-global-routing.cc | 2 +- examples/routing/static-routing-slash32.cc | 2 +- .../socket/socket-bound-static-routing.cc | 2 +- .../socket/socket-bound-tcp-static-routing.cc | 2 +- examples/stats/wifi-example-apps.cc | 5 +- examples/stats/wifi-example-apps.h | 2 +- examples/stats/wifi-example-sim.cc | 3 +- examples/tap/tap-csma-virtual-machine.cc | 2 +- examples/tap/tap-csma.cc | 2 +- examples/tap/tap-wifi-dumbbell.cc | 2 +- examples/tap/tap-wifi-virtual-machine.cc | 2 +- examples/tcp/star.cc | 2 +- examples/tcp/tcp-bulk-send.cc | 2 +- examples/tcp/tcp-large-transfer.cc | 3 +- examples/tcp/tcp-nsc-lfn.cc | 4 +- examples/tcp/tcp-nsc-zoo.cc | 2 +- examples/tcp/tcp-star-server.cc | 2 +- .../topology-read/topology-example-sim.cc | 3 +- examples/tutorial/fifth.cc | 5 +- examples/tutorial/first.cc | 2 +- examples/tutorial/second.cc | 2 +- examples/tutorial/sixth.cc | 5 +- examples/tutorial/third.cc | 2 +- examples/wimax/wimax-ipv4.cc | 3 +- examples/wimax/wimax-multicast.cc | 3 +- examples/wimax/wimax-simple.cc | 3 +- examples/wireless/mixed-wireless.cc | 3 +- examples/wireless/multirate.cc | 3 +- .../wireless/simple-wifi-frame-aggregation.cc | 2 +- examples/wireless/wifi-adhoc.cc | 3 +- examples/wireless/wifi-ap.cc | 3 +- examples/wireless/wifi-blockack.cc | 2 +- examples/wireless/wifi-clear-channel-cmu.cc | 3 +- examples/wireless/wifi-hidden-terminal.cc | 2 +- examples/wireless/wifi-simple-adhoc-grid.cc | 3 +- examples/wireless/wifi-simple-adhoc.cc | 3 +- examples/wireless/wifi-simple-infra.cc | 3 +- examples/wireless/wifi-simple-interference.cc | 3 +- examples/wireless/wifi-wired-bridging.cc | 2 +- samples/main-simple.cc | 2 +- scratch/multiple-sources/simple-simulation.cc | 2 +- scratch/simple.cc | 2 +- src/applications/bulk-send/wscript | 2 +- src/applications/onoff/wscript | 2 +- src/applications/packet-sink/wscript | 2 +- src/applications/v4ping/wscript | 2 +- src/common/wscript | 51 -------- src/contrib/energy/wscript | 2 +- src/contrib/stats/wscript | 2 +- src/contrib/topology-read/wscript | 2 +- src/contrib/wscript | 2 +- .../bridge/examples/csma-bridge-one-hop.cc | 2 +- src/devices/bridge/examples/csma-bridge.cc | 2 +- src/devices/bridge/wscript | 2 +- src/devices/csma/wscript | 2 +- src/devices/emu/wscript | 2 +- src/devices/lte/examples/lte-amc.cc | 4 +- src/devices/lte/examples/lte-channel-model.cc | 4 +- src/devices/lte/examples/lte-device.cc | 3 +- .../lte/examples/lte-multiple-flows.cc | 3 +- src/devices/lte/examples/lte-phy-downlink.cc | 4 +- src/devices/lte/examples/lte-phy-uplink.cc | 4 +- src/devices/lte/wscript | 2 +- src/devices/point-to-point/wscript | 2 +- src/devices/tap-bridge/wscript | 2 +- src/devices/uan/examples/uan-cw-example.cc | 3 +- src/devices/uan/examples/uan-cw-example.h | 3 +- src/devices/uan/examples/uan-rc-example.cc | 3 +- src/devices/uan/examples/uan-rc-example.h | 3 +- src/devices/uan/wscript | 2 +- .../examples/virtual-net-device.cc | 2 +- src/devices/virtual-net-device/wscript | 2 +- src/devices/wifi/wscript | 2 +- src/devices/wimax/wscript | 2 +- src/helper/aodv-helper.h | 2 +- src/helper/bulk-send-helper.h | 4 +- src/helper/internet-stack-helper.h | 4 +- src/helper/ipv4-address-helper.h | 2 +- src/helper/ipv6-address-helper.h | 2 +- src/helper/on-off-helper.h | 4 +- src/helper/packet-sink-helper.h | 4 +- src/helper/ping6-helper.h | 4 +- src/helper/tap-bridge-helper.h | 2 +- src/helper/udp-client-server-helper.h | 4 +- src/helper/udp-echo-helper.h | 4 +- src/helper/v4ping-helper.h | 4 +- src/helper/wscript | 10 +- .../ipv4-address-generator.cc | 0 .../ipv4-address-generator.h | 0 src/{node => internet-stack}/ipv4-header.cc | 0 src/{node => internet-stack}/ipv4-header.h | 0 .../ipv4-interface-address.cc | 0 .../ipv4-interface-address.h | 2 +- .../ipv4-raw-socket-factory.cc | 0 .../ipv4-raw-socket-factory.h | 2 +- src/{node => internet-stack}/ipv4-route.cc | 2 +- src/{node => internet-stack}/ipv4-route.h | 2 +- .../ipv4-routing-protocol.cc | 0 .../ipv4-routing-protocol.h | 2 +- src/{node => internet-stack}/ipv4.cc | 0 src/{node => internet-stack}/ipv4.h | 2 +- src/{node => internet-stack}/ipv6-header.cc | 2 +- src/{node => internet-stack}/ipv6-header.h | 0 .../ipv6-interface-address.cc | 0 .../ipv6-interface-address.h | 2 +- .../ipv6-raw-socket-factory.cc | 0 .../ipv6-raw-socket-factory.h | 2 +- src/{node => internet-stack}/ipv6-route.cc | 2 +- src/{node => internet-stack}/ipv6-route.h | 2 +- .../ipv6-routing-protocol.cc | 0 .../ipv6-routing-protocol.h | 0 src/{node => internet-stack}/ipv6.cc | 0 src/{node => internet-stack}/ipv6.h | 2 +- .../tcp-socket-factory.cc | 0 .../tcp-socket-factory.h | 2 +- src/{node => internet-stack}/tcp-socket.cc | 0 src/{node => internet-stack}/tcp-socket.h | 2 +- .../udp-socket-factory.cc | 0 .../udp-socket-factory.h | 2 +- src/{node => internet-stack}/udp-socket.cc | 0 src/{node => internet-stack}/udp-socket.h | 2 +- src/internet-stack/wscript | 36 +++++- .../helper/application-container.cc | 0 .../helper/application-container.h | 0 .../helper/net-device-container.cc | 0 .../helper/net-device-container.h | 0 src/{ => network}/helper/node-container.cc | 0 src/{ => network}/helper/node-container.h | 0 .../helper/packet-socket-helper.cc | 0 .../helper/packet-socket-helper.h | 0 src/{node => network/model}/address.cc | 0 src/{node => network/model}/address.h | 0 src/{node => network/model}/application.cc | 0 src/{node => network/model}/application.h | 0 src/{common => network/model}/buffer.cc | 0 src/{common => network/model}/buffer.h | 0 .../model}/byte-tag-list.cc | 0 src/{common => network/model}/byte-tag-list.h | 0 src/{node => network/model}/channel-list.cc | 0 src/{node => network/model}/channel-list.h | 0 src/{node => network/model}/channel.cc | 0 src/{node => network/model}/channel.h | 0 src/{common => network/model}/chunk.cc | 0 src/{common => network/model}/chunk.h | 0 src/{common => network/model}/header.cc | 0 src/{common => network/model}/header.h | 0 src/{node => network/model}/net-device.cc | 0 src/{node => network/model}/net-device.h | 4 +- src/{common => network/model}/nix-vector.cc | 0 src/{common => network/model}/nix-vector.h | 0 src/{node => network/model}/node-list.cc | 0 src/{node => network/model}/node-list.h | 0 src/{node => network/model}/node.cc | 0 src/{node => network/model}/node.h | 0 .../model}/packet-metadata.cc | 0 .../model}/packet-metadata.h | 0 .../model}/packet-tag-list.cc | 0 .../model}/packet-tag-list.h | 0 src/{common => network/model}/packet.cc | 0 src/{common => network/model}/packet.h | 0 src/{node => network/model}/socket-factory.cc | 0 src/{node => network/model}/socket-factory.h | 0 src/{node => network/model}/socket.cc | 0 src/{node => network/model}/socket.h | 0 src/{common => network/model}/tag-buffer.cc | 0 src/{common => network/model}/tag-buffer.h | 0 src/{common => network/model}/tag.cc | 0 src/{common => network/model}/tag.h | 0 src/{common => network/model}/trailer.cc | 0 src/{common => network/model}/trailer.h | 0 src/{common => network/test}/buffer-test.cc | 2 +- src/{common => network/test}/known.pcap | Bin .../test}/packet-metadata-test.cc | 8 +- .../test}/packetbb-test-suite.cc | 0 .../test}/pcap-file-test-suite.cc | 0 src/{node => network/utils}/address-utils.cc | 0 src/{node => network/utils}/address-utils.h | 2 +- src/{common => network/utils}/data-rate.cc | 0 src/{common => network/utils}/data-rate.h | 0 .../utils}/drop-tail-queue.cc | 0 src/{node => network/utils}/drop-tail-queue.h | 0 src/{common => network/utils}/error-model.cc | 0 src/{common => network/utils}/error-model.h | 0 .../utils}/ethernet-header.cc | 0 src/{node => network/utils}/ethernet-header.h | 0 .../utils}/ethernet-trailer.cc | 0 .../utils}/ethernet-trailer.h | 0 .../utils}/inet-socket-address.cc | 0 .../utils}/inet-socket-address.h | 2 +- .../utils}/inet6-socket-address.cc | 0 .../utils}/inet6-socket-address.h | 2 +- src/{node => network/utils}/ipv4-address.cc | 0 src/{node => network/utils}/ipv4-address.h | 2 +- src/{node => network/utils}/ipv6-address.cc | 0 src/{node => network/utils}/ipv6-address.h | 3 +- .../utils}/llc-snap-header.cc | 0 src/{node => network/utils}/llc-snap-header.h | 0 src/{node => network/utils}/mac48-address.cc | 2 +- src/{node => network/utils}/mac48-address.h | 0 src/{node => network/utils}/mac64-address.cc | 2 +- src/{node => network/utils}/mac64-address.h | 0 .../utils}/output-stream-wrapper.cc | 0 .../utils}/output-stream-wrapper.h | 0 src/{common => network/utils}/packet-burst.cc | 0 src/{common => network/utils}/packet-burst.h | 0 .../utils}/packet-socket-address.cc | 2 +- .../utils}/packet-socket-address.h | 4 +- .../utils}/packet-socket-factory.cc | 2 +- .../utils}/packet-socket-factory.h | 2 +- src/{node => network/utils}/packet-socket.cc | 0 src/{node => network/utils}/packet-socket.h | 0 src/{node => network/utils}/packetbb.cc | 0 src/{node => network/utils}/packetbb.h | 0 .../utils}/pcap-file-wrapper.cc | 5 +- .../utils}/pcap-file-wrapper.h | 0 src/{common => network/utils}/pcap-file.cc | 0 src/{common => network/utils}/pcap-file.h | 0 src/{node => network/utils}/phy-mac.h | 0 src/{node => network/utils}/queue.cc | 0 src/{node => network/utils}/queue.h | 0 .../utils}/radiotap-header.cc | 0 src/{node => network/utils}/radiotap-header.h | 0 .../utils}/sequence-number.cc | 0 .../utils}/sequence-number.h | 0 src/{common => network/utils}/sgi-hashmap.h | 0 src/{node => network/utils}/simple-channel.cc | 0 src/{node => network/utils}/simple-channel.h | 2 +- .../utils}/simple-net-device.cc | 2 +- .../utils}/simple-net-device.h | 2 +- src/{common => network}/waf | 0 src/network/wscript | 117 ++++++++++++++++++ src/node/waf | 1 - src/node/wscript | 102 --------------- src/propagation/wscript | 2 +- src/routing/dsdv/examples/dsdv-manet.cc | 3 +- src/routing/global-routing/wscript | 2 +- src/routing/list-routing/wscript | 2 +- src/routing/olsr/examples/olsr-hna.cc | 3 +- .../examples/simple-point-to-point-olsr.cc | 2 +- src/routing/static-routing/wscript | 2 +- ...hoc-aloha-ideal-phy-with-microwave-oven.cc | 4 +- .../examples/adhoc-aloha-ideal-phy.cc | 4 +- src/spectrum/wscript | 2 +- src/test/perf/perf-io.cc | 2 +- src/wscript | 3 +- utils/wscript | 2 +- 272 files changed, 329 insertions(+), 385 deletions(-) delete mode 100644 src/common/wscript rename src/{node => internet-stack}/ipv4-address-generator.cc (100%) rename src/{node => internet-stack}/ipv4-address-generator.h (100%) rename src/{node => internet-stack}/ipv4-header.cc (100%) rename src/{node => internet-stack}/ipv4-header.h (100%) rename src/{node => internet-stack}/ipv4-interface-address.cc (100%) rename src/{node => internet-stack}/ipv4-interface-address.h (99%) rename src/{node => internet-stack}/ipv4-raw-socket-factory.cc (100%) rename src/{node => internet-stack}/ipv4-raw-socket-factory.h (97%) rename src/{node => internet-stack}/ipv4-route.cc (98%) rename src/{node => internet-stack}/ipv4-route.h (99%) rename src/{node => internet-stack}/ipv4-routing-protocol.cc (100%) rename src/{node => internet-stack}/ipv4-routing-protocol.h (99%) rename src/{node => internet-stack}/ipv4.cc (100%) rename src/{node => internet-stack}/ipv4.h (99%) rename src/{node => internet-stack}/ipv6-header.cc (99%) rename src/{node => internet-stack}/ipv6-header.h (100%) rename src/{node => internet-stack}/ipv6-interface-address.cc (100%) rename src/{node => internet-stack}/ipv6-interface-address.h (99%) rename src/{node => internet-stack}/ipv6-raw-socket-factory.cc (100%) rename src/{node => internet-stack}/ipv6-raw-socket-factory.h (97%) rename src/{node => internet-stack}/ipv6-route.cc (99%) rename src/{node => internet-stack}/ipv6-route.h (99%) rename src/{node => internet-stack}/ipv6-routing-protocol.cc (100%) rename src/{node => internet-stack}/ipv6-routing-protocol.h (100%) rename src/{node => internet-stack}/ipv6.cc (100%) rename src/{node => internet-stack}/ipv6.h (99%) rename src/{node => internet-stack}/tcp-socket-factory.cc (100%) rename src/{node => internet-stack}/tcp-socket-factory.h (98%) rename src/{node => internet-stack}/tcp-socket.cc (100%) rename src/{node => internet-stack}/tcp-socket.h (99%) rename src/{node => internet-stack}/udp-socket-factory.cc (100%) rename src/{node => internet-stack}/udp-socket-factory.h (97%) rename src/{node => internet-stack}/udp-socket.cc (100%) rename src/{node => internet-stack}/udp-socket.h (99%) rename src/{ => network}/helper/application-container.cc (100%) rename src/{ => network}/helper/application-container.h (100%) rename src/{ => network}/helper/net-device-container.cc (100%) rename src/{ => network}/helper/net-device-container.h (100%) rename src/{ => network}/helper/node-container.cc (100%) rename src/{ => network}/helper/node-container.h (100%) rename src/{ => network}/helper/packet-socket-helper.cc (100%) rename src/{ => network}/helper/packet-socket-helper.h (100%) rename src/{node => network/model}/address.cc (100%) rename src/{node => network/model}/address.h (100%) rename src/{node => network/model}/application.cc (100%) rename src/{node => network/model}/application.h (100%) rename src/{common => network/model}/buffer.cc (100%) rename src/{common => network/model}/buffer.h (100%) rename src/{common => network/model}/byte-tag-list.cc (100%) rename src/{common => network/model}/byte-tag-list.h (100%) rename src/{node => network/model}/channel-list.cc (100%) rename src/{node => network/model}/channel-list.h (100%) rename src/{node => network/model}/channel.cc (100%) rename src/{node => network/model}/channel.h (100%) rename src/{common => network/model}/chunk.cc (100%) rename src/{common => network/model}/chunk.h (100%) rename src/{common => network/model}/header.cc (100%) rename src/{common => network/model}/header.h (100%) rename src/{node => network/model}/net-device.cc (100%) rename src/{node => network/model}/net-device.h (99%) rename src/{common => network/model}/nix-vector.cc (100%) rename src/{common => network/model}/nix-vector.h (100%) rename src/{node => network/model}/node-list.cc (100%) rename src/{node => network/model}/node-list.h (100%) rename src/{node => network/model}/node.cc (100%) rename src/{node => network/model}/node.h (100%) rename src/{common => network/model}/packet-metadata.cc (100%) rename src/{common => network/model}/packet-metadata.h (100%) rename src/{common => network/model}/packet-tag-list.cc (100%) rename src/{common => network/model}/packet-tag-list.h (100%) rename src/{common => network/model}/packet.cc (100%) rename src/{common => network/model}/packet.h (100%) rename src/{node => network/model}/socket-factory.cc (100%) rename src/{node => network/model}/socket-factory.h (100%) rename src/{node => network/model}/socket.cc (100%) rename src/{node => network/model}/socket.h (100%) rename src/{common => network/model}/tag-buffer.cc (100%) rename src/{common => network/model}/tag-buffer.h (100%) rename src/{common => network/model}/tag.cc (100%) rename src/{common => network/model}/tag.h (100%) rename src/{common => network/model}/trailer.cc (100%) rename src/{common => network/model}/trailer.h (100%) rename src/{common => network/test}/buffer-test.cc (99%) rename src/{common => network/test}/known.pcap (100%) rename src/{common => network/test}/packet-metadata-test.cc (99%) rename src/{node => network/test}/packetbb-test-suite.cc (100%) rename src/{common => network/test}/pcap-file-test-suite.cc (100%) rename src/{node => network/utils}/address-utils.cc (100%) rename src/{node => network/utils}/address-utils.h (98%) rename src/{common => network/utils}/data-rate.cc (100%) rename src/{common => network/utils}/data-rate.h (100%) rename src/{node => network/utils}/drop-tail-queue.cc (100%) rename src/{node => network/utils}/drop-tail-queue.h (100%) rename src/{common => network/utils}/error-model.cc (100%) rename src/{common => network/utils}/error-model.h (100%) rename src/{node => network/utils}/ethernet-header.cc (100%) rename src/{node => network/utils}/ethernet-header.h (100%) rename src/{node => network/utils}/ethernet-trailer.cc (100%) rename src/{node => network/utils}/ethernet-trailer.h (100%) rename src/{node => network/utils}/inet-socket-address.cc (100%) rename src/{node => network/utils}/inet-socket-address.h (99%) rename src/{node => network/utils}/inet6-socket-address.cc (100%) rename src/{node => network/utils}/inet6-socket-address.h (99%) rename src/{node => network/utils}/ipv4-address.cc (100%) rename src/{node => network/utils}/ipv4-address.h (99%) rename src/{node => network/utils}/ipv6-address.cc (100%) rename src/{node => network/utils}/ipv6-address.h (99%) rename src/{node => network/utils}/llc-snap-header.cc (100%) rename src/{node => network/utils}/llc-snap-header.h (100%) rename src/{node => network/utils}/mac48-address.cc (99%) rename src/{node => network/utils}/mac48-address.h (100%) rename src/{node => network/utils}/mac64-address.cc (99%) rename src/{node => network/utils}/mac64-address.h (100%) rename src/{common => network/utils}/output-stream-wrapper.cc (100%) rename src/{common => network/utils}/output-stream-wrapper.h (100%) rename src/{common => network/utils}/packet-burst.cc (100%) rename src/{common => network/utils}/packet-burst.h (100%) rename src/{node => network/utils}/packet-socket-address.cc (99%) rename src/{node => network/utils}/packet-socket-address.h (97%) rename src/{node => network/utils}/packet-socket-factory.cc (98%) rename src/{node => network/utils}/packet-socket-factory.h (97%) rename src/{node => network/utils}/packet-socket.cc (100%) rename src/{node => network/utils}/packet-socket.h (100%) rename src/{node => network/utils}/packetbb.cc (100%) rename src/{node => network/utils}/packetbb.h (100%) rename src/{common => network/utils}/pcap-file-wrapper.cc (98%) rename src/{common => network/utils}/pcap-file-wrapper.h (100%) rename src/{common => network/utils}/pcap-file.cc (100%) rename src/{common => network/utils}/pcap-file.h (100%) rename src/{node => network/utils}/phy-mac.h (100%) rename src/{node => network/utils}/queue.cc (100%) rename src/{node => network/utils}/queue.h (100%) rename src/{node => network/utils}/radiotap-header.cc (100%) rename src/{node => network/utils}/radiotap-header.h (100%) rename src/{common => network/utils}/sequence-number.cc (100%) rename src/{common => network/utils}/sequence-number.h (100%) rename src/{common => network/utils}/sgi-hashmap.h (100%) rename src/{node => network/utils}/simple-channel.cc (100%) rename src/{node => network/utils}/simple-channel.h (98%) rename src/{node => network/utils}/simple-net-device.cc (99%) rename src/{node => network/utils}/simple-net-device.h (99%) rename src/{common => network}/waf (100%) create mode 100644 src/network/wscript delete mode 100755 src/node/waf delete mode 100644 src/node/wscript diff --git a/examples/animation/dumbbell-animation.cc b/examples/animation/dumbbell-animation.cc index 3fcd7a3b3..7cccb2377 100644 --- a/examples/animation/dumbbell-animation.cc +++ b/examples/animation/dumbbell-animation.cc @@ -20,7 +20,7 @@ #include "ns3/core-module.h" #include "ns3/core-module.h" -#include "ns3/node-module.h" +#include "ns3/network-module.h" #include "ns3/helper-module.h" #include "ns3/ipv4-global-routing-helper.h" diff --git a/examples/animation/grid-animation.cc b/examples/animation/grid-animation.cc index be9b6410c..da156831c 100644 --- a/examples/animation/grid-animation.cc +++ b/examples/animation/grid-animation.cc @@ -20,7 +20,7 @@ #include "ns3/core-module.h" #include "ns3/core-module.h" -#include "ns3/node-module.h" +#include "ns3/network-module.h" #include "ns3/helper-module.h" #include "ns3/ipv4-global-routing-helper.h" diff --git a/examples/animation/star-animation.cc b/examples/animation/star-animation.cc index b7e6d7ba3..653f894b4 100644 --- a/examples/animation/star-animation.cc +++ b/examples/animation/star-animation.cc @@ -17,7 +17,7 @@ #include "ns3/core-module.h" #include "ns3/core-module.h" -#include "ns3/node-module.h" +#include "ns3/network-module.h" #include "ns3/helper-module.h" #include "ns3/ipv4-global-routing-helper.h" diff --git a/examples/csma/csma-broadcast.cc b/examples/csma/csma-broadcast.cc index 312526dc7..60c3181e7 100644 --- a/examples/csma/csma-broadcast.cc +++ b/examples/csma/csma-broadcast.cc @@ -34,7 +34,7 @@ #include "ns3/core-module.h" #include "ns3/core-module.h" -#include "ns3/node-module.h" +#include "ns3/network-module.h" #include "ns3/helper-module.h" using namespace ns3; diff --git a/examples/csma/csma-multicast.cc b/examples/csma/csma-multicast.cc index 78583e0fe..e2ad8d06b 100644 --- a/examples/csma/csma-multicast.cc +++ b/examples/csma/csma-multicast.cc @@ -34,7 +34,7 @@ #include "ns3/core-module.h" #include "ns3/core-module.h" -#include "ns3/node-module.h" +#include "ns3/network-module.h" #include "ns3/helper-module.h" #include "ns3/ipv4-static-routing-helper.h" #include "ns3/ipv4-list-routing-helper.h" diff --git a/examples/csma/csma-one-subnet.cc b/examples/csma/csma-one-subnet.cc index b0a81868b..e67cc81c5 100644 --- a/examples/csma/csma-one-subnet.cc +++ b/examples/csma/csma-one-subnet.cc @@ -29,7 +29,7 @@ #include #include "ns3/core-module.h" -#include "ns3/node-module.h" +#include "ns3/network-module.h" #include "ns3/core-module.h" #include "ns3/helper-module.h" diff --git a/examples/csma/csma-packet-socket.cc b/examples/csma/csma-packet-socket.cc index 4e86168cc..820cc623a 100644 --- a/examples/csma/csma-packet-socket.cc +++ b/examples/csma/csma-packet-socket.cc @@ -34,7 +34,7 @@ #include "ns3/core-module.h" #include "ns3/core-module.h" -#include "ns3/node-module.h" +#include "ns3/network-module.h" #include "ns3/helper-module.h" using namespace ns3; diff --git a/examples/csma/csma-ping.cc b/examples/csma/csma-ping.cc index c9b458239..ee668957b 100644 --- a/examples/csma/csma-ping.cc +++ b/examples/csma/csma-ping.cc @@ -30,7 +30,7 @@ #include "ns3/core-module.h" #include "ns3/core-module.h" -#include "ns3/node-module.h" +#include "ns3/network-module.h" #include "ns3/helper-module.h" using namespace ns3; diff --git a/examples/csma/csma-raw-ip-socket.cc b/examples/csma/csma-raw-ip-socket.cc index e3bd6feeb..4403f674d 100644 --- a/examples/csma/csma-raw-ip-socket.cc +++ b/examples/csma/csma-raw-ip-socket.cc @@ -33,7 +33,7 @@ #include "ns3/core-module.h" #include "ns3/core-module.h" -#include "ns3/node-module.h" +#include "ns3/network-module.h" #include "ns3/helper-module.h" using namespace ns3; diff --git a/examples/csma/csma-star.cc b/examples/csma/csma-star.cc index 69fdfd73c..cd9d61aac 100644 --- a/examples/csma/csma-star.cc +++ b/examples/csma/csma-star.cc @@ -17,7 +17,7 @@ #include "ns3/core-module.h" #include "ns3/core-module.h" -#include "ns3/node-module.h" +#include "ns3/network-module.h" #include "ns3/helper-module.h" #include "ns3/csma-module.h" #include "ns3/ipv4-global-routing-helper.h" diff --git a/examples/emulation/emu-ping.cc b/examples/emulation/emu-ping.cc index 250ea1864..7e8f1618c 100644 --- a/examples/emulation/emu-ping.cc +++ b/examples/emulation/emu-ping.cc @@ -54,7 +54,7 @@ #include "ns3/abort.h" #include "ns3/core-module.h" #include "ns3/core-module.h" -#include "ns3/node-module.h" +#include "ns3/network-module.h" #include "ns3/emu-module.h" #include "ns3/v4ping-module.h" #include "ns3/helper-module.h" diff --git a/examples/energy/energy-model-example.cc b/examples/energy/energy-model-example.cc index 976a3f3bf..dce40f389 100644 --- a/examples/energy/energy-model-example.cc +++ b/examples/energy/energy-model-example.cc @@ -19,8 +19,7 @@ */ #include "ns3/core-module.h" -#include "ns3/common-module.h" -#include "ns3/node-module.h" +#include "ns3/network-module.h" #include "ns3/helper-module.h" #include "ns3/mobility-module.h" #include "ns3/contrib-module.h" diff --git a/examples/error-model/simple-error-model.cc b/examples/error-model/simple-error-model.cc index e47e125ce..f52689c2c 100644 --- a/examples/error-model/simple-error-model.cc +++ b/examples/error-model/simple-error-model.cc @@ -36,9 +36,7 @@ #include #include "ns3/core-module.h" -#include "ns3/common-module.h" -#include "ns3/core-module.h" -#include "ns3/node-module.h" +#include "ns3/network-module.h" #include "ns3/helper-module.h" #include "ns3/ipv4-global-routing-helper.h" diff --git a/examples/matrix-topology/matrix-topology.cc b/examples/matrix-topology/matrix-topology.cc index 218b6e88c..2b0e67b78 100644 --- a/examples/matrix-topology/matrix-topology.cc +++ b/examples/matrix-topology/matrix-topology.cc @@ -48,7 +48,7 @@ #include "ns3/core-module.h" #include "ns3/core-module.h" -#include "ns3/node-module.h" +#include "ns3/network-module.h" #include "ns3/helper-module.h" #include "ns3/global-route-manager.h" #include "ns3/mobility-module.h" diff --git a/examples/mesh/mesh.cc b/examples/mesh/mesh.cc index 410a88f6c..259a9eefd 100644 --- a/examples/mesh/mesh.cc +++ b/examples/mesh/mesh.cc @@ -46,7 +46,7 @@ #include "ns3/core-module.h" #include "ns3/core-module.h" -#include "ns3/node-module.h" +#include "ns3/network-module.h" #include "ns3/helper-module.h" #include "ns3/global-routing-module.h" #include "ns3/wifi-module.h" diff --git a/examples/mpi/nms-p2p-nix-distributed.cc b/examples/mpi/nms-p2p-nix-distributed.cc index 04d89e9ee..8b148abf4 100644 --- a/examples/mpi/nms-p2p-nix-distributed.cc +++ b/examples/mpi/nms-p2p-nix-distributed.cc @@ -40,7 +40,7 @@ #include "ns3/core-module.h" #include "ns3/core-module.h" -#include "ns3/node-module.h" +#include "ns3/network-module.h" #include "ns3/helper-module.h" #include "ns3/global-routing-module.h" #include "ns3/onoff-application.h" diff --git a/examples/mpi/simple-distributed.cc b/examples/mpi/simple-distributed.cc index e8d400959..5b18b7db8 100644 --- a/examples/mpi/simple-distributed.cc +++ b/examples/mpi/simple-distributed.cc @@ -43,7 +43,7 @@ #include "ns3/core-module.h" #include "ns3/core-module.h" -#include "ns3/node-module.h" +#include "ns3/network-module.h" #include "ns3/helper-module.h" #include "ns3/mpi-interface.h" #include "ns3/ipv4-global-routing-helper.h" diff --git a/examples/mpi/third-distributed.cc b/examples/mpi/third-distributed.cc index e9939ae1f..20a9df088 100644 --- a/examples/mpi/third-distributed.cc +++ b/examples/mpi/third-distributed.cc @@ -16,7 +16,7 @@ #include "ns3/core-module.h" #include "ns3/core-module.h" -#include "ns3/node-module.h" +#include "ns3/network-module.h" #include "ns3/helper-module.h" #include "ns3/wifi-module.h" #include "ns3/mobility-module.h" diff --git a/examples/routing/aodv.cc b/examples/routing/aodv.cc index 88fdb0c29..16688b6f9 100644 --- a/examples/routing/aodv.cc +++ b/examples/routing/aodv.cc @@ -22,8 +22,7 @@ #include "ns3/aodv-module.h" #include "ns3/core-module.h" -#include "ns3/common-module.h" -#include "ns3/node-module.h" +#include "ns3/network-module.h" #include "ns3/helper-module.h" #include "ns3/mobility-module.h" #include "ns3/contrib-module.h" diff --git a/examples/routing/dynamic-global-routing.cc b/examples/routing/dynamic-global-routing.cc index a3dba07c5..01c34298e 100644 --- a/examples/routing/dynamic-global-routing.cc +++ b/examples/routing/dynamic-global-routing.cc @@ -69,7 +69,7 @@ #include "ns3/core-module.h" #include "ns3/core-module.h" -#include "ns3/node-module.h" +#include "ns3/network-module.h" #include "ns3/helper-module.h" #include "ns3/ipv4-global-routing-helper.h" diff --git a/examples/routing/global-injection-slash32.cc b/examples/routing/global-injection-slash32.cc index 5925e79e0..c3d033133 100644 --- a/examples/routing/global-injection-slash32.cc +++ b/examples/routing/global-injection-slash32.cc @@ -27,7 +27,7 @@ #include "ns3/csma-net-device.h" #include "ns3/core-module.h" #include "ns3/core-module.h" -#include "ns3/node-module.h" +#include "ns3/network-module.h" #include "ns3/helper-module.h" #include "ns3/ipv4-static-routing.h" #include "ns3/ipv4-global-routing.h" diff --git a/examples/routing/global-routing-slash32.cc b/examples/routing/global-routing-slash32.cc index d6497cab5..a0510d4cb 100644 --- a/examples/routing/global-routing-slash32.cc +++ b/examples/routing/global-routing-slash32.cc @@ -27,7 +27,7 @@ #include "ns3/csma-net-device.h" #include "ns3/core-module.h" #include "ns3/core-module.h" -#include "ns3/node-module.h" +#include "ns3/network-module.h" #include "ns3/helper-module.h" #include "ns3/ipv4-global-routing-helper.h" diff --git a/examples/routing/mixed-global-routing.cc b/examples/routing/mixed-global-routing.cc index 5c79b7f51..8acf4712e 100644 --- a/examples/routing/mixed-global-routing.cc +++ b/examples/routing/mixed-global-routing.cc @@ -38,7 +38,7 @@ #include "ns3/core-module.h" #include "ns3/core-module.h" -#include "ns3/node-module.h" +#include "ns3/network-module.h" #include "ns3/helper-module.h" #include "ns3/ipv4-global-routing-helper.h" diff --git a/examples/routing/nix-simple.cc b/examples/routing/nix-simple.cc index 0d934ac55..e21496589 100644 --- a/examples/routing/nix-simple.cc +++ b/examples/routing/nix-simple.cc @@ -16,7 +16,7 @@ #include "ns3/core-module.h" #include "ns3/core-module.h" -#include "ns3/node-module.h" +#include "ns3/network-module.h" #include "ns3/helper-module.h" #include "ns3/ipv4-static-routing-helper.h" #include "ns3/ipv4-list-routing-helper.h" diff --git a/examples/routing/nms-p2p-nix.cc b/examples/routing/nms-p2p-nix.cc index 69049301c..e68b630bd 100644 --- a/examples/routing/nms-p2p-nix.cc +++ b/examples/routing/nms-p2p-nix.cc @@ -38,7 +38,7 @@ #include "ns3/core-module.h" #include "ns3/core-module.h" -#include "ns3/node-module.h" +#include "ns3/network-module.h" #include "ns3/helper-module.h" #include "ns3/global-routing-module.h" #include "ns3/onoff-application.h" diff --git a/examples/routing/simple-alternate-routing.cc b/examples/routing/simple-alternate-routing.cc index 7d3e76c0a..3a15be024 100644 --- a/examples/routing/simple-alternate-routing.cc +++ b/examples/routing/simple-alternate-routing.cc @@ -39,7 +39,7 @@ #include "ns3/core-module.h" #include "ns3/core-module.h" -#include "ns3/node-module.h" +#include "ns3/network-module.h" #include "ns3/helper-module.h" #include "ns3/ipv4-global-routing-helper.h" diff --git a/examples/routing/simple-global-routing.cc b/examples/routing/simple-global-routing.cc index ab843a2ca..37f8d6dad 100644 --- a/examples/routing/simple-global-routing.cc +++ b/examples/routing/simple-global-routing.cc @@ -41,7 +41,7 @@ #include "ns3/core-module.h" #include "ns3/core-module.h" -#include "ns3/node-module.h" +#include "ns3/network-module.h" #include "ns3/helper-module.h" #include "ns3/flow-monitor-helper.h" #include "ns3/ipv4-global-routing-helper.h" diff --git a/examples/routing/static-routing-slash32.cc b/examples/routing/static-routing-slash32.cc index 72fad8e35..f0d92ee4e 100644 --- a/examples/routing/static-routing-slash32.cc +++ b/examples/routing/static-routing-slash32.cc @@ -27,7 +27,7 @@ #include "ns3/csma-net-device.h" #include "ns3/core-module.h" #include "ns3/core-module.h" -#include "ns3/node-module.h" +#include "ns3/network-module.h" #include "ns3/helper-module.h" #include "ns3/ipv4-static-routing-helper.h" diff --git a/examples/socket/socket-bound-static-routing.cc b/examples/socket/socket-bound-static-routing.cc index 9b1519b88..8c3097000 100644 --- a/examples/socket/socket-bound-static-routing.cc +++ b/examples/socket/socket-bound-static-routing.cc @@ -37,7 +37,7 @@ #include "ns3/core-module.h" #include "ns3/core-module.h" -#include "ns3/node-module.h" +#include "ns3/network-module.h" #include "ns3/helper-module.h" #include "ns3/ipv4-static-routing-helper.h" #include "ns3/ipv4-list-routing-helper.h" diff --git a/examples/socket/socket-bound-tcp-static-routing.cc b/examples/socket/socket-bound-tcp-static-routing.cc index 372cefb2b..08e0f8243 100644 --- a/examples/socket/socket-bound-tcp-static-routing.cc +++ b/examples/socket/socket-bound-tcp-static-routing.cc @@ -37,7 +37,7 @@ #include "ns3/core-module.h" #include "ns3/core-module.h" -#include "ns3/node-module.h" +#include "ns3/network-module.h" #include "ns3/helper-module.h" #include "ns3/ipv4-static-routing-helper.h" #include "ns3/ipv4-list-routing-helper.h" diff --git a/examples/stats/wifi-example-apps.cc b/examples/stats/wifi-example-apps.cc index a32e39b2e..3cdb39473 100644 --- a/examples/stats/wifi-example-apps.cc +++ b/examples/stats/wifi-example-apps.cc @@ -28,9 +28,8 @@ #include #include "ns3/core-module.h" -#include "ns3/common-module.h" -#include "ns3/core-module.h" -#include "ns3/node-module.h" +#include "ns3/network-module.h" +#include "ns3/network-module.h" #include "ns3/internet-stack-module.h" #include "ns3/stats-module.h" diff --git a/examples/stats/wifi-example-apps.h b/examples/stats/wifi-example-apps.h index afde4fd34..8dc70c600 100644 --- a/examples/stats/wifi-example-apps.h +++ b/examples/stats/wifi-example-apps.h @@ -28,7 +28,7 @@ // #define NS3_LOG_ENABLE // Now defined by Makefile #include "ns3/core-module.h" -#include "ns3/common-module.h" +#include "ns3/network-module.h" #include "ns3/application.h" #include "ns3/stats-module.h" diff --git a/examples/stats/wifi-example-sim.cc b/examples/stats/wifi-example-sim.cc index 4a8dec963..5645208b7 100644 --- a/examples/stats/wifi-example-sim.cc +++ b/examples/stats/wifi-example-sim.cc @@ -37,8 +37,7 @@ #include #include "ns3/core-module.h" -#include "ns3/common-module.h" -#include "ns3/node-module.h" +#include "ns3/network-module.h" #include "ns3/helper-module.h" #include "ns3/mobility-module.h" #include "ns3/wifi-module.h" diff --git a/examples/tap/tap-csma-virtual-machine.cc b/examples/tap/tap-csma-virtual-machine.cc index 8d66246fb..0d178aace 100644 --- a/examples/tap/tap-csma-virtual-machine.cc +++ b/examples/tap/tap-csma-virtual-machine.cc @@ -62,7 +62,7 @@ #include #include "ns3/core-module.h" -#include "ns3/node-module.h" +#include "ns3/network-module.h" #include "ns3/core-module.h" #include "ns3/helper-module.h" diff --git a/examples/tap/tap-csma.cc b/examples/tap/tap-csma.cc index 88d2c6318..5c31190ec 100644 --- a/examples/tap/tap-csma.cc +++ b/examples/tap/tap-csma.cc @@ -58,7 +58,7 @@ #include #include "ns3/core-module.h" -#include "ns3/node-module.h" +#include "ns3/network-module.h" #include "ns3/core-module.h" #include "ns3/wifi-module.h" #include "ns3/helper-module.h" diff --git a/examples/tap/tap-wifi-dumbbell.cc b/examples/tap/tap-wifi-dumbbell.cc index 6d1e2740e..3ede9a547 100644 --- a/examples/tap/tap-wifi-dumbbell.cc +++ b/examples/tap/tap-wifi-dumbbell.cc @@ -100,7 +100,7 @@ #include #include "ns3/core-module.h" -#include "ns3/node-module.h" +#include "ns3/network-module.h" #include "ns3/core-module.h" #include "ns3/wifi-module.h" #include "ns3/helper-module.h" diff --git a/examples/tap/tap-wifi-virtual-machine.cc b/examples/tap/tap-wifi-virtual-machine.cc index f1121bf38..b0b659166 100644 --- a/examples/tap/tap-wifi-virtual-machine.cc +++ b/examples/tap/tap-wifi-virtual-machine.cc @@ -70,7 +70,7 @@ #include #include "ns3/core-module.h" -#include "ns3/node-module.h" +#include "ns3/network-module.h" #include "ns3/core-module.h" #include "ns3/wifi-module.h" #include "ns3/helper-module.h" diff --git a/examples/tcp/star.cc b/examples/tcp/star.cc index 98c0967b1..d1411fca6 100644 --- a/examples/tcp/star.cc +++ b/examples/tcp/star.cc @@ -17,7 +17,7 @@ #include "ns3/core-module.h" #include "ns3/core-module.h" -#include "ns3/node-module.h" +#include "ns3/network-module.h" #include "ns3/helper-module.h" #include "ns3/ipv4-global-routing-helper.h" diff --git a/examples/tcp/tcp-bulk-send.cc b/examples/tcp/tcp-bulk-send.cc index 482e07839..2ae186b72 100644 --- a/examples/tcp/tcp-bulk-send.cc +++ b/examples/tcp/tcp-bulk-send.cc @@ -29,7 +29,7 @@ #include "ns3/core-module.h" #include "ns3/core-module.h" #include "ns3/helper-module.h" -#include "ns3/node-module.h" +#include "ns3/network-module.h" #include "ns3/packet-sink.h" using namespace ns3; diff --git a/examples/tcp/tcp-large-transfer.cc b/examples/tcp/tcp-large-transfer.cc index 343201afc..b1b0e6388 100644 --- a/examples/tcp/tcp-large-transfer.cc +++ b/examples/tcp/tcp-large-transfer.cc @@ -38,7 +38,8 @@ #include "ns3/core-module.h" #include "ns3/helper-module.h" -#include "ns3/node-module.h" +#include "ns3/network-module.h" +#include "ns3/internet-stack-module.h" #include "ns3/core-module.h" #include "ns3/ipv4-global-routing-helper.h" diff --git a/examples/tcp/tcp-nsc-lfn.cc b/examples/tcp/tcp-nsc-lfn.cc index 2e452be3a..cfa5827ab 100644 --- a/examples/tcp/tcp-nsc-lfn.cc +++ b/examples/tcp/tcp-nsc-lfn.cc @@ -33,10 +33,8 @@ #include #include "ns3/core-module.h" -#include "ns3/common-module.h" +#include "ns3/network-module.h" #include "ns3/helper-module.h" -#include "ns3/node-module.h" -#include "ns3/core-module.h" #include "ns3/ipv4-global-routing-helper.h" using namespace ns3; diff --git a/examples/tcp/tcp-nsc-zoo.cc b/examples/tcp/tcp-nsc-zoo.cc index b012293c8..f10a8479e 100644 --- a/examples/tcp/tcp-nsc-zoo.cc +++ b/examples/tcp/tcp-nsc-zoo.cc @@ -32,7 +32,7 @@ #include "ns3/core-module.h" #include "ns3/helper-module.h" -#include "ns3/node-module.h" +#include "ns3/network-module.h" #include "ns3/core-module.h" #include "ns3/ipv4-global-routing-helper.h" diff --git a/examples/tcp/tcp-star-server.cc b/examples/tcp/tcp-star-server.cc index cd3e25fe6..15cf3abd9 100644 --- a/examples/tcp/tcp-star-server.cc +++ b/examples/tcp/tcp-star-server.cc @@ -50,7 +50,7 @@ #include "ns3/core-module.h" #include "ns3/core-module.h" -#include "ns3/node-module.h" +#include "ns3/network-module.h" #include "ns3/helper-module.h" #include "ns3/ipv4-global-routing-helper.h" diff --git a/examples/topology-read/topology-example-sim.cc b/examples/topology-read/topology-example-sim.cc index a19c7e069..afc281db0 100644 --- a/examples/topology-read/topology-example-sim.cc +++ b/examples/topology-read/topology-example-sim.cc @@ -27,8 +27,7 @@ #include #include "ns3/core-module.h" -#include "ns3/common-module.h" -#include "ns3/node-module.h" +#include "ns3/network-module.h" #include "ns3/helper-module.h" #include "ns3/core-module.h" #include "ns3/ipv4-static-routing-helper.h" diff --git a/examples/tutorial/fifth.cc b/examples/tutorial/fifth.cc index db9dfcb4d..fc565af8e 100644 --- a/examples/tutorial/fifth.cc +++ b/examples/tutorial/fifth.cc @@ -16,9 +16,8 @@ #include #include "ns3/core-module.h" -#include "ns3/common-module.h" -#include "ns3/core-module.h" -#include "ns3/node-module.h" +#include "ns3/network-module.h" +#include "ns3/internet-stack-module.h" #include "ns3/helper-module.h" using namespace ns3; diff --git a/examples/tutorial/first.cc b/examples/tutorial/first.cc index 5164c16a0..efdda4926 100644 --- a/examples/tutorial/first.cc +++ b/examples/tutorial/first.cc @@ -16,7 +16,7 @@ #include "ns3/core-module.h" #include "ns3/core-module.h" -#include "ns3/node-module.h" +#include "ns3/network-module.h" #include "ns3/helper-module.h" using namespace ns3; diff --git a/examples/tutorial/second.cc b/examples/tutorial/second.cc index f683aeaa2..06f5f4e6c 100644 --- a/examples/tutorial/second.cc +++ b/examples/tutorial/second.cc @@ -16,7 +16,7 @@ #include "ns3/core-module.h" #include "ns3/core-module.h" -#include "ns3/node-module.h" +#include "ns3/network-module.h" #include "ns3/helper-module.h" #include "ns3/ipv4-global-routing-helper.h" diff --git a/examples/tutorial/sixth.cc b/examples/tutorial/sixth.cc index 882291f70..5a9e89592 100644 --- a/examples/tutorial/sixth.cc +++ b/examples/tutorial/sixth.cc @@ -16,9 +16,8 @@ #include #include "ns3/core-module.h" -#include "ns3/common-module.h" -#include "ns3/core-module.h" -#include "ns3/node-module.h" +#include "ns3/network-module.h" +#include "ns3/internet-stack-module.h" #include "ns3/helper-module.h" using namespace ns3; diff --git a/examples/tutorial/third.cc b/examples/tutorial/third.cc index 1506bed3e..a5a5009c2 100644 --- a/examples/tutorial/third.cc +++ b/examples/tutorial/third.cc @@ -16,7 +16,7 @@ #include "ns3/core-module.h" #include "ns3/core-module.h" -#include "ns3/node-module.h" +#include "ns3/network-module.h" #include "ns3/helper-module.h" #include "ns3/wifi-module.h" #include "ns3/mobility-module.h" diff --git a/examples/wimax/wimax-ipv4.cc b/examples/wimax/wimax-ipv4.cc index 063e9f208..b9e92e637 100644 --- a/examples/wimax/wimax-ipv4.cc +++ b/examples/wimax/wimax-ipv4.cc @@ -51,8 +51,7 @@ // +-----+ +-----+ +-----+ #include "ns3/core-module.h" -#include "ns3/common-module.h" -#include "ns3/node-module.h" +#include "ns3/network-module.h" #include "ns3/helper-module.h" #include "ns3/mobility-module.h" #include "ns3/contrib-module.h" diff --git a/examples/wimax/wimax-multicast.cc b/examples/wimax/wimax-multicast.cc index def3b3cfb..19ab74143 100644 --- a/examples/wimax/wimax-multicast.cc +++ b/examples/wimax/wimax-multicast.cc @@ -51,8 +51,7 @@ // +-----+ +-----+ +-----+ +-----+ +-----+ #include "ns3/core-module.h" -#include "ns3/common-module.h" -#include "ns3/node-module.h" +#include "ns3/network-module.h" #include "ns3/helper-module.h" #include "ns3/mobility-module.h" #include "ns3/contrib-module.h" diff --git a/examples/wimax/wimax-simple.cc b/examples/wimax/wimax-simple.cc index 6fc3fb748..9e224f640 100644 --- a/examples/wimax/wimax-simple.cc +++ b/examples/wimax/wimax-simple.cc @@ -43,8 +43,7 @@ // +-----+ #include "ns3/core-module.h" -#include "ns3/common-module.h" -#include "ns3/node-module.h" +#include "ns3/network-module.h" #include "ns3/helper-module.h" #include "ns3/mobility-module.h" #include "ns3/contrib-module.h" diff --git a/examples/wireless/mixed-wireless.cc b/examples/wireless/mixed-wireless.cc index e15d63e44..82da6e919 100644 --- a/examples/wireless/mixed-wireless.cc +++ b/examples/wireless/mixed-wireless.cc @@ -61,8 +61,7 @@ #include #include #include "ns3/core-module.h" -#include "ns3/common-module.h" -#include "ns3/node-module.h" +#include "ns3/network-module.h" #include "ns3/helper-module.h" #include "ns3/mobility-module.h" #include "ns3/contrib-module.h" diff --git a/examples/wireless/multirate.cc b/examples/wireless/multirate.cc index 4a1e3ebd8..7514f8dd3 100644 --- a/examples/wireless/multirate.cc +++ b/examples/wireless/multirate.cc @@ -49,8 +49,7 @@ */ #include "ns3/core-module.h" -#include "ns3/common-module.h" -#include "ns3/node-module.h" +#include "ns3/network-module.h" #include "ns3/helper-module.h" #include "ns3/mobility-module.h" #include "ns3/contrib-module.h" diff --git a/examples/wireless/simple-wifi-frame-aggregation.cc b/examples/wireless/simple-wifi-frame-aggregation.cc index cd268303b..ccfa31a78 100644 --- a/examples/wireless/simple-wifi-frame-aggregation.cc +++ b/examples/wireless/simple-wifi-frame-aggregation.cc @@ -19,7 +19,7 @@ */ #include "ns3/core-module.h" #include "ns3/core-module.h" -#include "ns3/node-module.h" +#include "ns3/network-module.h" #include "ns3/helper-module.h" #include "ns3/wifi-module.h" #include "ns3/mobility-module.h" diff --git a/examples/wireless/wifi-adhoc.cc b/examples/wireless/wifi-adhoc.cc index 9db6c9c36..28296bb95 100644 --- a/examples/wireless/wifi-adhoc.cc +++ b/examples/wireless/wifi-adhoc.cc @@ -19,8 +19,7 @@ */ #include "ns3/core-module.h" -#include "ns3/common-module.h" -#include "ns3/node-module.h" +#include "ns3/network-module.h" #include "ns3/helper-module.h" #include "ns3/mobility-module.h" #include "ns3/contrib-module.h" diff --git a/examples/wireless/wifi-ap.cc b/examples/wireless/wifi-ap.cc index 593d240cf..08f020505 100644 --- a/examples/wireless/wifi-ap.cc +++ b/examples/wireless/wifi-ap.cc @@ -20,8 +20,7 @@ #include "ns3/core-module.h" -#include "ns3/common-module.h" -#include "ns3/node-module.h" +#include "ns3/network-module.h" #include "ns3/helper-module.h" #include "ns3/mobility-module.h" #include "ns3/contrib-module.h" diff --git a/examples/wireless/wifi-blockack.cc b/examples/wireless/wifi-blockack.cc index e1411a21a..758621cdd 100644 --- a/examples/wireless/wifi-blockack.cc +++ b/examples/wireless/wifi-blockack.cc @@ -41,7 +41,7 @@ */ #include "ns3/core-module.h" #include "ns3/core-module.h" -#include "ns3/node-module.h" +#include "ns3/network-module.h" #include "ns3/helper-module.h" #include "ns3/global-routing-module.h" #include "ns3/wifi-module.h" diff --git a/examples/wireless/wifi-clear-channel-cmu.cc b/examples/wireless/wifi-clear-channel-cmu.cc index 40f1df0ab..a002442ed 100644 --- a/examples/wireless/wifi-clear-channel-cmu.cc +++ b/examples/wireless/wifi-clear-channel-cmu.cc @@ -19,8 +19,7 @@ */ #include "ns3/core-module.h" -#include "ns3/common-module.h" -#include "ns3/node-module.h" +#include "ns3/network-module.h" #include "ns3/helper-module.h" #include "ns3/mobility-module.h" #include "ns3/contrib-module.h" diff --git a/examples/wireless/wifi-hidden-terminal.cc b/examples/wireless/wifi-hidden-terminal.cc index 1aef9e9a1..6a5addc90 100644 --- a/examples/wireless/wifi-hidden-terminal.cc +++ b/examples/wireless/wifi-hidden-terminal.cc @@ -31,7 +31,7 @@ */ #include "ns3/core-module.h" #include "ns3/propagation-module.h" -#include "ns3/node-module.h" +#include "ns3/network-module.h" #include "ns3/helper-module.h" #include "ns3/mobility-module.h" #include "ns3/flow-monitor-module.h" diff --git a/examples/wireless/wifi-simple-adhoc-grid.cc b/examples/wireless/wifi-simple-adhoc-grid.cc index ce8a3ec2c..345690ca4 100644 --- a/examples/wireless/wifi-simple-adhoc-grid.cc +++ b/examples/wireless/wifi-simple-adhoc-grid.cc @@ -70,8 +70,7 @@ // #include "ns3/core-module.h" -#include "ns3/common-module.h" -#include "ns3/node-module.h" +#include "ns3/network-module.h" #include "ns3/helper-module.h" #include "ns3/mobility-module.h" #include "ns3/contrib-module.h" diff --git a/examples/wireless/wifi-simple-adhoc.cc b/examples/wireless/wifi-simple-adhoc.cc index f5d5ff93c..9ba254a0d 100644 --- a/examples/wireless/wifi-simple-adhoc.cc +++ b/examples/wireless/wifi-simple-adhoc.cc @@ -52,8 +52,7 @@ // #include "ns3/core-module.h" -#include "ns3/common-module.h" -#include "ns3/node-module.h" +#include "ns3/network-module.h" #include "ns3/helper-module.h" #include "ns3/mobility-module.h" #include "ns3/contrib-module.h" diff --git a/examples/wireless/wifi-simple-infra.cc b/examples/wireless/wifi-simple-infra.cc index 28d682cf9..c9f789f2e 100644 --- a/examples/wireless/wifi-simple-infra.cc +++ b/examples/wireless/wifi-simple-infra.cc @@ -53,8 +53,7 @@ // #include "ns3/core-module.h" -#include "ns3/common-module.h" -#include "ns3/node-module.h" +#include "ns3/network-module.h" #include "ns3/helper-module.h" #include "ns3/mobility-module.h" #include "ns3/contrib-module.h" diff --git a/examples/wireless/wifi-simple-interference.cc b/examples/wireless/wifi-simple-interference.cc index 296ca276d..61eab43d0 100644 --- a/examples/wireless/wifi-simple-interference.cc +++ b/examples/wireless/wifi-simple-interference.cc @@ -81,8 +81,7 @@ // ./waf --run "wifi-simple-interference --delta=30000" #include "ns3/core-module.h" -#include "ns3/common-module.h" -#include "ns3/node-module.h" +#include "ns3/network-module.h" #include "ns3/helper-module.h" #include "ns3/mobility-module.h" #include "ns3/contrib-module.h" diff --git a/examples/wireless/wifi-wired-bridging.cc b/examples/wireless/wifi-wired-bridging.cc index a16a377a0..39905b19d 100644 --- a/examples/wireless/wifi-wired-bridging.cc +++ b/examples/wireless/wifi-wired-bridging.cc @@ -48,7 +48,7 @@ #include "ns3/mobility-module.h" #include "ns3/helper-module.h" #include "ns3/wifi-module.h" -#include "ns3/node-module.h" +#include "ns3/network-module.h" #include "ns3/bridge-helper.h" #include #include diff --git a/samples/main-simple.cc b/samples/main-simple.cc index f48b6ed1b..172cb1951 100644 --- a/samples/main-simple.cc +++ b/samples/main-simple.cc @@ -2,7 +2,7 @@ #include "ns3/core-module.h" #include "ns3/helper-module.h" -#include "ns3/node-module.h" +#include "ns3/network-module.h" #include "ns3/core-module.h" using namespace ns3; diff --git a/scratch/multiple-sources/simple-simulation.cc b/scratch/multiple-sources/simple-simulation.cc index 5fb56ee4c..be6dc5812 100644 --- a/scratch/multiple-sources/simple-simulation.cc +++ b/scratch/multiple-sources/simple-simulation.cc @@ -2,7 +2,7 @@ #include "ns3/core-module.h" #include "ns3/helper-module.h" -#include "ns3/node-module.h" +#include "ns3/network-module.h" #include "ns3/core-module.h" using namespace ns3; diff --git a/scratch/simple.cc b/scratch/simple.cc index 889321bdc..d8be40db0 100644 --- a/scratch/simple.cc +++ b/scratch/simple.cc @@ -2,7 +2,7 @@ #include "ns3/core-module.h" #include "ns3/helper-module.h" -#include "ns3/node-module.h" +#include "ns3/network-module.h" #include "ns3/core-module.h" using namespace ns3; diff --git a/src/applications/bulk-send/wscript b/src/applications/bulk-send/wscript index 8a53e04b5..dd6cc316e 100644 --- a/src/applications/bulk-send/wscript +++ b/src/applications/bulk-send/wscript @@ -1,7 +1,7 @@ ## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*- def build(bld): - module = bld.create_ns3_module('bulk-send', ['core', 'node']) + module = bld.create_ns3_module('bulk-send', ['core', 'network']) module.source = [ 'bulk-send-application.cc', ] diff --git a/src/applications/onoff/wscript b/src/applications/onoff/wscript index ec72ac135..ec57f06a5 100644 --- a/src/applications/onoff/wscript +++ b/src/applications/onoff/wscript @@ -1,7 +1,7 @@ ## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*- def build(bld): - module = bld.create_ns3_module('onoff', ['core', 'node']) + module = bld.create_ns3_module('onoff', ['core', 'network']) module.source = [ 'onoff-application.cc', ] diff --git a/src/applications/packet-sink/wscript b/src/applications/packet-sink/wscript index 0f618ddff..d8d4cef89 100644 --- a/src/applications/packet-sink/wscript +++ b/src/applications/packet-sink/wscript @@ -1,7 +1,7 @@ ## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*- def build(bld): - module = bld.create_ns3_module('packet-sink', ['node']) + module = bld.create_ns3_module('packet-sink', ['network']) module.source = [ 'packet-sink.cc', ] diff --git a/src/applications/v4ping/wscript b/src/applications/v4ping/wscript index 2fa4075d3..637009db8 100644 --- a/src/applications/v4ping/wscript +++ b/src/applications/v4ping/wscript @@ -1,7 +1,7 @@ ## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*- def build(bld): - module = bld.create_ns3_module('v4ping', ['node']) + module = bld.create_ns3_module('v4ping', ['network']) module.source = [ 'v4ping.cc', ] diff --git a/src/common/wscript b/src/common/wscript deleted file mode 100644 index 3fb50e9d5..000000000 --- a/src/common/wscript +++ /dev/null @@ -1,51 +0,0 @@ -## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*- - -def build(bld): - common = bld.create_ns3_module('common', ['core', 'mobility']) - common.source = [ - 'buffer.cc', - 'buffer-test.cc', - 'packet-metadata.cc', - 'packet-metadata-test.cc', - 'packet.cc', - 'packet-burst.cc', - 'chunk.cc', - 'header.cc', - 'trailer.cc', - 'data-rate.cc', - 'error-model.cc', - 'tag.cc', - 'byte-tag-list.cc', - 'tag-buffer.cc', - 'packet-tag-list.cc', - 'nix-vector.cc', - 'pcap-file.cc', - 'pcap-file-test-suite.cc', - 'pcap-file-wrapper.cc', - 'output-stream-wrapper.cc', - 'sequence-number.cc', - ] - - headers = bld.new_task_gen('ns3header') - headers.module = 'common' - headers.source = [ - 'buffer.h', - 'chunk.h', - 'header.h', - 'trailer.h', - 'packet.h', - 'packet-burst.h', - 'packet-metadata.h', - 'data-rate.h', - 'error-model.h', - 'tag.h', - 'byte-tag-list.h', - 'tag-buffer.h', - 'packet-tag-list.h', - 'nix-vector.h', - 'sgi-hashmap.h', - 'pcap-file.h', - 'pcap-file-wrapper.h', - 'output-stream-wrapper.h', - 'sequence-number.h', - ] diff --git a/src/contrib/energy/wscript b/src/contrib/energy/wscript index 4dabfc38a..5483f917e 100644 --- a/src/contrib/energy/wscript +++ b/src/contrib/energy/wscript @@ -1,7 +1,7 @@ ## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*- def build(bld): - obj = bld.create_ns3_module('energy', ['node', 'wifi']) + obj = bld.create_ns3_module('energy', ['network', 'wifi']) obj.source = [ 'model/wifi-radio-energy-model.cc', 'model/energy-source.cc', diff --git a/src/contrib/stats/wscript b/src/contrib/stats/wscript index 62b6146fd..f2a1ca812 100644 --- a/src/contrib/stats/wscript +++ b/src/contrib/stats/wscript @@ -8,7 +8,7 @@ def configure(conf): def build(bld): - obj = bld.create_ns3_module('stats', ['node']) + obj = bld.create_ns3_module('stats', ['network']) obj.source = [ 'data-calculator.cc', 'packet-data-calculators.cc', diff --git a/src/contrib/topology-read/wscript b/src/contrib/topology-read/wscript index 3dad58c06..21a189a0f 100644 --- a/src/contrib/topology-read/wscript +++ b/src/contrib/topology-read/wscript @@ -1,7 +1,7 @@ ## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*- def build(bld): - obj = bld.create_ns3_module('topology-read', ['node']) + obj = bld.create_ns3_module('topology-read', ['network']) obj.source = [ 'topology-reader.cc', 'inet-topology-reader.cc', diff --git a/src/contrib/wscript b/src/contrib/wscript index eb9ad5b6a..7ba2f68f7 100644 --- a/src/contrib/wscript +++ b/src/contrib/wscript @@ -20,7 +20,7 @@ def configure(conf): def build(bld): - module = bld.create_ns3_module('contrib', ['core', 'common']) + module = bld.create_ns3_module('contrib', ['core', 'network']) module.source = [ 'event-garbage-collector.cc', 'gnuplot.cc', diff --git a/src/devices/bridge/examples/csma-bridge-one-hop.cc b/src/devices/bridge/examples/csma-bridge-one-hop.cc index fd1030bbc..4d8fbac63 100644 --- a/src/devices/bridge/examples/csma-bridge-one-hop.cc +++ b/src/devices/bridge/examples/csma-bridge-one-hop.cc @@ -70,7 +70,7 @@ #include #include "ns3/core-module.h" -#include "ns3/node-module.h" +#include "ns3/network-module.h" #include "ns3/core-module.h" #include "ns3/helper-module.h" #include "ns3/bridge-module.h" diff --git a/src/devices/bridge/examples/csma-bridge.cc b/src/devices/bridge/examples/csma-bridge.cc index 5b6624062..84eec3502 100644 --- a/src/devices/bridge/examples/csma-bridge.cc +++ b/src/devices/bridge/examples/csma-bridge.cc @@ -33,7 +33,7 @@ #include #include "ns3/core-module.h" -#include "ns3/node-module.h" +#include "ns3/network-module.h" #include "ns3/core-module.h" #include "ns3/helper-module.h" #include "ns3/bridge-module.h" diff --git a/src/devices/bridge/wscript b/src/devices/bridge/wscript index 3dde0ec75..ff52ec670 100644 --- a/src/devices/bridge/wscript +++ b/src/devices/bridge/wscript @@ -1,7 +1,7 @@ ## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*- def build(bld): - obj = bld.create_ns3_module('bridge', ['node']) + obj = bld.create_ns3_module('bridge', ['network']) obj.source = [ 'model/bridge-net-device.cc', 'model/bridge-channel.cc', diff --git a/src/devices/csma/wscript b/src/devices/csma/wscript index af86e352b..8d77587e5 100644 --- a/src/devices/csma/wscript +++ b/src/devices/csma/wscript @@ -1,7 +1,7 @@ ## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*- def build(bld): - obj = bld.create_ns3_module('csma', ['node']) + obj = bld.create_ns3_module('csma', ['network']) obj.source = [ 'backoff.cc', 'csma-net-device.cc', diff --git a/src/devices/emu/wscript b/src/devices/emu/wscript index e306b540c..72ead4ade 100644 --- a/src/devices/emu/wscript +++ b/src/devices/emu/wscript @@ -20,7 +20,7 @@ def configure(conf): conf.env.append_value('NS3_EXECUTABLE_PATH', emucreatordir) def build(bld): - module = bld.create_ns3_module('emu', ['node']) + module = bld.create_ns3_module('emu', ['network']) module.source = [ ] headers = bld.new_task_gen('ns3header') diff --git a/src/devices/lte/examples/lte-amc.cc b/src/devices/lte/examples/lte-amc.cc index b7bee10f3..c3363af56 100644 --- a/src/devices/lte/examples/lte-amc.cc +++ b/src/devices/lte/examples/lte-amc.cc @@ -25,9 +25,7 @@ #include #include #include -#include -#include -#include +#include #include #include #include diff --git a/src/devices/lte/examples/lte-channel-model.cc b/src/devices/lte/examples/lte-channel-model.cc index 742dd3639..ce8e6649f 100644 --- a/src/devices/lte/examples/lte-channel-model.cc +++ b/src/devices/lte/examples/lte-channel-model.cc @@ -25,9 +25,7 @@ #include #include #include -#include -#include -#include +#include #include #include #include diff --git a/src/devices/lte/examples/lte-device.cc b/src/devices/lte/examples/lte-device.cc index 7fa6ee339..42b91491d 100644 --- a/src/devices/lte/examples/lte-device.cc +++ b/src/devices/lte/examples/lte-device.cc @@ -11,8 +11,7 @@ // +------------+ #include "ns3/core-module.h" -#include "ns3/common-module.h" -#include "ns3/node-module.h" +#include "ns3/network-module.h" #include "ns3/helper-module.h" #include "ns3/mobility-module.h" #include "ns3/contrib-module.h" diff --git a/src/devices/lte/examples/lte-multiple-flows.cc b/src/devices/lte/examples/lte-multiple-flows.cc index e58f12c50..4cf196028 100644 --- a/src/devices/lte/examples/lte-multiple-flows.cc +++ b/src/devices/lte/examples/lte-multiple-flows.cc @@ -11,8 +11,7 @@ // +------------+ #include "ns3/core-module.h" -#include "ns3/common-module.h" -#include "ns3/node-module.h" +#include "ns3/network-module.h" #include "ns3/helper-module.h" #include "ns3/mobility-module.h" #include "ns3/contrib-module.h" diff --git a/src/devices/lte/examples/lte-phy-downlink.cc b/src/devices/lte/examples/lte-phy-downlink.cc index ecbd53591..76ac815d9 100644 --- a/src/devices/lte/examples/lte-phy-downlink.cc +++ b/src/devices/lte/examples/lte-phy-downlink.cc @@ -49,9 +49,7 @@ #include #include -#include -#include -#include +#include #include #include #include diff --git a/src/devices/lte/examples/lte-phy-uplink.cc b/src/devices/lte/examples/lte-phy-uplink.cc index 51f515149..642976099 100644 --- a/src/devices/lte/examples/lte-phy-uplink.cc +++ b/src/devices/lte/examples/lte-phy-uplink.cc @@ -50,9 +50,7 @@ #include #include -#include -#include -#include +#include #include #include #include diff --git a/src/devices/lte/wscript b/src/devices/lte/wscript index 95101ddcc..0f6239125 100644 --- a/src/devices/lte/wscript +++ b/src/devices/lte/wscript @@ -2,7 +2,7 @@ def build(bld): - module = bld.create_ns3_module('lte', ['core', 'node', 'common', 'spectrum']) + module = bld.create_ns3_module('lte', ['core', 'network', 'spectrum']) module.source = [ 'model/lte-spectrum-phy.cc', 'model/enb-lte-spectrum-phy.cc', diff --git a/src/devices/point-to-point/wscript b/src/devices/point-to-point/wscript index bea19f31d..ca340f9ef 100644 --- a/src/devices/point-to-point/wscript +++ b/src/devices/point-to-point/wscript @@ -2,7 +2,7 @@ def build(bld): - module = bld.create_ns3_module('point-to-point', ['node']) + module = bld.create_ns3_module('point-to-point', ['network']) module.source = [ 'point-to-point-net-device.cc', 'point-to-point-channel.cc', diff --git a/src/devices/tap-bridge/wscript b/src/devices/tap-bridge/wscript index b7903ce3b..345b305f8 100644 --- a/src/devices/tap-bridge/wscript +++ b/src/devices/tap-bridge/wscript @@ -20,7 +20,7 @@ def configure(conf): conf.env.append_value('NS3_EXECUTABLE_PATH', tapcreatordir) def build(bld): - module = bld.create_ns3_module('tap-bridge', ['node']) + module = bld.create_ns3_module('tap-bridge', ['network']) module.source = [ ] headers = bld.new_task_gen('ns3header') diff --git a/src/devices/uan/examples/uan-cw-example.cc b/src/devices/uan/examples/uan-cw-example.cc index 60ada179b..9d2663cbd 100644 --- a/src/devices/uan/examples/uan-cw-example.cc +++ b/src/devices/uan/examples/uan-cw-example.cc @@ -38,8 +38,7 @@ #include "uan-cw-example.h" #include "ns3/core-module.h" -#include "ns3/common-module.h" -#include "ns3/node-module.h" +#include "ns3/network-module.h" #include "ns3/mobility-module.h" #include "ns3/contrib-module.h" #include "ns3/helper-module.h" diff --git a/src/devices/uan/examples/uan-cw-example.h b/src/devices/uan/examples/uan-cw-example.h index ef0cfe5f2..4903904e7 100644 --- a/src/devices/uan/examples/uan-cw-example.h +++ b/src/devices/uan/examples/uan-cw-example.h @@ -21,8 +21,7 @@ #ifndef UANCWEXAMPLE_H #define UANCWEXAMPLE_H -#include "ns3/common-module.h" -#include "ns3/node-module.h" +#include "ns3/network-module.h" #include "ns3/contrib-module.h" #include "ns3/uan-module.h" #include "ns3/helper-module.h" diff --git a/src/devices/uan/examples/uan-rc-example.cc b/src/devices/uan/examples/uan-rc-example.cc index 7870804db..dc2b5a3d5 100644 --- a/src/devices/uan/examples/uan-rc-example.cc +++ b/src/devices/uan/examples/uan-rc-example.cc @@ -53,10 +53,9 @@ #include "uan-rc-example.h" #include "ns3/core-module.h" -#include "ns3/common-module.h" +#include "ns3/network-module.h" #include "ns3/helper-module.h" #include "ns3/mobility-module.h" -#include "ns3/node-module.h" #include "ns3/log.h" #include "ns3/config.h" #include "ns3/callback.h" diff --git a/src/devices/uan/examples/uan-rc-example.h b/src/devices/uan/examples/uan-rc-example.h index ba2616e8e..df83bc96d 100644 --- a/src/devices/uan/examples/uan-rc-example.h +++ b/src/devices/uan/examples/uan-rc-example.h @@ -21,8 +21,7 @@ #ifndef UANRCEXAMPLE_H #define UANRCEXAMPLE_H -#include "ns3/common-module.h" -#include "ns3/node-module.h" +#include "ns3/network-module.h" #include "ns3/contrib-module.h" #include "ns3/helper-module.h" #include "ns3/uan-module.h" diff --git a/src/devices/uan/wscript b/src/devices/uan/wscript index 1d3ae0b55..8b13a85da 100644 --- a/src/devices/uan/wscript +++ b/src/devices/uan/wscript @@ -1,7 +1,7 @@ ## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*- def build(bld): - module = bld.create_ns3_module('uan', ['node', 'energy']) + module = bld.create_ns3_module('uan', ['network', 'energy']) module.source = [ 'model/uan-channel.cc', 'model/uan-phy-gen.cc', diff --git a/src/devices/virtual-net-device/examples/virtual-net-device.cc b/src/devices/virtual-net-device/examples/virtual-net-device.cc index c5e1cef7a..876055f7c 100644 --- a/src/devices/virtual-net-device/examples/virtual-net-device.cc +++ b/src/devices/virtual-net-device/examples/virtual-net-device.cc @@ -53,7 +53,7 @@ #include "ns3/core-module.h" #include "ns3/core-module.h" -#include "ns3/node-module.h" +#include "ns3/network-module.h" #include "ns3/helper-module.h" #include "ns3/virtual-net-device.h" #include "ns3/ipv4-global-routing-helper.h" diff --git a/src/devices/virtual-net-device/wscript b/src/devices/virtual-net-device/wscript index 09d56dcf0..fa15ba909 100644 --- a/src/devices/virtual-net-device/wscript +++ b/src/devices/virtual-net-device/wscript @@ -2,7 +2,7 @@ def build(bld): - module = bld.create_ns3_module('virtual-net-device', ['node']) + module = bld.create_ns3_module('virtual-net-device', ['network']) module.source = [ 'model/virtual-net-device.cc', ] diff --git a/src/devices/wifi/wscript b/src/devices/wifi/wscript index 8d8071bbf..48c3fdc7e 100644 --- a/src/devices/wifi/wscript +++ b/src/devices/wifi/wscript @@ -1,7 +1,7 @@ ## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*- def build(bld): - obj = bld.create_ns3_module('wifi', ['node']) + obj = bld.create_ns3_module('wifi', ['network']) obj.source = [ 'wifi-information-element.cc', 'wifi-information-element-vector.cc', diff --git a/src/devices/wimax/wscript b/src/devices/wimax/wscript index d4f629bb7..2dca80b3c 100644 --- a/src/devices/wimax/wscript +++ b/src/devices/wimax/wscript @@ -1,6 +1,6 @@ ## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*- def build(bld): - obj = bld.create_ns3_module('wimax', ['node']) + obj = bld.create_ns3_module('wimax', ['network']) obj.source = [ 'cid.cc', 'cid-factory.cc', diff --git a/src/helper/aodv-helper.h b/src/helper/aodv-helper.h index c0b7d347b..0bc70b4c5 100644 --- a/src/helper/aodv-helper.h +++ b/src/helper/aodv-helper.h @@ -22,7 +22,7 @@ #include "ns3/object-factory.h" #include "ns3/node.h" -#include "node-container.h" +#include "ns3/node-container.h" #include "ipv4-routing-helper.h" namespace ns3 diff --git a/src/helper/bulk-send-helper.h b/src/helper/bulk-send-helper.h index 253cf25cc..955decca8 100644 --- a/src/helper/bulk-send-helper.h +++ b/src/helper/bulk-send-helper.h @@ -29,8 +29,8 @@ #include "ns3/address.h" #include "ns3/attribute.h" #include "ns3/net-device.h" -#include "node-container.h" -#include "application-container.h" +#include "ns3/node-container.h" +#include "ns3/application-container.h" namespace ns3 { diff --git a/src/helper/internet-stack-helper.h b/src/helper/internet-stack-helper.h index df8b84744..db96ac238 100644 --- a/src/helper/internet-stack-helper.h +++ b/src/helper/internet-stack-helper.h @@ -21,8 +21,8 @@ #ifndef INTERNET_STACK_HELPER_H #define INTERNET_STACK_HELPER_H -#include "node-container.h" -#include "net-device-container.h" +#include "ns3/node-container.h" +#include "ns3/net-device-container.h" #include "ns3/packet.h" #include "ns3/ptr.h" #include "ns3/object-factory.h" diff --git a/src/helper/ipv4-address-helper.h b/src/helper/ipv4-address-helper.h index a4e09b08c..a2fcbd286 100644 --- a/src/helper/ipv4-address-helper.h +++ b/src/helper/ipv4-address-helper.h @@ -20,7 +20,7 @@ #define IPV4_ADDRESS_HELPER_H #include "ns3/ipv4-address.h" -#include "net-device-container.h" +#include "ns3/net-device-container.h" #include "ipv4-interface-container.h" namespace ns3 { diff --git a/src/helper/ipv6-address-helper.h b/src/helper/ipv6-address-helper.h index df55ba280..487907657 100644 --- a/src/helper/ipv6-address-helper.h +++ b/src/helper/ipv6-address-helper.h @@ -25,7 +25,7 @@ #include "ns3/ipv6-address.h" -#include "net-device-container.h" +#include "ns3/net-device-container.h" #include "ipv6-interface-container.h" namespace ns3 diff --git a/src/helper/on-off-helper.h b/src/helper/on-off-helper.h index 7914ef090..67e466242 100644 --- a/src/helper/on-off-helper.h +++ b/src/helper/on-off-helper.h @@ -26,8 +26,8 @@ #include "ns3/address.h" #include "ns3/attribute.h" #include "ns3/net-device.h" -#include "node-container.h" -#include "application-container.h" +#include "ns3/node-container.h" +#include "ns3/application-container.h" namespace ns3 { diff --git a/src/helper/packet-sink-helper.h b/src/helper/packet-sink-helper.h index ed6006cb9..b795dfc45 100644 --- a/src/helper/packet-sink-helper.h +++ b/src/helper/packet-sink-helper.h @@ -22,8 +22,8 @@ #include "ns3/object-factory.h" #include "ns3/ipv4-address.h" -#include "node-container.h" -#include "application-container.h" +#include "ns3/node-container.h" +#include "ns3/application-container.h" namespace ns3 { diff --git a/src/helper/ping6-helper.h b/src/helper/ping6-helper.h index 3fed2aa7b..499de18a3 100644 --- a/src/helper/ping6-helper.h +++ b/src/helper/ping6-helper.h @@ -26,8 +26,8 @@ #include "ns3/object-factory.h" #include "ns3/ipv6-address.h" -#include "application-container.h" -#include "node-container.h" +#include "ns3/application-container.h" +#include "ns3/node-container.h" namespace ns3 { diff --git a/src/helper/tap-bridge-helper.h b/src/helper/tap-bridge-helper.h index f466407d4..a7f4cbe14 100644 --- a/src/helper/tap-bridge-helper.h +++ b/src/helper/tap-bridge-helper.h @@ -19,7 +19,7 @@ #ifndef TAP_BRIDGE_HELPER_H #define TAP_BRIDGE_HELPER_H -#include "net-device-container.h" +#include "ns3/net-device-container.h" #include "ns3/object-factory.h" #include "ns3/tap-bridge.h" #include diff --git a/src/helper/udp-client-server-helper.h b/src/helper/udp-client-server-helper.h index 9660c6262..e14463ff4 100644 --- a/src/helper/udp-client-server-helper.h +++ b/src/helper/udp-client-server-helper.h @@ -21,8 +21,8 @@ #define UDP_CLIENT_SERVER_HELPER_H #include -#include "application-container.h" -#include "node-container.h" +#include "ns3/application-container.h" +#include "ns3/node-container.h" #include "ns3/object-factory.h" #include "ns3/ipv4-address.h" #include "ns3/udp-server.h" diff --git a/src/helper/udp-echo-helper.h b/src/helper/udp-echo-helper.h index bc24dd041..39eacef70 100644 --- a/src/helper/udp-echo-helper.h +++ b/src/helper/udp-echo-helper.h @@ -21,8 +21,8 @@ #define UDP_ECHO_HELPER_H #include -#include "application-container.h" -#include "node-container.h" +#include "ns3/application-container.h" +#include "ns3/node-container.h" #include "ns3/object-factory.h" #include "ns3/ipv4-address.h" diff --git a/src/helper/v4ping-helper.h b/src/helper/v4ping-helper.h index c83852bc4..d61c5806f 100644 --- a/src/helper/v4ping-helper.h +++ b/src/helper/v4ping-helper.h @@ -1,8 +1,8 @@ #ifndef V4PING_HELPER_H #define V4PING_HELPER_H -#include "node-container.h" -#include "application-container.h" +#include "ns3/node-container.h" +#include "ns3/application-container.h" #include "ns3/object-factory.h" namespace ns3 { diff --git a/src/helper/wscript b/src/helper/wscript index b9af0551b..432c88116 100644 --- a/src/helper/wscript +++ b/src/helper/wscript @@ -1,10 +1,8 @@ ## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*- def build(bld): - helper = bld.create_ns3_module('helper', ['mobility', 'node', 'internet-stack', 'wifi', 'point-to-point', 'csma', 'onoff', 'packet-sink', 'udp-echo', 'spectrum']) + helper = bld.create_ns3_module('helper', ['mobility', 'network', 'internet-stack', 'wifi', 'point-to-point', 'csma', 'onoff', 'packet-sink', 'udp-echo', 'spectrum']) helper.source = [ - 'node-container.cc', - 'net-device-container.cc', 'wifi-helper.cc', 'point-to-point-helper.cc', 'csma-helper.cc', @@ -12,10 +10,8 @@ def build(bld): 'ns2-mobility-helper.cc', 'ipv4-address-helper.cc', 'internet-stack-helper.cc', - 'application-container.cc', 'on-off-helper.cc', 'packet-sink-helper.cc', - 'packet-socket-helper.cc', 'ipv4-interface-container.cc', 'udp-echo-helper.cc', 'yans-wifi-helper.cc', @@ -49,8 +45,6 @@ def build(bld): headers = bld.new_task_gen('ns3header') headers.module = 'helper' headers.source = [ - 'node-container.h', - 'net-device-container.h', 'wifi-helper.h', 'point-to-point-helper.h', 'csma-helper.h', @@ -58,10 +52,8 @@ def build(bld): 'ns2-mobility-helper.h', 'ipv4-address-helper.h', 'internet-stack-helper.h', - 'application-container.h', 'on-off-helper.h', 'packet-sink-helper.h', - 'packet-socket-helper.h', 'ipv4-interface-container.h', 'udp-echo-helper.h', 'yans-wifi-helper.h', diff --git a/src/node/ipv4-address-generator.cc b/src/internet-stack/ipv4-address-generator.cc similarity index 100% rename from src/node/ipv4-address-generator.cc rename to src/internet-stack/ipv4-address-generator.cc diff --git a/src/node/ipv4-address-generator.h b/src/internet-stack/ipv4-address-generator.h similarity index 100% rename from src/node/ipv4-address-generator.h rename to src/internet-stack/ipv4-address-generator.h diff --git a/src/node/ipv4-header.cc b/src/internet-stack/ipv4-header.cc similarity index 100% rename from src/node/ipv4-header.cc rename to src/internet-stack/ipv4-header.cc diff --git a/src/node/ipv4-header.h b/src/internet-stack/ipv4-header.h similarity index 100% rename from src/node/ipv4-header.h rename to src/internet-stack/ipv4-header.h diff --git a/src/node/ipv4-interface-address.cc b/src/internet-stack/ipv4-interface-address.cc similarity index 100% rename from src/node/ipv4-interface-address.cc rename to src/internet-stack/ipv4-interface-address.cc diff --git a/src/node/ipv4-interface-address.h b/src/internet-stack/ipv4-interface-address.h similarity index 99% rename from src/node/ipv4-interface-address.h rename to src/internet-stack/ipv4-interface-address.h index 95e167e73..7b51e170f 100644 --- a/src/node/ipv4-interface-address.h +++ b/src/internet-stack/ipv4-interface-address.h @@ -22,7 +22,7 @@ #include #include -#include "ipv4-address.h" +#include "ns3/ipv4-address.h" namespace ns3 { diff --git a/src/node/ipv4-raw-socket-factory.cc b/src/internet-stack/ipv4-raw-socket-factory.cc similarity index 100% rename from src/node/ipv4-raw-socket-factory.cc rename to src/internet-stack/ipv4-raw-socket-factory.cc diff --git a/src/node/ipv4-raw-socket-factory.h b/src/internet-stack/ipv4-raw-socket-factory.h similarity index 97% rename from src/node/ipv4-raw-socket-factory.h rename to src/internet-stack/ipv4-raw-socket-factory.h index 65b43aeb5..fb7ae0e45 100644 --- a/src/node/ipv4-raw-socket-factory.h +++ b/src/internet-stack/ipv4-raw-socket-factory.h @@ -20,7 +20,7 @@ #ifndef IPV4_RAW_SOCKET_FACTORY_H #define IPV4_RAW_SOCKET_FACTORY_H -#include "socket-factory.h" +#include "ns3/socket-factory.h" namespace ns3 { diff --git a/src/node/ipv4-route.cc b/src/internet-stack/ipv4-route.cc similarity index 98% rename from src/node/ipv4-route.cc rename to src/internet-stack/ipv4-route.cc index d4134ae33..a58d0c9f7 100644 --- a/src/node/ipv4-route.cc +++ b/src/internet-stack/ipv4-route.cc @@ -18,7 +18,7 @@ */ #include "ipv4-route.h" -#include "net-device.h" +#include "ns3/net-device.h" #include "ns3/assert.h" namespace ns3 { diff --git a/src/node/ipv4-route.h b/src/internet-stack/ipv4-route.h similarity index 99% rename from src/node/ipv4-route.h rename to src/internet-stack/ipv4-route.h index db89413e0..6a59d62d1 100644 --- a/src/node/ipv4-route.h +++ b/src/internet-stack/ipv4-route.h @@ -24,7 +24,7 @@ #include #include "ns3/simple-ref-count.h" -#include "ipv4-address.h" +#include "ns3/ipv4-address.h" namespace ns3 { diff --git a/src/node/ipv4-routing-protocol.cc b/src/internet-stack/ipv4-routing-protocol.cc similarity index 100% rename from src/node/ipv4-routing-protocol.cc rename to src/internet-stack/ipv4-routing-protocol.cc diff --git a/src/node/ipv4-routing-protocol.h b/src/internet-stack/ipv4-routing-protocol.h similarity index 99% rename from src/node/ipv4-routing-protocol.h rename to src/internet-stack/ipv4-routing-protocol.h index e79e6a1c7..00dfa1d29 100644 --- a/src/node/ipv4-routing-protocol.h +++ b/src/internet-stack/ipv4-routing-protocol.h @@ -23,7 +23,7 @@ #include "ns3/object.h" #include "ns3/socket.h" #include "ipv4-header.h" -#include "ipv4-interface-address.h" +#include "ns3/ipv4-interface-address.h" #include "ipv4.h" #include "ns3/output-stream-wrapper.h" diff --git a/src/node/ipv4.cc b/src/internet-stack/ipv4.cc similarity index 100% rename from src/node/ipv4.cc rename to src/internet-stack/ipv4.cc diff --git a/src/node/ipv4.h b/src/internet-stack/ipv4.h similarity index 99% rename from src/node/ipv4.h rename to src/internet-stack/ipv4.h index 9701b1c13..2ad16a228 100644 --- a/src/node/ipv4.h +++ b/src/internet-stack/ipv4.h @@ -24,7 +24,7 @@ #include "ns3/object.h" #include "ns3/socket.h" #include "ns3/callback.h" -#include "ipv4-address.h" +#include "ns3/ipv4-address.h" #include "ipv4-interface-address.h" namespace ns3 { diff --git a/src/node/ipv6-header.cc b/src/internet-stack/ipv6-header.cc similarity index 99% rename from src/node/ipv6-header.cc rename to src/internet-stack/ipv6-header.cc index 2cf251b62..cd2190c46 100644 --- a/src/node/ipv6-header.cc +++ b/src/internet-stack/ipv6-header.cc @@ -22,7 +22,7 @@ #include "ns3/log.h" #include "ns3/header.h" -#include "address-utils.h" +#include "ns3/address-utils.h" #include "ipv6-header.h" NS_LOG_COMPONENT_DEFINE ("Ipv6Header"); diff --git a/src/node/ipv6-header.h b/src/internet-stack/ipv6-header.h similarity index 100% rename from src/node/ipv6-header.h rename to src/internet-stack/ipv6-header.h diff --git a/src/node/ipv6-interface-address.cc b/src/internet-stack/ipv6-interface-address.cc similarity index 100% rename from src/node/ipv6-interface-address.cc rename to src/internet-stack/ipv6-interface-address.cc diff --git a/src/node/ipv6-interface-address.h b/src/internet-stack/ipv6-interface-address.h similarity index 99% rename from src/node/ipv6-interface-address.h rename to src/internet-stack/ipv6-interface-address.h index 45ce60bfc..ee1475c92 100644 --- a/src/node/ipv6-interface-address.h +++ b/src/internet-stack/ipv6-interface-address.h @@ -23,7 +23,7 @@ #include -#include "ipv6-address.h" +#include "ns3/ipv6-address.h" namespace ns3 { diff --git a/src/node/ipv6-raw-socket-factory.cc b/src/internet-stack/ipv6-raw-socket-factory.cc similarity index 100% rename from src/node/ipv6-raw-socket-factory.cc rename to src/internet-stack/ipv6-raw-socket-factory.cc diff --git a/src/node/ipv6-raw-socket-factory.h b/src/internet-stack/ipv6-raw-socket-factory.h similarity index 97% rename from src/node/ipv6-raw-socket-factory.h rename to src/internet-stack/ipv6-raw-socket-factory.h index f9941b480..a9ed03bb8 100644 --- a/src/node/ipv6-raw-socket-factory.h +++ b/src/internet-stack/ipv6-raw-socket-factory.h @@ -21,7 +21,7 @@ #ifndef IPV6_RAW_SOCKET_FACTORY_H #define IPV6_RAW_SOCKET_FACTORY_H -#include "socket-factory.h" +#include "ns3/socket-factory.h" namespace ns3 { diff --git a/src/node/ipv6-route.cc b/src/internet-stack/ipv6-route.cc similarity index 99% rename from src/node/ipv6-route.cc rename to src/internet-stack/ipv6-route.cc index c4de3fcd5..c865276dc 100644 --- a/src/node/ipv6-route.cc +++ b/src/internet-stack/ipv6-route.cc @@ -20,7 +20,7 @@ #include -#include "net-device.h" +#include "ns3/net-device.h" #include "ipv6-route.h" namespace ns3 diff --git a/src/node/ipv6-route.h b/src/internet-stack/ipv6-route.h similarity index 99% rename from src/node/ipv6-route.h rename to src/internet-stack/ipv6-route.h index e87e6787d..b90cc673f 100644 --- a/src/node/ipv6-route.h +++ b/src/internet-stack/ipv6-route.h @@ -27,7 +27,7 @@ #include "ns3/simple-ref-count.h" -#include "ipv6-address.h" +#include "ns3/ipv6-address.h" namespace ns3 { diff --git a/src/node/ipv6-routing-protocol.cc b/src/internet-stack/ipv6-routing-protocol.cc similarity index 100% rename from src/node/ipv6-routing-protocol.cc rename to src/internet-stack/ipv6-routing-protocol.cc diff --git a/src/node/ipv6-routing-protocol.h b/src/internet-stack/ipv6-routing-protocol.h similarity index 100% rename from src/node/ipv6-routing-protocol.h rename to src/internet-stack/ipv6-routing-protocol.h diff --git a/src/node/ipv6.cc b/src/internet-stack/ipv6.cc similarity index 100% rename from src/node/ipv6.cc rename to src/internet-stack/ipv6.cc diff --git a/src/node/ipv6.h b/src/internet-stack/ipv6.h similarity index 99% rename from src/node/ipv6.h rename to src/internet-stack/ipv6.h index 6fbdd0dea..6d97b673a 100644 --- a/src/node/ipv6.h +++ b/src/internet-stack/ipv6.h @@ -29,7 +29,7 @@ #include "ns3/socket.h" #include "ns3/callback.h" -#include "ipv6-address.h" +#include "ns3/ipv6-address.h" #include "ipv6-interface-address.h" namespace ns3 { diff --git a/src/node/tcp-socket-factory.cc b/src/internet-stack/tcp-socket-factory.cc similarity index 100% rename from src/node/tcp-socket-factory.cc rename to src/internet-stack/tcp-socket-factory.cc diff --git a/src/node/tcp-socket-factory.h b/src/internet-stack/tcp-socket-factory.h similarity index 98% rename from src/node/tcp-socket-factory.h rename to src/internet-stack/tcp-socket-factory.h index 418bafde6..5d599c1c7 100644 --- a/src/node/tcp-socket-factory.h +++ b/src/internet-stack/tcp-socket-factory.h @@ -20,7 +20,7 @@ #ifndef TCP_SOCKET_FACTORY_H #define TCP_SOCKET_FACTORY_H -#include "socket-factory.h" +#include "ns3/socket-factory.h" namespace ns3 { diff --git a/src/node/tcp-socket.cc b/src/internet-stack/tcp-socket.cc similarity index 100% rename from src/node/tcp-socket.cc rename to src/internet-stack/tcp-socket.cc diff --git a/src/node/tcp-socket.h b/src/internet-stack/tcp-socket.h similarity index 99% rename from src/node/tcp-socket.h rename to src/internet-stack/tcp-socket.h index b8d893cfd..50eff31f2 100644 --- a/src/node/tcp-socket.h +++ b/src/internet-stack/tcp-socket.h @@ -23,7 +23,7 @@ #ifndef __TCP_SOCKET_H__ #define __TCP_SOCKET_H__ -#include "socket.h" +#include "ns3/socket.h" #include "ns3/traced-callback.h" #include "ns3/callback.h" #include "ns3/ptr.h" diff --git a/src/node/udp-socket-factory.cc b/src/internet-stack/udp-socket-factory.cc similarity index 100% rename from src/node/udp-socket-factory.cc rename to src/internet-stack/udp-socket-factory.cc diff --git a/src/node/udp-socket-factory.h b/src/internet-stack/udp-socket-factory.h similarity index 97% rename from src/node/udp-socket-factory.h rename to src/internet-stack/udp-socket-factory.h index ff8309b4e..9de33ffd2 100644 --- a/src/node/udp-socket-factory.h +++ b/src/internet-stack/udp-socket-factory.h @@ -20,7 +20,7 @@ #ifndef UDP_SOCKET_FACTORY_H #define UDP_SOCKET_FACTORY_H -#include "socket-factory.h" +#include "ns3/socket-factory.h" namespace ns3 { diff --git a/src/node/udp-socket.cc b/src/internet-stack/udp-socket.cc similarity index 100% rename from src/node/udp-socket.cc rename to src/internet-stack/udp-socket.cc diff --git a/src/node/udp-socket.h b/src/internet-stack/udp-socket.h similarity index 99% rename from src/node/udp-socket.h rename to src/internet-stack/udp-socket.h index ed6d412da..c2f13929e 100644 --- a/src/node/udp-socket.h +++ b/src/internet-stack/udp-socket.h @@ -23,7 +23,7 @@ #ifndef __UDP_SOCKET_H__ #define __UDP_SOCKET_H__ -#include "socket.h" +#include "ns3/socket.h" #include "ns3/traced-callback.h" #include "ns3/callback.h" #include "ns3/ptr.h" diff --git a/src/internet-stack/wscript b/src/internet-stack/wscript index a01448f94..9a00677ff 100644 --- a/src/internet-stack/wscript +++ b/src/internet-stack/wscript @@ -91,7 +91,7 @@ def configure(conf): def build(bld): - obj = bld.create_ns3_module('internet-stack', ['node']) + obj = bld.create_ns3_module('internet-stack', ['network']) obj.source = [ 'tcp-test.cc', 'udp-test.cc', @@ -147,6 +147,23 @@ def build(bld): 'tcp-tx-buffer.cc', 'ipv4-packet-info-tag.cc', 'ipv6-packet-info-tag.cc', + 'ipv4-interface-address.cc', + 'ipv4-address-generator.cc', + 'ipv4-header.cc', + 'ipv4-route.cc', + 'ipv4-routing-protocol.cc', + 'udp-socket.cc', + 'udp-socket-factory.cc', + 'tcp-socket.cc', + 'tcp-socket-factory.cc', + 'ipv4.cc', + 'ipv4-raw-socket-factory.cc', + 'ipv6-header.cc', + 'ipv6-interface-address.cc', + 'ipv6-route.cc', + 'ipv6.cc', + 'ipv6-raw-socket-factory.cc', + 'ipv6-routing-protocol.cc', ] headers = bld.new_task_gen('ns3header') @@ -176,6 +193,23 @@ def build(bld): 'loopback-net-device.h', 'ipv4-packet-info-tag.h', 'ipv6-packet-info-tag.h', + 'ipv4-interface-address.h', + 'ipv4-address-generator.h', + 'ipv4-header.h', + 'ipv4-route.h', + 'ipv4-routing-protocol.h', + 'udp-socket.h', + 'udp-socket-factory.h', + 'tcp-socket.h', + 'tcp-socket-factory.h', + 'ipv4.h', + 'ipv4-raw-socket-factory.h', + 'ipv6-header.h', + 'ipv6-interface-address.h', + 'ipv6-route.h', + 'ipv6.h', + 'ipv6-raw-socket-factory.h', + 'ipv6-routing-protocol.h', ] if bld.env['NSC_ENABLED']: diff --git a/src/helper/application-container.cc b/src/network/helper/application-container.cc similarity index 100% rename from src/helper/application-container.cc rename to src/network/helper/application-container.cc diff --git a/src/helper/application-container.h b/src/network/helper/application-container.h similarity index 100% rename from src/helper/application-container.h rename to src/network/helper/application-container.h diff --git a/src/helper/net-device-container.cc b/src/network/helper/net-device-container.cc similarity index 100% rename from src/helper/net-device-container.cc rename to src/network/helper/net-device-container.cc diff --git a/src/helper/net-device-container.h b/src/network/helper/net-device-container.h similarity index 100% rename from src/helper/net-device-container.h rename to src/network/helper/net-device-container.h diff --git a/src/helper/node-container.cc b/src/network/helper/node-container.cc similarity index 100% rename from src/helper/node-container.cc rename to src/network/helper/node-container.cc diff --git a/src/helper/node-container.h b/src/network/helper/node-container.h similarity index 100% rename from src/helper/node-container.h rename to src/network/helper/node-container.h diff --git a/src/helper/packet-socket-helper.cc b/src/network/helper/packet-socket-helper.cc similarity index 100% rename from src/helper/packet-socket-helper.cc rename to src/network/helper/packet-socket-helper.cc diff --git a/src/helper/packet-socket-helper.h b/src/network/helper/packet-socket-helper.h similarity index 100% rename from src/helper/packet-socket-helper.h rename to src/network/helper/packet-socket-helper.h diff --git a/src/node/address.cc b/src/network/model/address.cc similarity index 100% rename from src/node/address.cc rename to src/network/model/address.cc diff --git a/src/node/address.h b/src/network/model/address.h similarity index 100% rename from src/node/address.h rename to src/network/model/address.h diff --git a/src/node/application.cc b/src/network/model/application.cc similarity index 100% rename from src/node/application.cc rename to src/network/model/application.cc diff --git a/src/node/application.h b/src/network/model/application.h similarity index 100% rename from src/node/application.h rename to src/network/model/application.h diff --git a/src/common/buffer.cc b/src/network/model/buffer.cc similarity index 100% rename from src/common/buffer.cc rename to src/network/model/buffer.cc diff --git a/src/common/buffer.h b/src/network/model/buffer.h similarity index 100% rename from src/common/buffer.h rename to src/network/model/buffer.h diff --git a/src/common/byte-tag-list.cc b/src/network/model/byte-tag-list.cc similarity index 100% rename from src/common/byte-tag-list.cc rename to src/network/model/byte-tag-list.cc diff --git a/src/common/byte-tag-list.h b/src/network/model/byte-tag-list.h similarity index 100% rename from src/common/byte-tag-list.h rename to src/network/model/byte-tag-list.h diff --git a/src/node/channel-list.cc b/src/network/model/channel-list.cc similarity index 100% rename from src/node/channel-list.cc rename to src/network/model/channel-list.cc diff --git a/src/node/channel-list.h b/src/network/model/channel-list.h similarity index 100% rename from src/node/channel-list.h rename to src/network/model/channel-list.h diff --git a/src/node/channel.cc b/src/network/model/channel.cc similarity index 100% rename from src/node/channel.cc rename to src/network/model/channel.cc diff --git a/src/node/channel.h b/src/network/model/channel.h similarity index 100% rename from src/node/channel.h rename to src/network/model/channel.h diff --git a/src/common/chunk.cc b/src/network/model/chunk.cc similarity index 100% rename from src/common/chunk.cc rename to src/network/model/chunk.cc diff --git a/src/common/chunk.h b/src/network/model/chunk.h similarity index 100% rename from src/common/chunk.h rename to src/network/model/chunk.h diff --git a/src/common/header.cc b/src/network/model/header.cc similarity index 100% rename from src/common/header.cc rename to src/network/model/header.cc diff --git a/src/common/header.h b/src/network/model/header.h similarity index 100% rename from src/common/header.h rename to src/network/model/header.h diff --git a/src/node/net-device.cc b/src/network/model/net-device.cc similarity index 100% rename from src/node/net-device.cc rename to src/network/model/net-device.cc diff --git a/src/node/net-device.h b/src/network/model/net-device.h similarity index 99% rename from src/node/net-device.h rename to src/network/model/net-device.h index efaea800c..ea25c5ea6 100644 --- a/src/node/net-device.h +++ b/src/network/model/net-device.h @@ -27,8 +27,8 @@ #include "ns3/object.h" #include "ns3/ptr.h" #include "address.h" -#include "ipv4-address.h" -#include "ipv6-address.h" +#include "ns3/ipv4-address.h" +#include "ns3/ipv6-address.h" namespace ns3 { diff --git a/src/common/nix-vector.cc b/src/network/model/nix-vector.cc similarity index 100% rename from src/common/nix-vector.cc rename to src/network/model/nix-vector.cc diff --git a/src/common/nix-vector.h b/src/network/model/nix-vector.h similarity index 100% rename from src/common/nix-vector.h rename to src/network/model/nix-vector.h diff --git a/src/node/node-list.cc b/src/network/model/node-list.cc similarity index 100% rename from src/node/node-list.cc rename to src/network/model/node-list.cc diff --git a/src/node/node-list.h b/src/network/model/node-list.h similarity index 100% rename from src/node/node-list.h rename to src/network/model/node-list.h diff --git a/src/node/node.cc b/src/network/model/node.cc similarity index 100% rename from src/node/node.cc rename to src/network/model/node.cc diff --git a/src/node/node.h b/src/network/model/node.h similarity index 100% rename from src/node/node.h rename to src/network/model/node.h diff --git a/src/common/packet-metadata.cc b/src/network/model/packet-metadata.cc similarity index 100% rename from src/common/packet-metadata.cc rename to src/network/model/packet-metadata.cc diff --git a/src/common/packet-metadata.h b/src/network/model/packet-metadata.h similarity index 100% rename from src/common/packet-metadata.h rename to src/network/model/packet-metadata.h diff --git a/src/common/packet-tag-list.cc b/src/network/model/packet-tag-list.cc similarity index 100% rename from src/common/packet-tag-list.cc rename to src/network/model/packet-tag-list.cc diff --git a/src/common/packet-tag-list.h b/src/network/model/packet-tag-list.h similarity index 100% rename from src/common/packet-tag-list.h rename to src/network/model/packet-tag-list.h diff --git a/src/common/packet.cc b/src/network/model/packet.cc similarity index 100% rename from src/common/packet.cc rename to src/network/model/packet.cc diff --git a/src/common/packet.h b/src/network/model/packet.h similarity index 100% rename from src/common/packet.h rename to src/network/model/packet.h diff --git a/src/node/socket-factory.cc b/src/network/model/socket-factory.cc similarity index 100% rename from src/node/socket-factory.cc rename to src/network/model/socket-factory.cc diff --git a/src/node/socket-factory.h b/src/network/model/socket-factory.h similarity index 100% rename from src/node/socket-factory.h rename to src/network/model/socket-factory.h diff --git a/src/node/socket.cc b/src/network/model/socket.cc similarity index 100% rename from src/node/socket.cc rename to src/network/model/socket.cc diff --git a/src/node/socket.h b/src/network/model/socket.h similarity index 100% rename from src/node/socket.h rename to src/network/model/socket.h diff --git a/src/common/tag-buffer.cc b/src/network/model/tag-buffer.cc similarity index 100% rename from src/common/tag-buffer.cc rename to src/network/model/tag-buffer.cc diff --git a/src/common/tag-buffer.h b/src/network/model/tag-buffer.h similarity index 100% rename from src/common/tag-buffer.h rename to src/network/model/tag-buffer.h diff --git a/src/common/tag.cc b/src/network/model/tag.cc similarity index 100% rename from src/common/tag.cc rename to src/network/model/tag.cc diff --git a/src/common/tag.h b/src/network/model/tag.h similarity index 100% rename from src/common/tag.h rename to src/network/model/tag.h diff --git a/src/common/trailer.cc b/src/network/model/trailer.cc similarity index 100% rename from src/common/trailer.cc rename to src/network/model/trailer.cc diff --git a/src/common/trailer.h b/src/network/model/trailer.h similarity index 100% rename from src/common/trailer.h rename to src/network/model/trailer.h diff --git a/src/common/buffer-test.cc b/src/network/test/buffer-test.cc similarity index 99% rename from src/common/buffer-test.cc rename to src/network/test/buffer-test.cc index 80743876d..cbeca18ea 100644 --- a/src/common/buffer-test.cc +++ b/src/network/test/buffer-test.cc @@ -1,4 +1,4 @@ -#include "buffer.h" +#include "ns3/buffer.h" #include "ns3/random-variable.h" #include "ns3/test.h" diff --git a/src/common/known.pcap b/src/network/test/known.pcap similarity index 100% rename from src/common/known.pcap rename to src/network/test/known.pcap diff --git a/src/common/packet-metadata-test.cc b/src/network/test/packet-metadata-test.cc similarity index 99% rename from src/common/packet-metadata-test.cc rename to src/network/test/packet-metadata-test.cc index 9c9d03a68..b78cb7691 100644 --- a/src/common/packet-metadata-test.cc +++ b/src/network/test/packet-metadata-test.cc @@ -21,10 +21,10 @@ #include #include #include "ns3/test.h" -#include "header.h" -#include "trailer.h" -#include "packet.h" -#include "packet-metadata.h" +#include "ns3/header.h" +#include "ns3/trailer.h" +#include "ns3/packet.h" +#include "ns3/packet-metadata.h" using namespace ns3; diff --git a/src/node/packetbb-test-suite.cc b/src/network/test/packetbb-test-suite.cc similarity index 100% rename from src/node/packetbb-test-suite.cc rename to src/network/test/packetbb-test-suite.cc diff --git a/src/common/pcap-file-test-suite.cc b/src/network/test/pcap-file-test-suite.cc similarity index 100% rename from src/common/pcap-file-test-suite.cc rename to src/network/test/pcap-file-test-suite.cc diff --git a/src/node/address-utils.cc b/src/network/utils/address-utils.cc similarity index 100% rename from src/node/address-utils.cc rename to src/network/utils/address-utils.cc diff --git a/src/node/address-utils.h b/src/network/utils/address-utils.h similarity index 98% rename from src/node/address-utils.h rename to src/network/utils/address-utils.h index 0067f79d9..e26c5f630 100644 --- a/src/node/address-utils.h +++ b/src/network/utils/address-utils.h @@ -23,7 +23,7 @@ #include "ns3/buffer.h" #include "ipv4-address.h" #include "ipv6-address.h" -#include "address.h" +#include "ns3/address.h" #include "mac48-address.h" namespace ns3 { diff --git a/src/common/data-rate.cc b/src/network/utils/data-rate.cc similarity index 100% rename from src/common/data-rate.cc rename to src/network/utils/data-rate.cc diff --git a/src/common/data-rate.h b/src/network/utils/data-rate.h similarity index 100% rename from src/common/data-rate.h rename to src/network/utils/data-rate.h diff --git a/src/node/drop-tail-queue.cc b/src/network/utils/drop-tail-queue.cc similarity index 100% rename from src/node/drop-tail-queue.cc rename to src/network/utils/drop-tail-queue.cc diff --git a/src/node/drop-tail-queue.h b/src/network/utils/drop-tail-queue.h similarity index 100% rename from src/node/drop-tail-queue.h rename to src/network/utils/drop-tail-queue.h diff --git a/src/common/error-model.cc b/src/network/utils/error-model.cc similarity index 100% rename from src/common/error-model.cc rename to src/network/utils/error-model.cc diff --git a/src/common/error-model.h b/src/network/utils/error-model.h similarity index 100% rename from src/common/error-model.h rename to src/network/utils/error-model.h diff --git a/src/node/ethernet-header.cc b/src/network/utils/ethernet-header.cc similarity index 100% rename from src/node/ethernet-header.cc rename to src/network/utils/ethernet-header.cc diff --git a/src/node/ethernet-header.h b/src/network/utils/ethernet-header.h similarity index 100% rename from src/node/ethernet-header.h rename to src/network/utils/ethernet-header.h diff --git a/src/node/ethernet-trailer.cc b/src/network/utils/ethernet-trailer.cc similarity index 100% rename from src/node/ethernet-trailer.cc rename to src/network/utils/ethernet-trailer.cc diff --git a/src/node/ethernet-trailer.h b/src/network/utils/ethernet-trailer.h similarity index 100% rename from src/node/ethernet-trailer.h rename to src/network/utils/ethernet-trailer.h diff --git a/src/node/inet-socket-address.cc b/src/network/utils/inet-socket-address.cc similarity index 100% rename from src/node/inet-socket-address.cc rename to src/network/utils/inet-socket-address.cc diff --git a/src/node/inet-socket-address.h b/src/network/utils/inet-socket-address.h similarity index 99% rename from src/node/inet-socket-address.h rename to src/network/utils/inet-socket-address.h index 9f02e9fa0..e8d715baf 100644 --- a/src/node/inet-socket-address.h +++ b/src/network/utils/inet-socket-address.h @@ -21,7 +21,7 @@ #ifndef INET_SOCKET_ADDRESS_H #define INET_SOCKET_ADDRESS_H -#include "address.h" +#include "ns3/address.h" #include "ipv4-address.h" #include diff --git a/src/node/inet6-socket-address.cc b/src/network/utils/inet6-socket-address.cc similarity index 100% rename from src/node/inet6-socket-address.cc rename to src/network/utils/inet6-socket-address.cc diff --git a/src/node/inet6-socket-address.h b/src/network/utils/inet6-socket-address.h similarity index 99% rename from src/node/inet6-socket-address.h rename to src/network/utils/inet6-socket-address.h index 12a1aa291..55580e514 100644 --- a/src/node/inet6-socket-address.h +++ b/src/network/utils/inet6-socket-address.h @@ -23,7 +23,7 @@ #include -#include "address.h" +#include "ns3/address.h" #include "ipv6-address.h" namespace ns3 { diff --git a/src/node/ipv4-address.cc b/src/network/utils/ipv4-address.cc similarity index 100% rename from src/node/ipv4-address.cc rename to src/network/utils/ipv4-address.cc diff --git a/src/node/ipv4-address.h b/src/network/utils/ipv4-address.h similarity index 99% rename from src/node/ipv4-address.h rename to src/network/utils/ipv4-address.h index 7b4717bb9..fab1f2b2d 100644 --- a/src/node/ipv4-address.h +++ b/src/network/utils/ipv4-address.h @@ -23,7 +23,7 @@ #include #include -#include "address.h" +#include "ns3/address.h" #include "ns3/attribute-helper.h" namespace ns3 { diff --git a/src/node/ipv6-address.cc b/src/network/utils/ipv6-address.cc similarity index 100% rename from src/node/ipv6-address.cc rename to src/network/utils/ipv6-address.cc diff --git a/src/node/ipv6-address.h b/src/network/utils/ipv6-address.h similarity index 99% rename from src/node/ipv6-address.h rename to src/network/utils/ipv6-address.h index 8e97af2b0..05ca3f96a 100644 --- a/src/node/ipv6-address.h +++ b/src/network/utils/ipv6-address.h @@ -27,8 +27,7 @@ #include #include "ns3/attribute-helper.h" - -#include "address.h" +#include "ns3/address.h" namespace ns3 { diff --git a/src/node/llc-snap-header.cc b/src/network/utils/llc-snap-header.cc similarity index 100% rename from src/node/llc-snap-header.cc rename to src/network/utils/llc-snap-header.cc diff --git a/src/node/llc-snap-header.h b/src/network/utils/llc-snap-header.h similarity index 100% rename from src/node/llc-snap-header.h rename to src/network/utils/llc-snap-header.h diff --git a/src/node/mac48-address.cc b/src/network/utils/mac48-address.cc similarity index 99% rename from src/node/mac48-address.cc rename to src/network/utils/mac48-address.cc index 83ec23c72..77ba77046 100644 --- a/src/node/mac48-address.cc +++ b/src/network/utils/mac48-address.cc @@ -18,7 +18,7 @@ * Author: Mathieu Lacage */ #include "mac48-address.h" -#include "address.h" +#include "ns3/address.h" #include "ns3/assert.h" #include #include diff --git a/src/node/mac48-address.h b/src/network/utils/mac48-address.h similarity index 100% rename from src/node/mac48-address.h rename to src/network/utils/mac48-address.h diff --git a/src/node/mac64-address.cc b/src/network/utils/mac64-address.cc similarity index 99% rename from src/node/mac64-address.cc rename to src/network/utils/mac64-address.cc index 666397624..6f118c00f 100644 --- a/src/node/mac64-address.cc +++ b/src/network/utils/mac64-address.cc @@ -18,7 +18,7 @@ * Author: Mathieu Lacage */ #include "mac64-address.h" -#include "address.h" +#include "ns3/address.h" #include "ns3/assert.h" #include #include diff --git a/src/node/mac64-address.h b/src/network/utils/mac64-address.h similarity index 100% rename from src/node/mac64-address.h rename to src/network/utils/mac64-address.h diff --git a/src/common/output-stream-wrapper.cc b/src/network/utils/output-stream-wrapper.cc similarity index 100% rename from src/common/output-stream-wrapper.cc rename to src/network/utils/output-stream-wrapper.cc diff --git a/src/common/output-stream-wrapper.h b/src/network/utils/output-stream-wrapper.h similarity index 100% rename from src/common/output-stream-wrapper.h rename to src/network/utils/output-stream-wrapper.h diff --git a/src/common/packet-burst.cc b/src/network/utils/packet-burst.cc similarity index 100% rename from src/common/packet-burst.cc rename to src/network/utils/packet-burst.cc diff --git a/src/common/packet-burst.h b/src/network/utils/packet-burst.h similarity index 100% rename from src/common/packet-burst.h rename to src/network/utils/packet-burst.h diff --git a/src/node/packet-socket-address.cc b/src/network/utils/packet-socket-address.cc similarity index 99% rename from src/node/packet-socket-address.cc rename to src/network/utils/packet-socket-address.cc index 1b16b9cb5..d82cce43b 100644 --- a/src/node/packet-socket-address.cc +++ b/src/network/utils/packet-socket-address.cc @@ -18,7 +18,7 @@ * Author: Mathieu Lacage */ #include "packet-socket-address.h" -#include "net-device.h" +#include "ns3/net-device.h" namespace ns3 { diff --git a/src/node/packet-socket-address.h b/src/network/utils/packet-socket-address.h similarity index 97% rename from src/node/packet-socket-address.h rename to src/network/utils/packet-socket-address.h index 4ea350daf..a227be4e3 100644 --- a/src/node/packet-socket-address.h +++ b/src/network/utils/packet-socket-address.h @@ -21,10 +21,10 @@ #define PACKET_SOCKET_ADDRESS_H #include "ns3/ptr.h" -#include "address.h" +#include "ns3/address.h" #include "mac48-address.h" #include "mac64-address.h" -#include "net-device.h" +#include "ns3/net-device.h" namespace ns3 { diff --git a/src/node/packet-socket-factory.cc b/src/network/utils/packet-socket-factory.cc similarity index 98% rename from src/node/packet-socket-factory.cc rename to src/network/utils/packet-socket-factory.cc index 409654cfe..dc7fb2958 100644 --- a/src/node/packet-socket-factory.cc +++ b/src/network/utils/packet-socket-factory.cc @@ -18,7 +18,7 @@ * Author: Emmanuelle Laprise */ #include "packet-socket-factory.h" -#include "node.h" +#include "ns3/node.h" #include "packet-socket.h" namespace ns3 { diff --git a/src/node/packet-socket-factory.h b/src/network/utils/packet-socket-factory.h similarity index 97% rename from src/node/packet-socket-factory.h rename to src/network/utils/packet-socket-factory.h index 913d3ff8c..564628fa7 100644 --- a/src/node/packet-socket-factory.h +++ b/src/network/utils/packet-socket-factory.h @@ -20,7 +20,7 @@ #ifndef PACKET_SOCKET_FACTORY_H #define PACKET_SOCKET_FACTORY_H -#include "socket-factory.h" +#include "ns3/socket-factory.h" namespace ns3 { diff --git a/src/node/packet-socket.cc b/src/network/utils/packet-socket.cc similarity index 100% rename from src/node/packet-socket.cc rename to src/network/utils/packet-socket.cc diff --git a/src/node/packet-socket.h b/src/network/utils/packet-socket.h similarity index 100% rename from src/node/packet-socket.h rename to src/network/utils/packet-socket.h diff --git a/src/node/packetbb.cc b/src/network/utils/packetbb.cc similarity index 100% rename from src/node/packetbb.cc rename to src/network/utils/packetbb.cc diff --git a/src/node/packetbb.h b/src/network/utils/packetbb.h similarity index 100% rename from src/node/packetbb.h rename to src/network/utils/packetbb.h diff --git a/src/common/pcap-file-wrapper.cc b/src/network/utils/pcap-file-wrapper.cc similarity index 98% rename from src/common/pcap-file-wrapper.cc rename to src/network/utils/pcap-file-wrapper.cc index e2e4815ba..d443221d3 100644 --- a/src/common/pcap-file-wrapper.cc +++ b/src/network/utils/pcap-file-wrapper.cc @@ -18,9 +18,8 @@ #include "ns3/log.h" #include "ns3/uinteger.h" - -#include "buffer.h" -#include "header.h" +#include "ns3/buffer.h" +#include "ns3/header.h" #include "pcap-file-wrapper.h" NS_LOG_COMPONENT_DEFINE ("PcapFileWrapper"); diff --git a/src/common/pcap-file-wrapper.h b/src/network/utils/pcap-file-wrapper.h similarity index 100% rename from src/common/pcap-file-wrapper.h rename to src/network/utils/pcap-file-wrapper.h diff --git a/src/common/pcap-file.cc b/src/network/utils/pcap-file.cc similarity index 100% rename from src/common/pcap-file.cc rename to src/network/utils/pcap-file.cc diff --git a/src/common/pcap-file.h b/src/network/utils/pcap-file.h similarity index 100% rename from src/common/pcap-file.h rename to src/network/utils/pcap-file.h diff --git a/src/node/phy-mac.h b/src/network/utils/phy-mac.h similarity index 100% rename from src/node/phy-mac.h rename to src/network/utils/phy-mac.h diff --git a/src/node/queue.cc b/src/network/utils/queue.cc similarity index 100% rename from src/node/queue.cc rename to src/network/utils/queue.cc diff --git a/src/node/queue.h b/src/network/utils/queue.h similarity index 100% rename from src/node/queue.h rename to src/network/utils/queue.h diff --git a/src/node/radiotap-header.cc b/src/network/utils/radiotap-header.cc similarity index 100% rename from src/node/radiotap-header.cc rename to src/network/utils/radiotap-header.cc diff --git a/src/node/radiotap-header.h b/src/network/utils/radiotap-header.h similarity index 100% rename from src/node/radiotap-header.h rename to src/network/utils/radiotap-header.h diff --git a/src/common/sequence-number.cc b/src/network/utils/sequence-number.cc similarity index 100% rename from src/common/sequence-number.cc rename to src/network/utils/sequence-number.cc diff --git a/src/common/sequence-number.h b/src/network/utils/sequence-number.h similarity index 100% rename from src/common/sequence-number.h rename to src/network/utils/sequence-number.h diff --git a/src/common/sgi-hashmap.h b/src/network/utils/sgi-hashmap.h similarity index 100% rename from src/common/sgi-hashmap.h rename to src/network/utils/sgi-hashmap.h diff --git a/src/node/simple-channel.cc b/src/network/utils/simple-channel.cc similarity index 100% rename from src/node/simple-channel.cc rename to src/network/utils/simple-channel.cc diff --git a/src/node/simple-channel.h b/src/network/utils/simple-channel.h similarity index 98% rename from src/node/simple-channel.h rename to src/network/utils/simple-channel.h index b75383f80..e13329b8d 100644 --- a/src/node/simple-channel.h +++ b/src/network/utils/simple-channel.h @@ -20,7 +20,7 @@ #ifndef SIMPLE_CHANNEL_H #define SIMPLE_CHANNEL_H -#include "channel.h" +#include "ns3/channel.h" #include "mac48-address.h" #include diff --git a/src/node/simple-net-device.cc b/src/network/utils/simple-net-device.cc similarity index 99% rename from src/node/simple-net-device.cc rename to src/network/utils/simple-net-device.cc index ff83dd2ec..6a2208c48 100644 --- a/src/node/simple-net-device.cc +++ b/src/network/utils/simple-net-device.cc @@ -19,7 +19,7 @@ */ #include "simple-net-device.h" #include "simple-channel.h" -#include "node.h" +#include "ns3/node.h" #include "ns3/packet.h" #include "ns3/log.h" #include "ns3/pointer.h" diff --git a/src/node/simple-net-device.h b/src/network/utils/simple-net-device.h similarity index 99% rename from src/node/simple-net-device.h rename to src/network/utils/simple-net-device.h index 19a1d6568..68375cf35 100644 --- a/src/node/simple-net-device.h +++ b/src/network/utils/simple-net-device.h @@ -20,7 +20,7 @@ #ifndef SIMPLE_NET_DEVICE_H #define SIMPLE_NET_DEVICE_H -#include "net-device.h" +#include "ns3/net-device.h" #include "mac48-address.h" #include #include diff --git a/src/common/waf b/src/network/waf similarity index 100% rename from src/common/waf rename to src/network/waf diff --git a/src/network/wscript b/src/network/wscript new file mode 100644 index 000000000..99ad2ce70 --- /dev/null +++ b/src/network/wscript @@ -0,0 +1,117 @@ +## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*- + +def build(bld): + node = bld.create_ns3_module('network', ['core']) + node.source = [ + 'model/address.cc', + 'model/application.cc', + 'model/buffer.cc', + 'model/byte-tag-list.cc', + 'model/channel.cc', + 'model/channel-list.cc', + 'model/chunk.cc', + 'model/header.cc', + 'model/nix-vector.cc', + 'model/node.cc', + 'model/node-list.cc', + 'model/net-device.cc', + 'model/packet.cc', + 'model/packet-metadata.cc', + 'model/packet-tag-list.cc', + 'model/socket.cc', + 'model/socket-factory.cc', + 'model/tag.cc', + 'model/tag-buffer.cc', + 'model/trailer.cc', + 'utils/address-utils.cc', + 'utils/data-rate.cc', + 'utils/drop-tail-queue.cc', + 'utils/error-model.cc', + 'utils/ethernet-header.cc', + 'utils/ethernet-trailer.cc', + 'utils/inet-socket-address.cc', + 'utils/inet6-socket-address.cc', + 'utils/ipv4-address.cc', + 'utils/ipv6-address.cc', + 'utils/mac48-address.cc', + 'utils/mac64-address.cc', + 'utils/llc-snap-header.cc', + 'utils/output-stream-wrapper.cc', + 'utils/packetbb.cc', + 'utils/packet-burst.cc', + 'utils/packet-socket.cc', + 'utils/packet-socket-address.cc', + 'utils/packet-socket-factory.cc', + 'utils/pcap-file.cc', + 'utils/pcap-file-wrapper.cc', + 'utils/queue.cc', + 'utils/radiotap-header.cc', + 'utils/sequence-number.cc', + 'utils/simple-channel.cc', + 'utils/simple-net-device.cc', + 'test/buffer-test.cc', + 'test/packetbb-test-suite.cc', + 'test/packet-metadata-test.cc', + 'test/pcap-file-test-suite.cc', + 'helper/application-container.cc', + 'helper/net-device-container.cc', + 'helper/node-container.cc', + 'helper/packet-socket-helper.cc', + ] + + headers = bld.new_task_gen('ns3header') + headers.module = 'network' + headers.source = [ + 'model/address.h', + 'model/application.h', + 'model/buffer.h', + 'model/byte-tag-list.h', + 'model/channel.h', + 'model/channel-list.h', + 'model/chunk.h', + 'model/header.h', + 'model/net-device.h', + 'model/nix-vector.h', + 'model/node.h', + 'model/node-list.h', + 'model/packet.h', + 'model/packet-metadata.h', + 'model/packet-tag-list.h', + 'model/socket.h', + 'model/socket-factory.h', + 'model/tag.h', + 'model/tag-buffer.h', + 'model/trailer.h', + 'utils/address-utils.h', + 'utils/data-rate.h', + 'utils/drop-tail-queue.h', + 'utils/error-model.h', + 'utils/ethernet-header.h', + 'utils/ethernet-trailer.h', + 'utils/inet-socket-address.h', + 'utils/inet6-socket-address.h', + 'utils/ipv4-address.h', + 'utils/ipv6-address.h', + 'utils/llc-snap-header.h', + 'utils/mac48-address.h', + 'utils/mac64-address.h', + 'utils/output-stream-wrapper.h', + 'utils/packetbb.h', + 'utils/packet-burst.h', + 'utils/packet-socket.h', + 'utils/packet-socket-address.h', + 'utils/packet-socket-factory.h', + 'utils/pcap-file.h', + 'utils/pcap-file-wrapper.h', + 'utils/phy-mac.h', + 'utils/queue.h', + 'utils/radiotap-header.h', + 'utils/sequence-number.h', + 'utils/sgi-hashmap.h', + 'utils/simple-channel.h', + 'utils/simple-net-device.h', + 'helper/application-container.h', + 'helper/net-device-container.h', + 'helper/node-container.h', + 'helper/packet-socket-helper.h', + ] diff --git a/src/node/waf b/src/node/waf deleted file mode 100755 index 3dcf598bc..000000000 --- a/src/node/waf +++ /dev/null @@ -1 +0,0 @@ -exec "`dirname "$0"`"/../../waf "$@" \ No newline at end of file diff --git a/src/node/wscript b/src/node/wscript deleted file mode 100644 index d9a92dfbf..000000000 --- a/src/node/wscript +++ /dev/null @@ -1,102 +0,0 @@ -## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*- - -def build(bld): - node = bld.create_ns3_module('node', ['core', 'common']) - node.source = [ - 'address.cc', - 'mac48-address.cc', - 'mac64-address.cc', - 'inet-socket-address.cc', - 'packet-socket-address.cc', - 'node.cc', - 'ipv4-address.cc', - 'ipv4-interface-address.cc', - 'ipv4-address-generator.cc', - 'ipv4-header.cc', - 'net-device.cc', - 'address-utils.cc', - 'llc-snap-header.cc', - 'ethernet-header.cc', - 'ethernet-trailer.cc', - 'ipv4-route.cc', - 'ipv4-routing-protocol.cc', - 'queue.cc', - 'drop-tail-queue.cc', - 'channel.cc', - 'node-list.cc', - 'channel-list.cc', - 'socket.cc', - 'socket-factory.cc', - 'packet-socket-factory.cc', - 'packet-socket.cc', - 'udp-socket.cc', - 'udp-socket-factory.cc', - 'tcp-socket.cc', - 'tcp-socket-factory.cc', - 'ipv4.cc', - 'ipv4-raw-socket-factory.cc', - 'application.cc', - 'simple-channel.cc', - 'simple-net-device.cc', - 'inet6-socket-address.cc', - 'ipv6-address.cc', - 'ipv6-header.cc', - 'ipv6-interface-address.cc', - 'ipv6-route.cc', - 'ipv6.cc', - 'ipv6-raw-socket-factory.cc', - 'ipv6-routing-protocol.cc', - 'packetbb.cc', - 'packetbb-test-suite.cc', - 'radiotap-header.cc', - ] - - headers = bld.new_task_gen('ns3header') - headers.module = 'node' - headers.source = [ - 'address.h', - 'mac48-address.h', - 'mac64-address.h', - 'inet-socket-address.h', - 'packet-socket-address.h', - 'node.h', - 'ipv4-address.h', - 'ipv4-interface-address.h', - 'ipv4-address-generator.h', - 'ipv4-header.h', - 'net-device.h', - 'address-utils.h', - 'ipv4-route.h', - 'ipv4-routing-protocol.h', - 'queue.h', - 'drop-tail-queue.h', - 'llc-snap-header.h', - 'ethernet-header.h', - 'ethernet-trailer.h', - 'channel.h', - 'node-list.h', - 'channel-list.h', - 'socket.h', - 'socket-factory.h', - 'packet-socket-factory.h', - 'udp-socket.h', - 'udp-socket-factory.h', - 'tcp-socket.h', - 'tcp-socket-factory.h', - 'ipv4.h', - 'ipv4-raw-socket-factory.h', - 'application.h', - 'simple-channel.h', - 'simple-net-device.h', - 'inet6-socket-address.h', - 'ipv6-address.h', - 'ipv6-header.h', - 'ipv6-interface-address.h', - 'ipv6-route.h', - 'ipv6.h', - 'ipv6-raw-socket-factory.h', - 'ipv6-routing-protocol.h', - 'packetbb.h', - 'radiotap-header.h', - 'phy-mac.h', - ] diff --git a/src/propagation/wscript b/src/propagation/wscript index c7e3b6cf4..f145d520a 100644 --- a/src/propagation/wscript +++ b/src/propagation/wscript @@ -1,7 +1,7 @@ ## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*- def build(bld): - module = bld.create_ns3_module('propagation', ['node', 'mobility']) + module = bld.create_ns3_module('propagation', ['network', 'mobility']) module.includes = '.' module.source = [ 'model/propagation-delay-model.cc', diff --git a/src/routing/dsdv/examples/dsdv-manet.cc b/src/routing/dsdv/examples/dsdv-manet.cc index 24c748bdc..250ac416f 100644 --- a/src/routing/dsdv/examples/dsdv-manet.cc +++ b/src/routing/dsdv/examples/dsdv-manet.cc @@ -29,8 +29,7 @@ * US Department of Defense (DoD), and ITTC at The University of Kansas. */ #include "ns3/core-module.h" -#include "ns3/common-module.h" -#include "ns3/node-module.h" +#include "ns3/network-module.h" #include "ns3/helper-module.h" #include "ns3/mobility-module.h" #include "ns3/contrib-module.h" diff --git a/src/routing/global-routing/wscript b/src/routing/global-routing/wscript index 1b2923b8d..4ad772775 100644 --- a/src/routing/global-routing/wscript +++ b/src/routing/global-routing/wscript @@ -1,7 +1,7 @@ ## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*- def build(bld): - module = bld.create_ns3_module('global-routing', ['node', 'helper']) + module = bld.create_ns3_module('global-routing', ['network', 'helper']) module.source = [ 'model/global-router-interface.cc', 'model/global-route-manager.cc', diff --git a/src/routing/list-routing/wscript b/src/routing/list-routing/wscript index 5cdb1728c..dd6a1dfee 100644 --- a/src/routing/list-routing/wscript +++ b/src/routing/list-routing/wscript @@ -1,7 +1,7 @@ ## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*- def build(bld): - module = bld.create_ns3_module('list-routing', ['node', 'helper']) + module = bld.create_ns3_module('list-routing', ['network', 'helper']) module.source = [ 'model/ipv4-list-routing.cc', 'model/ipv6-list-routing.cc', diff --git a/src/routing/olsr/examples/olsr-hna.cc b/src/routing/olsr/examples/olsr-hna.cc index 1ed153499..2c0bec734 100644 --- a/src/routing/olsr/examples/olsr-hna.cc +++ b/src/routing/olsr/examples/olsr-hna.cc @@ -51,8 +51,7 @@ // #include "ns3/core-module.h" -#include "ns3/common-module.h" -#include "ns3/node-module.h" +#include "ns3/network-module.h" #include "ns3/helper-module.h" #include "ns3/mobility-module.h" #include "ns3/contrib-module.h" diff --git a/src/routing/olsr/examples/simple-point-to-point-olsr.cc b/src/routing/olsr/examples/simple-point-to-point-olsr.cc index 9f6c1eccc..ba4ec971a 100644 --- a/src/routing/olsr/examples/simple-point-to-point-olsr.cc +++ b/src/routing/olsr/examples/simple-point-to-point-olsr.cc @@ -42,7 +42,7 @@ #include "ns3/core-module.h" #include "ns3/core-module.h" -#include "ns3/node-module.h" +#include "ns3/network-module.h" #include "ns3/helper-module.h" #include "ns3/olsr-helper.h" #include "ns3/ipv4-static-routing-helper.h" diff --git a/src/routing/static-routing/wscript b/src/routing/static-routing/wscript index 189b074ff..7c2812e27 100644 --- a/src/routing/static-routing/wscript +++ b/src/routing/static-routing/wscript @@ -1,7 +1,7 @@ ## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*- def build(bld): - module = bld.create_ns3_module('static-routing', ['node', 'helper']) + module = bld.create_ns3_module('static-routing', ['network', 'helper']) module.source = [ 'model/ipv4-static-routing.cc', 'model/ipv4-routing-table-entry.cc', diff --git a/src/spectrum/examples/adhoc-aloha-ideal-phy-with-microwave-oven.cc b/src/spectrum/examples/adhoc-aloha-ideal-phy-with-microwave-oven.cc index 22c8b5a42..e95348876 100644 --- a/src/spectrum/examples/adhoc-aloha-ideal-phy-with-microwave-oven.cc +++ b/src/spectrum/examples/adhoc-aloha-ideal-phy-with-microwave-oven.cc @@ -23,9 +23,7 @@ #include #include -#include -#include -#include +#include #include #include #include diff --git a/src/spectrum/examples/adhoc-aloha-ideal-phy.cc b/src/spectrum/examples/adhoc-aloha-ideal-phy.cc index 0c353044a..c17771d6e 100644 --- a/src/spectrum/examples/adhoc-aloha-ideal-phy.cc +++ b/src/spectrum/examples/adhoc-aloha-ideal-phy.cc @@ -23,9 +23,7 @@ #include #include -#include -#include -#include +#include #include #include #include diff --git a/src/spectrum/wscript b/src/spectrum/wscript index 57d93fe21..3dc240678 100644 --- a/src/spectrum/wscript +++ b/src/spectrum/wscript @@ -2,7 +2,7 @@ def build(bld): - module = bld.create_ns3_module('spectrum', ['core', 'node', 'propagation']) + module = bld.create_ns3_module('spectrum', ['core', 'network', 'propagation']) module.source = [ 'model/spectrum-model.cc', 'model/spectrum-value.cc', diff --git a/src/test/perf/perf-io.cc b/src/test/perf/perf-io.cc index 7b70e56ef..8a27be527 100644 --- a/src/test/perf/perf-io.cc +++ b/src/test/perf/perf-io.cc @@ -24,7 +24,7 @@ #include #include "ns3/core-module.h" -#include "ns3/node-module.h" +#include "ns3/network-module.h" #include "ns3/core-module.h" #include "ns3/helper-module.h" #include "ns3/abort.h" diff --git a/src/wscript b/src/wscript index 1c6cf91cd..550c78ef4 100644 --- a/src/wscript +++ b/src/wscript @@ -19,9 +19,8 @@ except NameError: all_modules = ( 'core', - 'common', + 'network', 'contrib', - 'node', 'internet-stack', 'propagation', 'devices/point-to-point', diff --git a/utils/wscript b/utils/wscript index 3eed6b1c8..9faa024c4 100644 --- a/utils/wscript +++ b/utils/wscript @@ -12,7 +12,7 @@ def build(bld): obj = bld.create_ns3_program('bench-simulator', ['core']) obj.source = 'bench-simulator.cc' - obj = bld.create_ns3_program('bench-packets', ['common']) + obj = bld.create_ns3_program('bench-packets', ['network']) obj.source = 'bench-packets.cc' obj = bld.create_ns3_program('print-introspected-doxygen',