Commit Graph
749 Commits
Author SHA1 Message Date
Tom Henderson ec19f30901 remove copy-pasted reference to FixedRss loss model 2011-01-03 12:56:27 -08:00
Tom Henderson 36e8e527e3 Fix MTU issues with udp-trace-client-server example 2010-12-29 10:16:45 -08:00
Tom Henderson dadc73011e [bug 947] Pretty-print IPv4 routing tables (patch originated by Hemanth Narra) 2010-12-20 16:34:59 -08:00
He Wu db55c0c2a8 RV battery model and WiFi energy example 2010-12-20 15:49:12 -08:00
Tom Henderson 262886360f Fix arguments to Time and DataRate objects for TCP examples 2010-12-20 15:19:11 -08:00
Josh Pelkey b0513c00c5 merge new TCP code 2010-12-17 13:57:22 -05:00
Josh Pelkey d1958c8f88 Add BulkSendApplication 2010-12-16 20:24:14 -05:00
Dean Armstrong 7f16a8c0f6 Bug 978: Run check-style.py on files touched in the reorganisation
Cosmetic changes only in this one (hence the reason I wanted them kept
separate from the the previous changeset).
2010-12-01 22:13:26 +00:00
Dean Armstrong dee65aa304 Bug 978: Consolidate Wi-Fi MAC high functionality
This change reorganises the Wi-Fi MAC high classes in attempt to
reduce duplication of functionality that is required for more than one
of the MAC high models. A new class called RegularWifiMac has been
created. This derives from the abstract WifiMac, and is parent of
AdhocWifiMac, StaWifiMac, ApWifiMac, and MeshWifiInterfaceMac. The QoS
and non-QoS class variants are no longer, with a RegularWifiMac
attribute "QosSupported" allowing selection between these two modes of
operation. QosWifiMacHelper and NqosWifiMacHelper continue to work as
previously.

Updates to some regression traces are necessary because the
reorganisation has led to random number streams being initialised in
slightly different orders and thus over-the-air timing changing.

--HG--
rename : src/devices/wifi/qap-wifi-mac.cc => src/devices/wifi/ap-wifi-mac.cc
rename : src/devices/wifi/qap-wifi-mac.h => src/devices/wifi/ap-wifi-mac.h
rename : src/devices/wifi/qsta-wifi-mac.cc => src/devices/wifi/sta-wifi-mac.cc
rename : src/devices/wifi/qsta-wifi-mac.h => src/devices/wifi/sta-wifi-mac.h
2010-12-02 07:51:34 +00:00
Nicola Baldo cacb2cabb0 fixed bug 1031 2010-11-17 17:12:55 +01:00
Pavel Boyko 4f1dcd7a88 Bug 1030: routing/aodv example fixed 2010-11-17 11:03:07 +03:00
Josh Pelkey 2d432a3453 fix nms examples 2010-11-11 16:09:15 -05:00
Egemen K. Cetinkaya 0578a6f211 remove unneeded array 2010-11-09 20:27:55 -08:00
Tom Henderson a516580b87 hello-simulator.cc depends on core module 2010-11-08 11:38:12 -08:00
Josh Pelkey f36ac6236d add includes for mpi build 2010-11-01 12:23:07 -04:00
Gustavo J. A. M. Carneiro a46fcbe2cd Missing ipv4-global-routing-helper.h include 2010-10-27 12:05:40 +01:00
Gustavo J. A. M. Carneiro b668f9f9c9 Module layout rework for static-routing, list-routing, global-routing
--HG--
rename : src/helper/ipv4-global-routing-helper.cc => src/routing/global-routing/helper/ipv4-global-routing-helper.cc
rename : src/helper/ipv4-global-routing-helper.h => src/routing/global-routing/helper/ipv4-global-routing-helper.h
rename : src/routing/global-routing/candidate-queue.cc => src/routing/global-routing/model/candidate-queue.cc
rename : src/routing/global-routing/candidate-queue.h => src/routing/global-routing/model/candidate-queue.h
rename : src/routing/global-routing/global-route-manager-impl.cc => src/routing/global-routing/model/global-route-manager-impl.cc
rename : src/routing/global-routing/global-route-manager-impl.h => src/routing/global-routing/model/global-route-manager-impl.h
rename : src/routing/global-routing/global-route-manager.cc => src/routing/global-routing/model/global-route-manager.cc
rename : src/routing/global-routing/global-route-manager.h => src/routing/global-routing/model/global-route-manager.h
rename : src/routing/global-routing/global-router-interface.cc => src/routing/global-routing/model/global-router-interface.cc
rename : src/routing/global-routing/global-router-interface.h => src/routing/global-routing/model/global-router-interface.h
rename : src/routing/global-routing/global-routing.h => src/routing/global-routing/model/global-routing.h
rename : src/routing/global-routing/ipv4-global-routing.cc => src/routing/global-routing/model/ipv4-global-routing.cc
rename : src/routing/global-routing/ipv4-global-routing.h => src/routing/global-routing/model/ipv4-global-routing.h
rename : src/helper/ipv4-list-routing-helper.cc => src/routing/list-routing/helper/ipv4-list-routing-helper.cc
rename : src/helper/ipv4-list-routing-helper.h => src/routing/list-routing/helper/ipv4-list-routing-helper.h
rename : src/helper/ipv6-list-routing-helper.cc => src/routing/list-routing/helper/ipv6-list-routing-helper.cc
rename : src/helper/ipv6-list-routing-helper.h => src/routing/list-routing/helper/ipv6-list-routing-helper.h
rename : src/routing/list-routing/ipv4-list-routing.cc => src/routing/list-routing/model/ipv4-list-routing.cc
rename : src/routing/list-routing/ipv4-list-routing.h => src/routing/list-routing/model/ipv4-list-routing.h
rename : src/routing/list-routing/ipv6-list-routing.cc => src/routing/list-routing/model/ipv6-list-routing.cc
rename : src/routing/list-routing/ipv6-list-routing.h => src/routing/list-routing/model/ipv6-list-routing.h
rename : src/helper/ipv4-static-routing-helper.cc => src/routing/static-routing/helper/ipv4-static-routing-helper.cc
rename : src/helper/ipv4-static-routing-helper.h => src/routing/static-routing/helper/ipv4-static-routing-helper.h
rename : src/helper/ipv6-static-routing-helper.cc => src/routing/static-routing/helper/ipv6-static-routing-helper.cc
rename : src/helper/ipv6-static-routing-helper.h => src/routing/static-routing/helper/ipv6-static-routing-helper.h
rename : src/routing/static-routing/ipv4-routing-table-entry.cc => src/routing/static-routing/model/ipv4-routing-table-entry.cc
rename : src/routing/static-routing/ipv4-routing-table-entry.h => src/routing/static-routing/model/ipv4-routing-table-entry.h
rename : src/routing/static-routing/ipv4-static-routing.cc => src/routing/static-routing/model/ipv4-static-routing.cc
rename : src/routing/static-routing/ipv4-static-routing.h => src/routing/static-routing/model/ipv4-static-routing.h
rename : src/routing/static-routing/ipv6-routing-table-entry.cc => src/routing/static-routing/model/ipv6-routing-table-entry.cc
rename : src/routing/static-routing/ipv6-routing-table-entry.h => src/routing/static-routing/model/ipv6-routing-table-entry.h
rename : src/routing/static-routing/ipv6-static-routing.cc => src/routing/static-routing/model/ipv6-static-routing.cc
rename : src/routing/static-routing/ipv6-static-routing.h => src/routing/static-routing/model/ipv6-static-routing.h
2010-10-26 18:02:17 +01:00
Gustavo J. A. M. Carneiro 7111deedff Fix some examples, broken after bridge/olsr reorganization 2010-10-25 21:43:38 +01:00
Gustavo J. A. M. Carneiro 1459f529be Convert the virtual-net-device module to the new layout
--HG--
rename : examples/tunneling/virtual-net-device.cc => src/devices/virtual-net-device/examples/virtual-net-device.cc
rename : src/devices/virtual-net-device/virtual-net-device.cc => src/devices/virtual-net-device/model/virtual-net-device.cc
rename : src/devices/virtual-net-device/virtual-net-device.h => src/devices/virtual-net-device/model/virtual-net-device.h
2010-10-25 15:13:44 +01:00
Gustavo J. A. M. Carneiro 8b3b61d74f Convert the bridge module to the new layout
--HG--
rename : examples/csma/csma-bridge-one-hop.cc => src/devices/bridge/examples/csma-bridge-one-hop.cc
rename : examples/csma/csma-bridge.cc => src/devices/bridge/examples/csma-bridge.cc
rename : examples/csma/csma-bridge.py => src/devices/bridge/examples/csma-bridge.py
rename : src/helper/bridge-helper.cc => src/devices/bridge/helper/bridge-helper.cc
rename : src/helper/bridge-helper.h => src/devices/bridge/helper/bridge-helper.h
rename : src/devices/bridge/bridge-channel.cc => src/devices/bridge/model/bridge-channel.cc
rename : src/devices/bridge/bridge-channel.h => src/devices/bridge/model/bridge-channel.h
rename : src/devices/bridge/bridge-net-device.cc => src/devices/bridge/model/bridge-net-device.cc
rename : src/devices/bridge/bridge-net-device.h => src/devices/bridge/model/bridge-net-device.h
2010-10-25 15:00:28 +01:00
Gustavo J. A. M. Carneiro 866da8a2f7 Convert the olsr module to the new module layout
--HG--
rename : src/routing/olsr/olsr.h => src/routing/olsr/doc/olsr.h
rename : examples/routing/olsr-hna.cc => src/routing/olsr/examples/olsr-hna.cc
rename : examples/routing/simple-point-to-point-olsr.cc => src/routing/olsr/examples/simple-point-to-point-olsr.cc
rename : src/helper/olsr-helper.cc => src/routing/olsr/helper/olsr-helper.cc
rename : src/helper/olsr-helper.h => src/routing/olsr/helper/olsr-helper.h
rename : src/routing/olsr/olsr-header.cc => src/routing/olsr/model/olsr-header.cc
rename : src/routing/olsr/olsr-header.h => src/routing/olsr/model/olsr-header.h
rename : src/routing/olsr/olsr-repositories.h => src/routing/olsr/model/olsr-repositories.h
rename : src/routing/olsr/olsr-routing-protocol.cc => src/routing/olsr/model/olsr-routing-protocol.cc
rename : src/routing/olsr/olsr-routing-protocol.h => src/routing/olsr/model/olsr-routing-protocol.h
rename : src/routing/olsr/olsr-state.cc => src/routing/olsr/model/olsr-state.cc
rename : src/routing/olsr/olsr-state.h => src/routing/olsr/model/olsr-state.h
2010-10-25 14:43:02 +01:00
Gustavo J. A. M. Carneiro 86d74a5980 flow-monitor-helper.h is no longer part of the helper module 2010-10-23 12:50:24 +01:00
Gustavo J. A. M. Carneiro f675161e43 Adapt the flow-monitor module to the new module tree layout spec.
--HG--
rename : src/contrib/flow-monitor/design.txt => src/contrib/flow-monitor/doc/design.txt
rename : examples/flowmon/flowmon-parse-results.py => src/contrib/flow-monitor/examples/flowmon-parse-results.py
rename : examples/flowmon/wifi-olsr-flowmon.py => src/contrib/flow-monitor/examples/wifi-olsr-flowmon.py
rename : src/helper/flow-monitor-helper.cc => src/contrib/flow-monitor/helper/flow-monitor-helper.cc
rename : src/helper/flow-monitor-helper.h => src/contrib/flow-monitor/helper/flow-monitor-helper.h
rename : src/contrib/flow-monitor/flow-classifier.cc => src/contrib/flow-monitor/model/flow-classifier.cc
rename : src/contrib/flow-monitor/flow-classifier.h => src/contrib/flow-monitor/model/flow-classifier.h
rename : src/contrib/flow-monitor/flow-monitor.cc => src/contrib/flow-monitor/model/flow-monitor.cc
rename : src/contrib/flow-monitor/flow-monitor.h => src/contrib/flow-monitor/model/flow-monitor.h
rename : src/contrib/flow-monitor/flow-probe.cc => src/contrib/flow-monitor/model/flow-probe.cc
rename : src/contrib/flow-monitor/flow-probe.h => src/contrib/flow-monitor/model/flow-probe.h
rename : src/contrib/flow-monitor/histogram.cc => src/contrib/flow-monitor/model/histogram.cc
rename : src/contrib/flow-monitor/histogram.h => src/contrib/flow-monitor/model/histogram.h
rename : src/contrib/flow-monitor/ipv4-flow-classifier.cc => src/contrib/flow-monitor/model/ipv4-flow-classifier.cc
rename : src/contrib/flow-monitor/ipv4-flow-classifier.h => src/contrib/flow-monitor/model/ipv4-flow-classifier.h
rename : src/contrib/flow-monitor/ipv4-flow-probe.cc => src/contrib/flow-monitor/model/ipv4-flow-probe.cc
rename : src/contrib/flow-monitor/ipv4-flow-probe.h => src/contrib/flow-monitor/model/ipv4-flow-probe.h
2010-10-22 17:18:49 +01:00
Gustavo J. A. M. Carneiro a73a1cb6f0 Add example python script to parse Flow Monitor XML results. 2010-10-22 14:59:56 +01:00
Egemen K. Cetinkaya 68a875fa41 Fix comments on matrix-topology example 2010-10-19 22:03:30 -07:00
Tom Henderson 5c1a7dc52e fix optimized build 2010-10-19 21:58:13 -07:00
Egemen K. Cetinkaya cab265b38f Matrix topology example program 2010-10-18 22:02:03 -07:00
Tom Henderson d7e08772f0 fix csma-packet-socket.cc comments 2010-10-08 09:43:42 -07:00
Quincy Tse 21f5b31c16 Bug 930 - examples/topology-read/topology-example-sim.cc uses variable length array 2010-08-10 22:33:13 -04:00
Gustavo J. A. M. Carneiro 47a5ba267a Bring nodes close together, due to changes in ns-3.9 that bring reduced wifi range 2010-08-10 12:28:56 +01:00
Gustavo J. A. M. Carneiro b524d3492f realtime-udp-echo.cc ported to python 2010-08-10 12:21:08 +01:00
Josh Pelkey 207a9bd931 remove mobility trace to pass regression for now 2010-08-09 18:47:12 -04:00
Flavio Kubota ad4c1c6c98 Bug 953 - WiMAX channel scanning overflow 2010-08-07 21:15:14 -03:00
Josh Pelkey a387e018aa Bug 970 - move UAN over to new directory structure 2010-08-03 15:23:18 -04:00
Gilaras Drakeson 6190f34d6d SetAllowBroadcast(true) addition made to wifi-simple-infra.cc and wifi-simple-interference.cc 2010-07-19 23:15:42 +05:30
Gilaras Drakeson b5c5f394c2 Adds SetAllowBroadcast(true) to wifi-simple-adhoc.cc 2010-07-19 22:37:44 +05:30
ltracy 0d54c64023 Fixed valgrind errors 2010-07-09 13:29:12 -07:00
Yida Gao 8e486a1b28 Fix errors in simple-point-to-point-olsr.cc comments 2010-07-08 20:18:14 -07:00
Josh Pelkey 26591e3a74 fix uan example 2010-06-28 14:47:06 -04:00
Leonard Tracy c0e7539b6e UAN module addition 2010-06-24 14:35:29 -04:00
Hajime Tazaki 99b3d69735 Bug 946 - Rocketfuel topology dataset support for topology reader 2010-06-23 18:16:45 +09:00
Dean Armstrong 9d861d1332 Bug 853: Use consistent standards/rates for examples and tests that use Wi-Fi
The change to consider mandatory rates for control responses if a
suitable basic rate could not be found broke the tests involving the
wireless/wifi-simple-adhoc-grid example, and the
routing-olsr-regression testsuite.

In these cases it is actually the tests that need updating; in the
wifi-simple-adhoc-grid test and the bug780-test part of the
routing-olsr-regression testsuite, 802.11b rates were being used with
the Wi-Fi PHY standard left at the default of 802.11a. The fix here is
to set the standard to 802.11b in the test.

In the tx-regression-test part of routing-olsr-regression, the problem
was that the reference traces needed to be updated given the control
response rate fix.  In this case I have also modified the test to set
the standard to 802.11a for clarity.
2010-06-23 09:01:30 +01:00
Gustavo J. A. M. Carneiro 869a868a4d Another missing <math.h> include 2010-06-20 15:57:49 +01:00
Martín Giachino 37a1da58c1 473: brand new NS-2 mobility trace reader merged 2010-06-20 17:21:22 +04:00
Dean Armstrong d1ab02bcc3 Bug 871: Update OFDM validation script for new rate naming 2010-06-16 20:49:41 +01:00
Dean Armstrong e86eaa4e6b Bug 871: Rework construction of Wi-Fi rates
This patch attempts to lay some groundwork for enhancements to the Wi-Fi module
by bringing the representation of transmit rates more in line with the
standard.

The key part of the patch is the introduction of a type that corresponds to the
notion of Modulation Class described in IEEE 802.11-2007, Section 9.6.1, Table
9-2.

It also adds coding rate information to the WifiModes and centralises their
construction into a single WifiModeFactory method. The rates are also renamed
with reference to their Modulation Class.

WifiModes no longer have a WifiStandard, but the latter type still exists and is
used to imply the set of WifiModes that a MAC/PHY pair will support.
2010-06-16 10:55:13 +01:00
Gary Pei b7d10f0456 Add NistErrorRateModel for wifi 2010-06-15 10:28:51 -07:00
Lalith Suresh 51f737b0cf hnaEntries Create() moved into if block for clarity 2010-06-13 13:40:12 +05:30
Nicola Baldo 934f769b9a merged spectrum framework 2010-06-11 19:30:06 +02:00
Tom Henderson 9bf27e3942 bug 702: make global routing robust to link/device events 2010-05-24 10:52:58 -07:00