From 59a2a4f95909983158253780838cb6f00464c0a2 Mon Sep 17 00:00:00 2001 From: Lalith Suresh Date: Thu, 3 Mar 2011 19:54:57 +0000 Subject: [PATCH] Converts csma, emu, tap-bridge, point-to-point, wifi and wimax modules into modular format --- examples/animation/dumbbell-animation.cc | 2 + examples/animation/grid-animation.cc | 2 + examples/animation/star-animation.cc | 2 + examples/energy/energy-model-example.cc | 1 + examples/error-model/simple-error-model.cc | 2 + examples/ipv6/fragmentation-ipv6.cc | 1 + examples/ipv6/icmpv6-redirect.cc | 1 + examples/ipv6/loose-routing-ipv6.cc | 1 + examples/ipv6/ping6.cc | 1 + examples/ipv6/radvd-two-prefix.cc | 1 + examples/ipv6/radvd.cc | 1 + examples/matrix-topology/matrix-topology.cc | 2 + examples/naming/object-names.cc | 1 + examples/realtime/realtime-udp-echo.cc | 1 + examples/routing/dynamic-global-routing.cc | 3 + examples/routing/global-injection-slash32.cc | 2 + examples/routing/global-routing-slash32.cc | 2 + examples/routing/mixed-global-routing.cc | 2 + examples/routing/simple-alternate-routing.cc | 2 + examples/routing/simple-global-routing.cc | 2 + examples/routing/simple-routing-ping6.cc | 1 + examples/routing/static-routing-slash32.cc | 4 +- .../socket/socket-bound-static-routing.cc | 2 + .../socket/socket-bound-tcp-static-routing.cc | 2 + examples/stats/wifi-example-sim.cc | 1 + examples/tcp/star.cc | 2 + examples/tcp/tcp-bulk-send.cc | 2 + examples/tcp/tcp-large-transfer.cc | 1 + examples/tcp/tcp-nsc-lfn.cc | 2 + examples/tcp/tcp-nsc-zoo.cc | 1 + examples/tcp/tcp-star-server.cc | 2 + .../topology-read/topology-example-sim.cc | 2 + examples/tutorial/fifth.cc | 1 + examples/tutorial/first.cc | 2 + examples/tutorial/second.cc | 3 + examples/tutorial/sixth.cc | 1 + examples/tutorial/third.cc | 2 + .../udp-client-server/udp-client-server.cc | 2 + .../udp-trace-client-server.cc | 1 + examples/udp/udp-echo.cc | 1 + examples/wireless/mixed-wireless.cc | 1 + examples/wireless/multirate.cc | 1 + .../wireless/simple-wifi-frame-aggregation.cc | 1 + examples/wireless/wifi-adhoc.cc | 1 + examples/wireless/wifi-clear-channel-cmu.cc | 2 + examples/wireless/wifi-hidden-terminal.cc | 2 + examples/wireless/wifi-simple-adhoc-grid.cc | 1 + examples/wireless/wifi-simple-adhoc.cc | 1 + examples/wireless/wifi-simple-infra.cc | 1 + examples/wireless/wifi-simple-interference.cc | 1 + examples/wireless/wifi-wired-bridging.cc | 1 + samples/main-simple.cc | 1 + scratch/multiple-sources/simple-simulation.cc | 1 + scratch/simple.cc | 1 + .../bridge/examples/csma-bridge-one-hop.cc | 1 + src/devices/bridge/examples/csma-bridge.cc | 1 + .../devices/csma/examples}/csma-broadcast.cc | 1 + .../devices/csma/examples}/csma-multicast.cc | 1 + .../devices/csma/examples}/csma-one-subnet.cc | 1 + .../csma/examples}/csma-packet-socket.cc | 1 + .../devices/csma/examples}/csma-ping.cc | 1 + .../csma/examples}/csma-raw-ip-socket.cc | 1 + .../devices/csma/examples}/csma-star.cc | 1 + .../csma => src/devices/csma/examples}/waf | 0 .../devices/csma/examples}/wscript | 0 src/{ => devices/csma}/helper/csma-helper.cc | 0 src/{ => devices/csma}/helper/csma-helper.h | 0 .../csma}/helper/csma-star-helper.cc | 0 .../csma}/helper/csma-star-helper.h | 0 src/devices/csma/{ => model}/backoff.cc | 0 src/devices/csma/{ => model}/backoff.h | 0 src/devices/csma/{ => model}/csma-channel.cc | 0 src/devices/csma/{ => model}/csma-channel.h | 0 .../csma/{ => model}/csma-net-device.cc | 0 .../csma/{ => model}/csma-net-device.h | 0 src/devices/csma/{ => model}/csma.h | 0 src/devices/csma/wscript | 19 +- src/devices/emu/{ => doc}/emu.h | 0 .../devices/emu/examples}/emu-ping.cc | 5 +- .../devices/emu/examples}/emu-udp-echo.cc | 1 + .../devices/emu/examples}/waf | 0 .../devices/emu/examples}/wscript | 0 src/{ => devices/emu}/helper/emu-helper.cc | 0 src/{ => devices/emu}/helper/emu-helper.h | 0 .../emu/{ => model}/emu-encode-decode.cc | 0 .../emu/{ => model}/emu-encode-decode.h | 0 src/devices/emu/{ => model}/emu-net-device.cc | 0 src/devices/emu/{ => model}/emu-net-device.h | 0 .../emu/{ => model}/emu-sock-creator.cc | 0 src/devices/emu/wscript | 17 +- src/devices/lte/examples/lte-device.cc | 1 + .../lte/examples/lte-multiple-flows.cc | 1 + src/devices/lte/examples/lte-phy-downlink.cc | 6 +- src/devices/lte/examples/lte-phy-uplink.cc | 1 + .../point-to-point/{ => doc}/point-to-point.h | 0 .../helper/point-to-point-dumbbell-helper.cc | 0 .../helper/point-to-point-dumbbell-helper.h | 0 .../helper/point-to-point-grid-helper.cc | 0 .../helper/point-to-point-grid-helper.h | 0 .../helper/point-to-point-helper.cc | 0 .../helper/point-to-point-helper.h | 0 .../helper/point-to-point-star-helper.cc | 0 .../helper/point-to-point-star-helper.h | 0 .../{ => model}/point-to-point-channel.cc | 0 .../{ => model}/point-to-point-channel.h | 0 .../{ => model}/point-to-point-net-device.cc | 0 .../{ => model}/point-to-point-net-device.h | 0 .../point-to-point-remote-channel.cc | 0 .../point-to-point-remote-channel.h | 0 .../{ => model}/point-to-point-test.cc | 0 .../point-to-point/{ => model}/ppp-header.cc | 0 .../point-to-point/{ => model}/ppp-header.h | 0 src/devices/point-to-point/wscript | 26 +- src/devices/tap-bridge/{ => doc}/tap.h | 0 .../tap-bridge/examples}/lxc-left.conf | 0 .../tap-bridge/examples}/lxc-right.conf | 0 .../examples}/tap-csma-virtual-machine.cc | 2 + .../examples}/tap-csma-virtual-machine.py | 0 .../devices/tap-bridge/examples}/tap-csma.cc | 3 + .../tap-bridge/examples}/tap-wifi-dumbbell.cc | 4 + .../examples}/tap-wifi-virtual-machine.cc | 1 + .../examples}/tap-wifi-virtual-machine.py | 0 .../examples}/virtual-network-setup.sh | 0 .../examples}/virtual-network-teardown.sh | 0 .../devices/tap-bridge/examples}/waf | 0 .../devices/tap-bridge/examples}/wscript | 0 .../tap-bridge}/helper/tap-bridge-helper.cc | 0 .../tap-bridge}/helper/tap-bridge-helper.h | 0 .../tap-bridge/{ => model}/tap-bridge.cc | 0 .../tap-bridge/{ => model}/tap-bridge.h | 0 .../tap-bridge/{ => model}/tap-creator.cc | 0 .../{ => model}/tap-encode-decode.cc | 0 .../{ => model}/tap-encode-decode.h | 0 src/devices/tap-bridge/wscript | 17 +- .../examples/virtual-net-device.cc | 2 + src/devices/wifi/{ => doc}/wifi.h | 0 .../wifi}/helper/nqos-wifi-mac-helper.cc | 0 .../wifi}/helper/nqos-wifi-mac-helper.h | 0 .../wifi}/helper/qos-wifi-mac-helper.cc | 0 .../wifi}/helper/qos-wifi-mac-helper.h | 0 src/{ => devices/wifi}/helper/wifi-helper.cc | 0 src/{ => devices/wifi}/helper/wifi-helper.h | 0 .../wifi}/helper/yans-wifi-helper.cc | 0 .../wifi}/helper/yans-wifi-helper.h | 0 .../wifi/{ => model}/aarf-wifi-manager.cc | 0 .../wifi/{ => model}/aarf-wifi-manager.h | 0 .../wifi/{ => model}/aarfcd-wifi-manager.cc | 0 .../wifi/{ => model}/aarfcd-wifi-manager.h | 0 .../wifi/{ => model}/adhoc-wifi-mac.cc | 0 src/devices/wifi/{ => model}/adhoc-wifi-mac.h | 0 .../wifi/{ => model}/amrr-wifi-manager.cc | 0 .../wifi/{ => model}/amrr-wifi-manager.h | 0 .../wifi/{ => model}/amsdu-subframe-header.cc | 0 .../wifi/{ => model}/amsdu-subframe-header.h | 0 src/devices/wifi/{ => model}/ap-wifi-mac.cc | 0 src/devices/wifi/{ => model}/ap-wifi-mac.h | 0 .../wifi/{ => model}/arf-wifi-manager.cc | 0 .../wifi/{ => model}/arf-wifi-manager.h | 0 .../wifi/{ => model}/block-ack-agreement.cc | 0 .../wifi/{ => model}/block-ack-agreement.h | 0 .../wifi/{ => model}/block-ack-cache.cc | 0 .../wifi/{ => model}/block-ack-cache.h | 0 .../wifi/{ => model}/block-ack-manager.cc | 0 .../wifi/{ => model}/block-ack-manager.h | 0 .../wifi/{ => model}/block-ack-test-suite.cc | 0 .../{ => model}/capability-information.cc | 0 .../wifi/{ => model}/capability-information.h | 0 .../wifi/{ => model}/cara-wifi-manager.cc | 0 .../wifi/{ => model}/cara-wifi-manager.h | 0 .../{ => model}/constant-rate-wifi-manager.cc | 0 .../{ => model}/constant-rate-wifi-manager.h | 0 src/devices/wifi/{ => model}/ctrl-headers.cc | 0 src/devices/wifi/{ => model}/ctrl-headers.h | 0 src/devices/wifi/{ => model}/dca-txop.cc | 0 src/devices/wifi/{ => model}/dca-txop.h | 0 .../wifi/{ => model}/dcf-manager-test.cc | 0 src/devices/wifi/{ => model}/dcf-manager.cc | 0 src/devices/wifi/{ => model}/dcf-manager.h | 0 src/devices/wifi/{ => model}/dcf.cc | 0 src/devices/wifi/{ => model}/dcf.h | 0 .../wifi/{ => model}/dsss-error-rate-model.cc | 0 .../wifi/{ => model}/dsss-error-rate-model.h | 0 src/devices/wifi/{ => model}/edca-txop-n.cc | 0 src/devices/wifi/{ => model}/edca-txop-n.h | 0 .../wifi/{ => model}/error-rate-model.cc | 0 .../wifi/{ => model}/error-rate-model.h | 0 .../wifi/{ => model}/ideal-wifi-manager.cc | 0 .../wifi/{ => model}/ideal-wifi-manager.h | 0 .../interference-helper-tx-duration-test.cc | 0 .../wifi/{ => model}/interference-helper.cc | 0 .../wifi/{ => model}/interference-helper.h | 0 src/devices/wifi/{ => model}/mac-low.cc | 0 src/devices/wifi/{ => model}/mac-low.h | 0 src/devices/wifi/{ => model}/mac-rx-middle.cc | 0 src/devices/wifi/{ => model}/mac-rx-middle.h | 0 src/devices/wifi/{ => model}/mac-tx-middle.cc | 0 src/devices/wifi/{ => model}/mac-tx-middle.h | 0 src/devices/wifi/{ => model}/mgt-headers.cc | 0 src/devices/wifi/{ => model}/mgt-headers.h | 0 .../wifi/{ => model}/minstrel-wifi-manager.cc | 0 .../wifi/{ => model}/minstrel-wifi-manager.h | 0 .../wifi/{ => model}/msdu-aggregator.cc | 0 .../wifi/{ => model}/msdu-aggregator.h | 0 .../{ => model}/msdu-standard-aggregator.cc | 0 .../{ => model}/msdu-standard-aggregator.h | 0 .../wifi/{ => model}/nist-error-rate-model.cc | 0 .../wifi/{ => model}/nist-error-rate-model.h | 0 .../wifi/{ => model}/onoe-wifi-manager.cc | 0 .../wifi/{ => model}/onoe-wifi-manager.h | 0 .../originator-block-ack-agreement.cc | 0 .../originator-block-ack-agreement.h | 0 .../{ => model}/qos-blocked-destinations.cc | 0 .../{ => model}/qos-blocked-destinations.h | 0 src/devices/wifi/{ => model}/qos-tag.cc | 0 src/devices/wifi/{ => model}/qos-tag.h | 0 src/devices/wifi/{ => model}/qos-utils.cc | 0 src/devices/wifi/{ => model}/qos-utils.h | 0 src/devices/wifi/{ => model}/random-stream.cc | 0 src/devices/wifi/{ => model}/random-stream.h | 0 .../wifi/{ => model}/regular-wifi-mac.cc | 0 .../wifi/{ => model}/regular-wifi-mac.h | 0 .../wifi/{ => model}/rraa-wifi-manager.cc | 0 .../wifi/{ => model}/rraa-wifi-manager.h | 0 src/devices/wifi/{ => model}/ssid.cc | 0 src/devices/wifi/{ => model}/ssid.h | 0 src/devices/wifi/{ => model}/sta-wifi-mac.cc | 0 src/devices/wifi/{ => model}/sta-wifi-mac.h | 0 src/devices/wifi/{ => model}/status-code.cc | 0 src/devices/wifi/{ => model}/status-code.h | 0 .../wifi/{ => model}/supported-rates.cc | 0 .../wifi/{ => model}/supported-rates.h | 0 src/devices/wifi/{ => model}/wifi-channel.cc | 0 src/devices/wifi/{ => model}/wifi-channel.h | 0 .../wifi-information-element-vector.cc | 0 .../wifi-information-element-vector.h | 0 .../{ => model}/wifi-information-element.cc | 0 .../{ => model}/wifi-information-element.h | 0 .../wifi/{ => model}/wifi-mac-header.cc | 0 .../wifi/{ => model}/wifi-mac-header.h | 0 .../wifi/{ => model}/wifi-mac-queue.cc | 0 src/devices/wifi/{ => model}/wifi-mac-queue.h | 0 .../wifi/{ => model}/wifi-mac-trailer.cc | 0 .../wifi/{ => model}/wifi-mac-trailer.h | 0 src/devices/wifi/{ => model}/wifi-mac.cc | 0 src/devices/wifi/{ => model}/wifi-mac.h | 0 src/devices/wifi/{ => model}/wifi-mode.cc | 0 src/devices/wifi/{ => model}/wifi-mode.h | 0 .../wifi/{ => model}/wifi-net-device.cc | 0 .../wifi/{ => model}/wifi-net-device.h | 0 .../wifi/{ => model}/wifi-phy-standard.h | 0 .../wifi/{ => model}/wifi-phy-state-helper.cc | 0 .../wifi/{ => model}/wifi-phy-state-helper.h | 0 src/devices/wifi/{ => model}/wifi-phy.cc | 0 src/devices/wifi/{ => model}/wifi-phy.h | 0 src/devices/wifi/{ => model}/wifi-preamble.h | 0 .../wifi-remote-station-manager.cc | 0 .../{ => model}/wifi-remote-station-manager.h | 0 .../wifi/{ => model}/yans-error-rate-model.cc | 0 .../wifi/{ => model}/yans-error-rate-model.h | 0 .../wifi/{ => model}/yans-wifi-channel.cc | 0 .../wifi/{ => model}/yans-wifi-channel.h | 0 src/devices/wifi/{ => model}/yans-wifi-phy.cc | 0 src/devices/wifi/{ => model}/yans-wifi-phy.h | 0 src/devices/wifi/{ => test}/wifi-phy-test.cc | 10 +- src/devices/wifi/{ => test}/wifi-test.cc | 18 +- src/devices/wifi/wscript | 238 +++++++++--------- src/devices/wimax/{ => doc}/wimax.h | 0 .../wimax => src/devices/wimax/examples}/waf | 0 .../devices/wimax/examples}/wimax-ipv4.cc | 3 +- .../wimax/examples}/wimax-multicast.cc | 1 + .../devices/wimax/examples}/wimax-simple.cc | 4 +- .../devices/wimax/examples}/wscript | 0 .../wimax}/helper/wimax-helper.cc | 0 src/{ => devices/wimax}/helper/wimax-helper.h | 0 .../wimax/{ => model}/bandwidth-manager.cc | 0 .../wimax/{ => model}/bandwidth-manager.h | 0 .../wimax/{ => model}/bs-link-manager.cc | 0 .../wimax/{ => model}/bs-link-manager.h | 0 .../wimax/{ => model}/bs-net-device.cc | 0 src/devices/wimax/{ => model}/bs-net-device.h | 0 .../wimax/{ => model}/bs-scheduler-rtps.cc | 0 .../wimax/{ => model}/bs-scheduler-rtps.h | 0 .../wimax/{ => model}/bs-scheduler-simple.cc | 0 .../wimax/{ => model}/bs-scheduler-simple.h | 0 src/devices/wimax/{ => model}/bs-scheduler.cc | 0 src/devices/wimax/{ => model}/bs-scheduler.h | 0 .../{ => model}/bs-service-flow-manager.cc | 0 .../{ => model}/bs-service-flow-manager.h | 0 .../{ => model}/bs-uplink-scheduler-mbqos.cc | 0 .../{ => model}/bs-uplink-scheduler-mbqos.h | 0 .../{ => model}/bs-uplink-scheduler-rtps.cc | 0 .../{ => model}/bs-uplink-scheduler-rtps.h | 0 .../{ => model}/bs-uplink-scheduler-simple.cc | 0 .../{ => model}/bs-uplink-scheduler-simple.h | 0 .../wimax/{ => model}/bs-uplink-scheduler.cc | 0 .../wimax/{ => model}/bs-uplink-scheduler.h | 0 .../{ => model}/burst-profile-manager.cc | 0 .../wimax/{ => model}/burst-profile-manager.h | 0 src/devices/wimax/{ => model}/bvec.h | 0 src/devices/wimax/{ => model}/cid-factory.cc | 0 src/devices/wimax/{ => model}/cid-factory.h | 0 src/devices/wimax/{ => model}/cid.cc | 0 src/devices/wimax/{ => model}/cid.h | 0 .../wimax/{ => model}/connection-manager.cc | 0 .../wimax/{ => model}/connection-manager.h | 0 src/devices/wimax/{ => model}/crc8.cc | 0 src/devices/wimax/{ => model}/crc8.h | 0 .../wimax/{ => model}/cs-parameters.cc | 0 src/devices/wimax/{ => model}/cs-parameters.h | 0 .../wimax/{ => model}/default-traces.h | 0 .../wimax/{ => model}/dl-mac-messages.cc | 0 .../wimax/{ => model}/dl-mac-messages.h | 0 .../{ => model}/ipcs-classifier-record.cc | 0 .../{ => model}/ipcs-classifier-record.h | 0 .../wimax/{ => model}/ipcs-classifier.cc | 0 .../wimax/{ => model}/ipcs-classifier.h | 0 src/devices/wimax/{ => model}/mac-messages.cc | 0 src/devices/wimax/{ => model}/mac-messages.h | 0 .../{ => model}/ofdm-downlink-frame-prefix.cc | 0 .../{ => model}/ofdm-downlink-frame-prefix.h | 0 src/devices/wimax/{ => model}/send-params.cc | 0 src/devices/wimax/{ => model}/send-params.h | 0 .../wimax/{ => model}/service-flow-manager.cc | 0 .../wimax/{ => model}/service-flow-manager.h | 0 .../wimax/{ => model}/service-flow-record.cc | 0 .../wimax/{ => model}/service-flow-record.h | 0 src/devices/wimax/{ => model}/service-flow.cc | 0 src/devices/wimax/{ => model}/service-flow.h | 0 .../{ => model}/simple-ofdm-send-param.cc | 0 .../{ => model}/simple-ofdm-send-param.h | 0 .../{ => model}/simple-ofdm-wimax-channel.cc | 0 .../{ => model}/simple-ofdm-wimax-channel.h | 0 .../{ => model}/simple-ofdm-wimax-phy.cc | 0 .../wimax/{ => model}/simple-ofdm-wimax-phy.h | 0 .../snr-to-block-error-rate-manager.cc | 0 .../snr-to-block-error-rate-manager.h | 0 .../snr-to-block-error-rate-record.cc | 0 .../snr-to-block-error-rate-record.h | 0 .../wimax/{ => model}/ss-link-manager.cc | 0 .../wimax/{ => model}/ss-link-manager.h | 0 src/devices/wimax/{ => model}/ss-manager.cc | 0 src/devices/wimax/{ => model}/ss-manager.h | 0 .../wimax/{ => model}/ss-net-device.cc | 0 src/devices/wimax/{ => model}/ss-net-device.h | 0 src/devices/wimax/{ => model}/ss-record.cc | 0 src/devices/wimax/{ => model}/ss-record.h | 0 src/devices/wimax/{ => model}/ss-scheduler.cc | 0 src/devices/wimax/{ => model}/ss-scheduler.h | 0 .../{ => model}/ss-service-flow-manager.cc | 0 .../{ => model}/ss-service-flow-manager.h | 0 src/devices/wimax/{ => model}/ul-job.cc | 0 src/devices/wimax/{ => model}/ul-job.h | 0 .../wimax/{ => model}/ul-mac-messages.cc | 0 .../wimax/{ => model}/ul-mac-messages.h | 0 .../wimax/{ => model}/wimax-channel.cc | 0 src/devices/wimax/{ => model}/wimax-channel.h | 0 .../wimax/{ => model}/wimax-connection.cc | 0 .../wimax/{ => model}/wimax-connection.h | 0 .../wimax/{ => model}/wimax-mac-header.cc | 0 .../wimax/{ => model}/wimax-mac-header.h | 0 .../wimax/{ => model}/wimax-mac-queue.cc | 0 .../wimax/{ => model}/wimax-mac-queue.h | 0 .../{ => model}/wimax-mac-to-mac-header.cc | 0 .../{ => model}/wimax-mac-to-mac-header.h | 0 .../wimax/{ => model}/wimax-net-device.cc | 0 .../wimax/{ => model}/wimax-net-device.h | 0 src/devices/wimax/{ => model}/wimax-phy.cc | 0 src/devices/wimax/{ => model}/wimax-phy.h | 0 src/devices/wimax/{ => model}/wimax-tlv.cc | 0 src/devices/wimax/{ => model}/wimax-tlv.h | 0 .../wimax/{ => test}/mac-messages-test.cc | 8 +- src/devices/wimax/{ => test}/phy-test.cc | 4 +- src/devices/wimax/{ => test}/qos-test.cc | 0 src/devices/wimax/{ => test}/ss-mac-test.cc | 0 .../{ => test}/wimax-fragmentation-test.cc | 10 +- .../{ => test}/wimax-service-flow-test.cc | 8 +- .../wimax/{ => test}/wimax-tlv-test.cc | 8 +- src/devices/wimax/wscript | 200 ++++++++------- src/helper/wscript | 38 +-- src/routing/aodv/examples/aodv.cc | 1 + src/routing/dsdv/examples/dsdv-manet.cc | 1 + .../nix-vector-routing/examples/nix-simple.cc | 2 + .../examples/nms-p2p-nix.cc | 2 +- src/routing/olsr/examples/olsr-hna.cc | 1 + .../examples/simple-point-to-point-olsr.cc | 2 + test.py | 24 +- utils/print-introspected-doxygen.cc | 1 + 387 files changed, 451 insertions(+), 331 deletions(-) rename {examples/csma => src/devices/csma/examples}/csma-broadcast.cc (99%) rename {examples/csma => src/devices/csma/examples}/csma-multicast.cc (99%) rename {examples/csma => src/devices/csma/examples}/csma-one-subnet.cc (99%) rename {examples/csma => src/devices/csma/examples}/csma-packet-socket.cc (99%) rename {examples/csma => src/devices/csma/examples}/csma-ping.cc (99%) rename {examples/csma => src/devices/csma/examples}/csma-raw-ip-socket.cc (99%) rename {examples/csma => src/devices/csma/examples}/csma-star.cc (99%) rename {examples/csma => src/devices/csma/examples}/waf (100%) rename {examples/csma => src/devices/csma/examples}/wscript (100%) rename src/{ => devices/csma}/helper/csma-helper.cc (100%) rename src/{ => devices/csma}/helper/csma-helper.h (100%) rename src/{ => devices/csma}/helper/csma-star-helper.cc (100%) rename src/{ => devices/csma}/helper/csma-star-helper.h (100%) rename src/devices/csma/{ => model}/backoff.cc (100%) rename src/devices/csma/{ => model}/backoff.h (100%) rename src/devices/csma/{ => model}/csma-channel.cc (100%) rename src/devices/csma/{ => model}/csma-channel.h (100%) rename src/devices/csma/{ => model}/csma-net-device.cc (100%) rename src/devices/csma/{ => model}/csma-net-device.h (100%) rename src/devices/csma/{ => model}/csma.h (100%) rename src/devices/emu/{ => doc}/emu.h (100%) rename {examples/emulation => src/devices/emu/examples}/emu-ping.cc (98%) rename {examples/emulation => src/devices/emu/examples}/emu-udp-echo.cc (99%) rename {examples/emulation => src/devices/emu/examples}/waf (100%) rename {examples/emulation => src/devices/emu/examples}/wscript (100%) rename src/{ => devices/emu}/helper/emu-helper.cc (100%) rename src/{ => devices/emu}/helper/emu-helper.h (100%) rename src/devices/emu/{ => model}/emu-encode-decode.cc (100%) rename src/devices/emu/{ => model}/emu-encode-decode.h (100%) rename src/devices/emu/{ => model}/emu-net-device.cc (100%) rename src/devices/emu/{ => model}/emu-net-device.h (100%) rename src/devices/emu/{ => model}/emu-sock-creator.cc (100%) rename src/devices/point-to-point/{ => doc}/point-to-point.h (100%) rename src/{ => devices/point-to-point}/helper/point-to-point-dumbbell-helper.cc (100%) rename src/{ => devices/point-to-point}/helper/point-to-point-dumbbell-helper.h (100%) rename src/{ => devices/point-to-point}/helper/point-to-point-grid-helper.cc (100%) rename src/{ => devices/point-to-point}/helper/point-to-point-grid-helper.h (100%) rename src/{ => devices/point-to-point}/helper/point-to-point-helper.cc (100%) rename src/{ => devices/point-to-point}/helper/point-to-point-helper.h (100%) rename src/{ => devices/point-to-point}/helper/point-to-point-star-helper.cc (100%) rename src/{ => devices/point-to-point}/helper/point-to-point-star-helper.h (100%) rename src/devices/point-to-point/{ => model}/point-to-point-channel.cc (100%) rename src/devices/point-to-point/{ => model}/point-to-point-channel.h (100%) rename src/devices/point-to-point/{ => model}/point-to-point-net-device.cc (100%) rename src/devices/point-to-point/{ => model}/point-to-point-net-device.h (100%) rename src/devices/point-to-point/{ => model}/point-to-point-remote-channel.cc (100%) rename src/devices/point-to-point/{ => model}/point-to-point-remote-channel.h (100%) rename src/devices/point-to-point/{ => model}/point-to-point-test.cc (100%) rename src/devices/point-to-point/{ => model}/ppp-header.cc (100%) rename src/devices/point-to-point/{ => model}/ppp-header.h (100%) rename src/devices/tap-bridge/{ => doc}/tap.h (100%) rename {examples/tap => src/devices/tap-bridge/examples}/lxc-left.conf (100%) rename {examples/tap => src/devices/tap-bridge/examples}/lxc-right.conf (100%) rename {examples/tap => src/devices/tap-bridge/examples}/tap-csma-virtual-machine.cc (98%) rename {examples/tap => src/devices/tap-bridge/examples}/tap-csma-virtual-machine.py (100%) rename {examples/tap => src/devices/tap-bridge/examples}/tap-csma.cc (97%) rename {examples/tap => src/devices/tap-bridge/examples}/tap-wifi-dumbbell.cc (98%) rename {examples/tap => src/devices/tap-bridge/examples}/tap-wifi-virtual-machine.cc (99%) rename {examples/tap => src/devices/tap-bridge/examples}/tap-wifi-virtual-machine.py (100%) rename {examples/tap => src/devices/tap-bridge/examples}/virtual-network-setup.sh (100%) rename {examples/tap => src/devices/tap-bridge/examples}/virtual-network-teardown.sh (100%) rename {examples/tap => src/devices/tap-bridge/examples}/waf (100%) rename {examples/tap => src/devices/tap-bridge/examples}/wscript (100%) rename src/{ => devices/tap-bridge}/helper/tap-bridge-helper.cc (100%) rename src/{ => devices/tap-bridge}/helper/tap-bridge-helper.h (100%) rename src/devices/tap-bridge/{ => model}/tap-bridge.cc (100%) rename src/devices/tap-bridge/{ => model}/tap-bridge.h (100%) rename src/devices/tap-bridge/{ => model}/tap-creator.cc (100%) rename src/devices/tap-bridge/{ => model}/tap-encode-decode.cc (100%) rename src/devices/tap-bridge/{ => model}/tap-encode-decode.h (100%) rename src/devices/wifi/{ => doc}/wifi.h (100%) rename src/{ => devices/wifi}/helper/nqos-wifi-mac-helper.cc (100%) rename src/{ => devices/wifi}/helper/nqos-wifi-mac-helper.h (100%) rename src/{ => devices/wifi}/helper/qos-wifi-mac-helper.cc (100%) rename src/{ => devices/wifi}/helper/qos-wifi-mac-helper.h (100%) rename src/{ => devices/wifi}/helper/wifi-helper.cc (100%) rename src/{ => devices/wifi}/helper/wifi-helper.h (100%) rename src/{ => devices/wifi}/helper/yans-wifi-helper.cc (100%) rename src/{ => devices/wifi}/helper/yans-wifi-helper.h (100%) rename src/devices/wifi/{ => model}/aarf-wifi-manager.cc (100%) rename src/devices/wifi/{ => model}/aarf-wifi-manager.h (100%) rename src/devices/wifi/{ => model}/aarfcd-wifi-manager.cc (100%) rename src/devices/wifi/{ => model}/aarfcd-wifi-manager.h (100%) rename src/devices/wifi/{ => model}/adhoc-wifi-mac.cc (100%) rename src/devices/wifi/{ => model}/adhoc-wifi-mac.h (100%) rename src/devices/wifi/{ => model}/amrr-wifi-manager.cc (100%) rename src/devices/wifi/{ => model}/amrr-wifi-manager.h (100%) rename src/devices/wifi/{ => model}/amsdu-subframe-header.cc (100%) rename src/devices/wifi/{ => model}/amsdu-subframe-header.h (100%) rename src/devices/wifi/{ => model}/ap-wifi-mac.cc (100%) rename src/devices/wifi/{ => model}/ap-wifi-mac.h (100%) rename src/devices/wifi/{ => model}/arf-wifi-manager.cc (100%) rename src/devices/wifi/{ => model}/arf-wifi-manager.h (100%) rename src/devices/wifi/{ => model}/block-ack-agreement.cc (100%) rename src/devices/wifi/{ => model}/block-ack-agreement.h (100%) rename src/devices/wifi/{ => model}/block-ack-cache.cc (100%) rename src/devices/wifi/{ => model}/block-ack-cache.h (100%) rename src/devices/wifi/{ => model}/block-ack-manager.cc (100%) rename src/devices/wifi/{ => model}/block-ack-manager.h (100%) rename src/devices/wifi/{ => model}/block-ack-test-suite.cc (100%) rename src/devices/wifi/{ => model}/capability-information.cc (100%) rename src/devices/wifi/{ => model}/capability-information.h (100%) rename src/devices/wifi/{ => model}/cara-wifi-manager.cc (100%) rename src/devices/wifi/{ => model}/cara-wifi-manager.h (100%) rename src/devices/wifi/{ => model}/constant-rate-wifi-manager.cc (100%) rename src/devices/wifi/{ => model}/constant-rate-wifi-manager.h (100%) rename src/devices/wifi/{ => model}/ctrl-headers.cc (100%) rename src/devices/wifi/{ => model}/ctrl-headers.h (100%) rename src/devices/wifi/{ => model}/dca-txop.cc (100%) rename src/devices/wifi/{ => model}/dca-txop.h (100%) rename src/devices/wifi/{ => model}/dcf-manager-test.cc (100%) rename src/devices/wifi/{ => model}/dcf-manager.cc (100%) rename src/devices/wifi/{ => model}/dcf-manager.h (100%) rename src/devices/wifi/{ => model}/dcf.cc (100%) rename src/devices/wifi/{ => model}/dcf.h (100%) rename src/devices/wifi/{ => model}/dsss-error-rate-model.cc (100%) rename src/devices/wifi/{ => model}/dsss-error-rate-model.h (100%) rename src/devices/wifi/{ => model}/edca-txop-n.cc (100%) rename src/devices/wifi/{ => model}/edca-txop-n.h (100%) rename src/devices/wifi/{ => model}/error-rate-model.cc (100%) rename src/devices/wifi/{ => model}/error-rate-model.h (100%) rename src/devices/wifi/{ => model}/ideal-wifi-manager.cc (100%) rename src/devices/wifi/{ => model}/ideal-wifi-manager.h (100%) rename src/devices/wifi/{ => model}/interference-helper-tx-duration-test.cc (100%) rename src/devices/wifi/{ => model}/interference-helper.cc (100%) rename src/devices/wifi/{ => model}/interference-helper.h (100%) rename src/devices/wifi/{ => model}/mac-low.cc (100%) rename src/devices/wifi/{ => model}/mac-low.h (100%) rename src/devices/wifi/{ => model}/mac-rx-middle.cc (100%) rename src/devices/wifi/{ => model}/mac-rx-middle.h (100%) rename src/devices/wifi/{ => model}/mac-tx-middle.cc (100%) rename src/devices/wifi/{ => model}/mac-tx-middle.h (100%) rename src/devices/wifi/{ => model}/mgt-headers.cc (100%) rename src/devices/wifi/{ => model}/mgt-headers.h (100%) rename src/devices/wifi/{ => model}/minstrel-wifi-manager.cc (100%) rename src/devices/wifi/{ => model}/minstrel-wifi-manager.h (100%) rename src/devices/wifi/{ => model}/msdu-aggregator.cc (100%) rename src/devices/wifi/{ => model}/msdu-aggregator.h (100%) rename src/devices/wifi/{ => model}/msdu-standard-aggregator.cc (100%) rename src/devices/wifi/{ => model}/msdu-standard-aggregator.h (100%) rename src/devices/wifi/{ => model}/nist-error-rate-model.cc (100%) rename src/devices/wifi/{ => model}/nist-error-rate-model.h (100%) rename src/devices/wifi/{ => model}/onoe-wifi-manager.cc (100%) rename src/devices/wifi/{ => model}/onoe-wifi-manager.h (100%) rename src/devices/wifi/{ => model}/originator-block-ack-agreement.cc (100%) rename src/devices/wifi/{ => model}/originator-block-ack-agreement.h (100%) rename src/devices/wifi/{ => model}/qos-blocked-destinations.cc (100%) rename src/devices/wifi/{ => model}/qos-blocked-destinations.h (100%) rename src/devices/wifi/{ => model}/qos-tag.cc (100%) rename src/devices/wifi/{ => model}/qos-tag.h (100%) rename src/devices/wifi/{ => model}/qos-utils.cc (100%) rename src/devices/wifi/{ => model}/qos-utils.h (100%) rename src/devices/wifi/{ => model}/random-stream.cc (100%) rename src/devices/wifi/{ => model}/random-stream.h (100%) rename src/devices/wifi/{ => model}/regular-wifi-mac.cc (100%) rename src/devices/wifi/{ => model}/regular-wifi-mac.h (100%) rename src/devices/wifi/{ => model}/rraa-wifi-manager.cc (100%) rename src/devices/wifi/{ => model}/rraa-wifi-manager.h (100%) rename src/devices/wifi/{ => model}/ssid.cc (100%) rename src/devices/wifi/{ => model}/ssid.h (100%) rename src/devices/wifi/{ => model}/sta-wifi-mac.cc (100%) rename src/devices/wifi/{ => model}/sta-wifi-mac.h (100%) rename src/devices/wifi/{ => model}/status-code.cc (100%) rename src/devices/wifi/{ => model}/status-code.h (100%) rename src/devices/wifi/{ => model}/supported-rates.cc (100%) rename src/devices/wifi/{ => model}/supported-rates.h (100%) rename src/devices/wifi/{ => model}/wifi-channel.cc (100%) rename src/devices/wifi/{ => model}/wifi-channel.h (100%) rename src/devices/wifi/{ => model}/wifi-information-element-vector.cc (100%) rename src/devices/wifi/{ => model}/wifi-information-element-vector.h (100%) rename src/devices/wifi/{ => model}/wifi-information-element.cc (100%) rename src/devices/wifi/{ => model}/wifi-information-element.h (100%) rename src/devices/wifi/{ => model}/wifi-mac-header.cc (100%) rename src/devices/wifi/{ => model}/wifi-mac-header.h (100%) rename src/devices/wifi/{ => model}/wifi-mac-queue.cc (100%) rename src/devices/wifi/{ => model}/wifi-mac-queue.h (100%) rename src/devices/wifi/{ => model}/wifi-mac-trailer.cc (100%) rename src/devices/wifi/{ => model}/wifi-mac-trailer.h (100%) rename src/devices/wifi/{ => model}/wifi-mac.cc (100%) rename src/devices/wifi/{ => model}/wifi-mac.h (100%) rename src/devices/wifi/{ => model}/wifi-mode.cc (100%) rename src/devices/wifi/{ => model}/wifi-mode.h (100%) rename src/devices/wifi/{ => model}/wifi-net-device.cc (100%) rename src/devices/wifi/{ => model}/wifi-net-device.h (100%) rename src/devices/wifi/{ => model}/wifi-phy-standard.h (100%) rename src/devices/wifi/{ => model}/wifi-phy-state-helper.cc (100%) rename src/devices/wifi/{ => model}/wifi-phy-state-helper.h (100%) rename src/devices/wifi/{ => model}/wifi-phy.cc (100%) rename src/devices/wifi/{ => model}/wifi-phy.h (100%) rename src/devices/wifi/{ => model}/wifi-preamble.h (100%) rename src/devices/wifi/{ => model}/wifi-remote-station-manager.cc (100%) rename src/devices/wifi/{ => model}/wifi-remote-station-manager.h (100%) rename src/devices/wifi/{ => model}/yans-error-rate-model.cc (100%) rename src/devices/wifi/{ => model}/yans-error-rate-model.h (100%) rename src/devices/wifi/{ => model}/yans-wifi-channel.cc (100%) rename src/devices/wifi/{ => model}/yans-wifi-channel.h (100%) rename src/devices/wifi/{ => model}/yans-wifi-phy.cc (100%) rename src/devices/wifi/{ => model}/yans-wifi-phy.h (100%) rename src/devices/wifi/{ => test}/wifi-phy-test.cc (98%) rename src/devices/wifi/{ => test}/wifi-test.cc (97%) rename src/devices/wimax/{ => doc}/wimax.h (100%) rename {examples/wimax => src/devices/wimax/examples}/waf (100%) rename {examples/wimax => src/devices/wimax/examples}/wimax-ipv4.cc (99%) rename {examples/wimax => src/devices/wimax/examples}/wimax-multicast.cc (99%) rename {examples/wimax => src/devices/wimax/examples}/wimax-simple.cc (99%) rename {examples/wimax => src/devices/wimax/examples}/wscript (100%) rename src/{ => devices/wimax}/helper/wimax-helper.cc (100%) rename src/{ => devices/wimax}/helper/wimax-helper.h (100%) rename src/devices/wimax/{ => model}/bandwidth-manager.cc (100%) rename src/devices/wimax/{ => model}/bandwidth-manager.h (100%) rename src/devices/wimax/{ => model}/bs-link-manager.cc (100%) rename src/devices/wimax/{ => model}/bs-link-manager.h (100%) rename src/devices/wimax/{ => model}/bs-net-device.cc (100%) rename src/devices/wimax/{ => model}/bs-net-device.h (100%) rename src/devices/wimax/{ => model}/bs-scheduler-rtps.cc (100%) rename src/devices/wimax/{ => model}/bs-scheduler-rtps.h (100%) rename src/devices/wimax/{ => model}/bs-scheduler-simple.cc (100%) rename src/devices/wimax/{ => model}/bs-scheduler-simple.h (100%) rename src/devices/wimax/{ => model}/bs-scheduler.cc (100%) rename src/devices/wimax/{ => model}/bs-scheduler.h (100%) rename src/devices/wimax/{ => model}/bs-service-flow-manager.cc (100%) rename src/devices/wimax/{ => model}/bs-service-flow-manager.h (100%) rename src/devices/wimax/{ => model}/bs-uplink-scheduler-mbqos.cc (100%) rename src/devices/wimax/{ => model}/bs-uplink-scheduler-mbqos.h (100%) rename src/devices/wimax/{ => model}/bs-uplink-scheduler-rtps.cc (100%) rename src/devices/wimax/{ => model}/bs-uplink-scheduler-rtps.h (100%) rename src/devices/wimax/{ => model}/bs-uplink-scheduler-simple.cc (100%) rename src/devices/wimax/{ => model}/bs-uplink-scheduler-simple.h (100%) rename src/devices/wimax/{ => model}/bs-uplink-scheduler.cc (100%) rename src/devices/wimax/{ => model}/bs-uplink-scheduler.h (100%) rename src/devices/wimax/{ => model}/burst-profile-manager.cc (100%) rename src/devices/wimax/{ => model}/burst-profile-manager.h (100%) rename src/devices/wimax/{ => model}/bvec.h (100%) rename src/devices/wimax/{ => model}/cid-factory.cc (100%) rename src/devices/wimax/{ => model}/cid-factory.h (100%) rename src/devices/wimax/{ => model}/cid.cc (100%) rename src/devices/wimax/{ => model}/cid.h (100%) rename src/devices/wimax/{ => model}/connection-manager.cc (100%) rename src/devices/wimax/{ => model}/connection-manager.h (100%) rename src/devices/wimax/{ => model}/crc8.cc (100%) rename src/devices/wimax/{ => model}/crc8.h (100%) rename src/devices/wimax/{ => model}/cs-parameters.cc (100%) rename src/devices/wimax/{ => model}/cs-parameters.h (100%) rename src/devices/wimax/{ => model}/default-traces.h (100%) rename src/devices/wimax/{ => model}/dl-mac-messages.cc (100%) rename src/devices/wimax/{ => model}/dl-mac-messages.h (100%) rename src/devices/wimax/{ => model}/ipcs-classifier-record.cc (100%) rename src/devices/wimax/{ => model}/ipcs-classifier-record.h (100%) rename src/devices/wimax/{ => model}/ipcs-classifier.cc (100%) rename src/devices/wimax/{ => model}/ipcs-classifier.h (100%) rename src/devices/wimax/{ => model}/mac-messages.cc (100%) rename src/devices/wimax/{ => model}/mac-messages.h (100%) rename src/devices/wimax/{ => model}/ofdm-downlink-frame-prefix.cc (100%) rename src/devices/wimax/{ => model}/ofdm-downlink-frame-prefix.h (100%) rename src/devices/wimax/{ => model}/send-params.cc (100%) rename src/devices/wimax/{ => model}/send-params.h (100%) rename src/devices/wimax/{ => model}/service-flow-manager.cc (100%) rename src/devices/wimax/{ => model}/service-flow-manager.h (100%) rename src/devices/wimax/{ => model}/service-flow-record.cc (100%) rename src/devices/wimax/{ => model}/service-flow-record.h (100%) rename src/devices/wimax/{ => model}/service-flow.cc (100%) rename src/devices/wimax/{ => model}/service-flow.h (100%) rename src/devices/wimax/{ => model}/simple-ofdm-send-param.cc (100%) rename src/devices/wimax/{ => model}/simple-ofdm-send-param.h (100%) rename src/devices/wimax/{ => model}/simple-ofdm-wimax-channel.cc (100%) rename src/devices/wimax/{ => model}/simple-ofdm-wimax-channel.h (100%) rename src/devices/wimax/{ => model}/simple-ofdm-wimax-phy.cc (100%) rename src/devices/wimax/{ => model}/simple-ofdm-wimax-phy.h (100%) rename src/devices/wimax/{ => model}/snr-to-block-error-rate-manager.cc (100%) rename src/devices/wimax/{ => model}/snr-to-block-error-rate-manager.h (100%) rename src/devices/wimax/{ => model}/snr-to-block-error-rate-record.cc (100%) rename src/devices/wimax/{ => model}/snr-to-block-error-rate-record.h (100%) rename src/devices/wimax/{ => model}/ss-link-manager.cc (100%) rename src/devices/wimax/{ => model}/ss-link-manager.h (100%) rename src/devices/wimax/{ => model}/ss-manager.cc (100%) rename src/devices/wimax/{ => model}/ss-manager.h (100%) rename src/devices/wimax/{ => model}/ss-net-device.cc (100%) rename src/devices/wimax/{ => model}/ss-net-device.h (100%) rename src/devices/wimax/{ => model}/ss-record.cc (100%) rename src/devices/wimax/{ => model}/ss-record.h (100%) rename src/devices/wimax/{ => model}/ss-scheduler.cc (100%) rename src/devices/wimax/{ => model}/ss-scheduler.h (100%) rename src/devices/wimax/{ => model}/ss-service-flow-manager.cc (100%) rename src/devices/wimax/{ => model}/ss-service-flow-manager.h (100%) rename src/devices/wimax/{ => model}/ul-job.cc (100%) rename src/devices/wimax/{ => model}/ul-job.h (100%) rename src/devices/wimax/{ => model}/ul-mac-messages.cc (100%) rename src/devices/wimax/{ => model}/ul-mac-messages.h (100%) rename src/devices/wimax/{ => model}/wimax-channel.cc (100%) rename src/devices/wimax/{ => model}/wimax-channel.h (100%) rename src/devices/wimax/{ => model}/wimax-connection.cc (100%) rename src/devices/wimax/{ => model}/wimax-connection.h (100%) rename src/devices/wimax/{ => model}/wimax-mac-header.cc (100%) rename src/devices/wimax/{ => model}/wimax-mac-header.h (100%) rename src/devices/wimax/{ => model}/wimax-mac-queue.cc (100%) rename src/devices/wimax/{ => model}/wimax-mac-queue.h (100%) rename src/devices/wimax/{ => model}/wimax-mac-to-mac-header.cc (100%) rename src/devices/wimax/{ => model}/wimax-mac-to-mac-header.h (100%) rename src/devices/wimax/{ => model}/wimax-net-device.cc (100%) rename src/devices/wimax/{ => model}/wimax-net-device.h (100%) rename src/devices/wimax/{ => model}/wimax-phy.cc (100%) rename src/devices/wimax/{ => model}/wimax-phy.h (100%) rename src/devices/wimax/{ => model}/wimax-tlv.cc (100%) rename src/devices/wimax/{ => model}/wimax-tlv.h (100%) rename src/devices/wimax/{ => test}/mac-messages-test.cc (97%) rename src/devices/wimax/{ => test}/phy-test.cc (98%) rename src/devices/wimax/{ => test}/qos-test.cc (100%) rename src/devices/wimax/{ => test}/ss-mac-test.cc (100%) rename src/devices/wimax/{ => test}/wimax-fragmentation-test.cc (97%) rename src/devices/wimax/{ => test}/wimax-service-flow-test.cc (98%) rename src/devices/wimax/{ => test}/wimax-tlv-test.cc (98%) diff --git a/examples/animation/dumbbell-animation.cc b/examples/animation/dumbbell-animation.cc index a3a93052c..efbbff6cd 100644 --- a/examples/animation/dumbbell-animation.cc +++ b/examples/animation/dumbbell-animation.cc @@ -20,6 +20,8 @@ #include "ns3/core-module.h" #include "ns3/network-module.h" +#include "ns3/internet-module.h" +#include "ns3/point-to-point-module.h" #include "ns3/helper-module.h" #include "ns3/applications-module.h" #include "ns3/ipv4-global-routing-helper.h" diff --git a/examples/animation/grid-animation.cc b/examples/animation/grid-animation.cc index f4496835d..a039739f8 100644 --- a/examples/animation/grid-animation.cc +++ b/examples/animation/grid-animation.cc @@ -20,6 +20,8 @@ #include "ns3/core-module.h" #include "ns3/network-module.h" +#include "ns3/internet-module.h" +#include "ns3/point-to-point-module.h" #include "ns3/helper-module.h" #include "ns3/applications-module.h" #include "ns3/ipv4-global-routing-helper.h" diff --git a/examples/animation/star-animation.cc b/examples/animation/star-animation.cc index cecbc9004..6d6f87c8f 100644 --- a/examples/animation/star-animation.cc +++ b/examples/animation/star-animation.cc @@ -18,6 +18,8 @@ #include "ns3/core-module.h" #include "ns3/network-module.h" #include "ns3/helper-module.h" +#include "ns3/internet-module.h" +#include "ns3/point-to-point-module.h" #include "ns3/applications-module.h" #include "ns3/ipv4-global-routing-helper.h" diff --git a/examples/energy/energy-model-example.cc b/examples/energy/energy-model-example.cc index dce40f389..3919dae52 100644 --- a/examples/energy/energy-model-example.cc +++ b/examples/energy/energy-model-example.cc @@ -25,6 +25,7 @@ #include "ns3/contrib-module.h" #include "ns3/wifi-module.h" #include "ns3/energy-module.h" +#include "ns3/internet-module.h" #include #include diff --git a/examples/error-model/simple-error-model.cc b/examples/error-model/simple-error-model.cc index 46ab2912b..cb5eb55d2 100644 --- a/examples/error-model/simple-error-model.cc +++ b/examples/error-model/simple-error-model.cc @@ -38,6 +38,8 @@ #include "ns3/core-module.h" #include "ns3/network-module.h" #include "ns3/helper-module.h" +#include "ns3/internet-module.h" +#include "ns3/point-to-point-module.h" #include "ns3/applications-module.h" #include "ns3/ipv4-global-routing-helper.h" diff --git a/examples/ipv6/fragmentation-ipv6.cc b/examples/ipv6/fragmentation-ipv6.cc index ed4737ffb..dbbf7af62 100644 --- a/examples/ipv6/fragmentation-ipv6.cc +++ b/examples/ipv6/fragmentation-ipv6.cc @@ -32,6 +32,7 @@ #include "ns3/core-module.h" #include "ns3/internet-module.h" #include "ns3/helper-module.h" +#include "ns3/csma-module.h" #include "ns3/applications-module.h" #include "ns3/ipv6-static-routing-helper.h" diff --git a/examples/ipv6/icmpv6-redirect.cc b/examples/ipv6/icmpv6-redirect.cc index dde536b28..ab86df4e1 100644 --- a/examples/ipv6/icmpv6-redirect.cc +++ b/examples/ipv6/icmpv6-redirect.cc @@ -44,6 +44,7 @@ #include "ns3/core-module.h" #include "ns3/internet-module.h" #include "ns3/helper-module.h" +#include "ns3/csma-module.h" #include "ns3/applications-module.h" #include "ns3/ipv6-static-routing-helper.h" diff --git a/examples/ipv6/loose-routing-ipv6.cc b/examples/ipv6/loose-routing-ipv6.cc index fc293e8eb..dab7382f4 100644 --- a/examples/ipv6/loose-routing-ipv6.cc +++ b/examples/ipv6/loose-routing-ipv6.cc @@ -42,6 +42,7 @@ #include "ns3/core-module.h" #include "ns3/internet-module.h" #include "ns3/helper-module.h" +#include "ns3/csma-module.h" #include "ns3/applications-module.h" #include "ns3/ipv6-header.h" using namespace ns3; diff --git a/examples/ipv6/ping6.cc b/examples/ipv6/ping6.cc index da91b9b89..127470754 100644 --- a/examples/ipv6/ping6.cc +++ b/examples/ipv6/ping6.cc @@ -33,6 +33,7 @@ #include "ns3/core-module.h" #include "ns3/internet-module.h" #include "ns3/helper-module.h" +#include "ns3/csma-module.h" #include "ns3/applications-module.h" using namespace ns3; diff --git a/examples/ipv6/radvd-two-prefix.cc b/examples/ipv6/radvd-two-prefix.cc index 964392785..e80a24481 100644 --- a/examples/ipv6/radvd-two-prefix.cc +++ b/examples/ipv6/radvd-two-prefix.cc @@ -36,6 +36,7 @@ #include "ns3/core-module.h" #include "ns3/internet-module.h" #include "ns3/helper-module.h" +#include "ns3/csma-module.h" #include "ns3/applications-module.h" #include "ns3/ipv6-routing-table-entry.h" diff --git a/examples/ipv6/radvd.cc b/examples/ipv6/radvd.cc index c3698f9c1..c061509fb 100644 --- a/examples/ipv6/radvd.cc +++ b/examples/ipv6/radvd.cc @@ -35,6 +35,7 @@ #include "ns3/core-module.h" #include "ns3/internet-module.h" #include "ns3/helper-module.h" +#include "ns3/csma-module.h" #include "ns3/applications-module.h" #include "ns3/radvd.h" diff --git a/examples/matrix-topology/matrix-topology.cc b/examples/matrix-topology/matrix-topology.cc index 16bb71698..f1ffb326a 100644 --- a/examples/matrix-topology/matrix-topology.cc +++ b/examples/matrix-topology/matrix-topology.cc @@ -48,6 +48,8 @@ #include "ns3/core-module.h" #include "ns3/network-module.h" +#include "ns3/internet-module.h" +#include "ns3/point-to-point-module.h" #include "ns3/helper-module.h" #include "ns3/applications-module.h" #include "ns3/global-route-manager.h" diff --git a/examples/naming/object-names.cc b/examples/naming/object-names.cc index ac988ae39..3c69f7080 100644 --- a/examples/naming/object-names.cc +++ b/examples/naming/object-names.cc @@ -24,6 +24,7 @@ #include "ns3/core-module.h" #include "ns3/helper-module.h" +#include "ns3/csma-module.h" #include "ns3/applications-module.h" using namespace ns3; diff --git a/examples/realtime/realtime-udp-echo.cc b/examples/realtime/realtime-udp-echo.cc index d85eae0e3..d812efd5f 100644 --- a/examples/realtime/realtime-udp-echo.cc +++ b/examples/realtime/realtime-udp-echo.cc @@ -28,6 +28,7 @@ #include #include "ns3/core-module.h" #include "ns3/helper-module.h" +#include "ns3/csma-module.h" #include "ns3/applications-module.h" using namespace ns3; diff --git a/examples/routing/dynamic-global-routing.cc b/examples/routing/dynamic-global-routing.cc index 7547a7a44..458609b50 100644 --- a/examples/routing/dynamic-global-routing.cc +++ b/examples/routing/dynamic-global-routing.cc @@ -70,6 +70,9 @@ #include "ns3/core-module.h" #include "ns3/network-module.h" #include "ns3/helper-module.h" +#include "ns3/csma-module.h" +#include "ns3/internet-module.h" +#include "ns3/point-to-point-module.h" #include "ns3/applications-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 a070e3f94..5a5dc525d 100644 --- a/examples/routing/global-injection-slash32.cc +++ b/examples/routing/global-injection-slash32.cc @@ -27,6 +27,8 @@ #include "ns3/csma-net-device.h" #include "ns3/core-module.h" #include "ns3/network-module.h" +#include "ns3/internet-module.h" +#include "ns3/point-to-point-module.h" #include "ns3/helper-module.h" #include "ns3/applications-module.h" #include "ns3/ipv4-static-routing.h" diff --git a/examples/routing/global-routing-slash32.cc b/examples/routing/global-routing-slash32.cc index 8249b26d9..430f7c139 100644 --- a/examples/routing/global-routing-slash32.cc +++ b/examples/routing/global-routing-slash32.cc @@ -27,6 +27,8 @@ #include "ns3/csma-net-device.h" #include "ns3/core-module.h" #include "ns3/network-module.h" +#include "ns3/internet-module.h" +#include "ns3/point-to-point-module.h" #include "ns3/helper-module.h" #include "ns3/applications-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 2f238fd56..9c04837d0 100644 --- a/examples/routing/mixed-global-routing.cc +++ b/examples/routing/mixed-global-routing.cc @@ -38,7 +38,9 @@ #include "ns3/core-module.h" #include "ns3/network-module.h" +#include "ns3/point-to-point-module.h" #include "ns3/helper-module.h" +#include "ns3/csma-module.h" #include "ns3/applications-module.h" #include "ns3/ipv4-global-routing-helper.h" diff --git a/examples/routing/simple-alternate-routing.cc b/examples/routing/simple-alternate-routing.cc index d59943bda..bf4b400ea 100644 --- a/examples/routing/simple-alternate-routing.cc +++ b/examples/routing/simple-alternate-routing.cc @@ -38,6 +38,8 @@ #include #include "ns3/core-module.h" +#include "ns3/internet-module.h" +#include "ns3/point-to-point-module.h" #include "ns3/network-module.h" #include "ns3/helper-module.h" #include "ns3/applications-module.h" diff --git a/examples/routing/simple-global-routing.cc b/examples/routing/simple-global-routing.cc index ad997a16a..093347b95 100644 --- a/examples/routing/simple-global-routing.cc +++ b/examples/routing/simple-global-routing.cc @@ -41,6 +41,8 @@ #include "ns3/core-module.h" #include "ns3/network-module.h" +#include "ns3/internet-module.h" +#include "ns3/point-to-point-module.h" #include "ns3/helper-module.h" #include "ns3/applications-module.h" #include "ns3/flow-monitor-helper.h" diff --git a/examples/routing/simple-routing-ping6.cc b/examples/routing/simple-routing-ping6.cc index 1b27d7952..c1689adb6 100644 --- a/examples/routing/simple-routing-ping6.cc +++ b/examples/routing/simple-routing-ping6.cc @@ -32,6 +32,7 @@ #include "ns3/core-module.h" #include "ns3/internet-module.h" #include "ns3/helper-module.h" +#include "ns3/csma-module.h" #include "ns3/applications-module.h" #include "ns3/ipv6-static-routing-helper.h" diff --git a/examples/routing/static-routing-slash32.cc b/examples/routing/static-routing-slash32.cc index 246718c70..28f9174f8 100644 --- a/examples/routing/static-routing-slash32.cc +++ b/examples/routing/static-routing-slash32.cc @@ -24,9 +24,11 @@ #include #include -#include "ns3/csma-net-device.h" #include "ns3/core-module.h" #include "ns3/network-module.h" +#include "ns3/internet-module.h" +#include "ns3/point-to-point-module.h" +#include "ns3/csma-module.h" #include "ns3/helper-module.h" #include "ns3/applications-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 50dec9343..53f03c295 100644 --- a/examples/socket/socket-bound-static-routing.cc +++ b/examples/socket/socket-bound-static-routing.cc @@ -37,6 +37,8 @@ #include "ns3/core-module.h" #include "ns3/network-module.h" +#include "ns3/internet-module.h" +#include "ns3/point-to-point-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 9c173d07b..c62d04be7 100644 --- a/examples/socket/socket-bound-tcp-static-routing.cc +++ b/examples/socket/socket-bound-tcp-static-routing.cc @@ -37,6 +37,8 @@ #include "ns3/core-module.h" #include "ns3/network-module.h" +#include "ns3/internet-module.h" +#include "ns3/point-to-point-module.h" #include "ns3/helper-module.h" #include "ns3/applications-module.h" #include "ns3/ipv4-static-routing-helper.h" diff --git a/examples/stats/wifi-example-sim.cc b/examples/stats/wifi-example-sim.cc index 5645208b7..cc4d36245 100644 --- a/examples/stats/wifi-example-sim.cc +++ b/examples/stats/wifi-example-sim.cc @@ -41,6 +41,7 @@ #include "ns3/helper-module.h" #include "ns3/mobility-module.h" #include "ns3/wifi-module.h" +#include "ns3/internet-module.h" #include "ns3/stats-module.h" diff --git a/examples/tcp/star.cc b/examples/tcp/star.cc index 08aa4d188..78d0a1e7e 100644 --- a/examples/tcp/star.cc +++ b/examples/tcp/star.cc @@ -18,6 +18,8 @@ #include "ns3/core-module.h" #include "ns3/network-module.h" #include "ns3/helper-module.h" +#include "ns3/internet-module.h" +#include "ns3/point-to-point-module.h" #include "ns3/applications-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 d42024316..52eda6012 100644 --- a/examples/tcp/tcp-bulk-send.cc +++ b/examples/tcp/tcp-bulk-send.cc @@ -28,6 +28,8 @@ #include #include "ns3/core-module.h" #include "ns3/helper-module.h" +#include "ns3/point-to-point-module.h" +#include "ns3/internet-module.h" #include "ns3/applications-module.h" #include "ns3/network-module.h" #include "ns3/packet-sink.h" diff --git a/examples/tcp/tcp-large-transfer.cc b/examples/tcp/tcp-large-transfer.cc index fca2ddac3..41f59765f 100644 --- a/examples/tcp/tcp-large-transfer.cc +++ b/examples/tcp/tcp-large-transfer.cc @@ -41,6 +41,7 @@ #include "ns3/applications-module.h" #include "ns3/network-module.h" #include "ns3/internet-module.h" +#include "ns3/point-to-point-module.h" #include "ns3/ipv4-global-routing-helper.h" using namespace ns3; diff --git a/examples/tcp/tcp-nsc-lfn.cc b/examples/tcp/tcp-nsc-lfn.cc index 4e359616c..4f1e32be6 100644 --- a/examples/tcp/tcp-nsc-lfn.cc +++ b/examples/tcp/tcp-nsc-lfn.cc @@ -35,6 +35,8 @@ #include "ns3/core-module.h" #include "ns3/network-module.h" #include "ns3/helper-module.h" +#include "ns3/internet-module.h" +#include "ns3/point-to-point-module.h" #include "ns3/applications-module.h" #include "ns3/ipv4-global-routing-helper.h" diff --git a/examples/tcp/tcp-nsc-zoo.cc b/examples/tcp/tcp-nsc-zoo.cc index 3ba05f1cb..caf0e2eeb 100644 --- a/examples/tcp/tcp-nsc-zoo.cc +++ b/examples/tcp/tcp-nsc-zoo.cc @@ -34,6 +34,7 @@ #include "ns3/helper-module.h" #include "ns3/applications-module.h" #include "ns3/network-module.h" +#include "ns3/csma-module.h" #include "ns3/ipv4-global-routing-helper.h" using namespace ns3; diff --git a/examples/tcp/tcp-star-server.cc b/examples/tcp/tcp-star-server.cc index 1b16e14a4..c126d977f 100644 --- a/examples/tcp/tcp-star-server.cc +++ b/examples/tcp/tcp-star-server.cc @@ -51,6 +51,8 @@ #include "ns3/core-module.h" #include "ns3/network-module.h" #include "ns3/helper-module.h" +#include "ns3/internet-module.h" +#include "ns3/point-to-point-module.h" #include "ns3/applications-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 1a7178605..70beee0a2 100644 --- a/examples/topology-read/topology-example-sim.cc +++ b/examples/topology-read/topology-example-sim.cc @@ -29,6 +29,8 @@ #include "ns3/core-module.h" #include "ns3/network-module.h" #include "ns3/helper-module.h" +#include "ns3/internet-module.h" +#include "ns3/point-to-point-module.h" #include "ns3/applications-module.h" #include "ns3/ipv4-static-routing-helper.h" #include "ns3/ipv4-list-routing-helper.h" diff --git a/examples/tutorial/fifth.cc b/examples/tutorial/fifth.cc index 20849e5fb..7bc65956d 100644 --- a/examples/tutorial/fifth.cc +++ b/examples/tutorial/fifth.cc @@ -19,6 +19,7 @@ #include "ns3/network-module.h" #include "ns3/internet-module.h" #include "ns3/helper-module.h" +#include "ns3/point-to-point-module.h" #include "ns3/applications-module.h" using namespace ns3; diff --git a/examples/tutorial/first.cc b/examples/tutorial/first.cc index 4be50be36..7e4766b6f 100644 --- a/examples/tutorial/first.cc +++ b/examples/tutorial/first.cc @@ -16,6 +16,8 @@ #include "ns3/core-module.h" #include "ns3/network-module.h" +#include "ns3/internet-module.h" +#include "ns3/point-to-point-module.h" #include "ns3/helper-module.h" #include "ns3/applications-module.h" diff --git a/examples/tutorial/second.cc b/examples/tutorial/second.cc index 808e6adbf..930532830 100644 --- a/examples/tutorial/second.cc +++ b/examples/tutorial/second.cc @@ -17,6 +17,9 @@ #include "ns3/core-module.h" #include "ns3/network-module.h" #include "ns3/helper-module.h" +#include "ns3/csma-module.h" +#include "ns3/internet-module.h" +#include "ns3/point-to-point-module.h" #include "ns3/applications-module.h" #include "ns3/ipv4-global-routing-helper.h" diff --git a/examples/tutorial/sixth.cc b/examples/tutorial/sixth.cc index 13e31ea83..fac5724f4 100644 --- a/examples/tutorial/sixth.cc +++ b/examples/tutorial/sixth.cc @@ -19,6 +19,7 @@ #include "ns3/network-module.h" #include "ns3/internet-module.h" #include "ns3/helper-module.h" +#include "ns3/point-to-point-module.h" #include "ns3/applications-module.h" using namespace ns3; diff --git a/examples/tutorial/third.cc b/examples/tutorial/third.cc index 16b18a786..a92047fde 100644 --- a/examples/tutorial/third.cc +++ b/examples/tutorial/third.cc @@ -15,11 +15,13 @@ */ #include "ns3/core-module.h" +#include "ns3/point-to-point-module.h" #include "ns3/network-module.h" #include "ns3/helper-module.h" #include "ns3/applications-module.h" #include "ns3/wifi-module.h" #include "ns3/mobility-module.h" +#include "ns3/csma-module.h" #include "ns3/ipv4-global-routing-helper.h" // Default Network Topology diff --git a/examples/udp-client-server/udp-client-server.cc b/examples/udp-client-server/udp-client-server.cc index 0118fc084..1daaf192f 100644 --- a/examples/udp-client-server/udp-client-server.cc +++ b/examples/udp-client-server/udp-client-server.cc @@ -25,7 +25,9 @@ #include #include "ns3/core-module.h" +#include "ns3/core-module.h" #include "ns3/helper-module.h" +#include "ns3/csma-module.h" #include "ns3/applications-module.h" using namespace ns3; diff --git a/examples/udp-client-server/udp-trace-client-server.cc b/examples/udp-client-server/udp-trace-client-server.cc index acd4ddbc7..3d823c211 100644 --- a/examples/udp-client-server/udp-trace-client-server.cc +++ b/examples/udp-client-server/udp-trace-client-server.cc @@ -26,6 +26,7 @@ #include #include "ns3/core-module.h" #include "ns3/helper-module.h" +#include "ns3/csma-module.h" #include "ns3/applications-module.h" using namespace ns3; diff --git a/examples/udp/udp-echo.cc b/examples/udp/udp-echo.cc index d21b28241..8d849604b 100644 --- a/examples/udp/udp-echo.cc +++ b/examples/udp/udp-echo.cc @@ -28,6 +28,7 @@ #include #include "ns3/core-module.h" #include "ns3/helper-module.h" +#include "ns3/csma-module.h" #include "ns3/applications-module.h" using namespace ns3; diff --git a/examples/wireless/mixed-wireless.cc b/examples/wireless/mixed-wireless.cc index c6467f29c..51353c24b 100644 --- a/examples/wireless/mixed-wireless.cc +++ b/examples/wireless/mixed-wireless.cc @@ -67,6 +67,7 @@ #include "ns3/mobility-module.h" #include "ns3/contrib-module.h" #include "ns3/wifi-module.h" +#include "ns3/csma-module.h" #include "ns3/olsr-helper.h" #include "ns3/ipv4-global-routing-helper.h" diff --git a/examples/wireless/multirate.cc b/examples/wireless/multirate.cc index f00fc8b2a..038366ef4 100644 --- a/examples/wireless/multirate.cc +++ b/examples/wireless/multirate.cc @@ -56,6 +56,7 @@ #include "ns3/contrib-module.h" #include "ns3/random-variable.h" #include "ns3/wifi-module.h" +#include "ns3/internet-module.h" #include "ns3/flow-monitor-helper.h" #include "ns3/olsr-helper.h" #include "ns3/ipv4-static-routing-helper.h" diff --git a/examples/wireless/simple-wifi-frame-aggregation.cc b/examples/wireless/simple-wifi-frame-aggregation.cc index 2972c6aa5..8644b15a6 100644 --- a/examples/wireless/simple-wifi-frame-aggregation.cc +++ b/examples/wireless/simple-wifi-frame-aggregation.cc @@ -24,6 +24,7 @@ #include "ns3/wifi-module.h" #include "ns3/mobility-module.h" #include "ns3/ipv4-global-routing-helper.h" +#include "ns3/internet-module.h" //This is a simple example in order to show how 802.11n frame aggregation feature (A-MSDU) works. // diff --git a/examples/wireless/wifi-adhoc.cc b/examples/wireless/wifi-adhoc.cc index ecfa454ca..20b9c9a3f 100644 --- a/examples/wireless/wifi-adhoc.cc +++ b/examples/wireless/wifi-adhoc.cc @@ -24,6 +24,7 @@ #include "ns3/applications-module.h" #include "ns3/mobility-module.h" #include "ns3/contrib-module.h" +#include "ns3/wifi-module.h" #include diff --git a/examples/wireless/wifi-clear-channel-cmu.cc b/examples/wireless/wifi-clear-channel-cmu.cc index a002442ed..1ec7cb2a7 100644 --- a/examples/wireless/wifi-clear-channel-cmu.cc +++ b/examples/wireless/wifi-clear-channel-cmu.cc @@ -23,6 +23,8 @@ #include "ns3/helper-module.h" #include "ns3/mobility-module.h" #include "ns3/contrib-module.h" +#include "ns3/wifi-module.h" +#include "ns3/internet-module.h" #include #include diff --git a/examples/wireless/wifi-hidden-terminal.cc b/examples/wireless/wifi-hidden-terminal.cc index a77fb4519..a53c112ac 100644 --- a/examples/wireless/wifi-hidden-terminal.cc +++ b/examples/wireless/wifi-hidden-terminal.cc @@ -35,7 +35,9 @@ #include "ns3/helper-module.h" #include "ns3/applications-module.h" #include "ns3/mobility-module.h" +#include "ns3/internet-module.h" #include "ns3/flow-monitor-module.h" +#include "ns3/wifi-module.h" using namespace ns3; diff --git a/examples/wireless/wifi-simple-adhoc-grid.cc b/examples/wireless/wifi-simple-adhoc-grid.cc index 345690ca4..326d4b49d 100644 --- a/examples/wireless/wifi-simple-adhoc-grid.cc +++ b/examples/wireless/wifi-simple-adhoc-grid.cc @@ -75,6 +75,7 @@ #include "ns3/mobility-module.h" #include "ns3/contrib-module.h" #include "ns3/wifi-module.h" +#include "ns3/internet-module.h" #include "ns3/olsr-helper.h" #include "ns3/ipv4-static-routing-helper.h" #include "ns3/ipv4-list-routing-helper.h" diff --git a/examples/wireless/wifi-simple-adhoc.cc b/examples/wireless/wifi-simple-adhoc.cc index 9ba254a0d..578b02275 100644 --- a/examples/wireless/wifi-simple-adhoc.cc +++ b/examples/wireless/wifi-simple-adhoc.cc @@ -57,6 +57,7 @@ #include "ns3/mobility-module.h" #include "ns3/contrib-module.h" #include "ns3/wifi-module.h" +#include "ns3/internet-module.h" #include #include diff --git a/examples/wireless/wifi-simple-infra.cc b/examples/wireless/wifi-simple-infra.cc index c9f789f2e..06548eb96 100644 --- a/examples/wireless/wifi-simple-infra.cc +++ b/examples/wireless/wifi-simple-infra.cc @@ -58,6 +58,7 @@ #include "ns3/mobility-module.h" #include "ns3/contrib-module.h" #include "ns3/wifi-module.h" +#include "ns3/internet-module.h" #include #include diff --git a/examples/wireless/wifi-simple-interference.cc b/examples/wireless/wifi-simple-interference.cc index 61eab43d0..891f14f1d 100644 --- a/examples/wireless/wifi-simple-interference.cc +++ b/examples/wireless/wifi-simple-interference.cc @@ -86,6 +86,7 @@ #include "ns3/mobility-module.h" #include "ns3/contrib-module.h" #include "ns3/wifi-module.h" +#include "ns3/internet-module.h" #include #include diff --git a/examples/wireless/wifi-wired-bridging.cc b/examples/wireless/wifi-wired-bridging.cc index 87d810f53..a8ca3d6b7 100644 --- a/examples/wireless/wifi-wired-bridging.cc +++ b/examples/wireless/wifi-wired-bridging.cc @@ -49,6 +49,7 @@ #include "ns3/applications-module.h" #include "ns3/wifi-module.h" #include "ns3/network-module.h" +#include "ns3/csma-module.h" #include "ns3/bridge-helper.h" #include #include diff --git a/samples/main-simple.cc b/samples/main-simple.cc index c2700e449..9ebb0f251 100644 --- a/samples/main-simple.cc +++ b/samples/main-simple.cc @@ -3,6 +3,7 @@ #include "ns3/core-module.h" #include "ns3/helper-module.h" #include "ns3/network-module.h" +#include "ns3/internet-module.h" using namespace ns3; diff --git a/scratch/multiple-sources/simple-simulation.cc b/scratch/multiple-sources/simple-simulation.cc index 03cb5f444..837f3a9ea 100644 --- a/scratch/multiple-sources/simple-simulation.cc +++ b/scratch/multiple-sources/simple-simulation.cc @@ -3,6 +3,7 @@ #include "ns3/core-module.h" #include "ns3/helper-module.h" #include "ns3/network-module.h" +#include "ns3/internet-module.h" using namespace ns3; diff --git a/scratch/simple.cc b/scratch/simple.cc index 27bdaee2e..cb29ea34b 100644 --- a/scratch/simple.cc +++ b/scratch/simple.cc @@ -3,6 +3,7 @@ #include "ns3/core-module.h" #include "ns3/helper-module.h" #include "ns3/network-module.h" +#include "ns3/internet-module.h" using namespace ns3; diff --git a/src/devices/bridge/examples/csma-bridge-one-hop.cc b/src/devices/bridge/examples/csma-bridge-one-hop.cc index 3d28a3deb..8d543e095 100644 --- a/src/devices/bridge/examples/csma-bridge-one-hop.cc +++ b/src/devices/bridge/examples/csma-bridge-one-hop.cc @@ -74,6 +74,7 @@ #include "ns3/helper-module.h" #include "ns3/applications-module.h" #include "ns3/bridge-module.h" +#include "ns3/csma-module.h" #include "ns3/ipv4-global-routing-helper.h" using namespace ns3; diff --git a/src/devices/bridge/examples/csma-bridge.cc b/src/devices/bridge/examples/csma-bridge.cc index 07fbba446..0f7b3095e 100644 --- a/src/devices/bridge/examples/csma-bridge.cc +++ b/src/devices/bridge/examples/csma-bridge.cc @@ -37,6 +37,7 @@ #include "ns3/helper-module.h" #include "ns3/applications-module.h" #include "ns3/bridge-module.h" +#include "ns3/csma-module.h" using namespace ns3; diff --git a/examples/csma/csma-broadcast.cc b/src/devices/csma/examples/csma-broadcast.cc similarity index 99% rename from examples/csma/csma-broadcast.cc rename to src/devices/csma/examples/csma-broadcast.cc index 2da6d8e00..a388b6e12 100644 --- a/examples/csma/csma-broadcast.cc +++ b/src/devices/csma/examples/csma-broadcast.cc @@ -35,6 +35,7 @@ #include "ns3/core-module.h" #include "ns3/network-module.h" #include "ns3/helper-module.h" +#include "ns3/csma-module.h" #include "ns3/applications-module.h" using namespace ns3; diff --git a/examples/csma/csma-multicast.cc b/src/devices/csma/examples/csma-multicast.cc similarity index 99% rename from examples/csma/csma-multicast.cc rename to src/devices/csma/examples/csma-multicast.cc index b91a28e39..75ce464e6 100644 --- a/examples/csma/csma-multicast.cc +++ b/src/devices/csma/examples/csma-multicast.cc @@ -35,6 +35,7 @@ #include "ns3/core-module.h" #include "ns3/network-module.h" #include "ns3/helper-module.h" +#include "ns3/csma-module.h" #include "ns3/applications-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/src/devices/csma/examples/csma-one-subnet.cc similarity index 99% rename from examples/csma/csma-one-subnet.cc rename to src/devices/csma/examples/csma-one-subnet.cc index 08ef7a539..70a762a76 100644 --- a/examples/csma/csma-one-subnet.cc +++ b/src/devices/csma/examples/csma-one-subnet.cc @@ -31,6 +31,7 @@ #include "ns3/core-module.h" #include "ns3/network-module.h" #include "ns3/helper-module.h" +#include "ns3/csma-module.h" #include "ns3/applications-module.h" using namespace ns3; diff --git a/examples/csma/csma-packet-socket.cc b/src/devices/csma/examples/csma-packet-socket.cc similarity index 99% rename from examples/csma/csma-packet-socket.cc rename to src/devices/csma/examples/csma-packet-socket.cc index e7ab69187..4088400ba 100644 --- a/examples/csma/csma-packet-socket.cc +++ b/src/devices/csma/examples/csma-packet-socket.cc @@ -35,6 +35,7 @@ #include "ns3/core-module.h" #include "ns3/network-module.h" #include "ns3/helper-module.h" +#include "ns3/csma-module.h" #include "ns3/applications-module.h" using namespace ns3; diff --git a/examples/csma/csma-ping.cc b/src/devices/csma/examples/csma-ping.cc similarity index 99% rename from examples/csma/csma-ping.cc rename to src/devices/csma/examples/csma-ping.cc index 09f4ea19c..54e4f7a2a 100644 --- a/examples/csma/csma-ping.cc +++ b/src/devices/csma/examples/csma-ping.cc @@ -31,6 +31,7 @@ #include "ns3/core-module.h" #include "ns3/network-module.h" #include "ns3/helper-module.h" +#include "ns3/csma-module.h" #include "ns3/applications-module.h" using namespace ns3; diff --git a/examples/csma/csma-raw-ip-socket.cc b/src/devices/csma/examples/csma-raw-ip-socket.cc similarity index 99% rename from examples/csma/csma-raw-ip-socket.cc rename to src/devices/csma/examples/csma-raw-ip-socket.cc index 41eba0d62..322535592 100644 --- a/examples/csma/csma-raw-ip-socket.cc +++ b/src/devices/csma/examples/csma-raw-ip-socket.cc @@ -34,6 +34,7 @@ #include "ns3/core-module.h" #include "ns3/network-module.h" #include "ns3/helper-module.h" +#include "ns3/csma-module.h" #include "ns3/applications-module.h" using namespace ns3; diff --git a/examples/csma/csma-star.cc b/src/devices/csma/examples/csma-star.cc similarity index 99% rename from examples/csma/csma-star.cc rename to src/devices/csma/examples/csma-star.cc index 8d7ac256d..d426771cc 100644 --- a/examples/csma/csma-star.cc +++ b/src/devices/csma/examples/csma-star.cc @@ -18,6 +18,7 @@ #include "ns3/core-module.h" #include "ns3/network-module.h" #include "ns3/helper-module.h" +#include "ns3/csma-star-helper.h" #include "ns3/applications-module.h" #include "ns3/csma-module.h" #include "ns3/ipv4-global-routing-helper.h" diff --git a/examples/csma/waf b/src/devices/csma/examples/waf similarity index 100% rename from examples/csma/waf rename to src/devices/csma/examples/waf diff --git a/examples/csma/wscript b/src/devices/csma/examples/wscript similarity index 100% rename from examples/csma/wscript rename to src/devices/csma/examples/wscript diff --git a/src/helper/csma-helper.cc b/src/devices/csma/helper/csma-helper.cc similarity index 100% rename from src/helper/csma-helper.cc rename to src/devices/csma/helper/csma-helper.cc diff --git a/src/helper/csma-helper.h b/src/devices/csma/helper/csma-helper.h similarity index 100% rename from src/helper/csma-helper.h rename to src/devices/csma/helper/csma-helper.h diff --git a/src/helper/csma-star-helper.cc b/src/devices/csma/helper/csma-star-helper.cc similarity index 100% rename from src/helper/csma-star-helper.cc rename to src/devices/csma/helper/csma-star-helper.cc diff --git a/src/helper/csma-star-helper.h b/src/devices/csma/helper/csma-star-helper.h similarity index 100% rename from src/helper/csma-star-helper.h rename to src/devices/csma/helper/csma-star-helper.h diff --git a/src/devices/csma/backoff.cc b/src/devices/csma/model/backoff.cc similarity index 100% rename from src/devices/csma/backoff.cc rename to src/devices/csma/model/backoff.cc diff --git a/src/devices/csma/backoff.h b/src/devices/csma/model/backoff.h similarity index 100% rename from src/devices/csma/backoff.h rename to src/devices/csma/model/backoff.h diff --git a/src/devices/csma/csma-channel.cc b/src/devices/csma/model/csma-channel.cc similarity index 100% rename from src/devices/csma/csma-channel.cc rename to src/devices/csma/model/csma-channel.cc diff --git a/src/devices/csma/csma-channel.h b/src/devices/csma/model/csma-channel.h similarity index 100% rename from src/devices/csma/csma-channel.h rename to src/devices/csma/model/csma-channel.h diff --git a/src/devices/csma/csma-net-device.cc b/src/devices/csma/model/csma-net-device.cc similarity index 100% rename from src/devices/csma/csma-net-device.cc rename to src/devices/csma/model/csma-net-device.cc diff --git a/src/devices/csma/csma-net-device.h b/src/devices/csma/model/csma-net-device.h similarity index 100% rename from src/devices/csma/csma-net-device.h rename to src/devices/csma/model/csma-net-device.h diff --git a/src/devices/csma/csma.h b/src/devices/csma/model/csma.h similarity index 100% rename from src/devices/csma/csma.h rename to src/devices/csma/model/csma.h diff --git a/src/devices/csma/wscript b/src/devices/csma/wscript index 8d77587e5..a8f574ebe 100644 --- a/src/devices/csma/wscript +++ b/src/devices/csma/wscript @@ -3,14 +3,21 @@ def build(bld): obj = bld.create_ns3_module('csma', ['network']) obj.source = [ - 'backoff.cc', - 'csma-net-device.cc', - 'csma-channel.cc', + 'model/backoff.cc', + 'model/csma-net-device.cc', + 'model/csma-channel.cc', + 'helper/csma-helper.cc', + 'helper/csma-star-helper.cc', ] headers = bld.new_task_gen('ns3header') headers.module = 'csma' headers.source = [ - 'backoff.h', - 'csma-net-device.h', - 'csma-channel.h', + 'model/backoff.h', + 'model/csma-net-device.h', + 'model/csma-channel.h', + 'helper/csma-helper.h', + 'helper/csma-star-helper.h', ] + + if bld.env['ENABLE_EXAMPLES']: + bld.add_subdirs('examples') diff --git a/src/devices/emu/emu.h b/src/devices/emu/doc/emu.h similarity index 100% rename from src/devices/emu/emu.h rename to src/devices/emu/doc/emu.h diff --git a/examples/emulation/emu-ping.cc b/src/devices/emu/examples/emu-ping.cc similarity index 98% rename from examples/emulation/emu-ping.cc rename to src/devices/emu/examples/emu-ping.cc index 3054d4810..16ceaa975 100644 --- a/examples/emulation/emu-ping.cc +++ b/src/devices/emu/examples/emu-ping.cc @@ -53,6 +53,7 @@ #include "ns3/abort.h" #include "ns3/core-module.h" +#include "ns3/internet-module.h" #include "ns3/network-module.h" #include "ns3/emu-module.h" #include "ns3/applications-module.h" @@ -88,7 +89,7 @@ main (int argc, char *argv[]) cmd.Parse (argc, argv); Ipv4Address remoteIp (remote.c_str ()); - Ipv4Address localIp ("1.2.3.4"); + Ipv4Address localIp ("192.168.1.94"); NS_ABORT_MSG_IF (localIp == "1.2.3.4", "You must change the local IP address before running this example"); Ipv4Mask localMask ("255.255.255.0"); @@ -170,7 +171,7 @@ main (int argc, char *argv[]) // the default gateway on your host and add it below, replacing the // "1.2.3.4" string. // - Ipv4Address gateway ("1.2.3.4"); + Ipv4Address gateway ("192.168.1.254"); NS_ABORT_MSG_IF (gateway == "1.2.3.4", "You must change the gateway IP address before running this example"); Ipv4StaticRoutingHelper ipv4RoutingHelper; diff --git a/examples/emulation/emu-udp-echo.cc b/src/devices/emu/examples/emu-udp-echo.cc similarity index 99% rename from examples/emulation/emu-udp-echo.cc rename to src/devices/emu/examples/emu-udp-echo.cc index 11339e814..b97bfe5cd 100644 --- a/examples/emulation/emu-udp-echo.cc +++ b/src/devices/emu/examples/emu-udp-echo.cc @@ -64,6 +64,7 @@ #include #include "ns3/core-module.h" #include "ns3/helper-module.h" +#include "ns3/internet-module.h" #include "ns3/applications-module.h" #include "ns3/emu-helper.h" diff --git a/examples/emulation/waf b/src/devices/emu/examples/waf similarity index 100% rename from examples/emulation/waf rename to src/devices/emu/examples/waf diff --git a/examples/emulation/wscript b/src/devices/emu/examples/wscript similarity index 100% rename from examples/emulation/wscript rename to src/devices/emu/examples/wscript diff --git a/src/helper/emu-helper.cc b/src/devices/emu/helper/emu-helper.cc similarity index 100% rename from src/helper/emu-helper.cc rename to src/devices/emu/helper/emu-helper.cc diff --git a/src/helper/emu-helper.h b/src/devices/emu/helper/emu-helper.h similarity index 100% rename from src/helper/emu-helper.h rename to src/devices/emu/helper/emu-helper.h diff --git a/src/devices/emu/emu-encode-decode.cc b/src/devices/emu/model/emu-encode-decode.cc similarity index 100% rename from src/devices/emu/emu-encode-decode.cc rename to src/devices/emu/model/emu-encode-decode.cc diff --git a/src/devices/emu/emu-encode-decode.h b/src/devices/emu/model/emu-encode-decode.h similarity index 100% rename from src/devices/emu/emu-encode-decode.h rename to src/devices/emu/model/emu-encode-decode.h diff --git a/src/devices/emu/emu-net-device.cc b/src/devices/emu/model/emu-net-device.cc similarity index 100% rename from src/devices/emu/emu-net-device.cc rename to src/devices/emu/model/emu-net-device.cc diff --git a/src/devices/emu/emu-net-device.h b/src/devices/emu/model/emu-net-device.h similarity index 100% rename from src/devices/emu/emu-net-device.h rename to src/devices/emu/model/emu-net-device.h diff --git a/src/devices/emu/emu-sock-creator.cc b/src/devices/emu/model/emu-sock-creator.cc similarity index 100% rename from src/devices/emu/emu-sock-creator.cc rename to src/devices/emu/model/emu-sock-creator.cc diff --git a/src/devices/emu/wscript b/src/devices/emu/wscript index 72ead4ade..043158ee4 100644 --- a/src/devices/emu/wscript +++ b/src/devices/emu/wscript @@ -26,23 +26,26 @@ def build(bld): headers = bld.new_task_gen('ns3header') headers.module = 'emu' headers.source = [ - 'emu.h', + 'doc/emu.h', ] env = bld.env_of_name('default') if env['ENABLE_EMU']: module.source.extend([ - 'emu-net-device.cc', - 'emu-encode-decode.cc', + 'model/emu-net-device.cc', + 'model/emu-encode-decode.cc', + 'helper/emu-helper.cc', ]) headers.source.extend([ - 'emu-net-device.h', + 'model/emu-net-device.h', + 'helper/emu-helper.h', ]) obj = bld.create_suid_program('emu-sock-creator') obj.source = [ - 'emu-sock-creator.cc', - 'emu-encode-decode.cc', + 'model/emu-sock-creator.cc', + 'model/emu-encode-decode.cc', ] - + if bld.env['ENABLE_EXAMPLES']: + bld.add_subdirs('examples') diff --git a/src/devices/lte/examples/lte-device.cc b/src/devices/lte/examples/lte-device.cc index b0a23a85f..3bd9c024c 100644 --- a/src/devices/lte/examples/lte-device.cc +++ b/src/devices/lte/examples/lte-device.cc @@ -16,6 +16,7 @@ #include "ns3/applications-module.h" #include "ns3/mobility-module.h" #include "ns3/contrib-module.h" +#include "ns3/internet-module.h" #include "ns3/lte-module.h" #include #include "ns3/global-route-manager.h" diff --git a/src/devices/lte/examples/lte-multiple-flows.cc b/src/devices/lte/examples/lte-multiple-flows.cc index be7f0871f..9872ece67 100644 --- a/src/devices/lte/examples/lte-multiple-flows.cc +++ b/src/devices/lte/examples/lte-multiple-flows.cc @@ -16,6 +16,7 @@ #include "ns3/applications-module.h" #include "ns3/mobility-module.h" #include "ns3/contrib-module.h" +#include "ns3/internet-module.h" #include "ns3/lte-module.h" #include #include "ns3/global-route-manager.h" diff --git a/src/devices/lte/examples/lte-phy-downlink.cc b/src/devices/lte/examples/lte-phy-downlink.cc index 76ac815d9..65d781c3c 100644 --- a/src/devices/lte/examples/lte-phy-downlink.cc +++ b/src/devices/lte/examples/lte-phy-downlink.cc @@ -47,14 +47,13 @@ * |+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++| */ -#include #include #include #include #include -#include #include #include +#include #include #include #include @@ -62,6 +61,9 @@ #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 642976099..a802020e4 100644 --- a/src/devices/lte/examples/lte-phy-uplink.cc +++ b/src/devices/lte/examples/lte-phy-uplink.cc @@ -57,6 +57,7 @@ #include #include #include +#include #include #include #include diff --git a/src/devices/point-to-point/point-to-point.h b/src/devices/point-to-point/doc/point-to-point.h similarity index 100% rename from src/devices/point-to-point/point-to-point.h rename to src/devices/point-to-point/doc/point-to-point.h diff --git a/src/helper/point-to-point-dumbbell-helper.cc b/src/devices/point-to-point/helper/point-to-point-dumbbell-helper.cc similarity index 100% rename from src/helper/point-to-point-dumbbell-helper.cc rename to src/devices/point-to-point/helper/point-to-point-dumbbell-helper.cc diff --git a/src/helper/point-to-point-dumbbell-helper.h b/src/devices/point-to-point/helper/point-to-point-dumbbell-helper.h similarity index 100% rename from src/helper/point-to-point-dumbbell-helper.h rename to src/devices/point-to-point/helper/point-to-point-dumbbell-helper.h diff --git a/src/helper/point-to-point-grid-helper.cc b/src/devices/point-to-point/helper/point-to-point-grid-helper.cc similarity index 100% rename from src/helper/point-to-point-grid-helper.cc rename to src/devices/point-to-point/helper/point-to-point-grid-helper.cc diff --git a/src/helper/point-to-point-grid-helper.h b/src/devices/point-to-point/helper/point-to-point-grid-helper.h similarity index 100% rename from src/helper/point-to-point-grid-helper.h rename to src/devices/point-to-point/helper/point-to-point-grid-helper.h diff --git a/src/helper/point-to-point-helper.cc b/src/devices/point-to-point/helper/point-to-point-helper.cc similarity index 100% rename from src/helper/point-to-point-helper.cc rename to src/devices/point-to-point/helper/point-to-point-helper.cc diff --git a/src/helper/point-to-point-helper.h b/src/devices/point-to-point/helper/point-to-point-helper.h similarity index 100% rename from src/helper/point-to-point-helper.h rename to src/devices/point-to-point/helper/point-to-point-helper.h diff --git a/src/helper/point-to-point-star-helper.cc b/src/devices/point-to-point/helper/point-to-point-star-helper.cc similarity index 100% rename from src/helper/point-to-point-star-helper.cc rename to src/devices/point-to-point/helper/point-to-point-star-helper.cc diff --git a/src/helper/point-to-point-star-helper.h b/src/devices/point-to-point/helper/point-to-point-star-helper.h similarity index 100% rename from src/helper/point-to-point-star-helper.h rename to src/devices/point-to-point/helper/point-to-point-star-helper.h diff --git a/src/devices/point-to-point/point-to-point-channel.cc b/src/devices/point-to-point/model/point-to-point-channel.cc similarity index 100% rename from src/devices/point-to-point/point-to-point-channel.cc rename to src/devices/point-to-point/model/point-to-point-channel.cc diff --git a/src/devices/point-to-point/point-to-point-channel.h b/src/devices/point-to-point/model/point-to-point-channel.h similarity index 100% rename from src/devices/point-to-point/point-to-point-channel.h rename to src/devices/point-to-point/model/point-to-point-channel.h diff --git a/src/devices/point-to-point/point-to-point-net-device.cc b/src/devices/point-to-point/model/point-to-point-net-device.cc similarity index 100% rename from src/devices/point-to-point/point-to-point-net-device.cc rename to src/devices/point-to-point/model/point-to-point-net-device.cc diff --git a/src/devices/point-to-point/point-to-point-net-device.h b/src/devices/point-to-point/model/point-to-point-net-device.h similarity index 100% rename from src/devices/point-to-point/point-to-point-net-device.h rename to src/devices/point-to-point/model/point-to-point-net-device.h diff --git a/src/devices/point-to-point/point-to-point-remote-channel.cc b/src/devices/point-to-point/model/point-to-point-remote-channel.cc similarity index 100% rename from src/devices/point-to-point/point-to-point-remote-channel.cc rename to src/devices/point-to-point/model/point-to-point-remote-channel.cc diff --git a/src/devices/point-to-point/point-to-point-remote-channel.h b/src/devices/point-to-point/model/point-to-point-remote-channel.h similarity index 100% rename from src/devices/point-to-point/point-to-point-remote-channel.h rename to src/devices/point-to-point/model/point-to-point-remote-channel.h diff --git a/src/devices/point-to-point/point-to-point-test.cc b/src/devices/point-to-point/model/point-to-point-test.cc similarity index 100% rename from src/devices/point-to-point/point-to-point-test.cc rename to src/devices/point-to-point/model/point-to-point-test.cc diff --git a/src/devices/point-to-point/ppp-header.cc b/src/devices/point-to-point/model/ppp-header.cc similarity index 100% rename from src/devices/point-to-point/ppp-header.cc rename to src/devices/point-to-point/model/ppp-header.cc diff --git a/src/devices/point-to-point/ppp-header.h b/src/devices/point-to-point/model/ppp-header.h similarity index 100% rename from src/devices/point-to-point/ppp-header.h rename to src/devices/point-to-point/model/ppp-header.h diff --git a/src/devices/point-to-point/wscript b/src/devices/point-to-point/wscript index e738b3b41..9f58054a5 100644 --- a/src/devices/point-to-point/wscript +++ b/src/devices/point-to-point/wscript @@ -4,18 +4,26 @@ def build(bld): module = bld.create_ns3_module('point-to-point', ['network', 'mpi']) module.source = [ - 'point-to-point-net-device.cc', - 'point-to-point-channel.cc', - 'point-to-point-remote-channel.cc', - 'point-to-point-test.cc', - 'ppp-header.cc', + 'model/point-to-point-net-device.cc', + 'model/point-to-point-channel.cc', + 'model/point-to-point-remote-channel.cc', + 'model/point-to-point-test.cc', + 'model/ppp-header.cc', + 'helper/point-to-point-helper.cc', + 'helper/point-to-point-grid-helper.cc', + 'helper/point-to-point-dumbbell-helper.cc', + 'helper/point-to-point-star-helper.cc', ] headers = bld.new_task_gen('ns3header') headers.module = 'point-to-point' headers.source = [ - 'point-to-point-net-device.h', - 'point-to-point-channel.h', - 'point-to-point-remote-channel.h', - 'ppp-header.h', + 'model/point-to-point-net-device.h', + 'model/point-to-point-channel.h', + 'model/point-to-point-remote-channel.h', + 'model/ppp-header.h', + 'helper/point-to-point-helper.h', + 'helper/point-to-point-grid-helper.h', + 'helper/point-to-point-dumbbell-helper.h', + 'helper/point-to-point-star-helper.h', ] diff --git a/src/devices/tap-bridge/tap.h b/src/devices/tap-bridge/doc/tap.h similarity index 100% rename from src/devices/tap-bridge/tap.h rename to src/devices/tap-bridge/doc/tap.h diff --git a/examples/tap/lxc-left.conf b/src/devices/tap-bridge/examples/lxc-left.conf similarity index 100% rename from examples/tap/lxc-left.conf rename to src/devices/tap-bridge/examples/lxc-left.conf diff --git a/examples/tap/lxc-right.conf b/src/devices/tap-bridge/examples/lxc-right.conf similarity index 100% rename from examples/tap/lxc-right.conf rename to src/devices/tap-bridge/examples/lxc-right.conf diff --git a/examples/tap/tap-csma-virtual-machine.cc b/src/devices/tap-bridge/examples/tap-csma-virtual-machine.cc similarity index 98% rename from examples/tap/tap-csma-virtual-machine.cc rename to src/devices/tap-bridge/examples/tap-csma-virtual-machine.cc index 2d639357f..d76b7b971 100644 --- a/examples/tap/tap-csma-virtual-machine.cc +++ b/src/devices/tap-bridge/examples/tap-csma-virtual-machine.cc @@ -64,6 +64,8 @@ #include "ns3/core-module.h" #include "ns3/network-module.h" #include "ns3/helper-module.h" +#include "ns3/csma-module.h" +#include "ns3/tap-bridge-module.h" using namespace ns3; diff --git a/examples/tap/tap-csma-virtual-machine.py b/src/devices/tap-bridge/examples/tap-csma-virtual-machine.py similarity index 100% rename from examples/tap/tap-csma-virtual-machine.py rename to src/devices/tap-bridge/examples/tap-csma-virtual-machine.py diff --git a/examples/tap/tap-csma.cc b/src/devices/tap-bridge/examples/tap-csma.cc similarity index 97% rename from examples/tap/tap-csma.cc rename to src/devices/tap-bridge/examples/tap-csma.cc index 32aa3ace2..c78975bb1 100644 --- a/examples/tap/tap-csma.cc +++ b/src/devices/tap-bridge/examples/tap-csma.cc @@ -61,7 +61,10 @@ #include "ns3/network-module.h" #include "ns3/wifi-module.h" #include "ns3/helper-module.h" +#include "ns3/csma-module.h" +#include "ns3/internet-module.h" #include "ns3/ipv4-global-routing-helper.h" +#include "ns3/tap-bridge-module.h" using namespace ns3; diff --git a/examples/tap/tap-wifi-dumbbell.cc b/src/devices/tap-bridge/examples/tap-wifi-dumbbell.cc similarity index 98% rename from examples/tap/tap-wifi-dumbbell.cc rename to src/devices/tap-bridge/examples/tap-wifi-dumbbell.cc index 6ddaa7263..f2069a382 100644 --- a/examples/tap/tap-wifi-dumbbell.cc +++ b/src/devices/tap-bridge/examples/tap-wifi-dumbbell.cc @@ -102,10 +102,14 @@ #include "ns3/core-module.h" #include "ns3/network-module.h" #include "ns3/mobility-module.h" +#include "ns3/point-to-point-module.h" #include "ns3/wifi-module.h" +#include "ns3/internet-module.h" #include "ns3/helper-module.h" +#include "ns3/csma-module.h" #include "ns3/applications-module.h" #include "ns3/ipv4-global-routing-helper.h" +#include "ns3/tap-bridge-module.h" using namespace ns3; diff --git a/examples/tap/tap-wifi-virtual-machine.cc b/src/devices/tap-bridge/examples/tap-wifi-virtual-machine.cc similarity index 99% rename from examples/tap/tap-wifi-virtual-machine.cc rename to src/devices/tap-bridge/examples/tap-wifi-virtual-machine.cc index 5a85c49e2..4dbf209d6 100644 --- a/examples/tap/tap-wifi-virtual-machine.cc +++ b/src/devices/tap-bridge/examples/tap-wifi-virtual-machine.cc @@ -74,6 +74,7 @@ #include "ns3/mobility-module.h" #include "ns3/wifi-module.h" #include "ns3/helper-module.h" +#include "ns3/tap-bridge-module.h" using namespace ns3; diff --git a/examples/tap/tap-wifi-virtual-machine.py b/src/devices/tap-bridge/examples/tap-wifi-virtual-machine.py similarity index 100% rename from examples/tap/tap-wifi-virtual-machine.py rename to src/devices/tap-bridge/examples/tap-wifi-virtual-machine.py diff --git a/examples/tap/virtual-network-setup.sh b/src/devices/tap-bridge/examples/virtual-network-setup.sh similarity index 100% rename from examples/tap/virtual-network-setup.sh rename to src/devices/tap-bridge/examples/virtual-network-setup.sh diff --git a/examples/tap/virtual-network-teardown.sh b/src/devices/tap-bridge/examples/virtual-network-teardown.sh similarity index 100% rename from examples/tap/virtual-network-teardown.sh rename to src/devices/tap-bridge/examples/virtual-network-teardown.sh diff --git a/examples/tap/waf b/src/devices/tap-bridge/examples/waf similarity index 100% rename from examples/tap/waf rename to src/devices/tap-bridge/examples/waf diff --git a/examples/tap/wscript b/src/devices/tap-bridge/examples/wscript similarity index 100% rename from examples/tap/wscript rename to src/devices/tap-bridge/examples/wscript diff --git a/src/helper/tap-bridge-helper.cc b/src/devices/tap-bridge/helper/tap-bridge-helper.cc similarity index 100% rename from src/helper/tap-bridge-helper.cc rename to src/devices/tap-bridge/helper/tap-bridge-helper.cc diff --git a/src/helper/tap-bridge-helper.h b/src/devices/tap-bridge/helper/tap-bridge-helper.h similarity index 100% rename from src/helper/tap-bridge-helper.h rename to src/devices/tap-bridge/helper/tap-bridge-helper.h diff --git a/src/devices/tap-bridge/tap-bridge.cc b/src/devices/tap-bridge/model/tap-bridge.cc similarity index 100% rename from src/devices/tap-bridge/tap-bridge.cc rename to src/devices/tap-bridge/model/tap-bridge.cc diff --git a/src/devices/tap-bridge/tap-bridge.h b/src/devices/tap-bridge/model/tap-bridge.h similarity index 100% rename from src/devices/tap-bridge/tap-bridge.h rename to src/devices/tap-bridge/model/tap-bridge.h diff --git a/src/devices/tap-bridge/tap-creator.cc b/src/devices/tap-bridge/model/tap-creator.cc similarity index 100% rename from src/devices/tap-bridge/tap-creator.cc rename to src/devices/tap-bridge/model/tap-creator.cc diff --git a/src/devices/tap-bridge/tap-encode-decode.cc b/src/devices/tap-bridge/model/tap-encode-decode.cc similarity index 100% rename from src/devices/tap-bridge/tap-encode-decode.cc rename to src/devices/tap-bridge/model/tap-encode-decode.cc diff --git a/src/devices/tap-bridge/tap-encode-decode.h b/src/devices/tap-bridge/model/tap-encode-decode.h similarity index 100% rename from src/devices/tap-bridge/tap-encode-decode.h rename to src/devices/tap-bridge/model/tap-encode-decode.h diff --git a/src/devices/tap-bridge/wscript b/src/devices/tap-bridge/wscript index dabbba7d0..ba1ac911e 100644 --- a/src/devices/tap-bridge/wscript +++ b/src/devices/tap-bridge/wscript @@ -26,25 +26,28 @@ def build(bld): headers = bld.new_task_gen('ns3header') headers.module = 'tap-bridge' headers.source = [ - 'tap.h', + 'doc/tap.h', ] env = bld.env_of_name('default') if env['ENABLE_TAP']: module.source.extend([ - 'tap-bridge.cc', - 'tap-encode-decode.cc', + 'model/tap-bridge.cc', + 'model/tap-encode-decode.cc', + 'helper/tap-bridge-helper.cc', ]) headers.source.extend([ - 'tap-bridge.h', + 'model/tap-bridge.h', + 'helper/tap-bridge-helper.h', ]) if not env['PLATFORM'].startswith('freebsd'): obj = bld.create_suid_program('tap-creator') obj.source = [ - 'tap-creator.cc', - 'tap-encode-decode.cc', + 'model/tap-creator.cc', + 'model/tap-encode-decode.cc', ] - + if bld.env['ENABLE_EXAMPLES']: + bld.add_subdirs('examples') 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 c0fddd81f..2ae8cef3e 100644 --- a/src/devices/virtual-net-device/examples/virtual-net-device.cc +++ b/src/devices/virtual-net-device/examples/virtual-net-device.cc @@ -54,6 +54,8 @@ #include "ns3/core-module.h" #include "ns3/network-module.h" #include "ns3/helper-module.h" +#include "ns3/internet-module.h" +#include "ns3/point-to-point-module.h" #include "ns3/applications-module.h" #include "ns3/virtual-net-device.h" #include "ns3/ipv4-global-routing-helper.h" diff --git a/src/devices/wifi/wifi.h b/src/devices/wifi/doc/wifi.h similarity index 100% rename from src/devices/wifi/wifi.h rename to src/devices/wifi/doc/wifi.h diff --git a/src/helper/nqos-wifi-mac-helper.cc b/src/devices/wifi/helper/nqos-wifi-mac-helper.cc similarity index 100% rename from src/helper/nqos-wifi-mac-helper.cc rename to src/devices/wifi/helper/nqos-wifi-mac-helper.cc diff --git a/src/helper/nqos-wifi-mac-helper.h b/src/devices/wifi/helper/nqos-wifi-mac-helper.h similarity index 100% rename from src/helper/nqos-wifi-mac-helper.h rename to src/devices/wifi/helper/nqos-wifi-mac-helper.h diff --git a/src/helper/qos-wifi-mac-helper.cc b/src/devices/wifi/helper/qos-wifi-mac-helper.cc similarity index 100% rename from src/helper/qos-wifi-mac-helper.cc rename to src/devices/wifi/helper/qos-wifi-mac-helper.cc diff --git a/src/helper/qos-wifi-mac-helper.h b/src/devices/wifi/helper/qos-wifi-mac-helper.h similarity index 100% rename from src/helper/qos-wifi-mac-helper.h rename to src/devices/wifi/helper/qos-wifi-mac-helper.h diff --git a/src/helper/wifi-helper.cc b/src/devices/wifi/helper/wifi-helper.cc similarity index 100% rename from src/helper/wifi-helper.cc rename to src/devices/wifi/helper/wifi-helper.cc diff --git a/src/helper/wifi-helper.h b/src/devices/wifi/helper/wifi-helper.h similarity index 100% rename from src/helper/wifi-helper.h rename to src/devices/wifi/helper/wifi-helper.h diff --git a/src/helper/yans-wifi-helper.cc b/src/devices/wifi/helper/yans-wifi-helper.cc similarity index 100% rename from src/helper/yans-wifi-helper.cc rename to src/devices/wifi/helper/yans-wifi-helper.cc diff --git a/src/helper/yans-wifi-helper.h b/src/devices/wifi/helper/yans-wifi-helper.h similarity index 100% rename from src/helper/yans-wifi-helper.h rename to src/devices/wifi/helper/yans-wifi-helper.h diff --git a/src/devices/wifi/aarf-wifi-manager.cc b/src/devices/wifi/model/aarf-wifi-manager.cc similarity index 100% rename from src/devices/wifi/aarf-wifi-manager.cc rename to src/devices/wifi/model/aarf-wifi-manager.cc diff --git a/src/devices/wifi/aarf-wifi-manager.h b/src/devices/wifi/model/aarf-wifi-manager.h similarity index 100% rename from src/devices/wifi/aarf-wifi-manager.h rename to src/devices/wifi/model/aarf-wifi-manager.h diff --git a/src/devices/wifi/aarfcd-wifi-manager.cc b/src/devices/wifi/model/aarfcd-wifi-manager.cc similarity index 100% rename from src/devices/wifi/aarfcd-wifi-manager.cc rename to src/devices/wifi/model/aarfcd-wifi-manager.cc diff --git a/src/devices/wifi/aarfcd-wifi-manager.h b/src/devices/wifi/model/aarfcd-wifi-manager.h similarity index 100% rename from src/devices/wifi/aarfcd-wifi-manager.h rename to src/devices/wifi/model/aarfcd-wifi-manager.h diff --git a/src/devices/wifi/adhoc-wifi-mac.cc b/src/devices/wifi/model/adhoc-wifi-mac.cc similarity index 100% rename from src/devices/wifi/adhoc-wifi-mac.cc rename to src/devices/wifi/model/adhoc-wifi-mac.cc diff --git a/src/devices/wifi/adhoc-wifi-mac.h b/src/devices/wifi/model/adhoc-wifi-mac.h similarity index 100% rename from src/devices/wifi/adhoc-wifi-mac.h rename to src/devices/wifi/model/adhoc-wifi-mac.h diff --git a/src/devices/wifi/amrr-wifi-manager.cc b/src/devices/wifi/model/amrr-wifi-manager.cc similarity index 100% rename from src/devices/wifi/amrr-wifi-manager.cc rename to src/devices/wifi/model/amrr-wifi-manager.cc diff --git a/src/devices/wifi/amrr-wifi-manager.h b/src/devices/wifi/model/amrr-wifi-manager.h similarity index 100% rename from src/devices/wifi/amrr-wifi-manager.h rename to src/devices/wifi/model/amrr-wifi-manager.h diff --git a/src/devices/wifi/amsdu-subframe-header.cc b/src/devices/wifi/model/amsdu-subframe-header.cc similarity index 100% rename from src/devices/wifi/amsdu-subframe-header.cc rename to src/devices/wifi/model/amsdu-subframe-header.cc diff --git a/src/devices/wifi/amsdu-subframe-header.h b/src/devices/wifi/model/amsdu-subframe-header.h similarity index 100% rename from src/devices/wifi/amsdu-subframe-header.h rename to src/devices/wifi/model/amsdu-subframe-header.h diff --git a/src/devices/wifi/ap-wifi-mac.cc b/src/devices/wifi/model/ap-wifi-mac.cc similarity index 100% rename from src/devices/wifi/ap-wifi-mac.cc rename to src/devices/wifi/model/ap-wifi-mac.cc diff --git a/src/devices/wifi/ap-wifi-mac.h b/src/devices/wifi/model/ap-wifi-mac.h similarity index 100% rename from src/devices/wifi/ap-wifi-mac.h rename to src/devices/wifi/model/ap-wifi-mac.h diff --git a/src/devices/wifi/arf-wifi-manager.cc b/src/devices/wifi/model/arf-wifi-manager.cc similarity index 100% rename from src/devices/wifi/arf-wifi-manager.cc rename to src/devices/wifi/model/arf-wifi-manager.cc diff --git a/src/devices/wifi/arf-wifi-manager.h b/src/devices/wifi/model/arf-wifi-manager.h similarity index 100% rename from src/devices/wifi/arf-wifi-manager.h rename to src/devices/wifi/model/arf-wifi-manager.h diff --git a/src/devices/wifi/block-ack-agreement.cc b/src/devices/wifi/model/block-ack-agreement.cc similarity index 100% rename from src/devices/wifi/block-ack-agreement.cc rename to src/devices/wifi/model/block-ack-agreement.cc diff --git a/src/devices/wifi/block-ack-agreement.h b/src/devices/wifi/model/block-ack-agreement.h similarity index 100% rename from src/devices/wifi/block-ack-agreement.h rename to src/devices/wifi/model/block-ack-agreement.h diff --git a/src/devices/wifi/block-ack-cache.cc b/src/devices/wifi/model/block-ack-cache.cc similarity index 100% rename from src/devices/wifi/block-ack-cache.cc rename to src/devices/wifi/model/block-ack-cache.cc diff --git a/src/devices/wifi/block-ack-cache.h b/src/devices/wifi/model/block-ack-cache.h similarity index 100% rename from src/devices/wifi/block-ack-cache.h rename to src/devices/wifi/model/block-ack-cache.h diff --git a/src/devices/wifi/block-ack-manager.cc b/src/devices/wifi/model/block-ack-manager.cc similarity index 100% rename from src/devices/wifi/block-ack-manager.cc rename to src/devices/wifi/model/block-ack-manager.cc diff --git a/src/devices/wifi/block-ack-manager.h b/src/devices/wifi/model/block-ack-manager.h similarity index 100% rename from src/devices/wifi/block-ack-manager.h rename to src/devices/wifi/model/block-ack-manager.h diff --git a/src/devices/wifi/block-ack-test-suite.cc b/src/devices/wifi/model/block-ack-test-suite.cc similarity index 100% rename from src/devices/wifi/block-ack-test-suite.cc rename to src/devices/wifi/model/block-ack-test-suite.cc diff --git a/src/devices/wifi/capability-information.cc b/src/devices/wifi/model/capability-information.cc similarity index 100% rename from src/devices/wifi/capability-information.cc rename to src/devices/wifi/model/capability-information.cc diff --git a/src/devices/wifi/capability-information.h b/src/devices/wifi/model/capability-information.h similarity index 100% rename from src/devices/wifi/capability-information.h rename to src/devices/wifi/model/capability-information.h diff --git a/src/devices/wifi/cara-wifi-manager.cc b/src/devices/wifi/model/cara-wifi-manager.cc similarity index 100% rename from src/devices/wifi/cara-wifi-manager.cc rename to src/devices/wifi/model/cara-wifi-manager.cc diff --git a/src/devices/wifi/cara-wifi-manager.h b/src/devices/wifi/model/cara-wifi-manager.h similarity index 100% rename from src/devices/wifi/cara-wifi-manager.h rename to src/devices/wifi/model/cara-wifi-manager.h diff --git a/src/devices/wifi/constant-rate-wifi-manager.cc b/src/devices/wifi/model/constant-rate-wifi-manager.cc similarity index 100% rename from src/devices/wifi/constant-rate-wifi-manager.cc rename to src/devices/wifi/model/constant-rate-wifi-manager.cc diff --git a/src/devices/wifi/constant-rate-wifi-manager.h b/src/devices/wifi/model/constant-rate-wifi-manager.h similarity index 100% rename from src/devices/wifi/constant-rate-wifi-manager.h rename to src/devices/wifi/model/constant-rate-wifi-manager.h diff --git a/src/devices/wifi/ctrl-headers.cc b/src/devices/wifi/model/ctrl-headers.cc similarity index 100% rename from src/devices/wifi/ctrl-headers.cc rename to src/devices/wifi/model/ctrl-headers.cc diff --git a/src/devices/wifi/ctrl-headers.h b/src/devices/wifi/model/ctrl-headers.h similarity index 100% rename from src/devices/wifi/ctrl-headers.h rename to src/devices/wifi/model/ctrl-headers.h diff --git a/src/devices/wifi/dca-txop.cc b/src/devices/wifi/model/dca-txop.cc similarity index 100% rename from src/devices/wifi/dca-txop.cc rename to src/devices/wifi/model/dca-txop.cc diff --git a/src/devices/wifi/dca-txop.h b/src/devices/wifi/model/dca-txop.h similarity index 100% rename from src/devices/wifi/dca-txop.h rename to src/devices/wifi/model/dca-txop.h diff --git a/src/devices/wifi/dcf-manager-test.cc b/src/devices/wifi/model/dcf-manager-test.cc similarity index 100% rename from src/devices/wifi/dcf-manager-test.cc rename to src/devices/wifi/model/dcf-manager-test.cc diff --git a/src/devices/wifi/dcf-manager.cc b/src/devices/wifi/model/dcf-manager.cc similarity index 100% rename from src/devices/wifi/dcf-manager.cc rename to src/devices/wifi/model/dcf-manager.cc diff --git a/src/devices/wifi/dcf-manager.h b/src/devices/wifi/model/dcf-manager.h similarity index 100% rename from src/devices/wifi/dcf-manager.h rename to src/devices/wifi/model/dcf-manager.h diff --git a/src/devices/wifi/dcf.cc b/src/devices/wifi/model/dcf.cc similarity index 100% rename from src/devices/wifi/dcf.cc rename to src/devices/wifi/model/dcf.cc diff --git a/src/devices/wifi/dcf.h b/src/devices/wifi/model/dcf.h similarity index 100% rename from src/devices/wifi/dcf.h rename to src/devices/wifi/model/dcf.h diff --git a/src/devices/wifi/dsss-error-rate-model.cc b/src/devices/wifi/model/dsss-error-rate-model.cc similarity index 100% rename from src/devices/wifi/dsss-error-rate-model.cc rename to src/devices/wifi/model/dsss-error-rate-model.cc diff --git a/src/devices/wifi/dsss-error-rate-model.h b/src/devices/wifi/model/dsss-error-rate-model.h similarity index 100% rename from src/devices/wifi/dsss-error-rate-model.h rename to src/devices/wifi/model/dsss-error-rate-model.h diff --git a/src/devices/wifi/edca-txop-n.cc b/src/devices/wifi/model/edca-txop-n.cc similarity index 100% rename from src/devices/wifi/edca-txop-n.cc rename to src/devices/wifi/model/edca-txop-n.cc diff --git a/src/devices/wifi/edca-txop-n.h b/src/devices/wifi/model/edca-txop-n.h similarity index 100% rename from src/devices/wifi/edca-txop-n.h rename to src/devices/wifi/model/edca-txop-n.h diff --git a/src/devices/wifi/error-rate-model.cc b/src/devices/wifi/model/error-rate-model.cc similarity index 100% rename from src/devices/wifi/error-rate-model.cc rename to src/devices/wifi/model/error-rate-model.cc diff --git a/src/devices/wifi/error-rate-model.h b/src/devices/wifi/model/error-rate-model.h similarity index 100% rename from src/devices/wifi/error-rate-model.h rename to src/devices/wifi/model/error-rate-model.h diff --git a/src/devices/wifi/ideal-wifi-manager.cc b/src/devices/wifi/model/ideal-wifi-manager.cc similarity index 100% rename from src/devices/wifi/ideal-wifi-manager.cc rename to src/devices/wifi/model/ideal-wifi-manager.cc diff --git a/src/devices/wifi/ideal-wifi-manager.h b/src/devices/wifi/model/ideal-wifi-manager.h similarity index 100% rename from src/devices/wifi/ideal-wifi-manager.h rename to src/devices/wifi/model/ideal-wifi-manager.h diff --git a/src/devices/wifi/interference-helper-tx-duration-test.cc b/src/devices/wifi/model/interference-helper-tx-duration-test.cc similarity index 100% rename from src/devices/wifi/interference-helper-tx-duration-test.cc rename to src/devices/wifi/model/interference-helper-tx-duration-test.cc diff --git a/src/devices/wifi/interference-helper.cc b/src/devices/wifi/model/interference-helper.cc similarity index 100% rename from src/devices/wifi/interference-helper.cc rename to src/devices/wifi/model/interference-helper.cc diff --git a/src/devices/wifi/interference-helper.h b/src/devices/wifi/model/interference-helper.h similarity index 100% rename from src/devices/wifi/interference-helper.h rename to src/devices/wifi/model/interference-helper.h diff --git a/src/devices/wifi/mac-low.cc b/src/devices/wifi/model/mac-low.cc similarity index 100% rename from src/devices/wifi/mac-low.cc rename to src/devices/wifi/model/mac-low.cc diff --git a/src/devices/wifi/mac-low.h b/src/devices/wifi/model/mac-low.h similarity index 100% rename from src/devices/wifi/mac-low.h rename to src/devices/wifi/model/mac-low.h diff --git a/src/devices/wifi/mac-rx-middle.cc b/src/devices/wifi/model/mac-rx-middle.cc similarity index 100% rename from src/devices/wifi/mac-rx-middle.cc rename to src/devices/wifi/model/mac-rx-middle.cc diff --git a/src/devices/wifi/mac-rx-middle.h b/src/devices/wifi/model/mac-rx-middle.h similarity index 100% rename from src/devices/wifi/mac-rx-middle.h rename to src/devices/wifi/model/mac-rx-middle.h diff --git a/src/devices/wifi/mac-tx-middle.cc b/src/devices/wifi/model/mac-tx-middle.cc similarity index 100% rename from src/devices/wifi/mac-tx-middle.cc rename to src/devices/wifi/model/mac-tx-middle.cc diff --git a/src/devices/wifi/mac-tx-middle.h b/src/devices/wifi/model/mac-tx-middle.h similarity index 100% rename from src/devices/wifi/mac-tx-middle.h rename to src/devices/wifi/model/mac-tx-middle.h diff --git a/src/devices/wifi/mgt-headers.cc b/src/devices/wifi/model/mgt-headers.cc similarity index 100% rename from src/devices/wifi/mgt-headers.cc rename to src/devices/wifi/model/mgt-headers.cc diff --git a/src/devices/wifi/mgt-headers.h b/src/devices/wifi/model/mgt-headers.h similarity index 100% rename from src/devices/wifi/mgt-headers.h rename to src/devices/wifi/model/mgt-headers.h diff --git a/src/devices/wifi/minstrel-wifi-manager.cc b/src/devices/wifi/model/minstrel-wifi-manager.cc similarity index 100% rename from src/devices/wifi/minstrel-wifi-manager.cc rename to src/devices/wifi/model/minstrel-wifi-manager.cc diff --git a/src/devices/wifi/minstrel-wifi-manager.h b/src/devices/wifi/model/minstrel-wifi-manager.h similarity index 100% rename from src/devices/wifi/minstrel-wifi-manager.h rename to src/devices/wifi/model/minstrel-wifi-manager.h diff --git a/src/devices/wifi/msdu-aggregator.cc b/src/devices/wifi/model/msdu-aggregator.cc similarity index 100% rename from src/devices/wifi/msdu-aggregator.cc rename to src/devices/wifi/model/msdu-aggregator.cc diff --git a/src/devices/wifi/msdu-aggregator.h b/src/devices/wifi/model/msdu-aggregator.h similarity index 100% rename from src/devices/wifi/msdu-aggregator.h rename to src/devices/wifi/model/msdu-aggregator.h diff --git a/src/devices/wifi/msdu-standard-aggregator.cc b/src/devices/wifi/model/msdu-standard-aggregator.cc similarity index 100% rename from src/devices/wifi/msdu-standard-aggregator.cc rename to src/devices/wifi/model/msdu-standard-aggregator.cc diff --git a/src/devices/wifi/msdu-standard-aggregator.h b/src/devices/wifi/model/msdu-standard-aggregator.h similarity index 100% rename from src/devices/wifi/msdu-standard-aggregator.h rename to src/devices/wifi/model/msdu-standard-aggregator.h diff --git a/src/devices/wifi/nist-error-rate-model.cc b/src/devices/wifi/model/nist-error-rate-model.cc similarity index 100% rename from src/devices/wifi/nist-error-rate-model.cc rename to src/devices/wifi/model/nist-error-rate-model.cc diff --git a/src/devices/wifi/nist-error-rate-model.h b/src/devices/wifi/model/nist-error-rate-model.h similarity index 100% rename from src/devices/wifi/nist-error-rate-model.h rename to src/devices/wifi/model/nist-error-rate-model.h diff --git a/src/devices/wifi/onoe-wifi-manager.cc b/src/devices/wifi/model/onoe-wifi-manager.cc similarity index 100% rename from src/devices/wifi/onoe-wifi-manager.cc rename to src/devices/wifi/model/onoe-wifi-manager.cc diff --git a/src/devices/wifi/onoe-wifi-manager.h b/src/devices/wifi/model/onoe-wifi-manager.h similarity index 100% rename from src/devices/wifi/onoe-wifi-manager.h rename to src/devices/wifi/model/onoe-wifi-manager.h diff --git a/src/devices/wifi/originator-block-ack-agreement.cc b/src/devices/wifi/model/originator-block-ack-agreement.cc similarity index 100% rename from src/devices/wifi/originator-block-ack-agreement.cc rename to src/devices/wifi/model/originator-block-ack-agreement.cc diff --git a/src/devices/wifi/originator-block-ack-agreement.h b/src/devices/wifi/model/originator-block-ack-agreement.h similarity index 100% rename from src/devices/wifi/originator-block-ack-agreement.h rename to src/devices/wifi/model/originator-block-ack-agreement.h diff --git a/src/devices/wifi/qos-blocked-destinations.cc b/src/devices/wifi/model/qos-blocked-destinations.cc similarity index 100% rename from src/devices/wifi/qos-blocked-destinations.cc rename to src/devices/wifi/model/qos-blocked-destinations.cc diff --git a/src/devices/wifi/qos-blocked-destinations.h b/src/devices/wifi/model/qos-blocked-destinations.h similarity index 100% rename from src/devices/wifi/qos-blocked-destinations.h rename to src/devices/wifi/model/qos-blocked-destinations.h diff --git a/src/devices/wifi/qos-tag.cc b/src/devices/wifi/model/qos-tag.cc similarity index 100% rename from src/devices/wifi/qos-tag.cc rename to src/devices/wifi/model/qos-tag.cc diff --git a/src/devices/wifi/qos-tag.h b/src/devices/wifi/model/qos-tag.h similarity index 100% rename from src/devices/wifi/qos-tag.h rename to src/devices/wifi/model/qos-tag.h diff --git a/src/devices/wifi/qos-utils.cc b/src/devices/wifi/model/qos-utils.cc similarity index 100% rename from src/devices/wifi/qos-utils.cc rename to src/devices/wifi/model/qos-utils.cc diff --git a/src/devices/wifi/qos-utils.h b/src/devices/wifi/model/qos-utils.h similarity index 100% rename from src/devices/wifi/qos-utils.h rename to src/devices/wifi/model/qos-utils.h diff --git a/src/devices/wifi/random-stream.cc b/src/devices/wifi/model/random-stream.cc similarity index 100% rename from src/devices/wifi/random-stream.cc rename to src/devices/wifi/model/random-stream.cc diff --git a/src/devices/wifi/random-stream.h b/src/devices/wifi/model/random-stream.h similarity index 100% rename from src/devices/wifi/random-stream.h rename to src/devices/wifi/model/random-stream.h diff --git a/src/devices/wifi/regular-wifi-mac.cc b/src/devices/wifi/model/regular-wifi-mac.cc similarity index 100% rename from src/devices/wifi/regular-wifi-mac.cc rename to src/devices/wifi/model/regular-wifi-mac.cc diff --git a/src/devices/wifi/regular-wifi-mac.h b/src/devices/wifi/model/regular-wifi-mac.h similarity index 100% rename from src/devices/wifi/regular-wifi-mac.h rename to src/devices/wifi/model/regular-wifi-mac.h diff --git a/src/devices/wifi/rraa-wifi-manager.cc b/src/devices/wifi/model/rraa-wifi-manager.cc similarity index 100% rename from src/devices/wifi/rraa-wifi-manager.cc rename to src/devices/wifi/model/rraa-wifi-manager.cc diff --git a/src/devices/wifi/rraa-wifi-manager.h b/src/devices/wifi/model/rraa-wifi-manager.h similarity index 100% rename from src/devices/wifi/rraa-wifi-manager.h rename to src/devices/wifi/model/rraa-wifi-manager.h diff --git a/src/devices/wifi/ssid.cc b/src/devices/wifi/model/ssid.cc similarity index 100% rename from src/devices/wifi/ssid.cc rename to src/devices/wifi/model/ssid.cc diff --git a/src/devices/wifi/ssid.h b/src/devices/wifi/model/ssid.h similarity index 100% rename from src/devices/wifi/ssid.h rename to src/devices/wifi/model/ssid.h diff --git a/src/devices/wifi/sta-wifi-mac.cc b/src/devices/wifi/model/sta-wifi-mac.cc similarity index 100% rename from src/devices/wifi/sta-wifi-mac.cc rename to src/devices/wifi/model/sta-wifi-mac.cc diff --git a/src/devices/wifi/sta-wifi-mac.h b/src/devices/wifi/model/sta-wifi-mac.h similarity index 100% rename from src/devices/wifi/sta-wifi-mac.h rename to src/devices/wifi/model/sta-wifi-mac.h diff --git a/src/devices/wifi/status-code.cc b/src/devices/wifi/model/status-code.cc similarity index 100% rename from src/devices/wifi/status-code.cc rename to src/devices/wifi/model/status-code.cc diff --git a/src/devices/wifi/status-code.h b/src/devices/wifi/model/status-code.h similarity index 100% rename from src/devices/wifi/status-code.h rename to src/devices/wifi/model/status-code.h diff --git a/src/devices/wifi/supported-rates.cc b/src/devices/wifi/model/supported-rates.cc similarity index 100% rename from src/devices/wifi/supported-rates.cc rename to src/devices/wifi/model/supported-rates.cc diff --git a/src/devices/wifi/supported-rates.h b/src/devices/wifi/model/supported-rates.h similarity index 100% rename from src/devices/wifi/supported-rates.h rename to src/devices/wifi/model/supported-rates.h diff --git a/src/devices/wifi/wifi-channel.cc b/src/devices/wifi/model/wifi-channel.cc similarity index 100% rename from src/devices/wifi/wifi-channel.cc rename to src/devices/wifi/model/wifi-channel.cc diff --git a/src/devices/wifi/wifi-channel.h b/src/devices/wifi/model/wifi-channel.h similarity index 100% rename from src/devices/wifi/wifi-channel.h rename to src/devices/wifi/model/wifi-channel.h diff --git a/src/devices/wifi/wifi-information-element-vector.cc b/src/devices/wifi/model/wifi-information-element-vector.cc similarity index 100% rename from src/devices/wifi/wifi-information-element-vector.cc rename to src/devices/wifi/model/wifi-information-element-vector.cc diff --git a/src/devices/wifi/wifi-information-element-vector.h b/src/devices/wifi/model/wifi-information-element-vector.h similarity index 100% rename from src/devices/wifi/wifi-information-element-vector.h rename to src/devices/wifi/model/wifi-information-element-vector.h diff --git a/src/devices/wifi/wifi-information-element.cc b/src/devices/wifi/model/wifi-information-element.cc similarity index 100% rename from src/devices/wifi/wifi-information-element.cc rename to src/devices/wifi/model/wifi-information-element.cc diff --git a/src/devices/wifi/wifi-information-element.h b/src/devices/wifi/model/wifi-information-element.h similarity index 100% rename from src/devices/wifi/wifi-information-element.h rename to src/devices/wifi/model/wifi-information-element.h diff --git a/src/devices/wifi/wifi-mac-header.cc b/src/devices/wifi/model/wifi-mac-header.cc similarity index 100% rename from src/devices/wifi/wifi-mac-header.cc rename to src/devices/wifi/model/wifi-mac-header.cc diff --git a/src/devices/wifi/wifi-mac-header.h b/src/devices/wifi/model/wifi-mac-header.h similarity index 100% rename from src/devices/wifi/wifi-mac-header.h rename to src/devices/wifi/model/wifi-mac-header.h diff --git a/src/devices/wifi/wifi-mac-queue.cc b/src/devices/wifi/model/wifi-mac-queue.cc similarity index 100% rename from src/devices/wifi/wifi-mac-queue.cc rename to src/devices/wifi/model/wifi-mac-queue.cc diff --git a/src/devices/wifi/wifi-mac-queue.h b/src/devices/wifi/model/wifi-mac-queue.h similarity index 100% rename from src/devices/wifi/wifi-mac-queue.h rename to src/devices/wifi/model/wifi-mac-queue.h diff --git a/src/devices/wifi/wifi-mac-trailer.cc b/src/devices/wifi/model/wifi-mac-trailer.cc similarity index 100% rename from src/devices/wifi/wifi-mac-trailer.cc rename to src/devices/wifi/model/wifi-mac-trailer.cc diff --git a/src/devices/wifi/wifi-mac-trailer.h b/src/devices/wifi/model/wifi-mac-trailer.h similarity index 100% rename from src/devices/wifi/wifi-mac-trailer.h rename to src/devices/wifi/model/wifi-mac-trailer.h diff --git a/src/devices/wifi/wifi-mac.cc b/src/devices/wifi/model/wifi-mac.cc similarity index 100% rename from src/devices/wifi/wifi-mac.cc rename to src/devices/wifi/model/wifi-mac.cc diff --git a/src/devices/wifi/wifi-mac.h b/src/devices/wifi/model/wifi-mac.h similarity index 100% rename from src/devices/wifi/wifi-mac.h rename to src/devices/wifi/model/wifi-mac.h diff --git a/src/devices/wifi/wifi-mode.cc b/src/devices/wifi/model/wifi-mode.cc similarity index 100% rename from src/devices/wifi/wifi-mode.cc rename to src/devices/wifi/model/wifi-mode.cc diff --git a/src/devices/wifi/wifi-mode.h b/src/devices/wifi/model/wifi-mode.h similarity index 100% rename from src/devices/wifi/wifi-mode.h rename to src/devices/wifi/model/wifi-mode.h diff --git a/src/devices/wifi/wifi-net-device.cc b/src/devices/wifi/model/wifi-net-device.cc similarity index 100% rename from src/devices/wifi/wifi-net-device.cc rename to src/devices/wifi/model/wifi-net-device.cc diff --git a/src/devices/wifi/wifi-net-device.h b/src/devices/wifi/model/wifi-net-device.h similarity index 100% rename from src/devices/wifi/wifi-net-device.h rename to src/devices/wifi/model/wifi-net-device.h diff --git a/src/devices/wifi/wifi-phy-standard.h b/src/devices/wifi/model/wifi-phy-standard.h similarity index 100% rename from src/devices/wifi/wifi-phy-standard.h rename to src/devices/wifi/model/wifi-phy-standard.h diff --git a/src/devices/wifi/wifi-phy-state-helper.cc b/src/devices/wifi/model/wifi-phy-state-helper.cc similarity index 100% rename from src/devices/wifi/wifi-phy-state-helper.cc rename to src/devices/wifi/model/wifi-phy-state-helper.cc diff --git a/src/devices/wifi/wifi-phy-state-helper.h b/src/devices/wifi/model/wifi-phy-state-helper.h similarity index 100% rename from src/devices/wifi/wifi-phy-state-helper.h rename to src/devices/wifi/model/wifi-phy-state-helper.h diff --git a/src/devices/wifi/wifi-phy.cc b/src/devices/wifi/model/wifi-phy.cc similarity index 100% rename from src/devices/wifi/wifi-phy.cc rename to src/devices/wifi/model/wifi-phy.cc diff --git a/src/devices/wifi/wifi-phy.h b/src/devices/wifi/model/wifi-phy.h similarity index 100% rename from src/devices/wifi/wifi-phy.h rename to src/devices/wifi/model/wifi-phy.h diff --git a/src/devices/wifi/wifi-preamble.h b/src/devices/wifi/model/wifi-preamble.h similarity index 100% rename from src/devices/wifi/wifi-preamble.h rename to src/devices/wifi/model/wifi-preamble.h diff --git a/src/devices/wifi/wifi-remote-station-manager.cc b/src/devices/wifi/model/wifi-remote-station-manager.cc similarity index 100% rename from src/devices/wifi/wifi-remote-station-manager.cc rename to src/devices/wifi/model/wifi-remote-station-manager.cc diff --git a/src/devices/wifi/wifi-remote-station-manager.h b/src/devices/wifi/model/wifi-remote-station-manager.h similarity index 100% rename from src/devices/wifi/wifi-remote-station-manager.h rename to src/devices/wifi/model/wifi-remote-station-manager.h diff --git a/src/devices/wifi/yans-error-rate-model.cc b/src/devices/wifi/model/yans-error-rate-model.cc similarity index 100% rename from src/devices/wifi/yans-error-rate-model.cc rename to src/devices/wifi/model/yans-error-rate-model.cc diff --git a/src/devices/wifi/yans-error-rate-model.h b/src/devices/wifi/model/yans-error-rate-model.h similarity index 100% rename from src/devices/wifi/yans-error-rate-model.h rename to src/devices/wifi/model/yans-error-rate-model.h diff --git a/src/devices/wifi/yans-wifi-channel.cc b/src/devices/wifi/model/yans-wifi-channel.cc similarity index 100% rename from src/devices/wifi/yans-wifi-channel.cc rename to src/devices/wifi/model/yans-wifi-channel.cc diff --git a/src/devices/wifi/yans-wifi-channel.h b/src/devices/wifi/model/yans-wifi-channel.h similarity index 100% rename from src/devices/wifi/yans-wifi-channel.h rename to src/devices/wifi/model/yans-wifi-channel.h diff --git a/src/devices/wifi/yans-wifi-phy.cc b/src/devices/wifi/model/yans-wifi-phy.cc similarity index 100% rename from src/devices/wifi/yans-wifi-phy.cc rename to src/devices/wifi/model/yans-wifi-phy.cc diff --git a/src/devices/wifi/yans-wifi-phy.h b/src/devices/wifi/model/yans-wifi-phy.h similarity index 100% rename from src/devices/wifi/yans-wifi-phy.h rename to src/devices/wifi/model/yans-wifi-phy.h diff --git a/src/devices/wifi/wifi-phy-test.cc b/src/devices/wifi/test/wifi-phy-test.cc similarity index 98% rename from src/devices/wifi/wifi-phy-test.cc rename to src/devices/wifi/test/wifi-phy-test.cc index 3da23da67..020b386ef 100644 --- a/src/devices/wifi/wifi-phy-test.cc +++ b/src/devices/wifi/test/wifi-phy-test.cc @@ -17,13 +17,13 @@ * * Author: Mathieu Lacage */ -#include "wifi-net-device.h" -#include "yans-wifi-channel.h" -#include "yans-wifi-phy.h" +#include "ns3/wifi-net-device.h" +#include "ns3/yans-wifi-channel.h" +#include "ns3/yans-wifi-phy.h" #include "ns3/propagation-loss-model.h" #include "ns3/propagation-delay-model.h" -#include "error-rate-model.h" -#include "yans-error-rate-model.h" +#include "ns3/error-rate-model.h" +#include "ns3/yans-error-rate-model.h" #include "ns3/ptr.h" #include "ns3/mobility-model.h" #include "ns3/constant-position-mobility-model.h" diff --git a/src/devices/wifi/wifi-test.cc b/src/devices/wifi/test/wifi-test.cc similarity index 97% rename from src/devices/wifi/wifi-test.cc rename to src/devices/wifi/test/wifi-test.cc index c9309f81d..1c14807af 100644 --- a/src/devices/wifi/wifi-test.cc +++ b/src/devices/wifi/test/wifi-test.cc @@ -20,22 +20,22 @@ * Quincy Tse (Case for Bug 991) */ -#include "wifi-net-device.h" -#include "yans-wifi-channel.h" -#include "adhoc-wifi-mac.h" -#include "yans-wifi-phy.h" -#include "arf-wifi-manager.h" +#include "ns3/wifi-net-device.h" +#include "ns3/yans-wifi-channel.h" +#include "ns3/adhoc-wifi-mac.h" +#include "ns3/yans-wifi-phy.h" +#include "ns3/arf-wifi-manager.h" #include "ns3/propagation-delay-model.h" #include "ns3/propagation-loss-model.h" -#include "error-rate-model.h" -#include "yans-error-rate-model.h" +#include "ns3/error-rate-model.h" +#include "ns3/yans-error-rate-model.h" #include "ns3/constant-position-mobility-model.h" #include "ns3/node.h" #include "ns3/simulator.h" #include "ns3/test.h" #include "ns3/object-factory.h" -#include "dca-txop.h" -#include "mac-rx-middle.h" +#include "ns3/dca-txop.h" +#include "ns3/mac-rx-middle.h" #include "ns3/pointer.h" namespace ns3 { diff --git a/src/devices/wifi/wscript b/src/devices/wifi/wscript index 954040187..b17cf2151 100644 --- a/src/devices/wifi/wscript +++ b/src/devices/wifi/wscript @@ -3,124 +3,132 @@ def build(bld): obj = bld.create_ns3_module('wifi', ['network', 'propagation']) obj.source = [ - 'wifi-information-element.cc', - 'wifi-information-element-vector.cc', - 'wifi-channel.cc', - 'wifi-mode.cc', - 'ssid.cc', - 'wifi-phy.cc', - 'wifi-phy-state-helper.cc', - 'error-rate-model.cc', - 'yans-error-rate-model.cc', - 'nist-error-rate-model.cc', - 'dsss-error-rate-model.cc', - 'interference-helper.cc', - 'interference-helper-tx-duration-test.cc', - 'yans-wifi-phy.cc', - 'yans-wifi-channel.cc', - 'wifi-mac-header.cc', - 'wifi-mac-trailer.cc', - 'mac-low.cc', - 'wifi-mac-queue.cc', - 'mac-tx-middle.cc', - 'mac-rx-middle.cc', - 'dca-txop.cc', - 'supported-rates.cc', - 'capability-information.cc', - 'status-code.cc', - 'mgt-headers.cc', - 'random-stream.cc', - 'dcf-manager.cc', - 'dcf-manager-test.cc', - 'wifi-mac.cc', - 'regular-wifi-mac.cc', - 'wifi-remote-station-manager.cc', - 'ap-wifi-mac.cc', - 'sta-wifi-mac.cc', - 'adhoc-wifi-mac.cc', - 'wifi-net-device.cc', - 'arf-wifi-manager.cc', - 'aarf-wifi-manager.cc', - 'ideal-wifi-manager.cc', - 'constant-rate-wifi-manager.cc', - 'amrr-wifi-manager.cc', - 'onoe-wifi-manager.cc', - 'rraa-wifi-manager.cc', - 'aarfcd-wifi-manager.cc', - 'cara-wifi-manager.cc', - 'minstrel-wifi-manager.cc', - 'wifi-test.cc', - 'qos-tag.cc', - 'qos-utils.cc', - 'edca-txop-n.cc', - 'msdu-aggregator.cc', - 'amsdu-subframe-header.cc', - 'msdu-standard-aggregator.cc', - 'originator-block-ack-agreement.cc', - 'dcf.cc', - 'ctrl-headers.cc', - 'qos-blocked-destinations.cc', - 'block-ack-agreement.cc', - 'block-ack-manager.cc', - 'block-ack-test-suite.cc', - 'block-ack-cache.cc' + 'model/wifi-information-element.cc', + 'model/wifi-information-element-vector.cc', + 'model/wifi-channel.cc', + 'model/wifi-mode.cc', + 'model/ssid.cc', + 'model/wifi-phy.cc', + 'model/wifi-phy-state-helper.cc', + 'model/error-rate-model.cc', + 'model/yans-error-rate-model.cc', + 'model/nist-error-rate-model.cc', + 'model/dsss-error-rate-model.cc', + 'model/interference-helper.cc', + 'model/interference-helper-tx-duration-test.cc', + 'model/yans-wifi-phy.cc', + 'model/yans-wifi-channel.cc', + 'model/wifi-mac-header.cc', + 'model/wifi-mac-trailer.cc', + 'model/mac-low.cc', + 'model/wifi-mac-queue.cc', + 'model/mac-tx-middle.cc', + 'model/mac-rx-middle.cc', + 'model/dca-txop.cc', + 'model/supported-rates.cc', + 'model/capability-information.cc', + 'model/status-code.cc', + 'model/mgt-headers.cc', + 'model/random-stream.cc', + 'model/dcf-manager.cc', + 'model/dcf-manager-test.cc', + 'model/wifi-mac.cc', + 'model/regular-wifi-mac.cc', + 'model/wifi-remote-station-manager.cc', + 'model/ap-wifi-mac.cc', + 'model/sta-wifi-mac.cc', + 'model/adhoc-wifi-mac.cc', + 'model/wifi-net-device.cc', + 'model/arf-wifi-manager.cc', + 'model/aarf-wifi-manager.cc', + 'model/ideal-wifi-manager.cc', + 'model/constant-rate-wifi-manager.cc', + 'model/amrr-wifi-manager.cc', + 'model/onoe-wifi-manager.cc', + 'model/rraa-wifi-manager.cc', + 'model/aarfcd-wifi-manager.cc', + 'model/cara-wifi-manager.cc', + 'model/minstrel-wifi-manager.cc', + 'model/qos-tag.cc', + 'model/qos-utils.cc', + 'model/edca-txop-n.cc', + 'model/msdu-aggregator.cc', + 'model/amsdu-subframe-header.cc', + 'model/msdu-standard-aggregator.cc', + 'model/originator-block-ack-agreement.cc', + 'model/dcf.cc', + 'model/ctrl-headers.cc', + 'model/qos-blocked-destinations.cc', + 'model/block-ack-agreement.cc', + 'model/block-ack-manager.cc', + 'model/block-ack-test-suite.cc', + 'model/block-ack-cache.cc', + 'helper/wifi-helper.cc', + 'helper/yans-wifi-helper.cc', + 'helper/nqos-wifi-mac-helper.cc', + 'helper/qos-wifi-mac-helper.cc', + 'test/wifi-test.cc', ] headers = bld.new_task_gen('ns3header') headers.module = 'wifi' headers.source = [ - 'wifi-information-element.h', - 'wifi-information-element-vector.h', - 'wifi-net-device.h', - 'wifi-channel.h', - 'wifi-mode.h', - 'ssid.h', - 'wifi-preamble.h', - 'wifi-phy-standard.h', - 'yans-wifi-phy.h', - 'yans-wifi-channel.h', - 'wifi-phy.h', - 'interference-helper.h', - 'wifi-remote-station-manager.h', - 'ap-wifi-mac.h', - 'sta-wifi-mac.h', - 'adhoc-wifi-mac.h', - 'arf-wifi-manager.h', - 'aarf-wifi-manager.h', - 'ideal-wifi-manager.h', - 'constant-rate-wifi-manager.h', - 'amrr-wifi-manager.h', - 'onoe-wifi-manager.h', - 'rraa-wifi-manager.h', - 'aarfcd-wifi-manager.h', - 'cara-wifi-manager.h', - 'minstrel-wifi-manager.h', - 'wifi-mac.h', - 'regular-wifi-mac.h', - 'wifi-phy.h', - 'supported-rates.h', - 'error-rate-model.h', - 'yans-error-rate-model.h', - 'nist-error-rate-model.h', - 'dsss-error-rate-model.h', - 'dca-txop.h', - 'wifi-mac-header.h', - 'qos-utils.h', - 'edca-txop-n.h', - 'msdu-aggregator.h', - 'amsdu-subframe-header.h', - 'qos-tag.h', - 'mgt-headers.h', - 'status-code.h', - 'capability-information.h', - 'dcf-manager.h', - 'mac-rx-middle.h', - 'mac-low.h', - 'originator-block-ack-agreement.h', - 'dcf.h', - 'ctrl-headers.h', - 'block-ack-agreement.h', - 'block-ack-manager.h', - 'block-ack-cache.h' + 'model/wifi-information-element.h', + 'model/wifi-information-element-vector.h', + 'model/wifi-net-device.h', + 'model/wifi-channel.h', + 'model/wifi-mode.h', + 'model/ssid.h', + 'model/wifi-preamble.h', + 'model/wifi-phy-standard.h', + 'model/yans-wifi-phy.h', + 'model/yans-wifi-channel.h', + 'model/wifi-phy.h', + 'model/interference-helper.h', + 'model/wifi-remote-station-manager.h', + 'model/ap-wifi-mac.h', + 'model/sta-wifi-mac.h', + 'model/adhoc-wifi-mac.h', + 'model/arf-wifi-manager.h', + 'model/aarf-wifi-manager.h', + 'model/ideal-wifi-manager.h', + 'model/constant-rate-wifi-manager.h', + 'model/amrr-wifi-manager.h', + 'model/onoe-wifi-manager.h', + 'model/rraa-wifi-manager.h', + 'model/aarfcd-wifi-manager.h', + 'model/cara-wifi-manager.h', + 'model/minstrel-wifi-manager.h', + 'model/wifi-mac.h', + 'model/regular-wifi-mac.h', + 'model/wifi-phy.h', + 'model/supported-rates.h', + 'model/error-rate-model.h', + 'model/yans-error-rate-model.h', + 'model/nist-error-rate-model.h', + 'model/dsss-error-rate-model.h', + 'model/dca-txop.h', + 'model/wifi-mac-header.h', + 'model/qos-utils.h', + 'model/edca-txop-n.h', + 'model/msdu-aggregator.h', + 'model/amsdu-subframe-header.h', + 'model/qos-tag.h', + 'model/mgt-headers.h', + 'model/status-code.h', + 'model/capability-information.h', + 'model/dcf-manager.h', + 'model/mac-rx-middle.h', + 'model/mac-low.h', + 'model/originator-block-ack-agreement.h', + 'model/dcf.h', + 'model/ctrl-headers.h', + 'model/block-ack-agreement.h', + 'model/block-ack-manager.h', + 'model/block-ack-cache.h', + 'helper/wifi-helper.h', + 'helper/yans-wifi-helper.h', + 'helper/nqos-wifi-mac-helper.h', + 'helper/qos-wifi-mac-helper.h', ] if bld.env['ENABLE_GSL']: @@ -128,6 +136,6 @@ def build(bld): obj = bld.create_ns3_program('wifi-phy-test', ['core', 'simulator', 'mobility', 'node', 'wifi']) - obj.source = 'wifi-phy-test.cc' + obj.source = 'test/wifi-phy-test.cc' diff --git a/src/devices/wimax/wimax.h b/src/devices/wimax/doc/wimax.h similarity index 100% rename from src/devices/wimax/wimax.h rename to src/devices/wimax/doc/wimax.h diff --git a/examples/wimax/waf b/src/devices/wimax/examples/waf similarity index 100% rename from examples/wimax/waf rename to src/devices/wimax/examples/waf diff --git a/examples/wimax/wimax-ipv4.cc b/src/devices/wimax/examples/wimax-ipv4.cc similarity index 99% rename from examples/wimax/wimax-ipv4.cc rename to src/devices/wimax/examples/wimax-ipv4.cc index c2d17f9ca..9584b67b8 100644 --- a/examples/wimax/wimax-ipv4.cc +++ b/src/devices/wimax/examples/wimax-ipv4.cc @@ -57,8 +57,9 @@ #include "ns3/mobility-module.h" #include "ns3/contrib-module.h" #include "ns3/wimax-module.h" -#include +#include "ns3/internet-module.h" #include "ns3/global-route-manager.h" +#include NS_LOG_COMPONENT_DEFINE ("wimaxIpV4Simulation"); diff --git a/examples/wimax/wimax-multicast.cc b/src/devices/wimax/examples/wimax-multicast.cc similarity index 99% rename from examples/wimax/wimax-multicast.cc rename to src/devices/wimax/examples/wimax-multicast.cc index bc75b4cba..b9e5d1652 100644 --- a/examples/wimax/wimax-multicast.cc +++ b/src/devices/wimax/examples/wimax-multicast.cc @@ -57,6 +57,7 @@ #include "ns3/mobility-module.h" #include "ns3/contrib-module.h" #include "ns3/wimax-module.h" +#include "ns3/csma-module.h" #include #include "ns3/global-route-manager.h" #include "ns3/constant-position-mobility-model.h" diff --git a/examples/wimax/wimax-simple.cc b/src/devices/wimax/examples/wimax-simple.cc similarity index 99% rename from examples/wimax/wimax-simple.cc rename to src/devices/wimax/examples/wimax-simple.cc index 0d28fc078..e022635f1 100644 --- a/examples/wimax/wimax-simple.cc +++ b/src/devices/wimax/examples/wimax-simple.cc @@ -49,10 +49,12 @@ #include "ns3/mobility-module.h" #include "ns3/contrib-module.h" #include "ns3/wimax-module.h" -#include +#include "ns3/internet-module.h" #include "ns3/global-route-manager.h" #include "ns3/ipcs-classifier-record.h" #include "ns3/service-flow.h" +#include + NS_LOG_COMPONENT_DEFINE ("wimaxIpV4Simulation"); using namespace ns3; diff --git a/examples/wimax/wscript b/src/devices/wimax/examples/wscript similarity index 100% rename from examples/wimax/wscript rename to src/devices/wimax/examples/wscript diff --git a/src/helper/wimax-helper.cc b/src/devices/wimax/helper/wimax-helper.cc similarity index 100% rename from src/helper/wimax-helper.cc rename to src/devices/wimax/helper/wimax-helper.cc diff --git a/src/helper/wimax-helper.h b/src/devices/wimax/helper/wimax-helper.h similarity index 100% rename from src/helper/wimax-helper.h rename to src/devices/wimax/helper/wimax-helper.h diff --git a/src/devices/wimax/bandwidth-manager.cc b/src/devices/wimax/model/bandwidth-manager.cc similarity index 100% rename from src/devices/wimax/bandwidth-manager.cc rename to src/devices/wimax/model/bandwidth-manager.cc diff --git a/src/devices/wimax/bandwidth-manager.h b/src/devices/wimax/model/bandwidth-manager.h similarity index 100% rename from src/devices/wimax/bandwidth-manager.h rename to src/devices/wimax/model/bandwidth-manager.h diff --git a/src/devices/wimax/bs-link-manager.cc b/src/devices/wimax/model/bs-link-manager.cc similarity index 100% rename from src/devices/wimax/bs-link-manager.cc rename to src/devices/wimax/model/bs-link-manager.cc diff --git a/src/devices/wimax/bs-link-manager.h b/src/devices/wimax/model/bs-link-manager.h similarity index 100% rename from src/devices/wimax/bs-link-manager.h rename to src/devices/wimax/model/bs-link-manager.h diff --git a/src/devices/wimax/bs-net-device.cc b/src/devices/wimax/model/bs-net-device.cc similarity index 100% rename from src/devices/wimax/bs-net-device.cc rename to src/devices/wimax/model/bs-net-device.cc diff --git a/src/devices/wimax/bs-net-device.h b/src/devices/wimax/model/bs-net-device.h similarity index 100% rename from src/devices/wimax/bs-net-device.h rename to src/devices/wimax/model/bs-net-device.h diff --git a/src/devices/wimax/bs-scheduler-rtps.cc b/src/devices/wimax/model/bs-scheduler-rtps.cc similarity index 100% rename from src/devices/wimax/bs-scheduler-rtps.cc rename to src/devices/wimax/model/bs-scheduler-rtps.cc diff --git a/src/devices/wimax/bs-scheduler-rtps.h b/src/devices/wimax/model/bs-scheduler-rtps.h similarity index 100% rename from src/devices/wimax/bs-scheduler-rtps.h rename to src/devices/wimax/model/bs-scheduler-rtps.h diff --git a/src/devices/wimax/bs-scheduler-simple.cc b/src/devices/wimax/model/bs-scheduler-simple.cc similarity index 100% rename from src/devices/wimax/bs-scheduler-simple.cc rename to src/devices/wimax/model/bs-scheduler-simple.cc diff --git a/src/devices/wimax/bs-scheduler-simple.h b/src/devices/wimax/model/bs-scheduler-simple.h similarity index 100% rename from src/devices/wimax/bs-scheduler-simple.h rename to src/devices/wimax/model/bs-scheduler-simple.h diff --git a/src/devices/wimax/bs-scheduler.cc b/src/devices/wimax/model/bs-scheduler.cc similarity index 100% rename from src/devices/wimax/bs-scheduler.cc rename to src/devices/wimax/model/bs-scheduler.cc diff --git a/src/devices/wimax/bs-scheduler.h b/src/devices/wimax/model/bs-scheduler.h similarity index 100% rename from src/devices/wimax/bs-scheduler.h rename to src/devices/wimax/model/bs-scheduler.h diff --git a/src/devices/wimax/bs-service-flow-manager.cc b/src/devices/wimax/model/bs-service-flow-manager.cc similarity index 100% rename from src/devices/wimax/bs-service-flow-manager.cc rename to src/devices/wimax/model/bs-service-flow-manager.cc diff --git a/src/devices/wimax/bs-service-flow-manager.h b/src/devices/wimax/model/bs-service-flow-manager.h similarity index 100% rename from src/devices/wimax/bs-service-flow-manager.h rename to src/devices/wimax/model/bs-service-flow-manager.h diff --git a/src/devices/wimax/bs-uplink-scheduler-mbqos.cc b/src/devices/wimax/model/bs-uplink-scheduler-mbqos.cc similarity index 100% rename from src/devices/wimax/bs-uplink-scheduler-mbqos.cc rename to src/devices/wimax/model/bs-uplink-scheduler-mbqos.cc diff --git a/src/devices/wimax/bs-uplink-scheduler-mbqos.h b/src/devices/wimax/model/bs-uplink-scheduler-mbqos.h similarity index 100% rename from src/devices/wimax/bs-uplink-scheduler-mbqos.h rename to src/devices/wimax/model/bs-uplink-scheduler-mbqos.h diff --git a/src/devices/wimax/bs-uplink-scheduler-rtps.cc b/src/devices/wimax/model/bs-uplink-scheduler-rtps.cc similarity index 100% rename from src/devices/wimax/bs-uplink-scheduler-rtps.cc rename to src/devices/wimax/model/bs-uplink-scheduler-rtps.cc diff --git a/src/devices/wimax/bs-uplink-scheduler-rtps.h b/src/devices/wimax/model/bs-uplink-scheduler-rtps.h similarity index 100% rename from src/devices/wimax/bs-uplink-scheduler-rtps.h rename to src/devices/wimax/model/bs-uplink-scheduler-rtps.h diff --git a/src/devices/wimax/bs-uplink-scheduler-simple.cc b/src/devices/wimax/model/bs-uplink-scheduler-simple.cc similarity index 100% rename from src/devices/wimax/bs-uplink-scheduler-simple.cc rename to src/devices/wimax/model/bs-uplink-scheduler-simple.cc diff --git a/src/devices/wimax/bs-uplink-scheduler-simple.h b/src/devices/wimax/model/bs-uplink-scheduler-simple.h similarity index 100% rename from src/devices/wimax/bs-uplink-scheduler-simple.h rename to src/devices/wimax/model/bs-uplink-scheduler-simple.h diff --git a/src/devices/wimax/bs-uplink-scheduler.cc b/src/devices/wimax/model/bs-uplink-scheduler.cc similarity index 100% rename from src/devices/wimax/bs-uplink-scheduler.cc rename to src/devices/wimax/model/bs-uplink-scheduler.cc diff --git a/src/devices/wimax/bs-uplink-scheduler.h b/src/devices/wimax/model/bs-uplink-scheduler.h similarity index 100% rename from src/devices/wimax/bs-uplink-scheduler.h rename to src/devices/wimax/model/bs-uplink-scheduler.h diff --git a/src/devices/wimax/burst-profile-manager.cc b/src/devices/wimax/model/burst-profile-manager.cc similarity index 100% rename from src/devices/wimax/burst-profile-manager.cc rename to src/devices/wimax/model/burst-profile-manager.cc diff --git a/src/devices/wimax/burst-profile-manager.h b/src/devices/wimax/model/burst-profile-manager.h similarity index 100% rename from src/devices/wimax/burst-profile-manager.h rename to src/devices/wimax/model/burst-profile-manager.h diff --git a/src/devices/wimax/bvec.h b/src/devices/wimax/model/bvec.h similarity index 100% rename from src/devices/wimax/bvec.h rename to src/devices/wimax/model/bvec.h diff --git a/src/devices/wimax/cid-factory.cc b/src/devices/wimax/model/cid-factory.cc similarity index 100% rename from src/devices/wimax/cid-factory.cc rename to src/devices/wimax/model/cid-factory.cc diff --git a/src/devices/wimax/cid-factory.h b/src/devices/wimax/model/cid-factory.h similarity index 100% rename from src/devices/wimax/cid-factory.h rename to src/devices/wimax/model/cid-factory.h diff --git a/src/devices/wimax/cid.cc b/src/devices/wimax/model/cid.cc similarity index 100% rename from src/devices/wimax/cid.cc rename to src/devices/wimax/model/cid.cc diff --git a/src/devices/wimax/cid.h b/src/devices/wimax/model/cid.h similarity index 100% rename from src/devices/wimax/cid.h rename to src/devices/wimax/model/cid.h diff --git a/src/devices/wimax/connection-manager.cc b/src/devices/wimax/model/connection-manager.cc similarity index 100% rename from src/devices/wimax/connection-manager.cc rename to src/devices/wimax/model/connection-manager.cc diff --git a/src/devices/wimax/connection-manager.h b/src/devices/wimax/model/connection-manager.h similarity index 100% rename from src/devices/wimax/connection-manager.h rename to src/devices/wimax/model/connection-manager.h diff --git a/src/devices/wimax/crc8.cc b/src/devices/wimax/model/crc8.cc similarity index 100% rename from src/devices/wimax/crc8.cc rename to src/devices/wimax/model/crc8.cc diff --git a/src/devices/wimax/crc8.h b/src/devices/wimax/model/crc8.h similarity index 100% rename from src/devices/wimax/crc8.h rename to src/devices/wimax/model/crc8.h diff --git a/src/devices/wimax/cs-parameters.cc b/src/devices/wimax/model/cs-parameters.cc similarity index 100% rename from src/devices/wimax/cs-parameters.cc rename to src/devices/wimax/model/cs-parameters.cc diff --git a/src/devices/wimax/cs-parameters.h b/src/devices/wimax/model/cs-parameters.h similarity index 100% rename from src/devices/wimax/cs-parameters.h rename to src/devices/wimax/model/cs-parameters.h diff --git a/src/devices/wimax/default-traces.h b/src/devices/wimax/model/default-traces.h similarity index 100% rename from src/devices/wimax/default-traces.h rename to src/devices/wimax/model/default-traces.h diff --git a/src/devices/wimax/dl-mac-messages.cc b/src/devices/wimax/model/dl-mac-messages.cc similarity index 100% rename from src/devices/wimax/dl-mac-messages.cc rename to src/devices/wimax/model/dl-mac-messages.cc diff --git a/src/devices/wimax/dl-mac-messages.h b/src/devices/wimax/model/dl-mac-messages.h similarity index 100% rename from src/devices/wimax/dl-mac-messages.h rename to src/devices/wimax/model/dl-mac-messages.h diff --git a/src/devices/wimax/ipcs-classifier-record.cc b/src/devices/wimax/model/ipcs-classifier-record.cc similarity index 100% rename from src/devices/wimax/ipcs-classifier-record.cc rename to src/devices/wimax/model/ipcs-classifier-record.cc diff --git a/src/devices/wimax/ipcs-classifier-record.h b/src/devices/wimax/model/ipcs-classifier-record.h similarity index 100% rename from src/devices/wimax/ipcs-classifier-record.h rename to src/devices/wimax/model/ipcs-classifier-record.h diff --git a/src/devices/wimax/ipcs-classifier.cc b/src/devices/wimax/model/ipcs-classifier.cc similarity index 100% rename from src/devices/wimax/ipcs-classifier.cc rename to src/devices/wimax/model/ipcs-classifier.cc diff --git a/src/devices/wimax/ipcs-classifier.h b/src/devices/wimax/model/ipcs-classifier.h similarity index 100% rename from src/devices/wimax/ipcs-classifier.h rename to src/devices/wimax/model/ipcs-classifier.h diff --git a/src/devices/wimax/mac-messages.cc b/src/devices/wimax/model/mac-messages.cc similarity index 100% rename from src/devices/wimax/mac-messages.cc rename to src/devices/wimax/model/mac-messages.cc diff --git a/src/devices/wimax/mac-messages.h b/src/devices/wimax/model/mac-messages.h similarity index 100% rename from src/devices/wimax/mac-messages.h rename to src/devices/wimax/model/mac-messages.h diff --git a/src/devices/wimax/ofdm-downlink-frame-prefix.cc b/src/devices/wimax/model/ofdm-downlink-frame-prefix.cc similarity index 100% rename from src/devices/wimax/ofdm-downlink-frame-prefix.cc rename to src/devices/wimax/model/ofdm-downlink-frame-prefix.cc diff --git a/src/devices/wimax/ofdm-downlink-frame-prefix.h b/src/devices/wimax/model/ofdm-downlink-frame-prefix.h similarity index 100% rename from src/devices/wimax/ofdm-downlink-frame-prefix.h rename to src/devices/wimax/model/ofdm-downlink-frame-prefix.h diff --git a/src/devices/wimax/send-params.cc b/src/devices/wimax/model/send-params.cc similarity index 100% rename from src/devices/wimax/send-params.cc rename to src/devices/wimax/model/send-params.cc diff --git a/src/devices/wimax/send-params.h b/src/devices/wimax/model/send-params.h similarity index 100% rename from src/devices/wimax/send-params.h rename to src/devices/wimax/model/send-params.h diff --git a/src/devices/wimax/service-flow-manager.cc b/src/devices/wimax/model/service-flow-manager.cc similarity index 100% rename from src/devices/wimax/service-flow-manager.cc rename to src/devices/wimax/model/service-flow-manager.cc diff --git a/src/devices/wimax/service-flow-manager.h b/src/devices/wimax/model/service-flow-manager.h similarity index 100% rename from src/devices/wimax/service-flow-manager.h rename to src/devices/wimax/model/service-flow-manager.h diff --git a/src/devices/wimax/service-flow-record.cc b/src/devices/wimax/model/service-flow-record.cc similarity index 100% rename from src/devices/wimax/service-flow-record.cc rename to src/devices/wimax/model/service-flow-record.cc diff --git a/src/devices/wimax/service-flow-record.h b/src/devices/wimax/model/service-flow-record.h similarity index 100% rename from src/devices/wimax/service-flow-record.h rename to src/devices/wimax/model/service-flow-record.h diff --git a/src/devices/wimax/service-flow.cc b/src/devices/wimax/model/service-flow.cc similarity index 100% rename from src/devices/wimax/service-flow.cc rename to src/devices/wimax/model/service-flow.cc diff --git a/src/devices/wimax/service-flow.h b/src/devices/wimax/model/service-flow.h similarity index 100% rename from src/devices/wimax/service-flow.h rename to src/devices/wimax/model/service-flow.h diff --git a/src/devices/wimax/simple-ofdm-send-param.cc b/src/devices/wimax/model/simple-ofdm-send-param.cc similarity index 100% rename from src/devices/wimax/simple-ofdm-send-param.cc rename to src/devices/wimax/model/simple-ofdm-send-param.cc diff --git a/src/devices/wimax/simple-ofdm-send-param.h b/src/devices/wimax/model/simple-ofdm-send-param.h similarity index 100% rename from src/devices/wimax/simple-ofdm-send-param.h rename to src/devices/wimax/model/simple-ofdm-send-param.h diff --git a/src/devices/wimax/simple-ofdm-wimax-channel.cc b/src/devices/wimax/model/simple-ofdm-wimax-channel.cc similarity index 100% rename from src/devices/wimax/simple-ofdm-wimax-channel.cc rename to src/devices/wimax/model/simple-ofdm-wimax-channel.cc diff --git a/src/devices/wimax/simple-ofdm-wimax-channel.h b/src/devices/wimax/model/simple-ofdm-wimax-channel.h similarity index 100% rename from src/devices/wimax/simple-ofdm-wimax-channel.h rename to src/devices/wimax/model/simple-ofdm-wimax-channel.h diff --git a/src/devices/wimax/simple-ofdm-wimax-phy.cc b/src/devices/wimax/model/simple-ofdm-wimax-phy.cc similarity index 100% rename from src/devices/wimax/simple-ofdm-wimax-phy.cc rename to src/devices/wimax/model/simple-ofdm-wimax-phy.cc diff --git a/src/devices/wimax/simple-ofdm-wimax-phy.h b/src/devices/wimax/model/simple-ofdm-wimax-phy.h similarity index 100% rename from src/devices/wimax/simple-ofdm-wimax-phy.h rename to src/devices/wimax/model/simple-ofdm-wimax-phy.h diff --git a/src/devices/wimax/snr-to-block-error-rate-manager.cc b/src/devices/wimax/model/snr-to-block-error-rate-manager.cc similarity index 100% rename from src/devices/wimax/snr-to-block-error-rate-manager.cc rename to src/devices/wimax/model/snr-to-block-error-rate-manager.cc diff --git a/src/devices/wimax/snr-to-block-error-rate-manager.h b/src/devices/wimax/model/snr-to-block-error-rate-manager.h similarity index 100% rename from src/devices/wimax/snr-to-block-error-rate-manager.h rename to src/devices/wimax/model/snr-to-block-error-rate-manager.h diff --git a/src/devices/wimax/snr-to-block-error-rate-record.cc b/src/devices/wimax/model/snr-to-block-error-rate-record.cc similarity index 100% rename from src/devices/wimax/snr-to-block-error-rate-record.cc rename to src/devices/wimax/model/snr-to-block-error-rate-record.cc diff --git a/src/devices/wimax/snr-to-block-error-rate-record.h b/src/devices/wimax/model/snr-to-block-error-rate-record.h similarity index 100% rename from src/devices/wimax/snr-to-block-error-rate-record.h rename to src/devices/wimax/model/snr-to-block-error-rate-record.h diff --git a/src/devices/wimax/ss-link-manager.cc b/src/devices/wimax/model/ss-link-manager.cc similarity index 100% rename from src/devices/wimax/ss-link-manager.cc rename to src/devices/wimax/model/ss-link-manager.cc diff --git a/src/devices/wimax/ss-link-manager.h b/src/devices/wimax/model/ss-link-manager.h similarity index 100% rename from src/devices/wimax/ss-link-manager.h rename to src/devices/wimax/model/ss-link-manager.h diff --git a/src/devices/wimax/ss-manager.cc b/src/devices/wimax/model/ss-manager.cc similarity index 100% rename from src/devices/wimax/ss-manager.cc rename to src/devices/wimax/model/ss-manager.cc diff --git a/src/devices/wimax/ss-manager.h b/src/devices/wimax/model/ss-manager.h similarity index 100% rename from src/devices/wimax/ss-manager.h rename to src/devices/wimax/model/ss-manager.h diff --git a/src/devices/wimax/ss-net-device.cc b/src/devices/wimax/model/ss-net-device.cc similarity index 100% rename from src/devices/wimax/ss-net-device.cc rename to src/devices/wimax/model/ss-net-device.cc diff --git a/src/devices/wimax/ss-net-device.h b/src/devices/wimax/model/ss-net-device.h similarity index 100% rename from src/devices/wimax/ss-net-device.h rename to src/devices/wimax/model/ss-net-device.h diff --git a/src/devices/wimax/ss-record.cc b/src/devices/wimax/model/ss-record.cc similarity index 100% rename from src/devices/wimax/ss-record.cc rename to src/devices/wimax/model/ss-record.cc diff --git a/src/devices/wimax/ss-record.h b/src/devices/wimax/model/ss-record.h similarity index 100% rename from src/devices/wimax/ss-record.h rename to src/devices/wimax/model/ss-record.h diff --git a/src/devices/wimax/ss-scheduler.cc b/src/devices/wimax/model/ss-scheduler.cc similarity index 100% rename from src/devices/wimax/ss-scheduler.cc rename to src/devices/wimax/model/ss-scheduler.cc diff --git a/src/devices/wimax/ss-scheduler.h b/src/devices/wimax/model/ss-scheduler.h similarity index 100% rename from src/devices/wimax/ss-scheduler.h rename to src/devices/wimax/model/ss-scheduler.h diff --git a/src/devices/wimax/ss-service-flow-manager.cc b/src/devices/wimax/model/ss-service-flow-manager.cc similarity index 100% rename from src/devices/wimax/ss-service-flow-manager.cc rename to src/devices/wimax/model/ss-service-flow-manager.cc diff --git a/src/devices/wimax/ss-service-flow-manager.h b/src/devices/wimax/model/ss-service-flow-manager.h similarity index 100% rename from src/devices/wimax/ss-service-flow-manager.h rename to src/devices/wimax/model/ss-service-flow-manager.h diff --git a/src/devices/wimax/ul-job.cc b/src/devices/wimax/model/ul-job.cc similarity index 100% rename from src/devices/wimax/ul-job.cc rename to src/devices/wimax/model/ul-job.cc diff --git a/src/devices/wimax/ul-job.h b/src/devices/wimax/model/ul-job.h similarity index 100% rename from src/devices/wimax/ul-job.h rename to src/devices/wimax/model/ul-job.h diff --git a/src/devices/wimax/ul-mac-messages.cc b/src/devices/wimax/model/ul-mac-messages.cc similarity index 100% rename from src/devices/wimax/ul-mac-messages.cc rename to src/devices/wimax/model/ul-mac-messages.cc diff --git a/src/devices/wimax/ul-mac-messages.h b/src/devices/wimax/model/ul-mac-messages.h similarity index 100% rename from src/devices/wimax/ul-mac-messages.h rename to src/devices/wimax/model/ul-mac-messages.h diff --git a/src/devices/wimax/wimax-channel.cc b/src/devices/wimax/model/wimax-channel.cc similarity index 100% rename from src/devices/wimax/wimax-channel.cc rename to src/devices/wimax/model/wimax-channel.cc diff --git a/src/devices/wimax/wimax-channel.h b/src/devices/wimax/model/wimax-channel.h similarity index 100% rename from src/devices/wimax/wimax-channel.h rename to src/devices/wimax/model/wimax-channel.h diff --git a/src/devices/wimax/wimax-connection.cc b/src/devices/wimax/model/wimax-connection.cc similarity index 100% rename from src/devices/wimax/wimax-connection.cc rename to src/devices/wimax/model/wimax-connection.cc diff --git a/src/devices/wimax/wimax-connection.h b/src/devices/wimax/model/wimax-connection.h similarity index 100% rename from src/devices/wimax/wimax-connection.h rename to src/devices/wimax/model/wimax-connection.h diff --git a/src/devices/wimax/wimax-mac-header.cc b/src/devices/wimax/model/wimax-mac-header.cc similarity index 100% rename from src/devices/wimax/wimax-mac-header.cc rename to src/devices/wimax/model/wimax-mac-header.cc diff --git a/src/devices/wimax/wimax-mac-header.h b/src/devices/wimax/model/wimax-mac-header.h similarity index 100% rename from src/devices/wimax/wimax-mac-header.h rename to src/devices/wimax/model/wimax-mac-header.h diff --git a/src/devices/wimax/wimax-mac-queue.cc b/src/devices/wimax/model/wimax-mac-queue.cc similarity index 100% rename from src/devices/wimax/wimax-mac-queue.cc rename to src/devices/wimax/model/wimax-mac-queue.cc diff --git a/src/devices/wimax/wimax-mac-queue.h b/src/devices/wimax/model/wimax-mac-queue.h similarity index 100% rename from src/devices/wimax/wimax-mac-queue.h rename to src/devices/wimax/model/wimax-mac-queue.h diff --git a/src/devices/wimax/wimax-mac-to-mac-header.cc b/src/devices/wimax/model/wimax-mac-to-mac-header.cc similarity index 100% rename from src/devices/wimax/wimax-mac-to-mac-header.cc rename to src/devices/wimax/model/wimax-mac-to-mac-header.cc diff --git a/src/devices/wimax/wimax-mac-to-mac-header.h b/src/devices/wimax/model/wimax-mac-to-mac-header.h similarity index 100% rename from src/devices/wimax/wimax-mac-to-mac-header.h rename to src/devices/wimax/model/wimax-mac-to-mac-header.h diff --git a/src/devices/wimax/wimax-net-device.cc b/src/devices/wimax/model/wimax-net-device.cc similarity index 100% rename from src/devices/wimax/wimax-net-device.cc rename to src/devices/wimax/model/wimax-net-device.cc diff --git a/src/devices/wimax/wimax-net-device.h b/src/devices/wimax/model/wimax-net-device.h similarity index 100% rename from src/devices/wimax/wimax-net-device.h rename to src/devices/wimax/model/wimax-net-device.h diff --git a/src/devices/wimax/wimax-phy.cc b/src/devices/wimax/model/wimax-phy.cc similarity index 100% rename from src/devices/wimax/wimax-phy.cc rename to src/devices/wimax/model/wimax-phy.cc diff --git a/src/devices/wimax/wimax-phy.h b/src/devices/wimax/model/wimax-phy.h similarity index 100% rename from src/devices/wimax/wimax-phy.h rename to src/devices/wimax/model/wimax-phy.h diff --git a/src/devices/wimax/wimax-tlv.cc b/src/devices/wimax/model/wimax-tlv.cc similarity index 100% rename from src/devices/wimax/wimax-tlv.cc rename to src/devices/wimax/model/wimax-tlv.cc diff --git a/src/devices/wimax/wimax-tlv.h b/src/devices/wimax/model/wimax-tlv.h similarity index 100% rename from src/devices/wimax/wimax-tlv.h rename to src/devices/wimax/model/wimax-tlv.h diff --git a/src/devices/wimax/mac-messages-test.cc b/src/devices/wimax/test/mac-messages-test.cc similarity index 97% rename from src/devices/wimax/mac-messages-test.cc rename to src/devices/wimax/test/mac-messages-test.cc index 08e47e9c6..328629d01 100644 --- a/src/devices/wimax/mac-messages-test.cc +++ b/src/devices/wimax/test/mac-messages-test.cc @@ -33,11 +33,11 @@ #include "ns3/simulator.h" #include "ns3/wimax-helper.h" #include "ns3/mobility-helper.h" -#include #include "ns3/global-route-manager.h" -#include "wimax-tlv.h" -#include "ipcs-classifier-record.h" -#include "service-flow.h" +#include "ns3/wimax-tlv.h" +#include "ns3/ipcs-classifier-record.h" +#include "ns3/service-flow.h" +#include using namespace ns3; /* diff --git a/src/devices/wimax/phy-test.cc b/src/devices/wimax/test/phy-test.cc similarity index 98% rename from src/devices/wimax/phy-test.cc rename to src/devices/wimax/test/phy-test.cc index 0bf07582f..ce00c4385 100644 --- a/src/devices/wimax/phy-test.cc +++ b/src/devices/wimax/test/phy-test.cc @@ -33,9 +33,9 @@ #include "ns3/simulator.h" #include "ns3/wimax-helper.h" #include "ns3/mobility-helper.h" -#include #include "ns3/global-route-manager.h" -#include "snr-to-block-error-rate-manager.h" +#include "ns3/snr-to-block-error-rate-manager.h" +#include using namespace ns3; diff --git a/src/devices/wimax/qos-test.cc b/src/devices/wimax/test/qos-test.cc similarity index 100% rename from src/devices/wimax/qos-test.cc rename to src/devices/wimax/test/qos-test.cc diff --git a/src/devices/wimax/ss-mac-test.cc b/src/devices/wimax/test/ss-mac-test.cc similarity index 100% rename from src/devices/wimax/ss-mac-test.cc rename to src/devices/wimax/test/ss-mac-test.cc diff --git a/src/devices/wimax/wimax-fragmentation-test.cc b/src/devices/wimax/test/wimax-fragmentation-test.cc similarity index 97% rename from src/devices/wimax/wimax-fragmentation-test.cc rename to src/devices/wimax/test/wimax-fragmentation-test.cc index 52dd06cb0..0c7736a81 100644 --- a/src/devices/wimax/wimax-fragmentation-test.cc +++ b/src/devices/wimax/test/wimax-fragmentation-test.cc @@ -33,12 +33,12 @@ #include "ns3/simulator.h" #include "ns3/wimax-helper.h" #include "ns3/mobility-helper.h" -#include #include "ns3/global-route-manager.h" -#include "wimax-tlv.h" -#include "ipcs-classifier-record.h" -#include "service-flow.h" -#include "wimax-connection.h" +#include "ns3/wimax-tlv.h" +#include "ns3/ipcs-classifier-record.h" +#include "ns3/service-flow.h" +#include "ns3/wimax-connection.h" +#include using namespace ns3; diff --git a/src/devices/wimax/wimax-service-flow-test.cc b/src/devices/wimax/test/wimax-service-flow-test.cc similarity index 98% rename from src/devices/wimax/wimax-service-flow-test.cc rename to src/devices/wimax/test/wimax-service-flow-test.cc index 761fef6ac..1a36850b0 100644 --- a/src/devices/wimax/wimax-service-flow-test.cc +++ b/src/devices/wimax/test/wimax-service-flow-test.cc @@ -34,11 +34,11 @@ #include "ns3/simulator.h" #include "ns3/wimax-helper.h" #include "ns3/mobility-helper.h" -#include #include "ns3/global-route-manager.h" -#include "wimax-tlv.h" -#include "ipcs-classifier-record.h" -#include "service-flow.h" +#include "ns3/wimax-tlv.h" +#include "ns3/ipcs-classifier-record.h" +#include "ns3/service-flow.h" +#include using namespace ns3; diff --git a/src/devices/wimax/wimax-tlv-test.cc b/src/devices/wimax/test/wimax-tlv-test.cc similarity index 98% rename from src/devices/wimax/wimax-tlv-test.cc rename to src/devices/wimax/test/wimax-tlv-test.cc index a94918d38..2abe38fd5 100644 --- a/src/devices/wimax/wimax-tlv-test.cc +++ b/src/devices/wimax/test/wimax-tlv-test.cc @@ -34,11 +34,11 @@ #include "ns3/simulator.h" #include "ns3/wimax-helper.h" #include "ns3/mobility-helper.h" -#include #include "ns3/global-route-manager.h" -#include "wimax-tlv.h" -#include "ipcs-classifier-record.h" -#include "service-flow.h" +#include "ns3/wimax-tlv.h" +#include "ns3/ipcs-classifier-record.h" +#include "ns3/service-flow.h" +#include using namespace ns3; diff --git a/src/devices/wimax/wscript b/src/devices/wimax/wscript index ae7dd3ec2..392e538f8 100644 --- a/src/devices/wimax/wscript +++ b/src/devices/wimax/wscript @@ -2,106 +2,112 @@ def build(bld): obj = bld.create_ns3_module('wimax', ['network', 'spectrum']) obj.source = [ - 'cid.cc', - 'cid-factory.cc', - 'wimax-net-device.cc', - 'bs-net-device.cc', - 'ss-net-device.cc', - 'wimax-mac-header.cc', - 'wimax-phy.cc', - 'wimax-channel.cc', - 'ofdm-downlink-frame-prefix.cc', - 'wimax-connection.cc', - 'ss-record.cc', - 'mac-messages.cc', - 'dl-mac-messages.cc', - 'ul-mac-messages.cc', - 'simple-ofdm-wimax-phy.cc', - 'simple-ofdm-wimax-channel.cc', - 'send-params.cc', - 'ss-manager.cc', - 'connection-manager.cc', - 'bs-uplink-scheduler.cc', - 'bs-uplink-scheduler-simple.cc', - 'bs-uplink-scheduler-mbqos.cc', - 'bs-uplink-scheduler-rtps.cc', - 'bs-scheduler.cc', - 'bs-scheduler-simple.cc', - 'bs-scheduler-rtps.cc', - 'wimax-mac-queue.cc', - 'burst-profile-manager.cc', - 'ss-scheduler.cc', - 'service-flow.cc', - 'service-flow-manager.cc', - 'service-flow-record.cc', - 'ss-link-manager.cc', - 'bs-link-manager.cc', - 'bandwidth-manager.cc', - 'crc8.cc', - 'ul-job.cc' , - 'snr-to-block-error-rate-record.cc', - 'snr-to-block-error-rate-manager.cc', - 'simple-ofdm-send-param.cc', - 'ss-service-flow-manager.cc', - 'bs-service-flow-manager.cc', - 'ipcs-classifier.cc', - 'ipcs-classifier-record.cc', - 'wimax-tlv.cc', - 'cs-parameters.cc', - 'wimax-tlv-test.cc', - 'mac-messages-test.cc', - 'wimax-service-flow-test.cc', - 'ss-mac-test.cc', - 'phy-test.cc', - 'qos-test.cc', - 'wimax-fragmentation-test.cc', - 'wimax-mac-to-mac-header.cc' + 'model/cid.cc', + 'model/cid-factory.cc', + 'model/wimax-net-device.cc', + 'model/bs-net-device.cc', + 'model/ss-net-device.cc', + 'model/wimax-mac-header.cc', + 'model/wimax-phy.cc', + 'model/wimax-channel.cc', + 'model/ofdm-downlink-frame-prefix.cc', + 'model/wimax-connection.cc', + 'model/ss-record.cc', + 'model/mac-messages.cc', + 'model/dl-mac-messages.cc', + 'model/ul-mac-messages.cc', + 'model/simple-ofdm-wimax-phy.cc', + 'model/simple-ofdm-wimax-channel.cc', + 'model/send-params.cc', + 'model/ss-manager.cc', + 'model/connection-manager.cc', + 'model/bs-uplink-scheduler.cc', + 'model/bs-uplink-scheduler-simple.cc', + 'model/bs-uplink-scheduler-mbqos.cc', + 'model/bs-uplink-scheduler-rtps.cc', + 'model/bs-scheduler.cc', + 'model/bs-scheduler-simple.cc', + 'model/bs-scheduler-rtps.cc', + 'model/wimax-mac-queue.cc', + 'model/burst-profile-manager.cc', + 'model/ss-scheduler.cc', + 'model/service-flow.cc', + 'model/service-flow-manager.cc', + 'model/service-flow-record.cc', + 'model/ss-link-manager.cc', + 'model/bs-link-manager.cc', + 'model/bandwidth-manager.cc', + 'model/crc8.cc', + 'model/ul-job.cc' , + 'model/snr-to-block-error-rate-record.cc', + 'model/snr-to-block-error-rate-manager.cc', + 'model/simple-ofdm-send-param.cc', + 'model/ss-service-flow-manager.cc', + 'model/bs-service-flow-manager.cc', + 'model/ipcs-classifier.cc', + 'model/ipcs-classifier-record.cc', + 'model/wimax-tlv.cc', + 'model/cs-parameters.cc', + 'model/wimax-mac-to-mac-header.cc', + 'helper/wimax-helper.cc', + 'test/wimax-tlv-test.cc', + 'test/mac-messages-test.cc', + 'test/wimax-service-flow-test.cc', + 'test/ss-mac-test.cc', + 'test/phy-test.cc', + 'test/qos-test.cc', + 'test/wimax-fragmentation-test.cc', ] headers = bld.new_task_gen('ns3header') headers.module = 'wimax' headers.source = [ - 'wimax-channel.h', - 'wimax-net-device.h', - 'bs-net-device.h', - 'ss-net-device.h', - 'cid.h', - 'cid-factory.h', - 'ofdm-downlink-frame-prefix.h', - 'wimax-connection.h', - 'ss-record.h', - 'mac-messages.h', - 'dl-mac-messages.h', - 'ul-mac-messages.h', - 'wimax-phy.h', - 'simple-ofdm-wimax-phy.h', - 'simple-ofdm-wimax-channel.h', - 'send-params.h', - 'service-flow.h', - 'ss-manager.h', - 'connection-manager.h', - 'wimax-mac-header.h', - 'wimax-mac-queue.h', - 'crc8.h', - 'service-flow-manager.h', - 'bs-uplink-scheduler.h', - 'bs-uplink-scheduler-simple.h', - 'bs-uplink-scheduler-mbqos.h', - 'bs-uplink-scheduler-rtps.h', - 'ul-job.h', - 'bs-scheduler.h', - 'bs-scheduler-simple.h', - 'bs-scheduler-rtps.h', - 'service-flow-record.h', - 'snr-to-block-error-rate-record.h', - 'snr-to-block-error-rate-manager.h', - 'simple-ofdm-send-param.h', - 'ss-service-flow-manager.h', - 'bs-service-flow-manager.h', - 'cs-parameters.h', - 'ipcs-classifier-record.h', - 'wimax-tlv.h', - 'ipcs-classifier.h', - 'bvec.h', - 'wimax-mac-to-mac-header.h' + 'model/wimax-channel.h', + 'model/wimax-net-device.h', + 'model/bs-net-device.h', + 'model/ss-net-device.h', + 'model/cid.h', + 'model/cid-factory.h', + 'model/ofdm-downlink-frame-prefix.h', + 'model/wimax-connection.h', + 'model/ss-record.h', + 'model/mac-messages.h', + 'model/dl-mac-messages.h', + 'model/ul-mac-messages.h', + 'model/wimax-phy.h', + 'model/simple-ofdm-wimax-phy.h', + 'model/simple-ofdm-wimax-channel.h', + 'model/send-params.h', + 'model/service-flow.h', + 'model/ss-manager.h', + 'model/connection-manager.h', + 'model/wimax-mac-header.h', + 'model/wimax-mac-queue.h', + 'model/crc8.h', + 'model/service-flow-manager.h', + 'model/bs-uplink-scheduler.h', + 'model/bs-uplink-scheduler-simple.h', + 'model/bs-uplink-scheduler-mbqos.h', + 'model/bs-uplink-scheduler-rtps.h', + 'model/ul-job.h', + 'model/bs-scheduler.h', + 'model/bs-scheduler-simple.h', + 'model/bs-scheduler-rtps.h', + 'model/service-flow-record.h', + 'model/snr-to-block-error-rate-record.h', + 'model/snr-to-block-error-rate-manager.h', + 'model/simple-ofdm-send-param.h', + 'model/ss-service-flow-manager.h', + 'model/bs-service-flow-manager.h', + 'model/cs-parameters.h', + 'model/ipcs-classifier-record.h', + 'model/wimax-tlv.h', + 'model/ipcs-classifier.h', + 'model/bvec.h', + 'model/wimax-mac-to-mac-header.h', + 'helper/wimax-helper.h', ] + + if bld.env['ENABLE_EXAMPLES']: + bld.add_subdirs('examples') + diff --git a/src/helper/wscript b/src/helper/wscript index d7617d40b..ab4af0154 100644 --- a/src/helper/wscript +++ b/src/helper/wscript @@ -1,37 +1,20 @@ ## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*- def build(bld): - helper = bld.create_ns3_module('helper', ['mobility', 'network', 'internet', 'wifi', 'point-to-point', 'csma', 'spectrum']) + helper = bld.create_ns3_module('helper', ['mobility', 'network', 'internet', 'wifi', 'point-to-point', 'spectrum']) helper.source = [ - 'wifi-helper.cc', - 'point-to-point-helper.cc', - 'csma-helper.cc', - 'yans-wifi-helper.cc', - 'nqos-wifi-mac-helper.cc', - 'qos-wifi-mac-helper.cc', 'mesh-helper.cc', 'dot11s-installer.cc', 'flame-installer.cc', 'athstats-helper.cc', 'animation-interface.cc', 'canvas-location.cc', - 'point-to-point-dumbbell-helper.cc', - 'point-to-point-grid-helper.cc', - 'point-to-point-star-helper.cc', - 'csma-star-helper.cc', - 'wimax-helper.cc', 'topology-reader-helper.cc', ] headers = bld.new_task_gen('ns3header') headers.module = 'helper' headers.source = [ - 'wifi-helper.h', - 'point-to-point-helper.h', - 'csma-helper.h', - 'yans-wifi-helper.h', - 'nqos-wifi-mac-helper.h', - 'qos-wifi-mac-helper.h', 'mesh-helper.h', 'mesh-stack-installer.h', 'dot11s-installer.h', @@ -39,29 +22,10 @@ def build(bld): 'athstats-helper.h', 'animation-interface.h', 'canvas-location.h', - 'point-to-point-dumbbell-helper.h', - 'point-to-point-grid-helper.h', - 'point-to-point-star-helper.h', - 'csma-star-helper.h', - 'wimax-helper.h', 'topology-reader-helper.h', ] env = bld.env_of_name('default') - if env['ENABLE_EMU']: - helper.source.extend([ - 'emu-helper.cc', - ]) - headers.source.extend([ - 'emu-helper.h', - ]) - if env['ENABLE_TAP']: - helper.source.extend([ - 'tap-bridge-helper.cc', - ]) - headers.source.extend([ - 'tap-bridge-helper.h', - ]) def configure(conf): conf.check(header_name='sys/socket.h', define_name='HAVE_SYS_SOCKET_H') diff --git a/src/routing/aodv/examples/aodv.cc b/src/routing/aodv/examples/aodv.cc index 134652df5..a8f6a673a 100644 --- a/src/routing/aodv/examples/aodv.cc +++ b/src/routing/aodv/examples/aodv.cc @@ -25,6 +25,7 @@ #include "ns3/network-module.h" #include "ns3/helper-module.h" #include "ns3/mobility-module.h" +#include "ns3/point-to-point-module.h" #include "ns3/wifi-module.h" #include "ns3/v4ping-helper.h" #include diff --git a/src/routing/dsdv/examples/dsdv-manet.cc b/src/routing/dsdv/examples/dsdv-manet.cc index 12bdd09d6..bdfd9ff32 100644 --- a/src/routing/dsdv/examples/dsdv-manet.cc +++ b/src/routing/dsdv/examples/dsdv-manet.cc @@ -35,6 +35,7 @@ #include "ns3/mobility-module.h" #include "ns3/contrib-module.h" #include "ns3/wifi-module.h" +#include "ns3/internet-module.h" #include "ns3/dsdv-helper.h" #include #include diff --git a/src/routing/nix-vector-routing/examples/nix-simple.cc b/src/routing/nix-vector-routing/examples/nix-simple.cc index 0b284edc8..2cd36809c 100644 --- a/src/routing/nix-vector-routing/examples/nix-simple.cc +++ b/src/routing/nix-vector-routing/examples/nix-simple.cc @@ -17,6 +17,8 @@ #include "ns3/core-module.h" #include "ns3/network-module.h" #include "ns3/helper-module.h" +#include "ns3/internet-module.h" +#include "ns3/point-to-point-module.h" #include "ns3/applications-module.h" #include "ns3/ipv4-static-routing-helper.h" #include "ns3/ipv4-list-routing-helper.h" diff --git a/src/routing/nix-vector-routing/examples/nms-p2p-nix.cc b/src/routing/nix-vector-routing/examples/nms-p2p-nix.cc index 2cdcca22f..bf1a49f42 100644 --- a/src/routing/nix-vector-routing/examples/nms-p2p-nix.cc +++ b/src/routing/nix-vector-routing/examples/nms-p2p-nix.cc @@ -40,10 +40,10 @@ #include "ns3/internet-module.h" #include "ns3/network-module.h" #include "ns3/helper-module.h" +#include "ns3/point-to-point-module.h" #include "ns3/applications-module.h" #include "ns3/onoff-application.h" #include "ns3/packet-sink.h" -#include "ns3/point-to-point-net-device.h" #include "ns3/simulator.h" #include "ns3/ipv4-static-routing-helper.h" #include "ns3/ipv4-list-routing-helper.h" diff --git a/src/routing/olsr/examples/olsr-hna.cc b/src/routing/olsr/examples/olsr-hna.cc index 2c0bec734..81d22adc7 100644 --- a/src/routing/olsr/examples/olsr-hna.cc +++ b/src/routing/olsr/examples/olsr-hna.cc @@ -56,6 +56,7 @@ #include "ns3/mobility-module.h" #include "ns3/contrib-module.h" #include "ns3/wifi-module.h" +#include "ns3/csma-module.h" #include "ns3/ipv4-list-routing.h" #include "ns3/olsr-routing-protocol.h" #include "ns3/olsr-helper.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 affc166ed..a2da75b62 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,9 @@ #include "ns3/core-module.h" #include "ns3/network-module.h" +#include "ns3/internet-module.h" #include "ns3/helper-module.h" +#include "ns3/point-to-point-module.h" #include "ns3/applications-module.h" #include "ns3/olsr-helper.h" #include "ns3/ipv4-static-routing-helper.h" diff --git a/test.py b/test.py index b74bc2d36..86cd369d5 100755 --- a/test.py +++ b/test.py @@ -93,16 +93,16 @@ core_nsc_missing_skip_tests = [ example_tests = [ ("src/devices/bridge/examples/csma-bridge", "True", "True"), ("src/devices/bridge/examples/csma-bridge-one-hop", "True", "True"), - ("examples/csma/csma-broadcast", "True", "True"), - ("examples/csma/csma-multicast", "True", "True"), - ("examples/csma/csma-one-subnet", "True", "True"), - ("examples/csma/csma-packet-socket", "True", "True"), - ("examples/csma/csma-ping", "True", "True"), - ("examples/csma/csma-raw-ip-socket", "True", "True"), - ("examples/csma/csma-star", "True", "True"), + ("src/devices/csma/examples/csma-broadcast", "True", "True"), + ("src/devices/csma/examples/csma-multicast", "True", "True"), + ("src/devices/csma/examples/csma-one-subnet", "True", "True"), + ("src/devices/csma/examples/csma-packet-socket", "True", "True"), + ("src/devices/csma/examples/csma-ping", "True", "True"), + ("src/devices/csma/examples/csma-raw-ip-socket", "True", "True"), + ("src/devices/csma/examples/csma-star", "True", "True"), - ("examples/emulation/emu-ping", "False", "True"), - ("examples/emulation/emu-udp-echo", "False", "True"), + ("src/devices/emu/examples/emu-ping", "False", "True"), + ("src/devices/emu/examples/emu-udp-echo", "False", "True"), ("examples/energy/energy-model-example", "True", "True"), @@ -181,9 +181,9 @@ example_tests = [ ("src/routing/click/examples/nsclick-simple-lan", "ENABLE_CLICK == True", "True"), - ("examples/wimax/wimax-simple", "True", "True"), - ("examples/wimax/wimax-ipv4", "True", "True"), - ("examples/wimax/wimax-multicast", "True", "True"), + ("src/devices/wimax/examples/wimax-simple", "True", "True"), + ("src/devices/wimax/examples/wimax-ipv4", "True", "True"), + ("src/devices/wimax/examples/wimax-multicast", "True", "True"), ] # diff --git a/utils/print-introspected-doxygen.cc b/utils/print-introspected-doxygen.cc index 0928a27d1..7a8a28324 100644 --- a/utils/print-introspected-doxygen.cc +++ b/utils/print-introspected-doxygen.cc @@ -1,4 +1,5 @@ #include +#include #include "ns3/object.h" #include "ns3/pointer.h" #include "ns3/object-vector.h"