Commit Graph
42 Commits
Author SHA1 Message Date
Tom Henderson dc35afb65f fix example and sample dependencies 2011-01-28 14:11:42 -08:00
Tom Henderson ec19f30901 remove copy-pasted reference to FixedRss loss model 2011-01-03 12:56:27 -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
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
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 86d74a5980 flow-monitor-helper.h is no longer part of the helper module 2010-10-23 12:50:24 +01:00
Josh Pelkey 207a9bd931 remove mobility trace to pass regression for now 2010-08-09 18:47:12 -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
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
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
Duy Nguyen a8b12c20a1 cleaned up and fixed valgrind error in multirate example 2010-05-21 14:19:15 -07:00
Duy Nguyen 19e1a27a0f disable flowmonitor for multirate example 2010-05-20 13:45:20 -07:00
Duy Nguyen d4b594439f update multirate example for test.py 2010-05-19 16:09:42 -07:00
Nicola Baldo 82e936500e fixed bug 890 2010-05-18 15:38:17 +02:00
Nicola Baldo 0034ca494d fixed bug 843 2010-05-18 11:35:47 +02:00
Mirko Banchi 48cf007902 add methods in QosWifiMacHelper for block ack parameters setup
--HG--
extra : rebase_source : 462107d0be0f263676a906bce3d445073bc41d02
2010-05-10 16:41:20 +02:00
Kim Højgaard-Hansen 3de4fcd57e Bug 885 - Error in Ascii tracing in Python examples 2010-04-20 14:12:35 -04:00
Gustavo J. A. M. Carneiro 9e90efb5cb Fix a couple of Python examples 2010-04-16 15:06:54 +01:00
Gustavo J. A. M. Carneiro 32b15e4e92 Fix tracing part of the mixed-wireless.py example 2010-04-16 12:58:30 +01:00
Pavel Boyko c79d9ce95f Missed file 2010-03-09 11:47:18 +03:00
Pavel Boyko e06ea69752 Matrix propagation loss model added 2010-03-09 11:35:09 +03:00
Craig Dowell 175ac1f10a OutputStreamKeeper to OutputStreamWrapper
--HG--
rename : src/common/output-stream-keeper.cc => src/common/output-stream-wrapper.cc
rename : src/common/output-stream-keeper.h => src/common/output-stream-wrapper.h
2010-02-23 10:30:38 -08:00
Craig Dowell 2d1892a496 The name OutputStreamObject is no longer appropriate
--HG--
rename : src/common/output-stream-object.cc => src/common/output-stream-keeper.cc
rename : src/common/output-stream-object.h => src/common/output-stream-keeper.h
2010-02-12 17:31:11 -08:00
Craig Dowell 723f50ab1b branch merge 2010-02-04 06:26:55 -08:00
Craig Dowell aeefbd4e9f Review feedback 2010-02-03 13:26:39 -08:00
Mirko Banchi b4dc9fe446 add a block ack example 2010-02-03 20:34:54 +01:00
Craig Dowell f3436f8baf add ipv6 2010-01-27 21:23:30 -08:00
Craig Dowell ec4936c20a checkpoint 2010-01-22 12:44:53 -08:00
Craig Dowell 75782d0884 redo pcap tracing 2010-01-04 10:35:32 -08:00
Tom Henderson 6f503fd3fe remove reference to scratch/ directory in wireless examples 2009-12-29 09:39:52 -08:00
Tom Henderson 614c5cf78e bug 776: sinkNode hardcoded in example program 2009-12-14 10:42:33 -08:00
Timo Bingmann 823e1343b1 Renaming WifiPhy state SYNC to RX to avoid confusion with "synchronizing". 2009-11-30 18:40:35 +01:00
Guillaume Seguin ef00a998fb Make applications generate traffic within their associated context/node 2009-11-14 17:47:05 +01:00
Craig Dowell 69e1aaa1cf split examples, add examples, tweak test.py to minimize builds
--HG--
rename : examples/csma-bridge-one-hop.cc => examples/csma/csma-bridge-one-hop.cc
rename : examples/csma-bridge.cc => examples/csma/csma-bridge.cc
rename : examples/csma-bridge.py => examples/csma/csma-bridge.py
rename : examples/csma-broadcast.cc => examples/csma/csma-broadcast.cc
rename : examples/csma-multicast.cc => examples/csma/csma-multicast.cc
rename : examples/csma-one-subnet.cc => examples/csma/csma-one-subnet.cc
rename : examples/csma-packet-socket.cc => examples/csma/csma-packet-socket.cc
rename : examples/csma-ping.cc => examples/csma/csma-ping.cc
rename : examples/csma-raw-ip-socket.cc => examples/csma/csma-raw-ip-socket.cc
rename : examples/csma-star.cc => examples/csma/csma-star.cc
rename : examples/emu-ping.cc => examples/emulation/emu-ping.cc
rename : examples/emu-udp-echo.cc => examples/emulation/emu-udp-echo.cc
rename : examples/simple-error-model.cc => examples/error-model/simple-error-model.cc
rename : examples/wifi-olsr-flowmon.py => examples/flowmon/wifi-olsr-flowmon.py
rename : examples/icmpv6-redirect.cc => examples/ipv6/icmpv6-redirect.cc
rename : examples/ping6.cc => examples/ipv6/ping6.cc
rename : examples/radvd-two-prefix.cc => examples/ipv6/radvd-two-prefix.cc
rename : examples/radvd.cc => examples/ipv6/radvd.cc
rename : examples/test-ipv6.cc => examples/ipv6/test-ipv6.cc
rename : examples/mesh.cc => examples/mesh/mesh.cc
rename : examples/object-names.cc => examples/naming/object-names.cc
rename : examples/realtime-udp-echo.cc => examples/realtime/realtime-udp-echo.cc
rename : examples/dynamic-global-routing.cc => examples/routing/dynamic-global-routing.cc
rename : examples/global-injection-slash32.cc => examples/routing/global-injection-slash32.cc
rename : examples/global-routing-slash32.cc => examples/routing/global-routing-slash32.cc
rename : examples/mixed-global-routing.cc => examples/routing/mixed-global-routing.cc
rename : examples/nix-simple.cc => examples/routing/nix-simple.cc
rename : examples/nms-p2p-nix.cc => examples/routing/nms-p2p-nix.cc
rename : examples/simple-alternate-routing.cc => examples/routing/simple-alternate-routing.cc
rename : examples/simple-global-routing.cc => examples/routing/simple-global-routing.cc
rename : examples/simple-point-to-point-olsr.cc => examples/routing/simple-point-to-point-olsr.cc
rename : examples/simple-routing-ping6.cc => examples/routing/simple-routing-ping6.cc
rename : examples/simple-routing-ping6.py => examples/routing/simple-routing-ping6.py
rename : examples/static-routing-slash32.cc => examples/routing/static-routing-slash32.cc
rename : examples/tap-wifi-dumbbell.cc => examples/tap/tap-wifi-dumbbell.cc
rename : examples/star.cc => examples/tcp/star.cc
rename : examples/tcp-large-transfer.cc => examples/tcp/tcp-large-transfer.cc
rename : examples/tcp-nsc-lfn.cc => examples/tcp/tcp-nsc-lfn.cc
rename : examples/tcp-nsc-zoo.cc => examples/tcp/tcp-nsc-zoo.cc
rename : examples/tcp-star-server.cc => examples/tcp/tcp-star-server.cc
rename : examples/virtual-net-device.cc => examples/tunneling/virtual-net-device.cc
rename : examples/first.cc => examples/tutorial/first.cc
rename : examples/first.py => examples/tutorial/first.py
rename : examples/hello-simulator.cc => examples/tutorial/hello-simulator.cc
rename : examples/second.cc => examples/tutorial/second.cc
rename : examples/third.cc => examples/tutorial/third.cc
rename : examples/udp-echo.cc => examples/udp/udp-echo.cc
rename : examples/mixed-wireless.cc => examples/wireless/mixed-wireless.cc
rename : examples/mixed-wireless.py => examples/wireless/mixed-wireless.py
rename : examples/multirate.cc => examples/wireless/multirate.cc
rename : examples/simple-wifi-frame-aggregation.cc => examples/wireless/simple-wifi-frame-aggregation.cc
rename : examples/wifi-adhoc.cc => examples/wireless/wifi-adhoc.cc
rename : examples/wifi-ap.cc => examples/wireless/wifi-ap.cc
rename : examples/wifi-ap.py => examples/wireless/wifi-ap.py
rename : examples/wifi-clear-channel-cmu.cc => examples/wireless/wifi-clear-channel-cmu.cc
rename : examples/wifi-wired-bridging.cc => examples/wireless/wifi-wired-bridging.cc
2009-10-06 19:34:29 -07:00