Attachment #1687 for bug #1784

View | Details | Raw Unified | Return to bug 1784
Collapse All | Expand All




us a note on ns-developers mailing list.</p>

<hr>
<h1>Changes from ns-3.18 to ns-3.19</h1>
<h2>New API:</h2>
<ul>
  <li></li>
</ul>
<h2>Changes to existing API:</h2>
<ul>
  <li></li>
</ul>
<h2>Changes to build system:</h2>
<ul>
  <li></li>
</ul>
<h2>Changed behavior:</h2>
<ul>
  <li></li>
</ul>

<hr>
<h1>Changes from ns-3.17 to ns-3.18</h1>

<h2>New API:</h2>

  <li>AODV Hellos are disabled by default. The performance with Hellos enabled and disabled are almost identical. With Hellos enabled, AODV will suppress hellos from transmission, if any recent broadcast such as RREQ was transmitted. The attribute <tt>ns3::aodv::RoutingProtocol::EnableHello</tt> can be used to enable/disable Hellos.
</ul>

<hr>
<h1>Changes from ns-3.16 to ns-3.17</h1>

<h2>New API:</h2>





New user-visible features
-------------------------
- It is now possible to randomize the time of the first beacon from an access point.
  Use an attribute "EnableBeaconJitter" to enable/disable this feature.
- a new FixedRoomPositionAllocator helper class is available, it
  allows to generate a random position uniformly distributed in the
  volume of a chosen room inside a chosen building. 

Bugs fixed
----------
- Bug 1722 - beacons transmitted concurrently
- Bug 1616 - WifiPhyStateHelper reports false CCA_BUSY times at State trace source
- Bug 1011 - assert failed. file=../src/devices/wifi/dcf-manager.cc
- Bug 1691 - RTS/CTS NAV reset prematurely

Release 3.18
=============

Availability
------------
This release is available from: 
http://www.nsnam.org/release/ns-allinone-3.18.tar.bz2

Supported platforms
-------------------
These platforms have been tested; others may work also:
- Fedora Core 18 (32/64 bit) with g++-4.7.2
- Fedora Core 17 (32/64 bit) with g++-4.7.0
- Ubuntu 13.04 (32/64 bit) with g++-4.7.3
- Ubuntu 12.04 (32/64 bit) with g++-4.6.3
- Ubuntu 10.04.4 LTS (64 bit) with g++-4.4.3
- OS X Mountain Lion 10.8.3 with g++-4.2.1
- FreeBSD 9.1-RELEASE (64 bit) with g++-4.2.1

New user-visible features
-------------------------
- Time attributes can now be bounded.  See attribute-test-suite.cc for an
  example.
- Data collection components have been added to the stats module.  These





		ns-3 RELEASE NOTES

This file contains ns-3 release notes (most recent releases first).  

All of the ns-3 documentation is accessible from the ns-3 website: 
http://www.nsnam.org including tutorials: http://www.nsnam.org/tutorials.html

Consult the file CHANGES.html for more detailed information about changed
API and behavior across ns-3 releases.

Release 3.18
============

Availability
------------
This release is available from: 
http://www.nsnam.org/release/ns-allinone-3.18.tar.bz2

Supported platforms
-------------------

New user-visible features
-------------------------
- Time attributes can now be bounded.  See attribute-test-suite.cc for an
  example.
- Data collection components have been added to the stats module.  These
  components can be used to generate time series data in files and plots.
- IPv6 address class 2001:db8::/32 is now dropped by routers (RFC 3849).
- New generic hash function interface.  Two hash functions are provided:
  murmur3 (default), and the venerable FNV1a.  See the Hash Functions
  section in the Manual.
- New Mac16Address has been added, Mac64Address is now in-line with 
  Mac48Address and all the three can be used in IPv6 autoconfigure. 
- Previously, the use of Building models was limited to the use of the
  companion BuildingsMobilityModel. Now, any MobilityModel can be
  used with Building models. 
- The latest LTE module code by the LENA project has been merged,
  including the following new features: 
   - PHY support for UE measurements (RSRP and RSRQ)
   - RRC support for UE measurements (configuration, execution, reporting)
   - Automatic Handover trigger based on RRC UE measurement reports
- IPv6 can now detect and use Path-MTU. See 
  examples/ipv6/fragmentation-ipv6-two-MTU.cc for an example.
- Radvd application have a new Helper. See the updated 
  examples/ipv6/radvd.cc for an example.
- 11n- It is now possible to create a high throughput (HT) node that used the new 11n data rates and preambles.
- It is now possible to request printing command line arguments to the
  desired output stream using PrintHelp or operator <<

Bugs fixed
----------
- Bug  760 - IP address removal can be painful
- Bug 1190 - Suppress hello if bcast was sent within the last hello interval
- Bug 1296 - Enhancement in Ipv[4,6]RoutingHelper
- Bug 1390 - ICMPv6 Redirect are handled correctly only for /64 networks
- Bug 1522 - Hidden node scenario leads to ARP failure
- Bug 1584 - Old Association Request Timeouts are not canceled
- Bug 1629 - Make AODV Default to Disable Hello
- Bug 1643 - NdiscCache creation and existence checks
- Bug 1646 - ICMPv6 Redirect are sent from global address instead of link-local
- Bug 1662 - m_type not set for Ipv6OptionRouterAlertHeader
- Bug 1678 - C++11 compliance problem with std::pair"
- Bug 1682 - ./waf crashes on FC10
- Bug 1683 - IPv6 autoconfigured don't use *infinite* lifetimes
- Bug 1669 - ns-3 should support binding two and three (possibly more) arguments
- Bug 1675 - Throughput computation error in Wireless examples
- Bug 1687 - wscript features report doesn't respect NOCOLOR
- Bug 1688 - Routers should advertise themselves from the link-local address
- Bug 1689 - IPv6 shouldn't add a default gateway without checking the Router lifetime
- Bug 1690 - missing header files from wifi wscript
- Bug 1697 - ICMPv6 Redirect trigger contains multiple bugs
- Bug 1698 - mobility.SetPositionAllocator misses prefix "ns3::"
- Bug 1700 - Ipv6RawSocket does not honor the bound address when sending packets
- Bug 1701 - Ipv6StaticRouting: the source address should match the destination scope
- Bug 1702 - Ipv6InterfaceContainer::SetRouter should not always add the router as the default router.
- Bug 1703 - Nodes don't react to a DAD
- Bug 1712 - The IP (v4 and v6) forwarding needs a test
- Bug 1718 - Ipv4StaticRouting log component is misspelled
- Bug 1720 - IPv6 Fragmentation cause crashes
- Bug 1721 - Path MTU isn't handled properly
- Bug 1723 - name clash in ipv4-header.h with <termios.h>
- Bug 1727 - Ping6 should use a proper source address
- Bug 1728 - Radvd application is missing an Helper
- Bug 1731 - lte-phy-error-model passes unexpectedly
- Bug 1738 - strict aliasing compiler bug
- Bug 1742 - IPv6 HbH and Dst Extension Header size is not correctly calculated
- Bug 1752 - RadvdInterface m_defaultLifeTime is set to milliseconds instead of seconds
- Bug 1753 - Halting Issue with DistributedSimulatorImpl
- Bug 1754 - Missing GIL lock in generated callback destructor

Known issues
------------
In general, known issues are tracked on the project tracker available
at http://www.nsnam.org/bugzilla/

Release 3.17
============

Availability
------------
This release is available from: 
http://www.nsnam.org/release/ns-allinone-3.17.tar.bz2

Supported platforms
-------------------
These platforms have been tested; others may work also:
- Fedora Core 18 (32/64 bit) with g++-4.7.2
- Fedora Core 17 (32/64 bit) with g++-4.7.0
- Ubuntu 13.04 (32/64 bit) with g++-4.7.3
- Ubuntu 12.10 (32/64 bit) with g++-4.6.3
- Ubuntu 12.04 (32/64 bit) with g++-4.6.3
- Ubuntu 10.04.4 LTS (64 bit) with g++-4.4.3
- OS X Mountain Lion 10.8.3 with g++-4.2.1
- FreeBSD 9.1-RELEASE (64 bit) with g++-4.2.1

New user-visible features
-------------------------
- new TCP Westwood and Westwood+ models
- new FdNetDevice model and associated helpers.  The FdNetDevice is able
  to read and write from a file descriptor.  Various helpers are provided
  to associate this descriptor with underlying devices or sockets on the 
  host operating system, including a packet socket for emulation, and
  tap devices including a version specialized for use on PlanetLab.
- ns-3-click: it's now possible to (i) have Click pull random numbers from
  ns-3 and (ii) have ns-3 set "defines" in Click via the simulation file 
  (see src/click/examples/nsclick-defines.cc).
- Waf shipped with ns-3 has been upgraded to version 1.7.10 and custom
  pkg-config generator has been replaced by Waf's builtin tool.
- create-module.py script has been updated to work with waf 1.7 and support
  for creating modules with names containing dashes has been added.
- the M5 release of the LTE module by the LENA project has been
  merged; please see src/lte/RELEASE_NOTES for more detailed info 

Bugs fixed
----------
- bug 1256 - Unnecessary SND.NXT advance, missing ACK for Out of Order segments
- bug 1318 - Ipv6L3Protocol::LocalDeliver can get stuck in an infinte loop
- bug 1409 - Add an attribute "SystemId" to configure the ID for MPI
- bug 1421 - Frequency dependent propagation loss models need uniform Frequency / Lambda attribute
- bug 1434 - DSR throughput not comparable to other protocols for manet example
- bug 1502 - Shutdown on tcp socket seems to misbehave
- bug 1503 - BlockAckManager infine loop
- bug 1517 - Waf clean/distclean doesn't remove the doc/html directory
- bug 1540 - Waf not finding click libraries
- bug 1549 - Test for NS_LOG
- bug 1556 - Uses of htonl making OpenFlow's match field error
- bug 1563 - Reduce valgrind test scope
- bug 1564 - Packet meta data isn't shown in dumbbell-animation.xml
- bug 1566 - WiFi SNR tag improvements
- bug 1568 - Deserialized addresses are implicity marked as Mac48Address
- bug 1569 - droptail_vs_red example doesn't run
- bug 1570 - Valgrind errors in new test examples
- bug 1574 - Node color overwritten, by mobility updates in netanim
- bug 1575 - Invert the y-axis in netanim
- bug 1576 - Frequency units HERTZ and MEGAHERTZ mix up
- bug 1577 - Typo in ascii picture in example aodv script
- bug 1579 - edca-txop-n fragmentation causes segfault
- bug 1582 - IPv6 raw socket return value is not like Linux socket
- bug 1585 - Length field of A-MSDU subframe header endianness
- bug 1586 - Building documentation fails if make runs in parallel
- bug 1588 - UdpEchoServer::HandleRead logs fail when using Ipv6
- bug 1589 - Bake - support pre-2.7 version of python
- bug 1590 - Bake - more autotools version support
- bug 1595 - Function declarations without implementations cause problems with dsr module's python bindings
- bug 1596 - Inet TopologyReader is skipping one link and duplicating another one
- bug 1600 - Icmpv6OptionLinkLayerAddress can only carry 48 bit addresses correctly
- bug 1601 - RttEstimator doesn't set the m_currentEstimatedRtt to m_initialEstimatedRtt on creation
- bug 1602 - waf build can break due to file collisions in higher-level directory
- bug 1603 - random-variable-stream-helper - this unavalable for static member functions
- bug 1607 - OnOffApplication over TCP with IPv6 support
- bug 1608 - DSR Network ACK is not handled correctly
- bug 1609 - Route Request table is needed
- bug 1612 - pyviz (visualizer) will not be installed
- bug 1613 - Can't build ns-3-dev with g++ 4.7.2
- bug 1615 - Adjusting OLSR HelloInterval Attribute results in no links
- bug 1618 - bake.py not detecting install of libxml2-dev on ubuntu
- bug 1623 - pybindgen rev809 is not able to build after Ubuntu 1210
- bug 1625 - ns-3-dev fails to build on Debian wheezy amd64
- bug 1626 - ipv6-only network can't use UDP or TCP
- bug 1632 - Prepend bake build directory to the guessed locations
             that waf will look to find libraries
- bug 1633 - Bake - should not report that it is downloading qt4 when it is already installed
- bug 1635 - Small bug without Simulator::Destroy()
- bug 1636 - Compilation error flagged as unmet dependency
- bug 1637 - Bake calling apt-get for unpriviledged user
- bug 1639 - bake.py support for linux mint
- bug 1640 - bake needs to test for g++
- bug 1641 - bake reports autotools dependency, but needs automake
- bug 1661 - Variable ub1 defined but not used in ipv6-address.cc

Known issues
------------
In general, known issues are tracked on the project tracker available
at http://www.nsnam.org/bugzilla/

Release 3.16
============

Availability
------------
This release is available from: 
http://www.nsnam.org/release/ns-allinone-3.16.tar.bz2

Supported platforms
-------------------
- Fedora Core 17 (32/64 bit) with g++-4.7.0
- Fedora Core 15 (64 bit) with g++-4.6.3
- Ubuntu 12.10 (32/64 bit) with g++-4.6.3
- Ubuntu 12.04 (32/64 bit) with g++-4.6.3
- Ubuntu 10.04.4 LTS (64 bit) with g++-4.4.3
- OS X Mountain Lion 10.8.3 with g++-4.2.1
- FreeBSD 8.2 (32 bit) with g++-4.2.1
- Cygwin 1.7.9-1 with g++-4.5.3

New user-visible features
-------------------------
- Support several new LTE MAC schedulers developed in GSoC 2012 project. 
  Those schedulers include FD-MT, TD-MT, TTA, FD-BET, TD-BET, FD-TBFQ,
  TD-TBFQ, PSS. Here, FD and TD mean frequency domain and time domain 
  respectively.
- It's now possible to use distcc when building ns-3 by using
  $ CXX='distcc g++' ./waf configure
  $ ./waf build
- Support topology generation with the (external) BRITE topology generation 
  tool

Bugs fixed
----------
- bug  555 - DCF immediate access
- bug  976 - wifi-wired-bridging regression test fails because of 
             rounding errors in mobility model
- bug 1055:  Wrong UAN's Thorp absorption loss model formula
- bug 1284 - ./test.py performance tests do not exist
- bug 1324 - ns3tcp-cwnd-test-suite.cc test failing
- bug 1340 - ns3tcp-loss-suite.cc tests failing
- bug 1342 - ns3tcp-cwnd-test-suite.cc tests failing
- bug 1345 - ns-3 builds with clang compiler >= 3.0
- bug 1359 - TCP cannot receive ICMP
- bug 1361 - Set TOS from Application level (sockets)
- bug 1463 - ./test.py --example should automatically detect the path
- bug 1479 - When the Ipv4RawSocket "IpHeaderInclude" Attribute set true,
             Ip Checksum error
- bug 1485 - Setting global properties in config file (raw text) does
             not have any effect
- bug 1493 - test.py --list should show the test type default tip
- bug 1493 - test.py --list should show the test type 
- bug 1494 - test.py --constrain doesn't work
- bug 1495 - test.py claims test passed when no test was run
- bug 1506:  TCP data segment piggybacking acknowledgment
- bug 1509 - RttEstimator returns invalid value in presence of errors
- bug 1516 - GtkConfigStore does not show read-only attributes
- bug 1520 - Config paths not fully documented (partial fix)
- bug 1524 - Fragmentation Threshold equals to Packet Size at MAC Layer 
             (Data + IP + UDP) crash the reception
- bug 1525 - Linker error with mpi on Mac 10.8
- bug 1526:  Wrong calculation of pathloss within 
             UanPropModelThorp::GetPathLossDb
- bug 1527 - Ipv4RawSocket's BindToNetDevice not working
- bug 1528 - BindToNetDevice not working for IPv6 sockets
- bug 1531 - Crash when using NS_LOG in destructors of static objects
- bug 1532 - unimplemented LTE Scheduler methods

Known issues
------------
In general, known issues are tracked on the project tracker available
at http://www.nsnam.org/bugzilla/

Release 3.15
============

Availability
------------
This release is available from: 
http://www.nsnam.org/release/ns-allinone-3.15.tar.bz2

Supported platforms
-------------------
- Fedora Core 17 (32/64 bit) with g++-4.7.0
- Fedora Core 15 (64 bit) with g++-4.6.3
- Ubuntu 12.04 (32/64 bit) with g++-4.6.3
- Ubuntu 10.04.4 LTS (64 bit) with g++-4.4.3
- OS X Mountain Lion 10.7.4 with g++-4.2.1
- OS X Snow Leopard 10.6.8 with g++-4.2.1 
- FreeBSD 8.2 (32 bit) with g++-4.2.1
- Cygwin 1.7.9-1 with g++-4.5.3

New user-visible features
-------------------------
- A new random variable base class called 'RandomVariableStream', has been
  introduced.  This base class derives from ns3::Object, unlike the current 
  'RandomVariable' class which is a special type of object in the ns-3 
  system to date.  By making this class derive from ns3::Object, it can be 
  handled with the Ptr class, can carry attributes, and can have its parameters
  and initial state saved in the config-store subsystem.  A new attribute
  called "Stream" has been introduced for this class, to allow users to
  better control the assignment of underlying pseudo-random sequences to
  the RandomVariableStream objects (bug 101).

Bugs fixed
----------
 - bug 101 - random variable initialization
 - bug 1256 - Unnecessary SND.NXT advance, missing ACK for Out of Order segments
 - bug 1308 - Nix-vector; do not process packets to self
 - bug 1386 - assert if PositionAllocator not provided to 
              RandomWaypointMobilityModel
 - bug 1399 - TCP not backing off retransmissions properly
 - bug 1441 - IPv4 header length handling
 - bug 1464 - ConfigStore Save + Load => Could not set default value 
                  for ns3::UdpSocketImpl::IcmpCallback
 - bug 1470 - define default parameter for constructor in .h file
 - bug 1473 - GetQueue/SetQueue missing from Csma python bindings
 - bug 1475 - "test.py --list" should sort the output
 - bug 1476 - TestCase::GetName () should not be private
 - bug 1477 - Click doesn't work with raw sockets
 - bug 1481 - Openflow example doesn't run
 - bug 1486 - Segfaults in nix-vector-routing with bridges
 - bug 1489 - Jakes Log component is missing
 - fixed bug with multiple LCs in UL BSR
 - fixed bug with lena-dual-stripe crashes with --homeUesHomeEnbRatio=2

Known issues
------------
In general, known issues are tracked on the project tracker available
at http://www.nsnam.org/bugzilla/

Release 3.14.1
==============

Availability
------------
This release is available from:
http://www.nsnam.org/release/ns-allinone-3.14.1.tar.bz2

Bugs fixed
----------
This hotfix release contains a fix for the PyViz visualizer and makes it
easier to add PyViz support to examples; otherwise it is the same as the
ns-3.14 release.

Release 3.14
============

Availability
------------
This release is available from: 
http://www.nsnam.org/release/ns-allinone-3.14.tar.bz2

Supported platforms
-------------------
ns-3.14 has been tested on the following platforms.  Not all features are
available on all platforms; check the Installation page on the project wiki.

- Fedora Core 17 (32/64 bit) with g++-4.7.0
- Fedora Core 16 (32/64 bit) with g++-4.6.3
- Fedora Core 15 (64 bit) with g++-4.6.3
- Ubuntu 12.04 (32/64 bit) with g++-4.6.3
- Ubuntu 11.10 (32 bit) with g++-4.6.1
- Ubuntu 10.04.4 LTS (64 bit) with g++-4.4.3
- OS X Lion 10.7.4 with g++-4.2.1
- OS X Snow Leopard 10.6.8 with g++-4.2.1 
- FreeBSD 8.2 (32 bit) with g++-4.2.1
- Cygwin 1.7.9-1 with g++-4.5.3

New user-visible features
-------------------------
- Transport protocol implementations (TCP, UDP) have been refactored to
  support also IPv6 connections. Dual-stacked IPv6 sockets are implemented. 
  An IPv6 socket can accept an IPv4 connection, returning the sender's 
  address as an IPv4-mapped address (IPV6_V6ONLY socket option is not 
  implemented).
- The LTE code from the LENA project has been merged, bringing in a
  significant redesign of the LTE module as well as many new features.
- An antenna module is now included, which includes different
  radiation pattern models. See the corresponding new section of the
  ns-3 models library documentation for details.
- A new buildings module is introduced which allows to model the
  presence of buildings in a wireless network topology.  
- New propagation models (OkumuraHata, ITU-R P.1411, ITU-R P.1238)
  have been added
- The Dynamic Source Routing (DSR) MANET routing protocol for IPv4 was added.
- A Random Early Detection (RED) queue model has been added.
- Ipv6RoutingHelper is now in-line with Ipv4RoutingHelper concerning the RT 
  print functions. Various minor changes were made in Ipv6RoutingProtocol and 
  derived classes to make this possible.
- New "SendIcmpv6Redirect" attribute (and getter/setter functions) to 
  Ipv6L3Protocol. The behavior is similar to Linux's conf "send_redirects",
  i.e., enable/disable the ICMPv6 Redirect sending.
- Longer and more descriptive names are used for error units in RateErrorModel
  class and queue mode in Queue class. Attributes in those classes are also
  changed for consistency. See API documentation for details.
- The netanim animator is now bundled with the release.

Bugs fixed
----------
 - bug 603 - Simulator::Next is useless
 - bug 631 - RealtimeSimulatorImpl does not handle Ctrl-C with python bindings
 - bug 962 - list of paths to reach objects contains bogus entries
 - bug 1000 - Make RealtimeSimulatorImpl last until stop
 - bug 1053 - Need better error diagnostics in ns2-mobility-trace example
 - bug 1109 - Point out the effects of ArpCache::PendingQueueSize
 - bug 1179 - Add LTE trace hooks for supporting visualizer
 - bug 1180 - LTE: Add TX/RX trace support
 - bug 1273 - Better error message on missing Python development files
 - bug 1282 - Sleep state and CCA
 - bug 1283 - PacketSocket::SendTo should return number of bytes 
 - bug 1302 - Flow monitor bug
 - bug 1304 - Tag information changed after transmission
 - bug 1313 - Stddev (average.h) returning NaN
 - bug 1318 - Asserts for IPv6 malformed packets
 - bug 1319 - Fix Ipv6RawSocketImpl Icmpv6 filter
 - bug 1325 - Python examples get valgrind errors when build subdirectories 
              are specified in waf
 - bug 1339 - test.py uses the old name for the test runner
 - bug 1348 - python bindings: deprecated conversion from string constant 
              to ‘char*’
 - bug 1349 - TypeId.LookupAttributeByName Python bindings missing
 - bug 1350 - Simulator.ScheduleWithContext Python binding missing
 - bug 1351 and 1333 - TCP not able to take RTT samples on long delay network
 - bug 1352 - Fixed MapAttributes, previously was mapped to a vector in 
              ObjectPtrContainer and (and key information was dropped). 
              Now the container is a map.
 - bug 1354 - Building scratch subdir programs is broken
 - bug 1355 - Visualizer dependencies not detected at buildtime
 - bug 1357 - IPv6 fragmentation fails due to checks about malformed extensions
 - bug 1362 - ICMPv6 does not forward ICMPs to upper layers (and minor 
              fixes to ICMPv6)
 - bug 1376 - wrong wind variable's name
 - bug 1378 - UdpEchoClient::SetFill () does not set packet size correctly
 - bug 1379 - lte-multiple-flows example crashes
 - bug 1380 - lte-phy-uplink example crashes
 - bug 1391 - .ns3rc does not allow comments as expected
 - bug 1392 - Modules built report does not clarify C++ or Python
 - bug 1393 - IPv6 Routing Helper RT Print functions
 - bug 1395 - AODV DeferredRouteOutputTag missing constructor
 - bug 1396 - ARP with hardware addresses longer than 6 bytes
 - bug 1399 - TCP not backing off retransmissions properly
 - bug 1404 - Bound user input in tutorial third.cc program
 - bug 1406 - waf exits with maximum recursion depth exceeded 
 - bug 1415 - examples-to-run.py doesn't work with command line arguments
 - bug 1420 - no python bindings for csma-layout
 - bug 1441 - IPv4 header length handling
 
Known issues
------------
In general, known issues are tracked on the project tracker available
at http://www.nsnam.org/bugzilla/

Release 3.13
==============

Availability
------------
This release is available from: 
http://www.nsnam.org/release/ns-allinone-3.13.tar.bz2

Supported platforms
-------------------
ns-3.13 has been tested on the following platforms.  Not all features are
available on all platforms; check the Installation page on the project wiki.

- Ubuntu 11.10 (32 bit) with g++-4.5.2
- Ubuntu 11.04 (32/64 bit) with g++-4.5.2 
- Ubuntu 10.04.3 LTS (64 bit) with g++-4.4.3, g++-3.4.6 
- OS X Lion with g++-4.2.1
- OS X Snow Leopard with g++-4.2.1 
- Fedora Core 16 (32/64 bit) with g++-4.6.2
  --  however, g++-3.4.6 fails on Fedora 16 i686 
- Fedora Core 14 (64 bit) with g++-4.5.1
- FreeBSD 9.0-RC1 (AMD64) with g++-4.2.1

New user-visible features
-------------------------
- IPv6 address generator with support for duplicate address detection

Bugs fixed
----------
 - bug 962 - list of paths to reach objects contains bogus entries
 - bug 1001 - Buffer::CopyData() doesn't return the number of bytes copied
 - bug 1010 - Uan model sleep patch
 - bug 1020 - Wrong usage of the originator sequence number in HWMP PREP
 - bug 1021 - Beacon collision avoidance in Mesh module works incorrectly
 - bug 1039 - Nagle's algorithm in TCP 
 - bug 1055 - Wrong UAN's Thorp absorption loss model formula
 - bug 1059 - Unable to load trace files created from SUMO and TraNS Lite
 - bug 1112 - Advance m_nextTxSequence upon retransmit after RTO 
 - bug 1137 - mpi module is hard-coded for openmpi
 - bug 1166 - IPV4 TCP failed to send a RST when connect arrives before listen
 - bug 1186 - Ipv4Header lacks DSCP and ECN
 - bug 1204 - Can't Parse Time +100000000.0ns
 - bug 1219 - Coding style of ns2-mobility-helper-test-suite.cc is fixed
 - bug 1257 - waf install __init__ Python files even with --disable-python
 - bug 1263 - waf configure fails on FreeBSD 9.0-BETA2 amd64
 - bug 1266 - gdb cannot be loaded
 - bug 1227 - Spurious RTO due to low min RTO
 - bug 1229 - Multiplication overflow in WaypointMobilityModel::EndMobility
 - bug 1242 - m_lastRtt in tcp-socket-base.cc not implemented
 - bug 1256 - TCP unnecessary snd.nxt advance
 - bug 1265 - Make ns-3 directory "movable"
 - bug 1269 - sqlite3 not found on FreeBSD
 - bug 1270 - "Checking boost includes" weirdness
 - bug 1278 - Ipv4ClickRouting::HandleScheduleFromClick bug
 - bug 1281 - Checksum not calculated when doing IP fragmentation
 - bug 1285 - IPv6 Localhost is marked as GLOBAL instead of HOST
 - bug 1290 - buffer-test.cc gets a valgrind error
 - bug 1295 - Missing const qualifiers in TopologyRead 
 - bug 1299 - EnableAsciiIpv4All tracing doesn't show transmitted/recvd packets
 - bug 1300 - HalfDuplexIdealPhy notify SpectrumInterference of AbortRx 
 - bug 1301 - Ns2MobilityHelper causes Node GetPosition() to return NaN
 - bug 1305 - do not list modules built upon exiting waf shell
 - bug 1312: TopologyRead Assert condition fix
 - IPv4 packets double fragmentation was broken 
 - Fix wifi-clear-channel-cmu.cc example
 - NetAnim: fix for bcast packet reuse
 - Missing PropagationLossModel.CalcRxPower in Python bindings
 - Corrected compilation behavior in Ubuntu 11.10 due to ldd behavior change
 - Added required PTHREAD dependency to RT library check.

Known issues
------------
In general, known issues are tracked on the project tracker available
at http://www.nsnam.org/bugzilla/

Release 3.12.1
==============

Availability
------------
This release is available from: 
http://www.nsnam.org/release/ns-allinone-3.12.1.tar.bz2

Bugs fixed
----------
This release fixes PyViz visualizer's python bindings; otherwise, it
is the same as the ns-3.12 release.

Release 3.12
===========

Availability
------------
This release is available from: 
http://www.nsnam.org/release/ns-allinone-3.12.tar.bz2

Supported platforms
-------------------
ns-3.12 has been tested on the following platforms.  Not all features are
available on all platforms; check the Installation page on the project wiki.

- Fedora Core 15 (32/64 bit) with g++-4.6.0 
- Ubuntu 11.04 (32/64 bit) with g++-4.5.2 
- OS X Lion with g++-4.2.1 
- Fedora Core 14 (64 bit) with g++-4.3.4, g++-4.5.3, g++-4.4.6 
- Fedora Core 12 (64 bit) with g++-4.4.4 
- OS X Snow Leopard with g++-4.2.1 
- Ubuntu 10.04.3 LTS (64 bit) with g++-4.4.3, g++-3.4.6 

New user-visible features
-------------------------

- SpectrumChannel models now support the usage of single-frequency
  propagation loss models based on the PropagationLossModel
  class. These model can be used in conjunction with
  the frequency-dependent propagation loss model based on the
  SpectrumPropagationLossModel class already supported by
  SpectrumChannel. 

- Extend the attribute system extend the attribute system to store map
  container objects in addition to vector containers.  The ObjectMap
  and related classes are patterned after ObjectVector.

- Support for IPv4 fragmentation has been added.

- Significant performance improvement for AODV in dense mobile scenarios
  due to a fixed bug in RERR processing.

- WiFi traces that were named promiscuous are now renamed monitor, and
  a separate flag for setting the interface to promiscuous mode has been
  introduced.  This disambiguates monitor mode from promiscuous mode.

- Monolithic Python bindings have been removed

Bugs fixed
----------
 - bug 845  - fix ConfigStore output for changing default values
 - bug 1010 - Uan model Sleep patch
 - bug 1033 - Mesh airtime-metric fixed
 - bug 1043 - lte-spectrum-value-helper.cc file swapped uplink/downlink freq.
 - bug 1050 - ISO C++ forbids variable length array; remove all instances
 - bug 1057 - LTE bearers differentiation issue
 - bug 1082 - Check that log component names are correct when taken from NS_LOG
 - bug 1100 - IPv6 fragmentation enhancements
 - bug 1102 - IPv4 header fragment offset field not set correctly
 - bug 1123 - class MinMaxAvgTotalCalculator does not implement all methods
 - bug 1134 - Fix LiIonEnergySource attribute spelling for InitialCellVoltage
 - bug 1139 - Broadcast packets issue in uan cw mac
 - bug 1141 - MeshWifiInterfaceMac adds supported modes to wrong remote station
 - bug 1163 - Ipv4EndPointDemux::AllocateEphemeralPort forget to increment port
 - bug 1164 - IPV4 TCP Bind already used port failed, but without setting errno
 - bug 1168 - BridgeNetDevice: default expiration time not realistic
 - bug 1174 - Ns-3 does not generate static libraries
 - bug 1175 - shared libraries are not versioned
 - bug 1193 - AODV Hello timers scheduling skewed when RREP, RREQ are processed
 - bug 1194 - AODV Incorrect RERR processing
 - bug 1201 - UDP sockets need to set connected state before notifying the ConnectionSucceeded callback
 - bug 1208 - Spectrum module example causing valgrind errors
 - bug 1209 - ns-3-click fails to build on Fedora 15 when tests are enabled
 - bug 1220 - FdReader always stops with NS_FATAL_ERROR
 - bug 1222 - Incomplete PointToPointNetDevice Python bindings
 - bug 1224 - ns-3-allinone fails to compile on OS X Lion
 - bug 1226 - Incomplete YansWifiChannel Python bindings
 - bug 1234 - GetAttributeChecker is not defined anymore but still used
 - bug 1239 - Add assertion that reference count never overflows
 - bug 1244 - Seg Faults in optimized builds due to missing Logging components
 - Fix ARP issue in nsclick-ip-router.click and static route in nsclick-routing-node2.click

Known issues
------------
In general, known issues are tracked on the project tracker available
at http://www.nsnam.org/bugzilla/

Release 3.11
===========

Availability
------------
This release is available from: 
http://www.nsnam.org/release/ns-allinone-3.11.tar.bz2

Supported platforms
-------------------
ns-3.11 has been tested on the following platforms.  Not all features are
available on all platforms; check the Installation page on the project wiki.

- Linux x86_64 Ubuntu 11.04
  - g++-4.5.2
- Linux i686 Ubuntu 11.04
  - g++-4.5.2, g++-4.4.5
- Linux x86_64 Fedora Core 15
  - g++-4.6.0
- Linux x86_64 Fedora Core 14
  - g++-4.5.3, g++-4.4.6, g++-4.3.4
- Linux x86_64 Fedora Core 10
  - g++-3.4.6, 4.0.4, 4.1.2, 4.2.4, 4.3.2, 4.4.0
- OS X Snow Leopard
  - g++-4.2.1 

New user-visible features
-------------------------

  - The build system has been modularized, and the source code reorganized,
    to allow for modular libraries instead of a single monolithic ns-3
    library.   User programs now link a number of smaller, per-module
    libraries depending on the dependencies expressed to the build system.  
    Source code is now being maintained in individual modules with
    consistent directory structures.

  - Python bindings have also been modularized, and the bindings are now
    generated into a 'ns' namespace instead of 'ns3' for the old
    (monolithic) bindings.  By default the bindings are now modular, with
    a backward compatibility layer for older programs.  

  - By default, example and test programs are disabled from the build.
    Users can enable them via the use of a waf command at configure time,
    or automatically through the use of a new .ns3rc file.

  - int64x64_t is a new type which allows portable and easy to write arithmetic
    calculations that require a high degree of fractional precision.

  - An interface to the Click Modular Router and an Ipv4ClickRouting
    class has been added, to allow a node to use Click for external routing.

  - An interface to an OpenFlow software implementation distribution has
    been added to allow the simulation of OpenFlow switches in ns-3.

  - ns-3 coding style requirements have been applied to the entire coding
    base, resulting in a large number of whitespace changes.  The coding 
    style has been automatically enforced by running a style checking 
    program (utils/check-style.py) that uses the uncrustify (v. 0.58)
    program to apply changes. 

  - Some documentation reorganization to split documentation between
    the ns-3 manual (primarily focusing on the ns-3 core) and a new 
    "model library" document has been started.

Bugs fixed
----------
The following lists many of the bugs fixed or small feature additions
since ns-3.10, in many cases referencing the Bugzilla bug number.

   - bugfix: CsmaNetDevice ErrorModel not discarding packet
   - bugfix: do not call RouteOutput() twice 
   - Workaround gccxml bug scanning Seconds(0) as default value 
   - Copy a bug fix from ns3modulescan.py into ns3modulescan-modular.py 
   - Modular Python bindings work (many bug fixes, more modules tested) 
   - Modular bindings: bug fixes, more verbose scanning 
   - ./waf --apiscan: fix bug in detection of whether the per-module
   - Remove the 'Modules to build' debug print 
   - CsmaNetDevice ReceiveErrorModel was not dropping the packet
   - Several "set but not used" bugs for newer compilers quick-fixed

   - bug 445 - Is the class name Scalar in nstime.h appropriate?
   - bug 699 - TestCase::DoRun probably should not return a bool
   - bug 823 - Need finer-grained control over what goes into libns3
   - bug 957 - Issue with test.py
   - bug 1017 - node --> internet-stack --> node
   - bug 1018 - mobility --> helper --> mobility circular dependency
   - bug 1019 - common --> node --> common circular dependency
   - bug 1038 - Time::Get*Seconds () return signed integer while actually returning unsigned.
   - bug 1040 - Olsr and multiple interfaces
   - bug 1042 - AODV RERR implosion (missing RERR_RATELIMIT) 
   - bug 1044 - Seconds (1e-9) creates Time that is not IsPositive ()
   - bug 1047 - Multicast routes on nodes with >16 interfaces
   - bug 1048 - suggested MatrixPropagationLossModel::SetLoss() API change
   - bug 1049 - Issues with OLSR HNA messages sent by multiple gateways
   - bug 1052 - olsr::RoutingProtocol::LinkTupleUpdated incorrect detection of asymetric link with multiple interface nodes
   - bug 1054 - ipv6 InternetStackHelper EnablePcapIpv6All() broken
   - bug 1056 - CSMA: padding not handled correctly for LLC encapsulation
   - bug 1058 - InternetStackHelper pitfall: calling Install before adding routing protocols
   - bug 1060 - Setting NqStaWifiMac Active Probing true, crashes simulation
   - bug 1061 - Title level inconsistent in click.rst
   - bug 1062 - rescale-pdf not working
   - bug 1064 - Correct Friis propagation loss equation in spectrum module
   - bug 1066 - Set Radiotap modulation type flags correctly
   - bug 1069 - ApWifiMac unduly calls RegularWifiMac::Receive and crashes
   - bug 1070 - csma/ipv6 examples duplicate NS_LOG_COMPONENT_DEFINE
   - bug 1072 - crash upon call to Packet::AddAtEnd of fragmented packets 
   - bug 1075 - Python examples fail when static built is enabled
   - bug 1076 - Waf gives an error if you enable only a single module
   - bug 1078 - PacketTagList::Add performs NS_ASSERT counting one byte too few
   - bug 1079 - MPI code doesn't compile
   - bug 1081 - wutils.py refers to the old directory for visualizer module
   - bug 1083 - scratch doesn't work when only some modules are enabled
   - bug 1085 - Build failed: list index out of range
   - bug 1086 - sanity check for not calling Object::Dispose () twice
   - bug 1087 - Call MPI_Finalize to exit MPI environment
   - bug 1088 - Code in scratch directory assumes all modules are enabled
   - bug 1089 - lwip build issue
   - bug 1090 - WifiMacQueue is not accessible through the attribute path
   - bug 1092 - Problem building FreeBSD stack with g++ 4.5.2 (Ubuntu)
   - bug 1094 - Object::GetObject upon dlopen 
   - bug 1097 - AODV routing entry set to be VALID mistakenly.
   - bug 1098 - when to show users which modules are enabled?
   - bug 1101 - Sqlite stats disappeared from configuration file src/wscript
   - bug 1103 - Useless assignment in omnet-data-output.cc
   - bug 1105 - Move topology helpers into separate per-device modules
   - bug 1106 - Remove "CanvasLocation" dependencies in p2p helpers
   - bug 1108 - test.py -e option needs repair
   - bug 1110 - Sort alphabetically and display "Modules built" in columns
   - bug 1117 - bindings failures on selected platforms
   - bug 1122 - spectrum-value test should check tolerance on a per-value basis
   - bug 1125 - ./waf --enable-modules fails
   - bug 1131 - Bug in Ipv4L3Protocol::RemoveAddress()
   - bug 1133 - DSDV: Possible bug in settling time calc
   - bug 1142 - Wrong 802.11p Slot time
   - bug 1146 - help string for test.py with disabled tests

Known issues
------------
In general, known issues are tracked on the project tracker available
at http://www.nsnam.org/bugzilla/

Release 3.10
===========

Availability
------------
This release is available from: 
http://www.nsnam.org/release/ns-allinone-3.10.tar.bz2

Supported platforms
-------------------
ns-3.10 has been tested on the following platforms.  Not all features are
available on all platforms; check the Installation page on the project wiki.

- Linux i686 Ubuntu 10.10
  - g++-4.4.5
- Linux x86_64 Ubuntu 8.04.4
  - g++-3.4.6, g++-4.2.4
- Linux x86_64 Fedora Core 12
  - g++-4.4.4
- Linux x86_64 Fedora Core 10
  - g++-3.4.6, 4.0.4, 4.1.2, 4.2.4, 4.3.4, 4.4.0
- OS X Snow Leopard
  - g++-4.2.1 
- OS X powerpc Leopard 
  - g++-4.0, g++-4.2

New user-visible features
-------------------------

   - NS-3 PyViz, a live simulation visualizer, has been added.  The 
     visualizer interacts with a running simulation, such that it uses no
     trace files. It can be most useful for debugging purposes, i.e. to
     figure out if mobility models are what you expect, where packets are
     being dropped, etc. There is also a builtin interactive python console
     that can be used to debug the state of the running objects. Although
     it is mostly written in Python, it works both with Python and pure C++
     simulations.

   - Wi-Fi MAC high classes have been reorganised in attempt to
     consolidate shared functionality into a single class. This new
     class is RegularWifiMac, and it 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.

   - Support for IEEE 802.11g (specifically, rates with Modulation
     Class ERP-OFDM) has been added to the wifi module. The new
     WifiModes have names of the form ErpOfdmRatexxMbps, where xx is
     the rate in Mbps (one of 6, 9, 12, 18, 24, 36, 48, 54), and a
     WifiPhyStandard enumeration WIFI_PHY_STANDARD_80211g has been
     added to allow configuration of a Wi-Fi STA supporting ERP-OFDM,
     HR/DSSS, and DSSS rates (which some call an "802.11b/g" station).

   - Two attributes were added to WaypointMobilityModel.  The first
     "LazyNotify" (default false), if enabled to true, will suppress
     course change notifications if there are no position updates.
     The second, "InitialPositionIsWaypoint" (default false), if enabled,
     will allow an initial call to SetPosition () (before any waypoints
     have been added) to be treated as the first waypoint.

   - Regression testing is now completely performed within test.py
     rather than a separate "./waf --regression" that consults
     reference traces in the ns-3.x-ref-traces directory.  In most
     cases, the example programs whose traces were included in 
     ns-3.x-ref-traces have a corresponding test called from the
     test.py program.  It is still possible to write trace-based
     regression tests but they are now called from the test.py
     program.

   - New BulkSendApplication sends data as fast as possible up to 
     MaxBytes or unlimited if MaxBytes is zero.  Think OnOff, but 
     without the "off" and without the variable data rate. This 
     application only works with SOCK_STREAM and SOCK_SEQPACKET 
     sockets, for example TCP sockets and not UDP sockets.

   - Extensions to the energy models:  1) a new Rakhmatov Vrudhula 
     non-linear battery model, 2) additional support for modeling 
     energy consumption in WiFi devices, 3) an example for how to add 
     energy models to a WiFi-based simulation (in examples/energy/ 
     directory).

   - New methods to print IPv4 routing tables to an output stream.

   - A replacement implementation for TCP for IPv4.  TcpSocketBase
     now replaces TcpSocketImpl.  There are subclasses defined for
     TCP Tahoe, Reno, NewReno, and the original RFC793 without
     congestion control.

   - Energy support for UAN module and Li-Ion energy model.
     Now each network node can have an associated energy source
     from which it consumes energy. The user can specify a custom
     energy model for the underwater transducer, with default values
     set for WHOI acoustic transducer. Li-Ion battery model added
     into energy models folder.

   - Destination-Sequenced Distance Vector (DSDV) routing protocol 
     is a proactive, table-driven routing protocol for MANETs 
     developed by Charles E. Perkins and Pravin Bhagwat in 1994. 
     This implementation is for IPv4 routing and was contributed 
     by ResilNets Research Group.

   - A novel model to simulate LTE networks has been added.  It focuses 
     mainly on modeling the E-UTRA part of the system, with a particular 
     attention on the aspects related to the channel, PHY and MAC layers. 
     The most important features available at this moment are (i) a basic 
     implementation of both the UE and the eNB devices, (ii) RRC and 
     entities for both the UE and the eNB, (iii) an Adaptive Modulation 
     and Coding (AMC) scheme for the downlink, (iv) the management of the 
     data radio bearers (with their QoS parameters), the MAC queues and 
     the RLC instances, (v) Channel Quality Indicator (CQI) management, 
     (vi) support for both uplink and downlik packet scheduling, 
     (vii) a PHY layer model with Resource Block level granularity, and 
     (viii) a channel model with the outdoor E-UTRAN propagation loss 
     model.

   - Project documentation has been converted from GNU Texinfo to Sphinx. 

Bugs fixed
----------
The following lists many of the bugs fixed or small feature additions
since ns-3.9, in many cases referencing the Bugzilla bug number

   - bug 824 - TCP should implement FastRecovery by default
   - bug 852 - Add support for 802.11g devices
   - bug 892 - WaypointMobilityModel incompatible with MobilityHelper::Install
   - bug 893 - Lazy CourseChange notification for WaypointMobilityModel
   - bug 903 - TapBridge does not shut down properly
   - bug 953 - WiMAX channel scanning overflow
   - bug 967 - Need to decouple Ipv4L4Protocols from Ipv4L3Protocol
   - bug 978 - Consolidate Wi-Fi MAC high functionality
   - bug 979 - Multi-octet fields in Wi-Fi headers have wrong endianness
   - bug 981 - use a cache to keep track of received MPDUs under block ack
   - bug 983 - handle correctly ADDBA response action frames in QadhocWifiMac
   - bug 984 - EmuNetDevice should use DIX encapsulation by default
   - bug 985 - WiMAX Invalid management message type on wimax-simple
   - bug 988 - MacRxMiddle::SequenceControlSmaller method
   - bug 990 - Error with an NS_ASSERT at uan-phy-gen.cc
   - bug 991 - InterferenceHelper assertion failure
   - bug 992 - Unusual (possibly incorrect assertion) in Packet::Deserialize
   - bug 993 - MinstrelWifiManager::UpdateStats useless if clause
   - bug 994 - PointToPointGridHelper useless if clauses
   - bug 995 - Useless (possibly incorrect) comparison of unsigned int
   - bug 1004 - module header not rebuilt
   - bug 1005 - GetSocket() methods for OnOffApplication and PacketSink
   - bug 1009 - decouple m_finSequence (TcpSocketImpl) from tx sequence numbers
   - bug 1012 - UAN Throp propagation model bug
   - bug 1015 - GetChannelFrequencyMhz() does not match with standard
   - bug 1022 - inappropriate ASSERT in tcp-socket-impl.cc
   - bug 1025 - wimax-ipv4 script exists with signal SIGSEGV when nbSS>20
   - bug 1027 - RocketfuelTopologyReader is not working at all
   - bug 1029 - v4Ping application endian issues
   - bug 1030 - routing/aodv example fixed
   - bug 1031 - Wifi hidden terminal example does not work
   - bug 1032 - Unable to specify multiple Compiler/Linker flags

Known issues
------------
In general, known issues are tracked on the project tracker available
at http://www.nsnam.org/bugzilla/

Windows XP 32 bit Cygwin 1.7.7 does not seem to work because of a
problem (reported elsewhere) in linking large libraries.

Release 3.9
===========

Availability
------------
This release is immediately available from:
http://www.nsnam.org/release/ns-allinone-3.9.tar.bz2

Supported platforms
-------------------
ns-3.9 has been tested on the following platforms:
- Ubuntu 10.04 LTS 32/64-bit gcc-4.4.3
- Fedora Core 12 64-bit gcc-4.4.3
- Ubuntu 9.10 32-bit gcc-4.4.1
- Ubuntu 8.04 LTS 64-bit gcc-4.2.4
- Fedora Core 5 32-bit gcc-4.1.1
- Mac OS X Leopard powerpc gcc-4.0.1
- Windows Cygwin 1.7.5

Not all ns-3 options are available on all platforms; consult the
wiki for more information:
http://www.nsnam.org/wiki/index.php/Installation

New user-visible features
-------------------------

   - A reorganisation of the construction of Wi-Fi transmit rates has
     been undertaken with the aim of simplifying the task of
     supporting further IEEE 802.11 PHYs. This work has been completed
     under the auspices of Bug 871. A consequence of this work is that
     WifiModes have a new (hopefully future-proof) naming, and
     simulations which specify rates by name will need updating. The
     list of new rate names is given in the error message produced
     when an attempt is made to use any invalid rate name (including
     those that were previously valid).

   - A new OFDM error rate model for WiFi (NistErrorRateModel); this model
     has been validated in clear-channel testbed tests.  For 802.11b, it
     uses the same underlying model as the YansErrorRateModel, but it differs
     from YansErrorRateModel for OFDM modes (802.11a/g).  The default
     YansWifiPhyHelper has been changed to use this model.

   - A new NS-2 mobility trace reader supports BonnMotion, SUMO, TraNS, 
     etc. traces.

   - An energy model for nodes and devices, including an energy source
     model and device energy models allowing energy-aware devices
     to notify the energy source about energy consumption.  

   - Rocketfuel topology dataset support for existing topology reader
     Rocketfuel project: 
     http://www.cs.washington.edu/research/networking/rocketfuel/

   - Underwater Acoustic Network (UAN) model, split in to three parts, the 
     channel, PHY, and MAC models to enable researchers to model a variety 
     of underwater network scenarios.

   - the Spectrum framework, which provides support for spectrum-aware
     Channel and PHY layer modeling. It features a set of classes that
     allows the mathematical representation of frequency dependent
     phenomena. Some example channel, propagation and device
     implementations that make use of this framework are also
     included.  

Bugs fixed
----------
The following lists many of the bugs fixed or small feature additions 
since ns-3.8, in many cases referencing the Bugzilla bug number

   - IPv4 global routing code; stub networks were assumed to be /24
     and added as /24 networks even if the mask is actually different
   - OLSR was generating messages on non-OLSR interfaces
   - ICMPv4 objects not properly registered; affected serialization code
   - bug 231 - SocketAddressTag needs to be removed from a packet before 
               forwarding the packet to the user
   - bug 385 - Add a generic "sequence number" class
   - bug 473 - [PATCH] Alternative ns-2 trace reader
   - bug 665 - Need Tutorial Sectino on Config Path and Tracing Use
   - bug 671 - add packet-info-tag.cc for IP_PKTINFO/IPV6_PKTINFO
   - bug 702 - Global routing doesn't respond to interface events
   - bug 799 - Interference helper is too slow
   - bug 800 - Erroneous packet sender while using aloha or cw mac in uan module
   - bug 802 - Minstrel algorithm causes segmentation fault
   - bug 826 - Using uint64_t instead of Time in DcfManager
   - bug 828 - PacketSocket::Close does not unregister protocol handler
   - bug 842 - ns-3-dev crashes using block acks
   - bug 843 - Most wifi examples change BeaconInterval to unrealistic values
   - bug 844 - YansWifiPhy::GetPowerDbm off-by-one problem when calculating Tx 
               power
   - bug 846 - packet.cc triggers deprecated warning
   - bug 853 - Rates for Wi-Fi control responses are incorrectly selected
   - bug 854 - Support DROP_QUEUE reason-code in Ipv4FlowProbe
   - bug 858 - support MSG_PEEK in IPv4/IPv6 raw socket
   - bug 861 - Forwarding drops (due to no route found) were not being logged 
               in IPv4 or IPv6 ascii traces
   - bug 869 - suggested test framework enhancements
   - bug 871 - naming for WifiPhyStandard
   - bug 873 - Queue occupancy counter not decremented in WifiMacQueue::Remove()
   - bug 874 - wrong modulation type is selected in the forwardBurst method
   - bug 875 - "frame includes FCS" flag should be set in Radiotap frame header
   - bug 879 - source address selection for AODV using DeferredRouteRequest
   - bug 881 - Reorganise to allow wider use of WifiInformationElement
   - bug 890 - several rate adaptation algorithms not tested by test.py
   - bug 900:  RawTextConfigLoad::Default does not load configurations
   - bug 901 - Optimize Mac48Address < != and ==
   - bug 902 - TCP: handle out-of-order packets during connection shutdown
   - bug 905 - WimaxNetDevice loses packet uid, tags, and memory optimization
   - bug 906 - NSC TCP socket fork did not copy txbuffersize over
   - bug 908 - test.py should exit if waf dies
   - bug 910 - Change Wi-Fi "AccessClass" to something closer to the standard
   - bug 911 - IPv4/v6 multicast forwarding not going to all output interfaces
   - bug 913 - Queue Enqueue/Drop trace sources behavior unintuitive
   - bug 916 - EnableAsciiAll ("prefix") does not work for YansWifiPhyHelper
   - bug 918 - samples/main-packet-header.cc is broken
   - bug 919 - minstrel does not pass valgrind tests
   - bug 921 - Inconsistent declaration of class/struct Object in object.h
   - bug 922 - Inconsistent declaration of class/struct in 
               wifi-remote-station-manager.h
   - bug 923 - Inconsistent declaration of class/struct in mac-low.h
   - bug 924 - Inconsistent declaration of class/struct in <xxx>-wifi-managers 
   - bug 925 - Various IPv6 cc files trigger deprecated warning
   - bug 926 - olsr handling of multicast packets 
   - bug 927 - SimpleOfdmWimaxChannel RxPower computation
   - bug 930 - examples/topology-read/topology-example-sim.cc uses variable 
               length array
   - bug 931 - Abnormal exit reports SIGSEGV on failure
   - bug 932 - Support IP_HDRINCL option for Ipv4RawSocket
   - bug 933 - Flushing ostream and files on abnormal program exit 
               (ASSERT, ABORT and FATAL_ERROR)
   - bug 936 - Waf build error for python bindings on "AccessClass"
   - bug 937 - bugs in ns-3 wimax
   - bug 939 - EmuNetDevice uses too much memory when reading packet bursts
   - bug 940 - AODV fails to set up a correct path
   - bug 941 - Wifi Dcf attributes not reachable through configuration namespace
   - bug 943 - Add a SO_BROADCAST socket option
   - bug 944 - change default ErrorRateModel from YansErrorRateModel to 
               NistErrorRateModel
   - bug 946 - Rocketfuel topology dataset support for topology reader
   - bug 949 - Node::NonPromiscReceiveFromDevice reports a meaningless 
               destination address to user callbacks 
   - bug 950 - PointToPointNetDevice says promisc support is not implemented 
               but it is
   - bug 955 - Install NSC for NS3 in a Itanium Architecture (ia64) with Linux 2.6.16.6
   - bug 956 - Bindings failure in core (traced-value) with older gcc
   - bug 958 - WiFi uses wrong default values for MTU, FragmentationThreshold 
               and RtsCtsThreshold
   - bug 959 - Simulation never finishes when using RealtimeSimulatorImpl
   - bug 960 - V4Ping does not generate checksum
   - bug 961 - Problem with MPI activation 
   - bug 964 - AODV does not work with host addressed interfaces
   - bug 965 - Problem building /src/core/callback.cc
   - bug 966 - AODV originates new RREQ on each packet, when doesn't have 
               valid route
   - bug 969 - No SocketList is present in UdpL4Protocol class
   - bug 971 - fix AODV header Print functions 
   - bug 972 - [flow monitor] assertion fails in pv4-flow-probe.cc

Known issues
------------

Release 3.8
===========

Availability
------------
This release is immediately available from:
http://www.nsnam.org/release/ns-allinone-3.8.tar.bz2

Supported platforms
-------------------
ns-3.8 has been tested on the following platforms:
  - linux x86 gcc 4.4.0, 4.3.2, 4.2, 4.1.1, 4.1 and 3.4.6 (debug and optimized)
  - linux x86_64 gcc 4.4.0, 4.3.2, 4.2.4, 4.2.3, 4.2.1, 4.1.3, 3.4.6 (debug and optimized)
  - MacOS X ppc gcc 4.0.x and 4.2.x (debug and optimized)
  - cygwin gcc 4.3.4 (debug and optimized)

Not all ns-3 options are available on all platforms; consult the
wiki for more information:
http://www.nsnam.org/wiki/index.php/Installation

New user-visible features
-------------------------
  a) WiMAX net device: Allow to simulated IEEE 802.16 point to multi-point based networks 

  b) Distributed simulation for point-to-point networks using the Message 
     Passing Interface (MPI) standard.
    
  c) Matrix propagation loss model uses a two-dimensional matrix of path loss indexed 
     by source and destination nodes.

  d) Topology read system: Allows quick and easy creation of large topologies by reading 
     Inet or Orbis files

  e) Gauss-Markov mobility model: Adds 3-d adaptation of Gauss-Markov mobility model which 
     has both memory and variability

  f) Steady-state random waypoint mobility model: Based on random waypoint mobility (RWM) model for case when 
     speed, pause and position are uniformly distributed random variables. However, initial values of these 
     parameters are not from uniform distribution but from stationary distribution of RWM model.

  g) Two-ray ground propagation loss model: Calculates the crossover distance under which Friis is used. 
     The antenna height is set to the nodes z coordinate, but can be added to using the model parameter 
     SetHeightAboveZ, which will affect ALL stations


API changes from ns-3.7
-----------------------
API changes for this release are documented in the file CHANGES.html. 

Bugs fixed
----------
The following lists many of the bugs that were fixed since ns-3.7, in
many cases referencing the Bugzilla bug number
   - bug 155 - std::ostream & os" parameters not Python friendly
   - bug 184 - GtkConfigStore do not support ConfigureDefault
   - bug 407 - OLSR is missing HNA support
   - bug 414 - No ReceiveErrorModel in SimpleNetDevice
   - bug 602 - WifiRemoteStation lacks information about the access class of outgoing packets
   - bug 622 - [PATCH] Friendly names for pcap traces
   - bug 683 - Helper methods for pcap tracing with explicit filenames
   - bug 706 - Backoff counting when starting NS.
   - bug 720 - TapBridge creation fails from a script outside the ns3 tree
   - bug 731 - Send function in point-to-point-net-device fails to check the return value of the Dequeue function
   - bug 747 - Listening TCP socket closes on RST
   - bug 748 - Cloned TCP socket uses wrong source address
   - bug 772 - AODV is unable to correctly buffer packets waiting for route reply
   - bug 777 - AODV ignores specified outgoing interface in RouteOutput()
   - bug 778 - OLSR ignores specified outgoing interface in RouteOutput()
   - bug 787 - Addition of Two Ray Ground model to propagation loss model and tests
   - bug 788 - OLSR_NEIGH_HOLD_TIME should be 3 times OLSR_REFRESH_INTERVAL 
   - bug 789 - [PATCH] Globalrouting externalroutes to use the new GetRootExitDirections()
   - bug 794 - Ipv4Mask constructor for "/yy"-notation is wrong
   - bug 796 - TCP bug in ns-3-dev branch : Crash detected during retesting of Chord on ns-3-dev branch
   - bug 797 - Enhancements to src/core/random-variable.cc/h
   - bug 801 - ns-3.7 and SVN not coexisting nicely
   - bug 802 - Minstrel algorithm causes segmentation fault
   - bug 804 - null-pointer references in 3.7 internet stack
   - bug 806 - TCP doesn't work over a CSMA link
   - bug 807 - ns2-mobility-helper.cc: node id parsed wrong
   - bug 809 - Missing Python binding for Ipv4GlobalRouting::GetRoute
   - bug 810 - In TCP, Socket::GetSockName() does not return the local socket address
   - bug 812 - Assert when getting socket in RecvReply for AODV
   - bug 813 - Nqos AP sends packet to non associated STA
   - bug 814 - Function logging causing assert in wireless examples
   - bug 815 - waf shell file descriptor leak
   - bug 816 - tap-creator deadlock when python bindings enabled
   - bug 817 - Pareto rng constructors using scale and shape instead of mean and shape
   - bug 818 - TCP Socket implementation does not set ACK flag on retransmits
   - bug 819 - Build break when gtk not installed
   - bug 820 - Bad things happen in test.py when logging is enabled
   - bug 821 - AODV asserts with function logging enabled
   - bug 822 - Move Mtu attribute from NetDevice base class to subclasses
   - bug 825 - UDP-Client-server's packet loss counter not properly reset
   - bug 828 - PacketSocket::Close does not unregister protocol handler
   - bug 829 - TCP unbound memory problem (pending data)
   - bug 833 - OnOffApplication with PacketSocket: sniffs all traffic
   - bug 834 - Incorrect signature of Ipv4FlowProbe::DropLogger
   - bug 835 - Unlimited receive queues in sockets == evil
   - bug 836 - Delay is incremented over time with BsUplinkSchedulerSimple and BsUplinkSchedulerRtps
   - bug 838 - ns-3 can't compile on MacOS with 32bit processor
   - bug 839 - TestSuite wimax-ss-mac-layer crashes on Darwin 9.8.0 Power Macintosh
   - bug 840 - BS scheduler does not support fragmentation for UGS flows
   - bug 841 - Multicast transmission breaks with QoS Wifi
   - bug 844 - YansWifiPhy::GetPowerDbm off-by-one problem when calculating Tx power
   - bug 847 - Segfaults on BaseStationNetDevice with OnOffApplication and rtPS sched
   - bug 849 - stray patch files in lwip directory
   - bug 850 - Ipv4GlobalRouting::LookupGlobal bug
   - bug 855 - waf dies badly when switching from debug to optimized build or vice versa
   - bug 856 - initialize vbl
   - bug 857 - Link-Local Multicast handle in Ipv4 Output processing 
   - bug 859 - Output interface estimation for the source address bound socket in IPv4 Raw socket
   - bug 860 - waf sometimes dies while executing ns3header or gen_ns3_module_header tasks in case of 
               parallel jobs
   - bug 862 - NotifyInterfaceUp() Adds network route even when netmask is /32
   - bug 863 - Wrong Scalar arithmetics
   - bug 864 - Invalid return value in UdpSocketImpl::Send and Ipv4RawSocketImpl::Send
   - bug 865 - Ipv4RawSocketImpl::RecvFrom does not return from address all the time.
   - bug 866 - WiMAX mobility models not aggregated to Node
   - bug 867 - Minor bug in Ipv4L3Protocol::Send()
   - bug 868 - invalid packet size after Ipv4L3Protocol::Send
   - bug 872 - ns3::PcapFileWrapper::Write explodes stack
   - bug 873 - Queue occupancy counter not decremented in WifiMacQueue::Remove()
   - bug 876 - Tcp socket does not handle ShutdownRecv correctly
   - bug 877 - python bindings broken with multiple inheritance ?
   - bug 880 - Node sending a packet to itself via 127.0.0.1 aborts
   - bug 885 - Error in Ascii tracing in Python examples
   - bug 888 - Writing ascii trace to addtional tests fails
   - bug 891 - WiMAX device helper does not include propagation loss model by default 
   - bug 894 - ./waf --run error message upon segfault
   - bug 895 - SimpleOfdmWimaxPhy SNR computation
   - bug 899 - EmuNetDevice::SetPromiscReceiveCallback not implemented

Known issues
------------
ns-3 builds have been known to fail on the following platforms:
  - gcc 3.3 and earlier
  - optimized builds on gcc 3.4.4 and 3.4.5
  - optimized builds on linux x86 gcc 4.0.x


Release 3.7
===========

Availability
------------
This release is immediately available from:
http://www.nsnam.org/release/ns-allinone-3.7.tar.bz2

Supported platforms
-------------------
ns-3.7 has been tested on the following platforms:
  - linux x86 gcc 4.4.0, 4.3.2, 4.2, 4.1.1, 4.1 and 3.4.6 (debug and optimized)
  - linux x86_64 gcc 4.4.0, 4.3.2, 4.2.4, 4.2.3, 4.2.1, 4.1.3, 3.4.6 (debug and optimized)
  - MacOS X ppc gcc 4.0.x and 4.2.x (debug and optimized)
  - cygwin gcc 3.4.4 (debug only), gcc 4.3.2 (debug and optimized)

Unofficially supported platform
-------------------
- mingw gcc 3.4.5 (debug only)

Not all ns-3 options are available on all platforms; consult the
wiki for more information:
http://www.nsnam.org/wiki/index.php/Installation

New user-visible features
-------------------------

  a) Ad hoc On-Demand Distance Vector (AODV) routing model (RFC 3561)

  b) IPv6 extensions support to add IPv6 extensions and options.  Two 
     examples (fragmentation and loose routing) are available.

  c) NetAnim interface: Provides an interface to the Qt-based NetAnim 
     animator, which supports static, point-to-point topology-based 
     packet animations.

  d) New topology helpers have been introduced
     - PointToPointDumbbellHelper
     - PointToPointGridHelper
     - PointToPointStarHelper
     - CsmaStarHelper

  e) Equal-cost multipath for global routing: Enables quagga's equal 
     cost multipath for Ipv4GlobalRouting, and adds an attribute that
     can enable it with random packet distribution policy across 
     equal cost routes.

  f) Binding sockets to devices:  A method analogous to a SO_BINDTODEVICE
     socket option has been introduced to class Socket

  g) Object::DoStart: Users who need to complete their object setup at 
     the start of a simulation can override this virtual method, perform their 
     adhoc setup, and then, must chain up to their parent.

  h) Ipv4::IsDestinationAddress method added to support checks of whether a 
     destination address should be accepted as one of the host's own 
     addresses.  

  i) UniformDiscPositionAllocator added; distributes uniformly the nodes 
     within a disc of given radius. 

  j) ChannelNumber attribute added to YansWifiPhy. Now it is possible to 
     setup wifi channel using WifiPhyHelper::Set() method.

  k) WaypointMobilityModel provides a method to add mobility as a set of 
     (time, position) pairs

  l) 802.11p WiFi standards 
  
  m) UDP Client/Server application

  n) Support transactions in the SQLite output interface, making it usable for larger amounts of data

API changes from ns-3.6
-----------------------
API changes for this release are documented in the file CHANGES.html. 

Bugs fixed
----------
The following lists many of the bugs that were fixed since ns-3.6, in
many cases referencing the Bugzilla bug number
   - bug 752: Object::DoStart is not executed for objects created at t > 0
   - bug 767:  Incorrect modulation for 802.11a modes
   - bug 725: wifi fragmentation and RTS cannot be used at the same time
   - bug 782: CreateTap () requires IP address in modes other than 
     CONFIGURE_LOCAL.
   - bug 769: Queue::GetTotalReceived{Bytes,Packets}() broken
   - bug 738 ReceiveErrorModel called too late
   - Fix NSC improper response to FIN
   - Fixed bug in serialization of PbbAddressBlock.
   - Fix bug 780 (problem in RoutingTableComputation with asymetric links), 
     while adding debugging methods to OLSR.  
   - bug 759: Ipv6 uses wrong outgoing interface.
   - bug 770: IPv6 size calculation for unknown options is wrong.
   - bug 771: Radvd does not set ttl value.
   - Fix bug 606:  Arp depends on IP routing system
   - pad out CSMA payloads to 46 bytes if needed
   - Drop CSMA packets with CRC errors, rescan, dox tweaks
   - Add FCS capability to CSMA
   - Mesh:Dot11s: fixed airtime metric
   - Get emu working again:  Add Dix/Llc option, add and use contextual 
     realtime schedule ops, don't refcount realtime simulator impl
   - bug 695 - DcfManager::UpdateBackoff () uses slow HighPrecision::Div()
   - bug 674 - EIFS is not handled correctly in DcfManager::GetAccessGrantStart
   - bug 739 -  OLSR: Strange HTime value in HELLO messages 
   - bug 746 -  UDP source address is not set to bound address
   - bug 735 Update Olsr for local delivery
   - bug 740 OLSR MprCompute () works wrong: fixed
   - bug 729 Enable IPv6 over PPP.
   - bug 645: fixes for opening stats file with OMNeT++
   - bug 689: default energy detection and CCA thresholds are changed to be 
     more realistic.
   - bug 733: OLSR MPR Computation give incorrect result
   - Mesh: HWMP: fixed proactive routes
   - Mesh: fixed FLAME PATH_UPDATE procedure, fixed mesh.cc 

Known issues
------------
ns-3 builds have been known to fail on the following platforms:
  - gcc 3.3 and earlier
  - optimized builds on gcc 3.4.4 and 3.4.5
  - optimized builds on linux x86 gcc 4.0.x


Release 3.6
===========

Availability
------------
This release is immediately available from:
http://www.nsnam.org/release/ns-allinone-3.6.tar.bz2

Supported platforms
-------------------
ns-3.6 has been tested on the following platforms:
  - linux x86 gcc 4.4.1, 4.2, 4.1, and, 3.4.6.
  - linux x86_64 gcc 4.4.0, 4.3.2, 4.2.3, 4.2.1, 4.1.3, 3.4.6
  - MacOS X ppc and x86 (gcc 4.0.x and 4.2.x)
  - cygwin gcc 3.4.4 (debug only), gcc 4.3.2 (debug and optimized)

Not all ns-3 options are available on all platforms; consult the
wiki for more information:
http://www.nsnam.org/wiki/index.php/Installation

New user-visible features
-------------------------

  a) 802.11 models:
     - Add an implementation of the minstrel rate control algorithm 
       (Duy Nguyen for gsoc)
     - AthstatsHelper: enables the wifi device to produce periodic 
       reports similar to the ones generated by madwifi's
       athstats tool (Nicola Baldo)
     - 10MHz and 5MHz channel width supported by 802.11a model 
       (Ramon Bauza and Kirill Andreev)
     - Channel switching support. YansWifiPhy can now switch among 
       different channels (Ramon Bauza and Pavel Boyko)
  
  b) IPv6 models:
    - IPv6 interface;
    - IPv6 layer;
    - IPv6 raw socket;
    - Static IPv6 routing;
    - ICMPv6 layer;
    - Some ICMPv6 error messages (destination unreachable, ...);
    - Neighbor Discovery Protocol (NS/NA, RS/RA, redirection);
    - Ping6 application (send Echo request);
    - Radvd application (send RA);
    - Examples (ping6, simple-routing-ping6, radvd, radvd-two-prefix,
      icmpv6-redirect).

  c) Wireless Mesh Networking models:
    - General multi-interface mesh stack infrastructure (devices/mesh module).
    - IEEE 802.11s (Draft 3.0) model including Peering Management Protocol and HWMP.
    - Forwarding Layer for Meshing (FLAME) protocol.

  d) Nix-vector routing:  
    - Ipv4NixVectorHelper
    - Examples (nix-simple, nms-p2p-nix)

  e) New Test Framework
    - Use test.py instead of ./waf check or ./waf --regression
    - Previous unit tests have been ported to new framework.
    - Examples are tested for run-ability.

  f) A new Flow Monitor module
   - To very easily measure flow metrics in a simulation
   - No need to use trace callbacks or parsing trace files

API changes from ns-3.5
-----------------------
API changes for this release are documented in the file CHANGES.html. 

Known issues
------------
ns-3.6 build is known to fail on the following platforms:
  - gcc 3.3 and earlier
  - optimized builds on gcc 3.4.4 and 3.4.5
  - optimized builds on linux x86 gcc 4.0.x

Release 3.5
===========

Availability
------------
This release is immediately available from:
http://www.nsnam.org/release/ns-allinone-3.5.tar.bz2

Supported platforms
-------------------
ns-3.5 has been tested on the following platforms:
  - linux x86 gcc 4.2, 4.1, and, 3.4.6.
  - linux x86_64 gcc 4.4.0, 4.3.2, 4.2.3, 4.2.1, 4.1.3, 3.4.6
  - MacOS X ppc and x86 (gcc 4.0.x and 4.2.x)
  - cygwin gcc 3.4.4 (debug only), gcc 4.3.2 (debug and optimized)
  - mingw gcc 3.4.5 (debug only)

Not all ns-3 options are available on all platforms; consult the
wiki for more information:
http://www.nsnam.org/wiki/index.php/Installation

New user-visible features
-------------------------

  a) 802.11 MAC:
     - EDCA multi-qos-class support (Mirko Banchi)
     - 802.11n initial support for A-MSDU frame aggregation (Mirko Banchi)
     - aarf-cd and cara rate control algorithms (Federico Maguolo)
  b) 802.11 PHY:
     - 802.11b PHY support (Gary Pei)
     - Nakagami propagation loss model (Timo Bingmann)
     - radiotap and prism headers for PCAP output (Nicola Baldo)
  c) RandomVariable:
     - GammaVariable and ErlangVariable (Timo Bingmann)
     - ZipfVariable (Francesco Malandrino)
  d) UdpEcho: allows setting the payload of echo packets
  e) Ipv4/Ipv4RoutingProtocol: allow fine-grained control over
     routing policy and arbitrary composition of routing protocols
 
API changes from ns-3.4
-----------------------
API changes for this release are documented in the file CHANGES.html.  The
internal API and composition of the IPv4 stack underwent significant
refactoring in this release cycle.

Known issues
------------
ns-3 build is known to fail on the following platforms:
  - gcc 3.3 and earlier
  - optimized builds on gcc 3.4.4 and 3.4.5
  - optimized builds on linux x86 gcc 4.0.x

Future releases
---------------
Our next release, which is expected to happen in 2 to 4 months from now, will
feature the merging of some of our projects currently in development including
fuller IPv6 support, some smaller features such as a new Global ARP 
package, and possibly a new Testing and Validation suite.

Release 3.4
===========

Availability
------------
This release is immediately available from:
http://www.nsnam.org/release/ns-allinone-3.4.tar.bz2

Supported platforms
-------------------
ns-3.4 has been tested on the following platforms:
  - linux x86 gcc 4.2, 4.1, and, 3.4.6.
  - linux x86_64 gcc 4.3.2, 4.2.3, 4.2.1, 4.1.3, 3.4.6
  - MacOS X ppc and x86
  - cygwin gcc 3.4.4 (debug only)

Not all ns-3 options are available on all platforms; consult the
wiki for more information:
http://www.nsnam.org/wiki/index.php/Installation

New user-visible features
-------------------------
  a) Wifi models: Timo Bingman contributed a ThreeLogDistance and a Nakagami
     propagation loss model based on the ns-2 models. Fabian Mauchle contributed
     multicast support.

  b) Object Name Service:  A facility allowing ns-3 Objects to be assigned
     names has been added.

  c) Tap Bridge:  A second option for integrating ns-3 with real-world hosts
     has been added.  This allows for real hosts to talk over ns-3 net devices
     and simulated networks.

  d) A new build option (ns-3-allinone) has been provided to make it easier for
     users to download and bulid commonly used ns-3 configurations.

  e) The ns-3 calendar queue scheduler has been ported to ns-3.

  f) XML support has been added to the ConfigStore.

API changes from ns-3.3
-----------------------
API changes for this release are documented in the file CHANGES.html

Known issues
------------
ns-3 build is known to fail on the following platforms:
  - gcc 3.3 and earlier
  - optimized builds on gcc 3.4.4 and 3.4.5
  - optimized builds on linux x86 gcc 4.0.x
  - optimized builds on Ubuntu 8.10 alpha 5 x86 gcc4.3.2
  - MinGW

The IPv4 API defined in src/node/ipv4.h is expected to undergo major changes 
in preparation of the merge of the IPv6 API and implementation.

Future releases
---------------
Our next release, which is expected to happen in 2 to 4 months from now, will
feature the merging of some of our projects currently in development including
fuller IPv6 support, and IPv4 and routing protocol refactoring, and some smaller
features such as a new Global ARP package and possibly a new Testing and Validation
suite,

Release 3.3
===========

Availability
------------
This release is immediately available from:
http://www.nsnam.org/release/ns-3.3.tar.bz2

Supported platforms
-------------------
ns-3.3 has been tested on the following platforms:
  - linux x86 gcc 4.2, 4.1, and, 3.4.6.
  - linux x86_64 gcc 4.3.2, 4.2.3, 4.2.1, 4.1.3, 3.4.6
  - MacOS X ppc and x86
  - cygwin gcc 3.4.4 (debug only)

Not all ns-3 options are available on all platforms; consult the
wiki for more information:
http://www.nsnam.org/wiki/index.php/Installation

New user-visible features
-------------------------
  a) Emulated Net Device
     A new net device has been added as enabling technology for ns-3 emulation
     scenarios.  See src/devices/emu and examples/emu-udp-echo.cc for details.

  b) ICMP Support
     Support for several ICMP messages has been added to ns-3.  See 
     src/internet-stack/icmpv4.h for details.

  c) IPv6 Address Support
     New clases to support IPv6 addresses has been added to the system.  This
     is enabling technology for fuller IPv6 support scheduled for ns-3.4.

  d) A flow-id tag has been added to the contributed code section

  e) Star topologies can be created from the topology helper functions

  f) The global routing code has been made dynamic (not just limited to
     (pre-simulation computation) and supports stub network interfaces and 
     bridge net devices 

  g) A MatchContainer has been added to the configuration subsystem

API changes from ns-3.2
-----------------------
API changes for this release are documented in the file CHANGES.html

Known issues
------------
ns-3 build is known to fail on the following platforms:
  - gcc 3.3 and earlier
  - optimized builds on gcc 3.4.4 and 3.4.5
  - optimized builds on linux x86 gcc 4.0.x
  - optimized builds on Ubuntu 8.10 alpha 5 x86 gcc4.3.2
  - MinGW

The IPv4 API defined in src/node/ipv4.h is expected to undergo major changes 
in preparation of the merge of the IPv6 API and implementation.

Future releases
---------------
Our next release, which is expected to happen in 2 to 4 months from now, will
feature the merging of some of our projects currently in development including
fuller IPv6 support, and IPv4 and routing protocol refactoring, and some smaller
features such as an object naming facility and a new Global ARP package.

Release 3.2
===========

Availability
------------
This release is immediately available from:
http://www.nsnam.org/release/ns-3.2.tar.bz2

Supported platforms
-------------------
ns-3.2 has been tested on the following platforms:
  - linux x86 gcc 4.2, 4.1, and, 3.4.6.
  - linux x86_64 gcc 4.3.2, 4.2.3, 4.2.1, 4.1.3, 3.4.6
  - MacOS X ppc and x86
  - cygwin gcc 3.4.4 (debug only)

Not all ns-3 options are available on all platforms; consult the
wiki for more information:
http://www.nsnam.org/wiki/index.php/Installation

New user-visible features
-------------------------
  a) Learning bridge (IEEE 802.1D)
    It is now possible to bridge together multiple layer 2 devices to
    create larger layer 2 networks. The Wifi and Csma models support
    this new mode of operation. (contributed by Gustavo Carneiro)

  b) Python bindings
    It is now possible to write simulation scripts in python using our 
    python bindings (contributed by Gustavo Carneiro).

  c) Real-time simulator
    It is now possible to run simulations synchronized on the real-world
    wall-clock time (contributed by Craig Dowell).

  d) Network Simulation Cradle
    It is now possible to use the Network Simulation Cradle 
    (http://www.wand.net.nz/~stj2/nsc/) in ns-3 and run simulations 
    using various versions of kernel TCP network stacks. (contributed
    by Florian Westphal as part of his Google Summer of Code work)

  e) A statistics framework
    Joseph Kopena contributed a statistics framework which can be used
    keep track of simulation data in persistent storage across multiple 
    runs (database and ascii file backends are available).
    More information on the wiki:
    http://www.nsnam.org/wiki/index.php/Statistical_Framework_for_Network_Simulation

API changes from ns-3.1
-----------------------
API changes for this release are documented in the file CHANGES.html

Known issues
------------
ns-3 build is known to fail on the following platforms:
  - gcc 3.3 and earlier
  - optimized builds on gcc 3.4.4 and 3.4.5
  - optimized builds on linux x86 gcc 4.0.x
  - optimized builds on Ubuntu 8.10 alpha 5 x86 gcc4.3.2
  - MinGW

The IPv4 API defined in src/node/ipv4.h is expected to undergo major changes 
in preparation of the merge of the IPv6 API and implementation.

Future releases
---------------
Our next release, which is expected to happen in 2 to 4 months from now, will
feature the merging of some of our projects currently in development: IPv6, 
emulation, and synchronous posix sockets.

Release 3.1 (2008/06/30)
========================

The first ns-3 stable release
-----------------------------

This release is immediately available from:
http://www.nsnam.org/release/ns-3.1.tar.bz2

We dedicate this initial ns-3 release to our late contributor and friend, 
Federico Maguolo.

What is ns-3 ?
--------------

ns-3 is a new discrete-event network simulator designed for supporting network
research and education. ns-3 features a solid, well documented C++ core and 
models for TCP/IP (IPv4), several link types including WiFi, and mobility 
models.

ns-3 is an open source project released under the GNU GPLv2 license which 
allows anyone to use ns-3 without having to pay any license fee or royalties. 
ns-3 is actively seeking new contributors to extend the range of supported 
models and/or to maintain existing models.

Where to get more information about ns-3
----------------------------------------

All the ns-3 documentation, is accessible from the ns-3 website: 
http://www.nsnam.org

Including, tutorials:
http://www.nsnam.org/tutorials.html

Supported platforms
-------------------

ns-3 is regularly tested on the following platforms:
  - linux x86 gcc 4.2, 4.1, and, 3.4.6.
  - linux x86_64 gcc 4.1.3, 4.2.1, 3.4.6
  - MacOS X ppc and x86
  - cygwin gcc 3.4.4 (debug only)

Known issues
------------

ns-3 is known to fail on the following platforms:
  - gcc 3.3 and earlier
  - optimized builds on gcc 3.4.4 and 3.4.5
  - optimized builds on linux x86 gcc 4.0.x

The IPv4 API defined in src/node/ipv4.h is expected to undergo major changes 
in preparation of the merge of the IPv6 API and implementation.

Future releases
---------------

Our next release, which is expected to happen in 2 to 4 months from now, will
feature the merging of some of our projects currently in development: python 
scripting, IPv6, emulation, a statistics framework and synchronous posix 
sockets.

Release 3.0.13 (2008/06/02)
===========================
- point to point links generate ppp pcap traces
- point to point links support asymmetrical data rates.
- generate doxygen documentation for all attributes and trace sources
- add ConfigStore and GtkConfigStore to contrib module
- socket API now support tx and rx buffers: implemented for UDP and TCP
- ARP cache now supports per-entry pending queues
- lots of bugfixes and implementation and API cleanups

Warning: among API changes in this release, Application::Start and 
Application::Stop now interprets the time argument as a relative
instead of absolute simulation time, to align with how Simulator::Schedule
behaves.  Any code that calls these APIs in the middle of the simulation 
will need to be adapted.  

The API of Simulator::StopAt (time) has also changed.  Now it is 
called Simulator::Stop (time), and takes a relative time, instead of 
absolute.

Release 3.0.12 (2008/04/07)
===========================
    - Add Attribute support to the TypeId metadata system and add
attribute support to all in-tree models
    - Add a mid-level helper API to build simulation topologies 
and perform simple ascii and pcap link-level tracing.
    - Large amount of structural changes to accomodate the needs
of the upcoming python bindings
    - new rate control algorithm (RRAA) and a jakes propagation model
in the 802.11 model (Federico Maguolo).
    - regression test framework added
    - TCP delayed acknowledgements and multitasking server

Release 3.0.11 (2008/02/15)
===========================
    - Initial port of GTNetS TCP implementation (initial version 
that does not support multitasking or delayed acknowledgments yet, 
but supports a reliable stream service)
    - Changes to the ns-3 object model to create a TypeId-based 
metadata system
    - lots of bug fixes throughout the system
    - tutorial updates

Release 3.0.10 (2008/01/15)
===========================
   - Add tutorial document content;
   - Valgrind option for "waf" tool;
   - Doxygen organization changes.

Release 3.0.9 (2007/12/15)
==========================
   - A 802.11 model ported from Yans. This model supports:
       * a rather extensive PHY model
       * log-distance and friis propagation model
       * a simple set of rate control algorithms (ARF, Ideal, 
         AARF, constant-rate)
       * adhoc and infrastructure mode (beacon+assoc)
   - Use smart pointer for Packet in the APIs
   - A new contrib directory with helper classes: 
     EventGarbageCollector, Gnuplot
   - Tracing support for Applications
   - many bugs fixed

Release 3.0.8 (2007/11/15)
==========================
   - A simple error model
   - Source files for ns-3 tutorial

Release 3.0.7 (2007/10/15)
==========================
  - OLSR routing protocol
  - A timer class
  - Additional mobility models (random waypoint, random 2D walk)
  - A mobility visualization tool 

Release 3.0.6 (2007/09/15)
==========================
  - Static multicast IPv4 routing
  - Logging overhaul (NS_LOG macros)
  - Refactoring of tracing subsystem
  - Tutorial document started
 
Release 3.0.5 (2007/08/15)
==========================

  - Refactoring to support win32-based unix environments (Cygwin, mingw)
  - "Packet socket" for allowing applications to access NetDevices directly
  - Generalized, polymorphic Address class
  - Add CSMA NetDevice model (from Emmanuelle Laprise)
  - Modularize IPv4 routing support (from Gustavo Carneiro)
  - Add mobility framework and basic mobility models 
  - Global unicast centralized routing 

Release 3.0.4 (2007/07/15)
==========================

  - Enable waf as the default build system.
  - Per-packet metadata:  a system to track which headers and trailers 
    are added to a packet
  - Simplifications to point-to-point devices and channel

Release 3.0.3 (2007/06/15)
==========================

  - Enable Waf for release tarballs: users can now build ns-3
    with the "waf" tool. See doc/build-waf.txt.
  - Add support for variable time precision: it is now possible
    to run a simulation with an accuracy which is higher or lower
    than a nanosecond: seconds, milliseconds, microseconds, 
    femtoseconds and picoseconds are supported.
  - Optimize and rework the COM framework, solidify the component 
    manager
  - Many small API cleanups

Release 3.0.2 (2007/05/18)
==========================

  - Implement a new memory management infrastructure based
    on reference counting and smart pointers (the latter being
    optional)

  - Implement a COM-like framework with support for QueryInterface
    to provide object extensibility

  - Add support for a BSD-style socket API for user applications

Release 3.0.1 (2007/03/31)
==========================

  - First public release; not yet pre-alpha.

  - Simple UDP-based simulation script (examples/simple-p2p.cc)




# after = TaskGen.after

## https://launchpad.net/pybindgen/
REQUIRED_PYBINDGEN_VERSION = (0, 16, 0, 834)
REQUIRED_PYGCCXML_VERSION = (0, 9, 5)



        raise ValueError("Module %r not found" % module)
    return ns3headers.path.abspath()

class apiscan_task(Task.Task):
    """Uses gccxml to scan the file 'everything.h' and extract API definitions.
    """
    after = 'gen_ns3_module_header ns3header'

    color = "BLUE"
    def __init__(self, curdirnode, env, bld, target, cflags, module):
        self.bld = bld
        super(apiscan_task, self).__init__(generator=self, env=env)
        self.curdirnode = curdirnode
        self.env = env
        self.target = target

            return self.uid_

    def run(self):
        self.inputs = [self.bld.bldnode.find_resource("ns3/{0}-module.h".format(self.module))]
        self.outputs = [self.bld.srcnode.find_resource("src/{}/bindings/modulegen__{}.py".format(self.module, self.target))]
        top_builddir = self.bld.bldnode.abspath()
        module_path = get_module_path(self.bld, self.module)
        headers_map = get_headers_map(self.bld)




class python_scan_task_collector(Task.TaskBase):
    """Tasks that waits for the python-scan-* tasks to complete and then signals WAF to exit
    """
    after = 'apiscan'
    before = 'cxx'
    color = "BLUE"
    def __init__(self, curdirnode, env, bld):
        self.bld = bld
        super(python_scan_task_collector, self).__init__(generator=self)
        self.curdirnode = curdirnode
        self.env = env

    def display(self):
        return 'python-scan-collector\n'

    def run(self):
        # signal stop (we generated files into the source dir and WAF
        # can't cope with it, so we have to force the user to restart
        # WAF)
        self.bld.producer.stop = 1
        return 0



class gen_ns3_compat_pymod_task(Task.Task):
    """Generates a 'ns3.py' compatibility module."""
    before = 'cxx'

            group = bld.get_group(bld.current_group)
            for module in scan_modules:
                group.append(apiscan_task(bld.path, env, bld, target, cflags, module))
        group.append(python_scan_task_collector(bld.path, env, bld))
        return



(-)ns-3.18/doc/manual/Makefile (-1 / +1 lines)

Lines 87-93	Link Here

IMAGES = $(IMAGES_EPS) $(IMAGES_PNG) $(IMAGES_PDF)

IMAGES = $(IMAGES_EPS) $(IMAGES_PNG) $(IMAGES_PDF)

RESCALE = $(shell hg root)/utils/rescale-pdf.sh

RESCALE = ../../utils/rescale-pdf.sh

%.eps : %.dia; $(DIA) -t eps $< -e $@

%.eps : %.dia; $(DIA) -t eps $< -e $@

%.png : %.dia; $(DIA) -t png $< -e $@

%.png : %.dia; $(DIA) -t png $< -e $@

(-)ns-3.18/doc/manual/source/new-modules.rst (-2 / +20 lines)

Lines 152-158	Link Here

152

153

.. sourcecode:: python

153

.. sourcecode:: python

154

155

    headers = bld.new_task_gen(features=['ns3header'])

155

    headers = bld(features='ns3header')

156

157

    headers.module = 'spectrum'

157

    headers.module = 'spectrum'

158

Lines 329-335	Link Here

329

Step 8 - Build and test your new module

329

Step 8 - Build and test your new module

330

***************************************

330

***************************************

331

332

You can now build and test your module as normal:

332

You can now build and test your module as normal.  You must reconfigure

333

the project as a first step or else your new module will not be included

334

in the build.

333

335

334

.. sourcecode:: bash

336

.. sourcecode:: bash

335

337

Lines 338-340	Link Here

338

  $ ./test.py

340

  $ ./test.py

339

341

340

and look for your new module's test suite (and example programs, if enabled) in the test output.

342

and look for your new module's test suite (and example programs, if enabled) in the test output.

343

344

Step 9 - Python bindings

345

************************

346

347

Adding Python bindings to your module is optional, and the step is

348

commented out by default in the ``create-module.py`` script.

349

350

.. sourcecode:: python

351

352

    # bld.ns3_python_bindings()

353

354

If you want to include Python bindings (needed only if you want

355

to write Python ns-3 programs instead of C++ ns-3 programs), you

356

should uncomment the above and install the Python API scanning

357

system (covered elsewhere in this manual) and scan your module to

358

generate new bindings.

(-)ns-3.18/doc/models/Makefile (-1 / +1 lines)

Lines 309-315	Link Here

309

310

IMAGES = $(IMAGES_EPS) $(IMAGES_PNG) $(IMAGES_PDF)

310

IMAGES = $(IMAGES_EPS) $(IMAGES_PNG) $(IMAGES_PDF)

311

312

RESCALE = $(shell hg root)/utils/rescale-pdf.sh

312

RESCALE = ../../utils/rescale-pdf.sh

313

314

%.eps : %.dia; $(DIA) -t eps $< -e $@

314

%.eps : %.dia; $(DIA) -t eps $< -e $@

315

%.png : %.dia; $(DIA) -t png $< -e $@

315

%.png : %.dia; $(DIA) -t png $< -e $@

(-)ns-3.18/doc/release_steps.txt (-1 / +2 lines)

Lines 102-108	Link Here

102

   - change the string 3-dev in the VERSION file to the real version

102

   - change the string 3-dev in the VERSION file to the real version

103

     (e.g. 3.14)  This must agree with the version name you chose in the clone.

103

     (e.g. 3.14)  This must agree with the version name you chose in the clone.

104

   - change the version and release string for the documentation in

104

   - change the version and release string for the documentation in

105

     doc/manual/source, doc/tutorial/source, doc/tutorial-pt/source,

105

     doc/manual/source, doc/tutorial/source, doc/tutorial-pt-br/source,

106

     and doc/models/source conf.py files

106

     and doc/models/source conf.py files

107

     This should hopefully be updated in the future to simply pull from the

107

     This should hopefully be updated in the future to simply pull from the

108

     VERSION file.

108

     VERSION file.

Lines 155-160	Link Here

155

- Documentation

155

- Documentation

156

157

2. Repoint http://www.nsnam.org/releases/latest to the new page

157

2. Repoint http://www.nsnam.org/releases/latest to the new page

158

   Repoint http://www.nsnam.org/documentation/latest to the new page

158

   Repoint /var/www/html/doxygen-release to the new release doxygen.

159

   Repoint /var/www/html/doxygen-release to the new release doxygen.

159

160

3. Update the Older Releases page to create an entry for the previous

161

3. Update the Older Releases page to create an entry for the previous

(-)ns-3.18/examples/tcp/tcp-variants-comparison.cc (-1 lines)

Lines 300-306	Link Here

300

          ApplicationContainer sourceApp = ftp.Install (sources.Get(i));

300

          ApplicationContainer sourceApp = ftp.Install (sources.Get(i));

301

          sourceApp.Start (Seconds (start_time*i));

301

          sourceApp.Start (Seconds (start_time*i));

302

          sourceApp.Stop (Seconds (stop_time - 3));

302

          sourceApp.Stop (Seconds (stop_time - 3));

303

          Time check_start (Seconds((start_time*i)+3));

304

303

305

          sinkHelper.SetAttribute ("Protocol", TypeIdValue (TcpSocketFactory::GetTypeId ()));

304

          sinkHelper.SetAttribute ("Protocol", TypeIdValue (TcpSocketFactory::GetTypeId ()));

306

          ApplicationContainer sinkApp = sinkHelper.Install (sinks);

305

          ApplicationContainer sinkApp = sinkHelper.Install (sinks);

(-)ns-3.18/examples/wireless/ht-wifi-network.cc (-1 / +1 lines)

Lines 92-98	Link Here

    Ssid ssid = Ssid ("ns380211n");

    Ssid ssid = Ssid ("ns380211n");

    double datarate;

    double datarate = 0;

    StringValue DataRate;

    StringValue DataRate;

    if (i==0)

    if (i==0)





  // uncomment the following to have athstats output
  // AthstatsHelper athstats;
  // athstats.EnableAthstats(enableCtsRts ? "rtscts-athstats-node" : "basic-athstats-node" , nodes);

  // uncomment the following to have pcap output
  // wifiPhy.EnablePcap (enableCtsRts ? "rtscts-pcap-node" : "basic-pcap-node" , nodes);


  // 6. Install TCP/IP stack & assign IP addresses

  ApplicationContainer cbrApps;
  uint16_t cbrPort = 12345;
  OnOffHelper onOffHelper ("ns3::UdpSocketFactory", InetSocketAddress (Ipv4Address ("10.0.0.2"), cbrPort));
  onOffHelper.SetAttribute ("PacketSize", UintegerValue (1400));
  onOffHelper.SetAttribute ("OnTime",  StringValue ("ns3::ConstantRandomVariable[Constant=1]"));
  onOffHelper.SetAttribute ("OffTime", StringValue ("ns3::ConstantRandomVariable[Constant=0]"));


  for (std::map<FlowId, FlowMonitor::FlowStats>::const_iterator i = stats.begin (); i != stats.end (); ++i)
    {
      // first 2 FlowIds are for ECHO apps, we don't want to display them
      //
      // Duration for throughput measurement is 9.0 seconds, since 
      //   StartTime of the OnOffApplication is at about "second 1"
      // and 
      //   Simulator::Stops at "second 10".
      if (i->first > 2)
        {
          Ipv4FlowClassifier::FiveTuple t = classifier->FindFlow (i->first);
          std::cout << "Flow " << i->first - 2 << " (" << t.sourceAddress << " -> " << t.destinationAddress << ")\n";
          std::cout << "  Tx Packets: " << i->second.txPackets << "\n";
          std::cout << "  Tx Bytes:   " << i->second.txBytes << "\n";
          std::cout << "  TxOffered:  " << i->second.txBytes * 8.0 / 9.0 / 1000 / 1000  << " Mbps\n";
          std::cout << "  Rx Packets: " << i->second.rxPackets << "\n";
          std::cout << "  Rx Bytes:   " << i->second.rxBytes << "\n";
          std::cout << "  Throughput: " << i->second.rxBytes * 8.0 / 9.0 / 1000 / 1000  << " Mbps\n";
        }
    }


(-)ns-3.18/src/antenna/doc/Makefile (-1 / +1 lines)

Lines 20-26	Link Here

IMAGES = $(IMAGES_EPS) $(IMAGES_PNG) $(IMAGES_PDF)

IMAGES = $(IMAGES_EPS) $(IMAGES_PNG) $(IMAGES_PDF)

RESCALE = $(shell hg root)/utils/rescale-pdf.sh

RESCALE = ../../../utils/rescale-pdf.sh

%.eps : %.dia; $(DIA) -t eps $< -e $@

%.eps : %.dia; $(DIA) -t eps $< -e $@

%.png : %.dia; $(DIA) -t png $< -e $@

%.png : %.dia; $(DIA) -t png $< -e $@




  AllowedHelloLoss (2),
  DeletePeriod (Time (5 * std::max (ActiveRouteTimeout, HelloInterval))),
  NextHopWait (NodeTraversalTime + MilliSeconds (10)),
  TimeoutBuffer (2),
  BlackListTimeout (Time (RreqRetries * NetTraversalTime)),
  MaxQueueLen (64),
  MaxQueueTime (Seconds (30)),

                   TimeValue (Seconds (15)),
                   MakeTimeAccessor (&RoutingProtocol::DeletePeriod),
                   MakeTimeChecker ())
    .AddAttribute ("TimeoutBuffer", "Its purpose is to provide a buffer for the timeout so that if the RREP is delayed"
                   " due to congestion, a timeout is less likely to occur while the RREP is still en route back to the source.",
                   UintegerValue (2),
                   MakeUintegerAccessor (&RoutingProtocol::TimeoutBuffer),
                   MakeUintegerChecker<uint16_t> ())
    .AddAttribute ("NetDiameter", "Net diameter measures the maximum possible number of hops between two nodes in the network",
                   UintegerValue (35),
                   MakeUintegerAccessor (&RoutingProtocol::NetDiameter),

(-)ns-3.18/src/aodv/model/aodv-routing-protocol.h (-5 lines)

Lines 129-139	Link Here

129

*/

129

*/

130

  Time DeletePeriod;

130

  Time DeletePeriod;

131

  Time NextHopWait;                  ///< Period of our waiting for the neighbour's RREP_ACK

131

  Time NextHopWait;                  ///< Period of our waiting for the neighbour's RREP_ACK

132

/**

133

   * The TimeoutBuffer is configurable.  Its purpose is to provide a buffer for the timeout so that if the RREP is delayed

134

   * due to congestion, a timeout is less likely to occur while the RREP is still en route back to the source.

135

*/

136

  uint16_t TimeoutBuffer;

137

  Time BlackListTimeout;             ///< Time for which the node is put into the blacklist

132

  Time BlackListTimeout;             ///< Time for which the node is put into the blacklist

138

  uint32_t MaxQueueLen;              ///< The maximum number of packets that we allow a routing protocol to buffer.

133

  uint32_t MaxQueueLen;              ///< The maximum number of packets that we allow a routing protocol to buffer.

139

  Time MaxQueueTime;                 ///< The maximum period of time that a routing protocol is allowed to buffer a packet for.

134

  Time MaxQueueTime;                 ///< The maximum period of time that a routing protocol is allowed to buffer a packet for.

(-)ns-3.18/src/buildings/doc/Makefile (-1 / +1 lines)

Lines 20-26	Link Here

IMAGES = $(IMAGES_EPS) $(IMAGES_PNG) $(IMAGES_PDF)

IMAGES = $(IMAGES_EPS) $(IMAGES_PNG) $(IMAGES_PDF)

RESCALE = $(shell hg root)/utils/rescale-pdf.sh

RESCALE = ../../../utils/rescale-pdf.sh

%.eps : %.dia; $(DIA) -t eps $< -e $@

%.eps : %.dia; $(DIA) -t eps $< -e $@

%.png : %.dia; $(DIA) -t png $< -e $@

%.png : %.dia; $(DIA) -t png $< -e $@

(-)ns-3.18/src/buildings/doc/source/buildings-user.rst (-8 / +164 lines)

Lines 5-14	Link Here

  User Documentation

  User Documentation

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

How to use buildings in a simulation

====================================

In this section we explain the basic usage of the buildings model within a

simulation program.

Main configurable parameters

Include the headers

----------------------------

*******************

Add this at the beginning of your simulation program::

   #include <ns3/buildings-module.h>

Create a building

*****************

As an example, let's create a residential 10 x 20 x 10 building::

    double x_min = 0.0;

    double x_max = 10.0;

    double y_min = 0.0;

    double y_max = 20.0;

    double z_min = 0.0;

    double z_max = 10.0;

    Ptr<Building> b = CreateObject <Building> ();

    b->SetBoundaries (Box (x_min, x_max, y_min, y_max, z_min, z_max));

    b->SetBuildingType (Building::Residential);

    b->SetExtWallsType (Building::ConcreteWithWindows);

    b->SetNFloors (3);

    b->SetNRoomsX (3);

    b->SetNRoomsY (2);

This building has three floors and an internal 3 x 2  grid of rooms of equal size.

The helper class GridBuildingAllocator is also available to easily

create a set of buildings with identical characteristics placed on a

rectangular grid. Here's an example of how to use it::

  Ptr<GridBuildingAllocator>  gridBuildingAllocator;

  gridBuildingAllocator = CreateObject<GridBuildingAllocator> ();

  gridBuildingAllocator->SetAttribute ("GridWidth", UintegerValue (3));

  gridBuildingAllocator->SetAttribute ("LengthX", DoubleValue (7));

  gridBuildingAllocator->SetAttribute ("LengthY", DoubleValue (13));

  gridBuildingAllocator->SetAttribute ("DeltaX", DoubleValue (3));

  gridBuildingAllocator->SetAttribute ("DeltaY", DoubleValue (3));

  gridBuildingAllocator->SetAttribute ("Height", DoubleValue (6));

  gridBuildingAllocator->SetBuildingAttribute ("NRoomsX", UintegerValue (2));

  gridBuildingAllocator->SetBuildingAttribute ("NRoomsY", UintegerValue (4));

  gridBuildingAllocator->SetBuildingAttribute ("NFloors", UintegerValue (2));

  gridBuildingAllocator->SetAttribute ("MinX", DoubleValue (0));

  gridBuildingAllocator->SetAttribute ("MinY", DoubleValue (0));

  gridBuildingAllocator->Create (6);

This will create a 3x2 grid of 6 buildings, each 7 x 13 x 6 m with 2 x

4 rooms inside and 2 foors; the buildings are spaced by 3 m on both

the x and the y axis.

Setup nodes and mobility models

*******************************

Nodes and mobility models are configured as usual, however in order to

use them with the buildings model you need an additional call to

``BuildingsHelper::Install()``, so as to let the mobility model include

the informtion on their position w.r.t. the buildings. Here is an example::

    MobilityHelper mobility;

    mobility.SetMobilityModel ("ns3::ConstantPositionMobilityModel");

    ueNodes.Create (2);

    mobility.Install (ueNodes);

    BuildingsHelper::Install (ueNodes);

It is to be noted that any mobility model can be used. However, the

user is advised to make sure that the behavior of the mobility model

being used is consistent with the presence of Buildings. For example,

using a simple random mobility over the whole simulation area in

presence of buildings might easily results in node moving in and out

of buildings, regardless of the presence of walls.

Place some nodes

****************

You can place nodes in your simulation using several methods, which

are described in the following.

Legacy positioning methods

--------------------------

Any legacy ns-3 positioning method can be used to place node in the

100

simulation. The important additional step is to For example, you can

101

place nodes manually like this::

102

103

    Ptr<ConstantPositionMobilityModel> mm0 = enbNodes.Get (0)->GetObject<ConstantPositionMobilityModel> ();

104

    Ptr<ConstantPositionMobilityModel> mm1 = enbNodes.Get (1)->GetObject<ConstantPositionMobilityModel> ();

105

    mm0->SetPosition (Vector (5.0, 5.0, 1.5));

106

    mm1->SetPosition (Vector (30.0, 40.0, 1.5));

107

108

    MobilityHelper mobility;

109

    mobility.SetMobilityModel ("ns3::ConstantPositionMobilityModel");

110

    ueNodes.Create (2);

111

    mobility.Install (ueNodes);

112

    BuildingsHelper::Install (ueNodes);

113

    mm0->SetPosition (Vector (5.0, 5.0, 1.5));

114

    mm1->SetPosition (Vector (30.0, 40.0, 1.5));

115

116

Alternatively, you could use any existing PositionAllocator

117

class. The coordinates of the node will determine whether it is placed

118

outdoor or indoor and, if indoor, in which building and room it is placed.

119

120

121

Building-specific positioning methods

122

-------------------------------------

123

124

The following position allocator classes are available to place node

125

in special positions with respect to buildings:

126

127

 - ``RandomBuildingPositionAllocator``: Allocate each position by

128

   randomly chosing a building from the list of all buildings, and

129

   then randomly chosing a position inside the building.

130

131

 - ``RandomRoomPositionAllocator``: Allocate each position by randomly

132

   chosing a room from the list of rooms in all buildings, and then

133

   randomly chosing a position inside the room.

134

135

 - ``SameRoomPositionAllocator``: Walks a given NodeContainer

136

   sequentially, and for each node allocate a new position randomly in

137

   the same room of that node.

138

139

 - ``FixedRoomPositionAllocator``: Generate a random position

140

   uniformly distributed in the volume of a chosen room inside a

141

   chosen building.

142

143

144

145

Make the Mobility Model Consistent

146

**********************************

147

148

**Important**: whenever you use buildings, you have to issue the

149

following command after we have placed all nodes and buildings in the simulation::

150

151

    BuildingsHelper::MakeMobilityModelConsistent ();

152

153

This command will go through the lists of all nodes and of all

154

buildings, determine for each user if it is indoor or outdoor, and if

155

indoor it will also determine the building in which the user is

156

located and the corresponding floor and number inside the building.

157

158

159

Building-aware pathloss model

160

*****************************

161

162

After you placed buildings and nodes in a simulation, you can use a

163

building-aware pathloss model in a simulation exactly in the same way

164

you would use any regular path loss model. How to do this is specific

165

for the wireless module that you are considering (lte, wifi, wimax,

166

etc.), so please refer to the documentation of that model for specific

167

instructions.

168

169

170

171

172

Main configurable attributes

173

============================

174

The ``Building`` class has the following configurable parameters:

175

The ``Building`` class has the following configurable parameters:

176

Lines 42-53	Link Here

The simple ``OhBuildingMobilityLossModel`` overcome this problem by using only the Okumura Hata model and the wall penetration losses.

204

The simple ``OhBuildingMobilityLossModel`` overcome this problem by using only the Okumura Hata model and the wall penetration losses.

205

206

Helper Functionalities

----------------------

The ``BuildingsHelper`` class defines a set of static function for assisting in the definition of the scenario with building module. In detail, it provides the method ``Install`` for installing the building information included in  ``MobilityBuildingInfo`` to a specific node (or set of nodes, i.e.,  the ``NodeContainer``). In order to synchronize the nodes information with their position, this helper provides the function ``MakeMobilityModelConsistent`` that puts all the ``Node``\s presents in the simulation in the right position (i.e., outdoor or indoor, in the latter also updating in terms of building, floor and room number).

207

208

209




    {
      if (m_buildingListWithoutReplacement.empty ())
        {
          for (BuildingList::Iterator bit = BuildingList::Begin (); bit != BuildingList::End (); ++bit)
            {
              m_buildingListWithoutReplacement.push_back (*bit);
            }
        }
      uint32_t n = m_rand->GetInteger (0, m_buildingListWithoutReplacement.size () - 1);
      b = m_buildingListWithoutReplacement.at (n);
      m_buildingListWithoutReplacement.erase (m_buildingListWithoutReplacement.begin () + n);
    }


        }
    }
  uint32_t n = m_rand->GetInteger (0,m_roomListWithoutReplacement.size () - 1);
  RoomInfo r = m_roomListWithoutReplacement.at (n);
  m_roomListWithoutReplacement.erase (m_roomListWithoutReplacement.begin () + n);
  NS_LOG_LOGIC ("considering building " << r.b->GetId () << " room (" << r.roomx << ", " << r.roomy << ", " << r.floor << ")");

  Ptr<RandomBoxPositionAllocator> pa = CreateObject<RandomBoxPositionAllocator> ();

  double x = m_rand->GetValue (x1, x2);
  double y = m_rand->GetValue (y1, y2);
  double z = m_rand->GetValue (z1, z2);

  return Vector (x, y, z);
}


    {
      m_nodeIt  = m_nodes.Begin ();
    }

  NS_ASSERT_MSG (m_nodeIt != m_nodes.End (), "no node in container");

  NS_LOG_LOGIC ("considering node " << (*m_nodeIt)->GetId ());

  double x = m_rand->GetValue (x1, x2);
  double y = m_rand->GetValue (y1, y2);
  double z = m_rand->GetValue (z1, z2);

  return Vector (x, y, z);
}


  return 1;
}

NS_OBJECT_ENSURE_REGISTERED (FixedRoomPositionAllocator);


FixedRoomPositionAllocator::FixedRoomPositionAllocator (
  uint32_t x,
  uint32_t y,
  uint32_t z,
  Ptr<Building> pbtr)
{
  m_rand = CreateObject<UniformRandomVariable> ();
  roomx = x;
  roomy = y;
  floor = z;
  bptr = pbtr;
}

TypeId
FixedRoomPositionAllocator::GetTypeId (void)
{
  static TypeId tid = TypeId ("ns3::FixedRoomPositionAllocator")
    .SetParent<PositionAllocator> ()
    .SetGroupName ("Mobility")
    .AddConstructor<SameRoomPositionAllocator> ();
  return tid;
}

Vector
FixedRoomPositionAllocator::GetNext () const
{

  NS_LOG_LOGIC ("considering building " << bptr->GetId () << " room (" << roomx << ", " << roomy << ", " << floor << ")");

  Ptr<RandomBoxPositionAllocator> pa = CreateObject<RandomBoxPositionAllocator> ();

  Box box = bptr->GetBoundaries ();
  double rdx =  (box.xMax - box.xMin) / bptr->GetNRoomsX ();
  double rdy =  (box.yMax - box.yMin) / bptr->GetNRoomsY ();
  double rdz =  (box.zMax - box.zMin) / bptr->GetNFloors ();
  double x1 = box.xMin + rdx * (roomx - 1);
  double x2 = box.xMin + rdx * roomx;
  double y1 = box.yMin + rdy * (roomy -1);
  double y2 = box.yMin + rdy * roomy;
  double z1 = box.zMin + rdz * (floor - 1);
  double z2 = box.zMin + rdz * floor;
  NS_LOG_LOGIC ("randomly allocating position in "
                << " (" << x1 << "," << x2 << ") "
                << "x (" << y1 << "," << y2 << ") "
                << "x (" << z1 << "," << z2 << ") ");

  double x = m_rand->GetValue (x1, x2);
  double y = m_rand->GetValue (y1, y2);
  double z = m_rand->GetValue (z1, z2);
  return Vector (x, y, z);
}


int64_t
FixedRoomPositionAllocator::AssignStreams (int64_t stream)
{
  m_rand->SetStream (stream);
  return 1;
}


} // namespace ns3




  // inherited from PositionAllocator
  virtual Vector GetNext (void) const;

  /**
   * Assign a fixed random variable stream number to the random variables
   * used by this model.  Return the number of streams (possibly zero) that
   * have been assigned.
   *
   * \param stream first stream index to use
   * \return the number of stream indices assigned by this model
   */
  int64_t AssignStreams (int64_t stream);

private:

  bool m_withReplacement;
  mutable std::vector< Ptr<Building> > m_buildingListWithoutReplacement;


  int64_t AssignStreams (int64_t stream);

private:

  bool m_withReplacement;
  struct RoomInfo 
  {
    Ptr<Building> b;

};



/**
 * Walks a given NodeContainer sequentially, and for each node allocate a new
 * position randomly in the same room of that node
 *
 */
class SameRoomPositionAllocator : public PositionAllocator
{

  // inherited from PositionAllocator
  virtual Vector GetNext (void) const;

  /**
   * Assign a fixed random variable stream number to the random variables
   * used by this model.  Return the number of streams (possibly zero) that
   * have been assigned.
   *
   * \param stream first stream index to use
   * \return the number of stream indices assigned by this model
   */
  int64_t AssignStreams (int64_t);

private:

  Ptr<UniformRandomVariable> m_rand;
};

/**
 * Generate a random position uniformly distributed in the volume of a
 * chosen room inside a chosen building.  
 */
class FixedRoomPositionAllocator : public PositionAllocator
{
public:

  /** 
   * 
   * 
   * \param x index of the room on the x-axis 
   * \param y index of the room on the y-axis 
   * \param z index of the room on the z-axis (i.e., floor number)
   * \param b pointer to the chosen building
   * 
   */
  FixedRoomPositionAllocator (uint32_t x,
                              uint32_t y,
                              uint32_t z,
                              Ptr<Building> b);
  // inherited from Object
  static TypeId GetTypeId (void);
  // inherited from PositionAllocator
  virtual Vector GetNext (void) const;

  /**
   * Assign a fixed random variable stream number to the random variables
   * used by this model.  Return the number of streams (possibly zero) that
   * have been assigned.
   *
   * \param stream first stream index to use
   * \return the number of stream indices assigned by this model
   */
  int64_t AssignStreams (int64_t);

private:

  uint32_t roomx;
  uint32_t roomy;
  uint32_t floor;

  Ptr<Building> bptr;

  /// Provides uniform random variables.
  Ptr<UniformRandomVariable> m_rand;
};


} // namespace ns3





  virtual int64_t DoAssignStreams (int64_t stream);
  
  double m_frequency; ///< frequency in MHz
  double m_lambda; ///< wavelength
  EnvironmentType m_environment;
  CitySize m_citySize;
  double m_rooftopHeight; ///< in meters
  double m_streetsOrientation; ///< in degrees [0,90]
  double m_streetsWidth; ///< in meters
  double m_buildingsExtend; ///< in meters
  double m_buildingSeparation; ///< in meters

};


(-)ns-3.18/src/click/model/ipv4-l3-click-protocol.cc (-1 / +1 lines)

Lines 330-336	Link Here

330

  // First check whether an existing LoopbackNetDevice exists on the node

330

  // First check whether an existing LoopbackNetDevice exists on the node

331

  for (uint32_t i = 0; i < m_node->GetNDevices (); i++)

331

  for (uint32_t i = 0; i < m_node->GetNDevices (); i++)

332

333

      if (device = DynamicCast<LoopbackNetDevice> (m_node->GetDevice (i)))

333

      if ((device = DynamicCast<LoopbackNetDevice> (m_node->GetDevice (i))))

334

335

          break;

335

          break;

336





#include <iomanip>

/*
 * \brief Silence erroneous strict alias warning from a gcc 4.4 bug
 *
 * Casting \c (void*) triggers a strict alias warning bug
 * in gcc 4.4 (see http://gcc.gnu.org/bugzilla/show_bug.cgi?id=39390).
 *
 * In the murmur3 code, data is returned by
 * \code
 *   void Function (... , void * out)
 *   {
 *     ...
 *     *(uint32_t *)out = ...
 *   }
 * \endcode
 *
 * which triggers the erroneous warning.
 *
 * We suppress strict-alias warnings in this compilation unit.
 * (gcc 4.4 doesn't support the <tt>diagnostic push/pop</tt> pragmas,
 * so we can't narrow down the suppression any further.)
 */
// Test for gcc 4.4.x
#define GCC_VERSION (__GNUC__ * 100 + __GNUC_MINOR__)
#if (GCC_VERSION == 404)
#  pragma GCC diagnostic ignored "-Wstrict-aliasing"
#endif
 
namespace ns3 {

NS_LOG_COMPONENT_DEFINE ("Hash-Murmur3");

{
  using namespace Murmur3Implementation;
  MurmurHash3_x86_128_incr (buffer, size,
                            (uint32_t *)(void *)m_hash64, m_hash64);
  m_size64 += size;

  // Simpler would be:
  //
  //   uint64_t hash[2];
  //   MurmurHash3_x86_128_fin (m_size64, m_hash64, hash);
  //   return hash[0];
  //
  // but this triggers an aliasing bug in gcc-4.4 (perhaps related to
  // http://gcc.gnu.org/bugzilla/show_bug.cgi?id=39390).
  // In ns-3, this bug produces incorrect results in static optimized
  // builds only.
  //
  // Using uint32_t here avoids the bug, and continues to works with newer gcc.
  uint32_t hash[4];
  
  MurmurHash3_x86_128_fin (m_size64,
                           (uint32_t *)(void *)m_hash64, hash);
  uint64_t result = hash[1];
  result = (result << 32) | hash[0];
  return result;
}

void

{
  m_hash32 = (uint32_t)SEED;
  m_size32 = 0;
  m_hash64[0] = m_hash64[1] = ((uint64_t)(SEED) << 32) + (uint64_t)SEED;
  m_hash64[1] = ((uint64_t)(SEED) << 32) + (uint64_t)SEED;
  m_size64 = 0;
}





 * \ingroup time
 * \brief keep track of time values and allow control of global simulation resolution
 *
 * This class defines all the classic C++ addition/subtraction
 * operators: +, -, +=, -=; and all the classic comparison operators:
 * ==, !=, <, >, <=, >=. It is thus easy to add, substract, or
 * compare Time objects.
 *
 * For example:
 * \code
 * Time t1 = Seconds (10.0);
 * Time t2 = Seconds (10.0);
 * Time t3 = t1;
 * t3 += t2;
 * Time t5 = t3 * t1;
 * Time t6 = t1 / t5;
 * Time t7 = t3;
 * \endcode
 *
 * You can also use the following non-member functions to manipulate
 * any of these ns3::Time object:
 *  - \ref Abs()
 *  - \ref Max()
 *  - \ref Min()
 *
 * This class also controls the resolution of the underlying time value.
 * The resolution is the smallest representable time interval.
 * The default resolution is nanoseconds.
 *
 * To change the resolution, use SetResolution().  All Time objects created
 * before the call to SetResolution() will be updated to the new resolution.
 * This can only be done once!  (Tracking each Time object uses 4 pointers.
 * For speed, once we convert the existing instances we discard the recording
 * data structure and stop tracking new instances, so we have no way
 * to do a second conversion.)
 *
 * If you increase the global resolution, you also implicitly decrease
 * the range of your simulation.  The global simulation time is stored
 * in a 64 bit integer, whose interpretation will depend on the global
 * resolution.  Therefore the maximum duration of your simulation,
 * if you use picoseconds, is 2^64 ps = 2^24 s = 7 months, whereas,
 * had you used nanoseconds, you could have run for 584 years.
 * Time::SetResolution. If you do need to use picoseconds, it's thus best
 * to switch the global resolution to picoseconds to avoid nasty surprises.
 *
 * Another important issue to keep in mind is that if you increase the
 * global resolution, you also implicitely decrease the range of your simulation.
 * i.e., the global simulation time is stored in a 64 bit integer whose interpretation
 * will depend on the global resolution so, 2^64 picoseconds which is the maximum
 * duration of your simulation if the global resolution is picoseconds
 * is smaller than 2^64 nanoseconds which is the maximum duration of your simulation
 * if the global resolution is nanoseconds.
 *
 * Finally, don't even think about ever changing the global resolution after
 * creating Time objects: all Time objects created before the call to SetResolution
 * will contain values which are not updated to the new resolution. In practice,
 * the default value for the attributes of many models is indeed calculated
 * before the main function of the main program enters. Because of this, if you
 * use one of these models (and it's likely), it's going to be hard to change
 * the global simulation resolution in a way which gives reasonable results. This
 * issue has been filed as bug 954 in the ns-3 bugzilla installation.
 */
class Time
{

(-)ns-3.18/src/core/model/random-variable-stream.h (-4 lines)

Lines 2012-2021	Link Here

2012

2013

  /// The upper bound on values that can be returned by this RNG stream.

2013

  /// The upper bound on values that can be returned by this RNG stream.

2014

  double m_max;

2014

  double m_max;

2015

2016

  /// It's easier to work with the mode internally instead of the

2017

  /// mean.  They are related by the simple: mean = (min+max+mode)/3.

2018

  double m_mode;

2019

};

2015

};

2020

2016

2021

/**

2017

/**




    return tid;
  }

  AttributeObjectTest (void)
  {
    NS_UNUSED (m_boolTest);
    NS_UNUSED (m_int16);
    NS_UNUSED (m_int16WithBounds);
    NS_UNUSED (m_uint8);
    NS_UNUSED (m_float);
    NS_UNUSED (m_enum);
  }

  virtual ~AttributeObjectTest (void) {};

  void AddToVector1 (void) { m_vector1.push_back (CreateObject<Derived> ()); }
  void AddToVector2 (void) { m_vector2.push_back (CreateObject<Derived> ()); }





HashTestSuite::HashTestSuite ()
  : TestSuite ("hash", UNIT)
{
// The below tests fail for static optimized builds in gcc-4.4.3 (64-bit)
// This is likely due to a compiler bug (see also the strict alias
// warning issue mentioned in hash-murmur3.cc).  It does not impact
// most users of the code, so we silence the test failure while we
// continue to use gcc-4.4.3 (python bindings) for other purposes
//
// This code can be removed once gcc-4.4.3 is no longer supported
//
// Test for gcc 4.4.x
#define GCC_VERSION (__GNUC__ * 100 + __GNUC_MINOR__)
#if (GCC_VERSION != 404)
  AddTestCase (new DefaultHashTestCase, QUICK);
  AddTestCase (new Murmur3TestCase, QUICK);
  AddTestCase (new Fnv1aTestCase, QUICK);
  AddTestCase (new IncrementalTestCase, QUICK);
#endif
  AddTestCase (new Hash32FunctionPtrTestCase, QUICK);
  AddTestCase (new Hash64FunctionPtrTestCase, QUICK);
}

(-)ns-3.18/src/core/wscript (-3 / +13 lines)

Lines 12-17	Link Here

                         'with the configure command.'),

                         'with the configure command.'),

                   action="store_true", default=False,

                   action="store_true", default=False,

                   dest='int64x64_as_double')

                   dest='int64x64_as_double')

    opt.add_option('--disable-pthread',

                   help=('Whether to enable the use of POSIX threads'),

                   action="store_true", default=False,

                   dest='disable_pthread')

Lines 62-70	Link Here

   return 0;

   return 0;

"""

"""

    have_pthread = conf.check_nonfatal(header_name='pthread.h', define_name='HAVE_PTHREAD_H',

    if Options.options.disable_pthread:

                                       env=test_env, fragment=fragment,

        conf.report_optional_feature("Threading", "Threading Primitives",

                                       errmsg='Could not find pthread support (build/config.log for details)')

                                     False,

                                     "Disabled by user request (--disable-pthread)")

        have_pthread = False

    else:

        have_pthread = conf.check_nonfatal(header_name='pthread.h', define_name='HAVE_PTHREAD_H',

                                           env=test_env, fragment=fragment,

                                           errmsg='Could not find pthread support (build/config.log for details)')

    if have_pthread:

    if have_pthread:

        # darwin accepts -pthread but prints a warning saying it is ignored

        # darwin accepts -pthread but prints a warning saying it is ignored

        if Options.platform != 'darwin' and Options.platform != 'cygwin':

        if Options.platform != 'darwin' and Options.platform != 'cygwin':

(-)ns-3.18/src/create-module.py (-1 / +2 lines)

Lines 331-337	Link Here

331

        print >> sys.stderr, "Module %r already exists" % (modname,)

331

        print >> sys.stderr, "Module %r already exists" % (modname,)

332

        return 2

332

        return 2

333

334

    print "Creating module %r" % (modname,)

334

    print("Creating module %r, "

335

          "run './waf configure' to include it in the build" % (modname,))

335

336

    os.mkdir(moduledir)

337

    os.mkdir(moduledir)

337

    wscript = file(os.path.join(moduledir, "wscript"), "wt")

338

    wscript = file(os.path.join(moduledir, "wscript"), "wt")

(-)ns-3.18/src/csma/model/csma-net-device.cc (-1 lines)

Lines 699-705	Link Here

699

      trailer.EnableFcs (true);

699

      trailer.EnableFcs (true);

700

701

702

  trailer.CheckFcs (packet);

703

  bool crcGood = trailer.CheckFcs (packet);

702

  bool crcGood = trailer.CheckFcs (packet);

704

  if (!crcGood)

703

  if (!crcGood)

705

704

(-)ns-3.18/src/dsr/model/dsr-maintain-buff.h (-2 lines)

Lines 204-211	Link Here

204

  Ipv4Address m_dst;

204

  Ipv4Address m_dst;

205

  // / The data ack id

205

  // / The data ack id

206

  uint16_t m_ackId;

206

  uint16_t m_ackId;

207

  // / The ipv4 id

208

  uint16_t m_id;

209

  // / The segments left field

207

  // / The segments left field

210

  uint8_t m_segsLeft;

208

  uint8_t m_segsLeft;

211

  // / Expire time for queue entry

209

  // / Expire time for queue entry





DsrOptionRerrHeader::DsrOptionRerrHeader ()
  : m_errorType (0),
    m_reserved (0),
    m_salvage (0),
    m_errorLength (4)
{

}

DsrOptionRerrUnreachHeader::DsrOptionRerrUnreachHeader ()
  :
    m_salvage (0)
{
  SetType (3);

}

DsrOptionRerrUnsupportHeader::DsrOptionRerrUnsupportHeader ()
  :
    m_salvage (0)
{
  SetType (3);





private:
  /**
   * \brief The data length.
   */
  uint32_t m_dataLength;
  /**
   * \brief Identifier of the packet.
   */
  uint16_t m_identification;


private:
  /**
   * \brief option data length
   */
  uint8_t        m_optDataLen;
  /**
   * \brief The error type or route error option
   */
  uint8_t        m_errorType;
  /**
   * \brief The reserved field
   */
  uint8_t        m_reserved;
  /**
   * \brief The salavage field
   */
  uint8_t        m_salvage;


private:
  /**
   * \brief option data length
   */
  uint8_t        m_optDataLen;
  /**
   * \brief The error type or route error option
   */
  uint8_t        m_errorType;
  /**
   * \brief The reserved field
   */
  uint8_t        m_reserved;
  /**
   * \brief The salavage field
   */
  uint8_t        m_salvage;

   * \brief The original destination address
   */
  Ipv4Address    m_originalDst;
  /**
   * \brief The specific error type
   */
  uint16_t       m_typeSpecific;
};

/**


private:
  /**
   * \brief option data length
   */
  uint8_t        m_optDataLen;
  /**
   * \brief The error type or route error option
   */
  uint8_t        m_errorType;
  /**
   * \brief The reserved field
   */
  uint8_t        m_reserved;
  /**
   * \brief The salavage field
   */
  uint8_t        m_salvage;


private:
  /*
   * The option data length
   */
  uint8_t  m_optDataLen;
  /*
   * The identification field
   */
  uint16_t m_identification;


private:
  /**
   * \brief option data length
   */
  uint8_t m_optDataLen;
  /**
   * \brief identification field
   */
  uint16_t m_identification;




   */
  Ptr<dsr::RouteCache> m_routeCache;
  /**
   * \brief The length of the packet.
   */
  uint32_t m_length;
  /**
   * \brief The ip layer 3.
   */
  Ptr<Ipv4> m_ipv4;


private:
  /**
   * \brief The length of the packet.
   */
  uint32_t m_length;
  /**
   * \brief The ip layer 3.
   */
  Ptr<Ipv4> m_ipv4;

   */
  Ptr<dsr::RouteCache> m_routeCache;
  /**
   * \brief The length of the packet.
   */
  uint32_t m_length;
  /**
   * \brief The ipv4 layer 3.
   */
  Ptr<Ipv4> m_ipv4;

   */
  Ptr<dsr::RouteCache> m_routeCache;
  /**
   * \brief The length of the packet.
   */
  uint32_t m_length;
  /**
   * \brief The ipv4 layer 3.
   */
  Ptr<Ipv4> m_ipv4;

   */
  Ptr<dsr::RouteCache> m_routeCache;
  /**
   * \brief The length of the packet.
   */
  uint32_t m_length;
  /**
   * \brief The ipv4 layer 3.
   */
  Ptr<Ipv4> m_ipv4;

(-)ns-3.18/src/dsr/model/dsr-rreq-table.h (-3 lines)

Lines 238-246	Link Here

238

  bool FindSourceEntry (Ipv4Address src, Ipv4Address dst, uint16_t id);

238

  bool FindSourceEntry (Ipv4Address src, Ipv4Address dst, uint16_t id);

239

240

private:

240

private:

241

242

  // / The max # of requests to retransmit

243

  uint32_t MaxRequestRexmt;

244

  // / The max request period among requests

241

  // / The max request period among requests

245

  Time  MaxRequestPeriod;

242

  Time  MaxRequestPeriod;

246

  // / The original request period

243

  // / The original request period

(-)ns-3.18/src/energy/model/rv-battery-model.h (-1 lines)

Lines 225-231	Link Here

225

  std::vector<double> m_load;     // load profile

225

  std::vector<double> m_load;     // load profile

226

  std::vector<Time> m_timeStamps; // time stamps of load profile

226

  std::vector<Time> m_timeStamps; // time stamps of load profile

227

  Time m_lastSampleTime;

227

  Time m_lastSampleTime;

228

  uint64_t m_counter;

229

228

230

  int m_numOfTerms; // # of terms for infinite sum in battery level estimation

229

  int m_numOfTerms; // # of terms for infinite sum in battery level estimation

231

230




   * \return the processed size
   */
  virtual uint8_t Process (Ptr<Packet> packet, uint8_t offset, Ipv6Header const& ipv6Header, bool& isDropped);

private:
  /**
   * \brief The length of the packet.
   */
  uint32_t m_length;
};

/**

(-)ns-3.18/src/internet/model/tcp-header.h (-1 lines)

Lines 173-179	Link Here

173

  Address m_destination;

173

  Address m_destination;

174

  uint8_t m_protocol;

174

  uint8_t m_protocol;

175

176

  uint16_t m_initialChecksum;

177

  bool m_calcChecksum;

176

  bool m_calcChecksum;

178

  bool m_goodChecksum;

177

  bool m_goodChecksum;

179

};

178

};

(-)ns-3.18/src/lte/doc/Makefile (-1 / +1 lines)

Lines 148-154	Link Here

148

149

IMAGES = $(IMAGES_NOBUILD) $(IMAGES_BUILD)

149

IMAGES = $(IMAGES_NOBUILD) $(IMAGES_BUILD)

150

151

RESCALE = $(shell hg root)/utils/rescale-pdf.sh

151

RESCALE = ../../../utils/rescale-pdf.sh

152

153

%.eps : %.dia; $(DIA) -t eps $< -e $@

153

%.eps : %.dia; $(DIA) -t eps $< -e $@

154

%.png : %.dia; $(DIA) -t png $< -e $@

154

%.png : %.dia; $(DIA) -t png $< -e $@





PHY KPIs are distributed in seven different files, configurable through the attributes

  1. ``ns3::PhyStatsCalculator::DlRsrpSinrFilename``
  2. ``ns3::PhyStatsCalculator::UeSinrFilename``
  3. ``ns3::PhyStatsCalculator::InterferenceFilename``
  4. ``ns3::PhyStatsCalculator::DlTxOutputFilename``

#. Mobility model selection::

    MobilityHelper mobility;
    mobility.SetMobilityModel ("ns3::ConstantPositionMobilityModel"); 

    It is to be noted that any mobility model can be used. 

#. Building creation::


    mm0->SetPosition (Vector (5.0, 5.0, 1.5));
    mm1->SetPosition (Vector (30.0, 40.0, 1.5));

#. Finalize the building and mobility model configuration::

    BuildingsHelper::MakeMobilityModelConsistent ();

See the documentation of the *buildings* module for more detailed information.


PHY Error Model
---------------

(-)ns-3.18/src/lte/model/epc-x2-header.h (-2 lines)

Lines 69-76	Link Here

};

};

private:

private:

  uint32_t m_headerLength;

  uint8_t m_messageType;

  uint8_t m_messageType;

  uint8_t m_procedureCode;

  uint8_t m_procedureCode;

(-)ns-3.18/src/lte/model/fdbet-ff-mac-scheduler.h (-4 lines)

Lines 64-73	Link Here

/**

/**

 * \ingroup ff-api

 * \ingroup ff-api

 * \defgroup FF-API FdBetFfMacScheduler

*/

/**

 * \ingroup FdBetFfMacScheduler

 * \brief Implements the SCHED SAP and CSCHED SAP for a Frequency Domain Blind Equal Throughput scheduler

 * \brief Implements the SCHED SAP and CSCHED SAP for a Frequency Domain Blind Equal Throughput scheduler

 * This class implements the interface defined by the FfMacScheduler abstract class

 * This class implements the interface defined by the FfMacScheduler abstract class

(-)ns-3.18/src/lte/model/fdmt-ff-mac-scheduler.h (-4 lines)

Lines 56-65	Link Here

/**

/**

 * \ingroup ff-api

 * \ingroup ff-api

 * \defgroup FF-API FdMtFfMacScheduler

*/

/**

 * \ingroup FdMtFfMacScheduler

 * \brief Implements the SCHED SAP and CSCHED SAP for a Frequency Domain Maximize Throughput scheduler

 * \brief Implements the SCHED SAP and CSCHED SAP for a Frequency Domain Maximize Throughput scheduler

 * This class implements the interface defined by the FfMacScheduler abstract class

 * This class implements the interface defined by the FfMacScheduler abstract class

(-)ns-3.18/src/lte/model/fdtbfq-ff-mac-scheduler.cc (-1 lines)

Lines 217-223	Link Here

217

FdTbfqFfMacScheduler::FdTbfqFfMacScheduler ()

217

FdTbfqFfMacScheduler::FdTbfqFfMacScheduler ()

218

  :   m_cschedSapUser (0),

218

  :   m_cschedSapUser (0),

219

    m_schedSapUser (0),

219

    m_schedSapUser (0),

220

    m_timeWindow (99.0),

221

    m_nextRntiUl (0),

220

    m_nextRntiUl (0),

222

    bankSize (0)

221

    bankSize (0)

223

222





/**
 * \ingroup ff-api
 * \defgroup FF-API FdTbfqFfMacScheduler
 */
/**
 * \ingroup FdTbfqFfMacScheduler
 * \brief Implements the SCHED SAP and CSCHED SAP for a Frequency Domain Token Bank Fair Queue  scheduler
 *
 * This class implements the interface defined by the FfMacScheduler abstract class

  FfMacCschedSapProvider::CschedCellConfigReqParameters m_cschedCellConfig;


  double m_timeWindow;

  uint16_t m_nextRntiUl; // RNTI of the next user to be served next scheduling in UL

  uint32_t m_cqiTimersThreshold; // # of TTIs for which a CQI canbe considered valid

(-)ns-3.18/src/lte/model/ff-mac-csched-sap.h (-4 lines)

Lines 30-39	Link Here

/**

/**

 * \ingroup ff-api

 * \ingroup ff-api

 * \defgroup FF-API FfMacCschedSap

*/

/**

 * \ingroup FfMacCschedSap

 * \brief Provides the CSCHED SAP

 * \brief Provides the CSCHED SAP

 * This abstract class defines the MAC Scheduler interface specified in the

 * This abstract class defines the MAC Scheduler interface specified in the

(-)ns-3.18/src/lte/model/ff-mac-sched-sap.h (-4 lines)

Lines 31-40	Link Here

/**

/**

 * \ingroup ff-api

 * \ingroup ff-api

 * \defgroup FF-API FfMacSchedSap

*/

/**

 * \ingroup FfMacSchedSap

 * \brief Provides the SCHED SAP

 * \brief Provides the SCHED SAP

 * This abstract class defines the MAC Scheduler interface specified in the

 * This abstract class defines the MAC Scheduler interface specified in the

(-)ns-3.18/src/lte/model/ff-mac-scheduler.h (+7 lines)

Lines 35-40	Link Here

class FfMacSchedSapProvider;

class FfMacSchedSapProvider;

/**

/**

 * \ingroup lte

 * \defgroup ff-api FF MAC Schedulers

*/

/**

 * \ingroup ff-api

 * This abstract base class identifies the interface by means of which

 * This abstract base class identifies the interface by means of which

 * the helper object can plug on the MAC a scheduler implementation based on the

 * the helper object can plug on the MAC a scheduler implementation based on the

 * FF MAC Sched API.

 * FF MAC Sched API.

(-)ns-3.18/src/lte/model/lte-mi-error-model.cc (-1 lines)

Lines 31-37	Link Here

#include <list>

#include <list>

#include <tr1/functional>

#include <vector>

#include <vector>

#include <ns3/log.h>

#include <ns3/log.h>

#include <ns3/pointer.h>

#include <ns3/pointer.h>

(-)ns-3.18/src/lte/model/lte-rrc-header.cc (+7 lines)

Lines 2224-2229	Link Here

2224

2225

2226

void

2226

void

2227

RrcAsn1Header::Print (std::ostream &os) const

2228

2229

  NS_LOG_FUNCTION (this << &os);

2230

  NS_FATAL_ERROR ("RrcAsn1Header Print() function must also specify LteRrcSap::RadioResourceConfigDedicated as a second argument");

2231

2232

2233

void

2227

RrcAsn1Header::Print (std::ostream &os, LteRrcSap::RadioResourceConfigDedicated radioResourceConfigDedicated) const

2234

RrcAsn1Header::Print (std::ostream &os, LteRrcSap::RadioResourceConfigDedicated radioResourceConfigDedicated) const

2228

2235

2229

  os << "   srbToAddModList: " << std::endl;

2236

  os << "   srbToAddModList: " << std::endl;

(-)ns-3.18/src/lte/model/lte-rrc-header.h (+1 lines)

Lines 82-87	Link Here

  Buffer::Iterator DeserializeQoffsetRange (int8_t * qOffsetRange, Buffer::Iterator bIterator);

  Buffer::Iterator DeserializeQoffsetRange (int8_t * qOffsetRange, Buffer::Iterator bIterator);

  Buffer::Iterator DeserializeThresholdEutra (LteRrcSap::ThresholdEutra * thresholdEutra, Buffer::Iterator bIterator);

  Buffer::Iterator DeserializeThresholdEutra (LteRrcSap::ThresholdEutra * thresholdEutra, Buffer::Iterator bIterator);

  void Print (std::ostream &os) const;

/**

/**

   * This function prints RadioResourceConfigDedicated IE, for debugging purposes.

   * This function prints RadioResourceConfigDedicated IE, for debugging purposes.

   * @param os The output stream to use (i.e. std::cout)

   * @param os The output stream to use (i.e. std::cout)

(-)ns-3.18/src/lte/model/pf-ff-mac-scheduler.h (-4 lines)

Lines 63-72	Link Here

/**

/**

 * \ingroup ff-api

 * \ingroup ff-api

 * \defgroup FF-API PfFfMacScheduler

*/

/**

 * \ingroup PfFfMacScheduler

 * \brief Implements the SCHED SAP and CSCHED SAP for a Proportional Fair scheduler

 * \brief Implements the SCHED SAP and CSCHED SAP for a Proportional Fair scheduler

 * This class implements the interface defined by the FfMacScheduler abstract class

 * This class implements the interface defined by the FfMacScheduler abstract class

(-)ns-3.18/src/lte/model/pss-ff-mac-scheduler.h (-4 lines)

Lines 72-81	Link Here

/**

/**

 * \ingroup ff-api

 * \ingroup ff-api

 * \defgroup FF-API PssFfMacScheduler

*/

/**

 * \ingroup PssFfMacScheduler

 * \brief Implements the SCHED SAP and CSCHED SAP for a Priority Set scheduler

 * \brief Implements the SCHED SAP and CSCHED SAP for a Priority Set scheduler

 * This class implements the interface defined by the FfMacScheduler abstract class

 * This class implements the interface defined by the FfMacScheduler abstract class

(-)ns-3.18/src/lte/model/rr-ff-mac-scheduler.cc (-1 / +2 lines)

Lines 23-28	Link Here

#include <ns3/math.h>

#include <ns3/math.h>

#include <cfloat>

#include <cfloat>

#include <set>

#include <set>

#include <climits>

#include <ns3/lte-amc.h>

#include <ns3/lte-amc.h>

#include <ns3/rr-ff-mac-scheduler.h>

#include <ns3/rr-ff-mac-scheduler.h>

Lines 978-984	Link Here

978

  // Divide the resource equally among the active users according to

979

  // Divide the resource equally among the active users according to

979

  // Resource allocation type 0 (see sec 7.1.6.1 of 36.213)

980

  // Resource allocation type 0 (see sec 7.1.6.1 of 36.213)

980

981

  int rbgPerTb = (nTbs > 0) ? ((rbgNum - rbgAllocatedNum) / nTbs) : DBL_MAX;

982

  int rbgPerTb = (nTbs > 0) ? ((rbgNum - rbgAllocatedNum) / nTbs) : INT_MAX;

982

  NS_LOG_INFO (this << " Flows to be transmitted " << nflows << " rbgPerTb " << rbgPerTb);

983

  NS_LOG_INFO (this << " Flows to be transmitted " << nflows << " rbgPerTb " << rbgPerTb);

983

  if (rbgPerTb == 0)

984

  if (rbgPerTb == 0)

984

985

(-)ns-3.18/src/lte/model/rr-ff-mac-scheduler.h (-4 lines)

Lines 50-59	Link Here

/**

/**

 * \ingroup ff-api

 * \ingroup ff-api

 * \defgroup FF-API RrFfMacScheduler

*/

/**

 * \ingroup RrFfMacScheduler

 * \brief Implements the SCHED SAP and CSCHED SAP for a Round Robin scheduler

 * \brief Implements the SCHED SAP and CSCHED SAP for a Round Robin scheduler

 * This class implements the interface defined by the FfMacScheduler abstract class

 * This class implements the interface defined by the FfMacScheduler abstract class

(-)ns-3.18/src/lte/model/tdbet-ff-mac-scheduler.h (-4 lines)

Lines 64-73	Link Here

/**

/**

 * \ingroup ff-api

 * \ingroup ff-api

 * \defgroup FF-API TdBetFfMacScheduler

*/

/**

 * \ingroup TdBetFfMacScheduler

 * \brief Implements the SCHED SAP and CSCHED SAP for a Time Domain Blind Equal Throughput scheduler

 * \brief Implements the SCHED SAP and CSCHED SAP for a Time Domain Blind Equal Throughput scheduler

 * This class implements the interface defined by the FfMacScheduler abstract class

 * This class implements the interface defined by the FfMacScheduler abstract class

(-)ns-3.18/src/lte/model/tdmt-ff-mac-scheduler.h (-4 lines)

Lines 56-65	Link Here

/**

/**

 * \ingroup ff-api

 * \ingroup ff-api

 * \defgroup FF-API TdMtFfMacScheduler

*/

/**

 * \ingroup TdMtFfMacScheduler

 * \brief Implements the SCHED SAP and CSCHED SAP for a Time Domain Maximize Throughput scheduler

 * \brief Implements the SCHED SAP and CSCHED SAP for a Time Domain Maximize Throughput scheduler

 * This class implements the interface defined by the FfMacScheduler abstract class

 * This class implements the interface defined by the FfMacScheduler abstract class

(-)ns-3.18/src/lte/model/tdtbfq-ff-mac-scheduler.cc (-1 lines)

Lines 217-223	Link Here

217

TdTbfqFfMacScheduler::TdTbfqFfMacScheduler ()

217

TdTbfqFfMacScheduler::TdTbfqFfMacScheduler ()

218

  :   m_cschedSapUser (0),

218

  :   m_cschedSapUser (0),

219

    m_schedSapUser (0),

219

    m_schedSapUser (0),

220

    m_timeWindow (99.0),

221

    m_nextRntiUl (0),

220

    m_nextRntiUl (0),

222

    bankSize (0)

221

    bankSize (0)

223

222





/**
 * \ingroup ff-api
 * \defgroup FF-API TdTbfqFfMacScheduler
 */
/**
 * \ingroup TdTbfqFfMacScheduler
 * \brief Implements the SCHED SAP and CSCHED SAP for a Time Domain Token Bank Fair Queue  scheduler
 *
 * This class implements the interface defined by the FfMacScheduler abstract class

  FfMacCschedSapProvider::CschedCellConfigReqParameters m_cschedCellConfig;


  double m_timeWindow;

  uint16_t m_nextRntiUl; // RNTI of the next user to be served next scheduling in UL

  uint32_t m_cqiTimersThreshold; // # of TTIs for which a CQI canbe considered valid

(-)ns-3.18/src/lte/model/tta-ff-mac-scheduler.h (-4 lines)

Lines 56-65	Link Here

/**

/**

 * \ingroup ff-api

 * \ingroup ff-api

 * \defgroup FF-API TtaFfMacScheduler

*/

/**

 * \ingroup TtaFfMacScheduler

 * \brief Implements the SCHED SAP and CSCHED SAP for a Throughput to Average scheduler

 * \brief Implements the SCHED SAP and CSCHED SAP for a Throughput to Average scheduler

 * This class implements the interface defined by the FfMacScheduler abstract class

 * This class implements the interface defined by the FfMacScheduler abstract class




  // 6 users -> 4 PRB at Itbs 26 -> 373 -> 373000 bytes/sec
  // after the patch enforcing min 3 PRBs per UE:
  // 12 users -> 3 PRB at Itbs 26 -> 277 bytes * 8/12 UE/TTI -> 184670 bytes/sec
  AddTestCase (new LenaFdBetFfMacSchedulerTestCase1 (1,0,2196000,2292000, errorModel), TestCase::EXTENSIVE);
  AddTestCase (new LenaFdBetFfMacSchedulerTestCase1 (3,0,749000,749000, errorModel), TestCase::EXTENSIVE);
  AddTestCase (new LenaFdBetFfMacSchedulerTestCase1 (6,0,373000,373000, errorModel), TestCase::EXTENSIVE);
  AddTestCase (new LenaFdBetFfMacSchedulerTestCase1 (12,0,185000,184670, errorModel), TestCase::EXTENSIVE);

  // DOWNLINK - DISTANCE 4800 -> MCS 22 -> Itbs 20 (from table 7.1.7.2.1-1 of 36.213)
  // 1 user -> 24 PRB at Itbs 20 -> 1383 -> 1383000 bytes/sec

  // 6 users -> 4 PRB at Itbs 13 -> 125 -> 125000 bytes/sec
  // after the patch enforcing min 3 PRBs per UE:
  // 12 users -> 3 PRB at Itbs 13 -> 93  bytes * 8/12 UE/TTI  -> 62000 bytes/sec
  AddTestCase (new LenaFdBetFfMacSchedulerTestCase1 (1,4800,1383000,807000, errorModel), TestCase::EXTENSIVE);
  AddTestCase (new LenaFdBetFfMacSchedulerTestCase1 (3,4800,469000,253000, errorModel), TestCase::EXTENSIVE);
  AddTestCase (new LenaFdBetFfMacSchedulerTestCase1 (6,4800,233500,125000, errorModel), TestCase::EXTENSIVE);
  AddTestCase (new LenaFdBetFfMacSchedulerTestCase1 (12,4800,113000,62000, errorModel), TestCase::EXTENSIVE);

  // DOWNLINK - DISTANCE 6000 -> MCS 20 -> Itbs 18 (from table 7.1.7.2.1-1 of 36.213)
  // 1 user -> 24 PRB at Itbs 18 -> 1191 -> 1191000 byte/sec

  // 3 users -> 8 PRB at Itbs 11 -> 201 -> 201000 bytes/sec
  // 6 users -> 4 PRB at Itbs 11 -> 97 -> 97000 bytes/sec
  // 12 users -> 3 PRB at Itbs 11 -> 73 bytes * 8/12 UE/TTI -> 48667 bytes/sec
  AddTestCase (new LenaFdBetFfMacSchedulerTestCase1 (1,6000,1191000,621000,errorModel), TestCase::EXTENSIVE);
  AddTestCase (new LenaFdBetFfMacSchedulerTestCase1 (3,6000,389000,201000,errorModel), TestCase::EXTENSIVE);
  AddTestCase (new LenaFdBetFfMacSchedulerTestCase1 (6,6000,193000,97000,errorModel), TestCase::EXTENSIVE);
  AddTestCase (new LenaFdBetFfMacSchedulerTestCase1 (12,6000,97000,48667,errorModel), TestCase::EXTENSIVE);

  // DOWNLINK - DISTANCE 10000 -> MCS 14 -> Itbs 13 (from table 7.1.7.2.1-1 of 36.213)
  // 1 user -> 24 PRB at Itbs 13 -> 775 -> 775000 byte/sec

  // 6 users -> 4 PRB at Itbs 8 -> 67 -> 67000 bytes/sec
  // after the patch enforcing min 3 PRBs per UE:
  // 12 users -> 3 PRB at Itbs 8 -> 49 bytes * 8/12 UE/TTI -> 32667 bytes/sec
  AddTestCase (new LenaFdBetFfMacSchedulerTestCase1 (1,10000,775000,421000,errorModel), TestCase::EXTENSIVE);
  AddTestCase (new LenaFdBetFfMacSchedulerTestCase1 (3,10000,253000,137000,errorModel), TestCase::EXTENSIVE);
  AddTestCase (new LenaFdBetFfMacSchedulerTestCase1 (6,10000,125000,67000,errorModel), TestCase::EXTENSIVE);
  AddTestCase (new LenaFdBetFfMacSchedulerTestCase1 (12,10000,61000,32667,errorModel), TestCase::EXTENSIVE);

  // DOWNLINK - DISTANCE 20000 -> MCS 8 -> Itbs 8 (from table 7.1.7.2.1-1 of 36.213)
  // 1 user -> 24 PRB at Itbs 8 -> 421 -> 421000 bytes/sec

  // 6 users -> 4 PRB at Itbs 2 -> 22 -> 22000 bytes/sec
  // after the patch enforcing min 3 PRBs per UE:
  // 12 users -> 3 PRB at Itbs 2 -> 18 bytes * 8/12 UE/TTI -> 12000 bytes/sec
  AddTestCase (new LenaFdBetFfMacSchedulerTestCase1 (1,20000,421000,137000,errorModel), TestCase::EXTENSIVE);
  AddTestCase (new LenaFdBetFfMacSchedulerTestCase1 (3,20000,137000,41000,errorModel), TestCase::EXTENSIVE);
  AddTestCase (new LenaFdBetFfMacSchedulerTestCase1 (6,20000,67000,22000,errorModel), TestCase::EXTENSIVE);
  AddTestCase (new LenaFdBetFfMacSchedulerTestCase1 (12,20000,32000,12000,errorModel), TestCase::EXTENSIVE);

  // Test Case 2: fairness check


  return oss.str ();
}

LenaFdBetFfMacSchedulerTestCase1::LenaFdBetFfMacSchedulerTestCase1 (uint16_t nUser, uint16_t dist, double thrRefDl, double thrRefUl, bool errorModelEnabled)
  : TestCase (BuildNameString (nUser, dist)),
    m_nUser (nUser),
    m_nLc (nLc),
    m_dist (dist),
    m_thrRefDl (thrRefDl),
    m_thrRefUl (thrRefUl),




class LenaFdBetFfMacSchedulerTestCase1 : public TestCase
{
public:
  LenaFdBetFfMacSchedulerTestCase1 (uint16_t nUser, uint16_t dist, double thrRefDl, double thrRefUl,bool errorModelEnabled);
  virtual ~LenaFdBetFfMacSchedulerTestCase1 ();

private:
  static std::string BuildNameString (uint16_t nUser, uint16_t dist);
  virtual void DoRun (void);
  uint16_t m_nUser;
  uint16_t m_nLc;
  uint16_t m_dist;
  double m_thrRefDl;
  double m_thrRefUl;




  // 6 users -> 4 PRB at Itbs 26 -> 373 -> 373000 bytes/sec
  // after the patch enforcing min 3 PRBs per UE:
  // 12 users -> 3 PRB at Itbs 26 -> 277 bytes * 8/12 UE/TTI -> 184670 bytes/sec
  AddTestCase (new LenaFdMtFfMacSchedulerTestCase (1,0,2196000,2292000, errorModel), TestCase::EXTENSIVE);
  AddTestCase (new LenaFdMtFfMacSchedulerTestCase (3,0,2196000,749000,errorModel), TestCase::QUICK);
  AddTestCase (new LenaFdMtFfMacSchedulerTestCase (6,0,2196000,373000, errorModel), TestCase::EXTENSIVE);
  AddTestCase (new LenaFdMtFfMacSchedulerTestCase (12,0,2196000,184670, errorModel), TestCase::EXTENSIVE);

  // DOWNLINK - DISTANCE 4800 -> MCS 22 -> Itbs 20 (from table 7.1.7.2.1-1 of 36.213)
  // 1 user -> 24 PRB at Itbs 20 -> 1383 -> 1383000 byte/secfor one UE; 0 bytes/sec for other UEs

  // 6 users -> 4 PRB at Itbs 13 -> 125 -> 125000 bytes/sec
  // after the patch enforcing min 3 PRBs per UE:
  // 12 users -> 3 PRB at Itbs 13 -> 93  bytes * 8/12 UE/TTI  -> 62000 bytes/sec
  AddTestCase (new LenaFdMtFfMacSchedulerTestCase (1,4800,1383000,807000,errorModel), TestCase::EXTENSIVE);
  AddTestCase (new LenaFdMtFfMacSchedulerTestCase (3,4800,1383000,253000,errorModel), TestCase::EXTENSIVE);
  AddTestCase (new LenaFdMtFfMacSchedulerTestCase (6,4800,1383000,125000,errorModel), TestCase::EXTENSIVE);
  AddTestCase (new LenaFdMtFfMacSchedulerTestCase (12,4800,1383000,62000,errorModel), TestCase::EXTENSIVE);


  // DOWNLINK - DISTANCE 6000 -> MCS 20 -> Itbs 18 (from table 7.1.7.2.1-1 of 36.213)

  // 6 users -> 4 PRB at Itbs 11 -> 97 -> 97000 bytes/sec
  // after the patch enforcing min 3 PRBs per UE:
  // 12 users -> 3 PRB at Itbs 11 -> 73 bytes * 8/12 UE/TTI -> 48667 bytes/sec
  AddTestCase (new LenaFdMtFfMacSchedulerTestCase (1,6000,1191000,621000, errorModel), TestCase::EXTENSIVE);
  AddTestCase (new LenaFdMtFfMacSchedulerTestCase (3,6000,1191000,201000, errorModel), TestCase::EXTENSIVE);
  AddTestCase (new LenaFdMtFfMacSchedulerTestCase (6,6000,1191000,97000, errorModel), TestCase::EXTENSIVE);
  AddTestCase (new LenaFdMtFfMacSchedulerTestCase (12,6000,1191000,48667, errorModel), TestCase::EXTENSIVE);

  // DOWNLINK - DISTANCE 10000 -> MCS 14 -> Itbs 13 (from table 7.1.7.2.1-1 of 36.213)
  // 1 user -> 24 PRB at Itbs 13 -> 775 -> 775000 byte/sec for one UE; 0 bytes/sec for other UEs

  // 6 users -> 4 PRB at Itbs 8 -> 67 -> 67000 bytes/sec
  // after the patch enforcing min 3 PRBs per UE:
  // 12 users -> 3 PRB at Itbs 8 -> 49 bytes * 8/12 UE/TTI -> 32667 bytes/sec
  AddTestCase (new LenaFdMtFfMacSchedulerTestCase (1,10000,775000,437000,errorModel), TestCase::EXTENSIVE);
  AddTestCase (new LenaFdMtFfMacSchedulerTestCase (3,10000,775000,137000,errorModel), TestCase::EXTENSIVE);
  AddTestCase (new LenaFdMtFfMacSchedulerTestCase (6,10000,775000,67000,errorModel), TestCase::EXTENSIVE);
  AddTestCase (new LenaFdMtFfMacSchedulerTestCase (12,10000,775000,32667,errorModel), TestCase::EXTENSIVE);
 
  // DONWLINK - DISTANCE 20000 -> MCS 8 -> Itbs 8 (from table 7.1.7.2.1-1 of 36.213)
  // 1 user -> 24 PRB at Itbs 8 -> 421 -> 421000 bytes/sec for one UE; 0 bytes/sec for other UEs

  // 6 users -> 4 PRB at Itbs 2 -> 32 -> 22000 bytes/sec
  // after the patch enforcing min 3 PRBs per UE:
  // 12 users -> 3 PRB at Itbs 2 -> 26 bytes * 8/12 UE/TTI -> 12000 bytes/sec
  AddTestCase (new LenaFdMtFfMacSchedulerTestCase (1,20000,421000,137000,errorModel), TestCase::EXTENSIVE);
  AddTestCase (new LenaFdMtFfMacSchedulerTestCase (3,20000,421000,41000,errorModel), TestCase::EXTENSIVE);
  AddTestCase (new LenaFdMtFfMacSchedulerTestCase (6,20000,421000,22000,errorModel), TestCase::EXTENSIVE);
  AddTestCase (new LenaFdMtFfMacSchedulerTestCase (12,20000,421000,12000,errorModel), TestCase::EXTENSIVE);
}

static LenaTestFdMtFfMacSchedulerSuite lenaTestFdMtFfMacSchedulerSuite;

  return oss.str ();
}

LenaFdMtFfMacSchedulerTestCase::LenaFdMtFfMacSchedulerTestCase (uint16_t nUser, uint16_t dist, double thrRefDl, double thrRefUl, bool errorModelEnabled)
  : TestCase (BuildNameString (nUser, dist)),
    m_nUser (nUser),
    m_nLc (nLc),
    m_dist (dist),
    m_thrRefDl (thrRefDl),
    m_thrRefUl (thrRefUl),

(-)ns-3.18/src/lte/test/lte-test-fdmt-ff-mac-scheduler.h (-1 / +1 lines)

Lines 42-48	Link Here

class LenaFdMtFfMacSchedulerTestCase : public TestCase

class LenaFdMtFfMacSchedulerTestCase : public TestCase

public:

public:

  LenaFdMtFfMacSchedulerTestCase (uint16_t nUser, uint16_t nLc, uint16_t dist, double thrRefDl, double thrRefUl,bool errorModelEnabled);

  LenaFdMtFfMacSchedulerTestCase (uint16_t nUser, uint16_t dist, double thrRefDl, double thrRefUl,bool errorModelEnabled);

  virtual ~LenaFdMtFfMacSchedulerTestCase ();

  virtual ~LenaFdMtFfMacSchedulerTestCase ();

private:

private:




  // 3 users -> 8 PRB at Itbs 26 -> 749 -> 749000 > 232000 -> throughput = 232000 bytes/sec 
  // 6 users -> 4 PRB at Itbs 26 -> 373 -> 373000 > 232000 -> throughput = 232000 bytes/sec
  // 12 users -> 2 PRB at Itbs 26 -> 185 -> 185000 < 232000 -> throughput = 185000 bytes/sec
  AddTestCase (new LenaFdTbfqFfMacSchedulerTestCase1 (1,0,232000,232000,200,1,errorModel), TestCase::EXTENSIVE);
  AddTestCase (new LenaFdTbfqFfMacSchedulerTestCase1 (3,0,232000,232000,200,1,errorModel), TestCase::EXTENSIVE);
  AddTestCase (new LenaFdTbfqFfMacSchedulerTestCase1 (6,0,232000,232000,200,1,errorModel), TestCase::EXTENSIVE);
  //AddTestCase (new LenaFdTbfqFfMacSchedulerTestCase1 (12,0,183000,185000,200,1,errorModel));// simulation time = 1.5, otherwise, ul test will fail

  // DOWNLINK - DISTANCE 4800 -> MCS 22 -> Itbs 20 (from table 7.1.7.2.1-1 of 36.213)
  // Traffic info

  // 6 users -> 4 PRB at Itbs 13 -> 125 -> 125000 < 232000 -> throughput = 125000 bytes/sec
  // after the patch enforcing min 3 PRBs per UE:
  // 12 users -> 3 PRB at Itbs 13 -> 93  bytes * 8/12 UE/TTI  -> 62000 < 232000 -> throughput = 62000  bytes/sec
  AddTestCase (new LenaFdTbfqFfMacSchedulerTestCase1 (1,4800,232000,232000,200,1,errorModel), TestCase::EXTENSIVE);
  AddTestCase (new LenaFdTbfqFfMacSchedulerTestCase1 (3,4800,232000,232000,200,1,errorModel), TestCase::EXTENSIVE);
  AddTestCase (new LenaFdTbfqFfMacSchedulerTestCase1 (6,4800,230500,125000,200,1,errorModel), TestCase::EXTENSIVE);
  //AddTestCase (new LenaFdTbfqFfMacSchedulerTestCase1 (12,4800,75250,62000,200,1,errorModel)); // simulation time = 1.5, otherwise, ul test will fail

  // DOWNLINK - DISTANCE 6000 -> MCS 20 -> Itbs 18 (from table 7.1.7.2.1-1 of 36.213)
  // Traffic info

  // 6 users -> 4 PRB at Itbs 11 -> 97 -> 97000 < 232000 -> throughput = 97000 bytes/sec
  // after the patch enforcing min 3 PRBs per UE:
  // 12 users -> 3 PRB at Itbs 11 -> 73 bytes * 8/12 UE/TTI -> 48667 < 232000 -> throughput = 48667 bytes/sec
  AddTestCase (new LenaFdTbfqFfMacSchedulerTestCase1 (1,6000,232000,232000,200,1,errorModel), TestCase::EXTENSIVE);
  AddTestCase (new LenaFdTbfqFfMacSchedulerTestCase1 (3,6000,232000,201000,200,1,errorModel), TestCase::EXTENSIVE);
  AddTestCase (new LenaFdTbfqFfMacSchedulerTestCase1 (6,6000,198500,97000,200,1,errorModel), TestCase::EXTENSIVE);
  //AddTestCase (new LenaFdTbfqFfMacSchedulerTestCase1 (12,6000,99250,48667,200,1, errorModel)); // simulation time = 1.5, otherwise, ul test will fail

  // DOWNLINK - DISTANCE 10000 -> MCS 14 -> Itbs 13 (from table 7.1.7.2.1-1 of 36.213)
  // Traffic info

  // 6 users -> 4 PRB at Itbs 8 -> 67 -> 67000 < 232000 -> throughput = 67000 bytes/sec
  // after the patch enforcing min 3 PRBs per UE:
  // 12 users -> 3 PRB at Itbs 8 -> 49 bytes * 8/12 UE/TTI -> 32667 < 232000 -> throughput = 32667  bytes/sec
  AddTestCase (new LenaFdTbfqFfMacSchedulerTestCase1 (1,10000,232000,232000,200,1,errorModel), TestCase::EXTENSIVE);
  AddTestCase (new LenaFdTbfqFfMacSchedulerTestCase1 (3,10000,232000,137000,200,1,errorModel), TestCase::EXTENSIVE);
  AddTestCase (new LenaFdTbfqFfMacSchedulerTestCase1 (6,10000,129166,67000,200,1,errorModel), TestCase::EXTENSIVE);
  //AddTestCase (new LenaFdTbfqFfMacSchedulerTestCase1 (12,10000,64583,32667,200,1,errorModel));// simulation time = 1.5, otherwise, ul test will fail

  // Test Case 2: homogeneous flow test in FDTBFQ (different distance)
  // Traffic1 info

}


LenaFdTbfqFfMacSchedulerTestCase1::LenaFdTbfqFfMacSchedulerTestCase1 (uint16_t nUser, uint16_t dist, double thrRefDl, double thrRefUl, uint16_t packetSize, uint16_t interval,bool errorModelEnabled)
  : TestCase (BuildNameString (nUser, dist)),
    m_nUser (nUser),
    m_nLc (nLc),
    m_dist (dist),
    m_packetSize (packetSize),
    m_interval (interval),




class LenaFdTbfqFfMacSchedulerTestCase1 : public TestCase
{
public:
  LenaFdTbfqFfMacSchedulerTestCase1 (uint16_t nUser, uint16_t dist, double thrRefDl, double thrRefUl, uint16_t packetSize, uint16_t interval, bool  errorModelEnabled);
  virtual ~LenaFdTbfqFfMacSchedulerTestCase1 ();

private:
  static std::string BuildNameString (uint16_t nUser, uint16_t dist);
  virtual void DoRun (void);
  uint16_t m_nUser;
  uint16_t m_nLc;
  uint16_t m_dist;
  uint16_t m_packetSize;  // byte
  uint16_t m_interval;    // ms




static LenaTestHarqSuite lenaTestHarqSuite;

std::string
LenaHarqTestCase::BuildNameString (uint16_t nUser, uint16_t dist, uint16_t tbSize)
{
  std::ostringstream oss;
  oss << nUser << " UEs, distance " << dist << " m, TB size " << tbSize;
  return oss.str ();
}

LenaHarqTestCase::LenaHarqTestCase (uint16_t nUser, uint16_t dist, uint16_t tbSize, double amcBer, double thrRef)
  : TestCase (BuildNameString (nUser, dist, tbSize)),
    m_nUser (nUser),
    m_dist (dist),
    m_tbSize (tbSize),
    m_amcBer (amcBer),
    m_throughputRef (thrRef)
{

(-)ns-3.18/src/lte/test/lte-test-harq.h (-2 / +1 lines)

Lines 43-52	Link Here

private:

private:

  virtual void DoRun (void);

  virtual void DoRun (void);

  static std::string BuildNameString (uint16_t nUser, uint16_t dist);

  static std::string BuildNameString (uint16_t nUser, uint16_t dist, uint16_t tbSize);

  uint16_t m_nUser;

  uint16_t m_nUser;

  uint16_t m_dist;

  uint16_t m_dist;

  uint16_t m_tbSize;

  double m_amcBer;

  double m_amcBer;

  double m_throughputRef;

  double m_throughputRef;

(-)ns-3.18/src/lte/test/lte-test-interference.cc (-2 lines)

Lines 98-105	Link Here

    m_d2 (d2),

    m_d2 (d2),

    m_dlSinrDb (10 * std::log10 (dlSinr)),

    m_dlSinrDb (10 * std::log10 (dlSinr)),

100

    m_ulSinrDb (10 * std::log10 (ulSinr)),

100

    m_ulSinrDb (10 * std::log10 (ulSinr)),

101

    m_dlSe (dlSe),

102

    m_ulSe (ulSe),

103

    m_dlMcs (dlMcs),

101

    m_dlMcs (dlMcs),

104

    m_ulMcs (ulMcs)

102

    m_ulMcs (ulMcs)

105

103

(-)ns-3.18/src/lte/test/lte-test-interference.h (-2 lines)

Lines 58-65	Link Here

  double m_d2;

  double m_d2;

  double m_dlSinrDb;

  double m_dlSinrDb;

  double m_ulSinrDb;

  double m_ulSinrDb;

  double m_dlSe;

  double m_ulSe;

  uint16_t m_dlMcs;

  uint16_t m_dlMcs;

  uint16_t m_ulMcs;

  uint16_t m_ulMcs;

};

};

(-)ns-3.18/src/lte/test/lte-test-mimo.h (-2 lines)

Lines 43-50	Link Here

  void GetRlcBufferSample (Ptr<RadioBearerStatsCalculator> rlcStats, uint64_t imsi, uint8_t rnti);

  void GetRlcBufferSample (Ptr<RadioBearerStatsCalculator> rlcStats, uint64_t imsi, uint8_t rnti);

  static std::string BuildNameString (uint16_t dist, std::string schedulerType, bool useIdealRrc);

  static std::string BuildNameString (uint16_t dist, std::string schedulerType, bool useIdealRrc);

  uint16_t m_nUser;

  uint16_t m_nLc;

  uint16_t m_dist;

  uint16_t m_dist;

  std::vector<uint32_t> m_estThrDl;

  std::vector<uint32_t> m_estThrDl;

  std::string m_schedulerType;

  std::string m_schedulerType;




  // after the patch enforcing min 3 PRBs per UE:
  // 12 users -> 3 PRB at Itbs 26 -> 277 bytes * 8/12 UE/TTI -> 184670 bytes/sec
  // 15 users -> 3 PRB at Itbs 26 -> 277 bytes * 8/15 UE/TTI -> 147730 bytes/sec
  AddTestCase (new LenaPfFfMacSchedulerTestCase1 (1,0,2196000,2292000,errorModel), TestCase::EXTENSIVE);
  AddTestCase (new LenaPfFfMacSchedulerTestCase1 (3,0,732000,749000,errorModel), TestCase::EXTENSIVE);
  AddTestCase (new LenaPfFfMacSchedulerTestCase1 (6,0,366000,373000,errorModel), TestCase::EXTENSIVE);
  AddTestCase (new LenaPfFfMacSchedulerTestCase1 (12,0,183000,184670,errorModel), TestCase::EXTENSIVE);
  AddTestCase (new LenaPfFfMacSchedulerTestCase1 (15,0,146400,147730,errorModel), TestCase::EXTENSIVE);
  
 
  // DOWNLINK - DISTANCE 4800 -> MCS 22 -> Itbs 20 (from table 7.1.7.2.1-1 of 36.213)

  // after the patch enforcing min 3 PRBs per UE:
  // 12 users -> 3 PRB at Itbs 13 -> 93  bytes * 8/12 UE/TTI  -> 62000 bytes/sec
  // 15 users -> 3 PRB at Itbs 13 -> 93  bytes * 8/15 UE/TTI  -> 49600 bytes/sec
  AddTestCase (new LenaPfFfMacSchedulerTestCase1 (1,4800,1383000,807000,errorModel), TestCase::EXTENSIVE);
  AddTestCase (new LenaPfFfMacSchedulerTestCase1 (3,4800,461000,253000,errorModel), TestCase::EXTENSIVE);
  AddTestCase (new LenaPfFfMacSchedulerTestCase1 (6,4800,230500,125000,errorModel), TestCase::EXTENSIVE);
  AddTestCase (new LenaPfFfMacSchedulerTestCase1 (12,4800,115250,62000,errorModel), TestCase::EXTENSIVE);
  AddTestCase (new LenaPfFfMacSchedulerTestCase1 (15,4800,92200,49600,errorModel), TestCase::EXTENSIVE);
  
  // DOWNLINK - DISTANCE 6000 -> MCS 20 -> Itbs 18 (from table 7.1.7.2.1-1 of 36.213)
  // 1 user -> 24 PRB at Itbs 20 -> 1191 -> 1191000 bytes/sec

  // after the patch enforcing min 3 PRBs per UE:
  // 12 users -> 3 PRB at Itbs 11 -> 73 bytes * 8/12 UE/TTI -> 48667 bytes/sec
  // 15 users -> 3 PRB at Itbs 11 -> 73 bytes * 8/15 UE/TTI -> 38993 bytes/sec
  AddTestCase (new LenaPfFfMacSchedulerTestCase1 (1,6000,1191000,621000,errorModel), TestCase::EXTENSIVE);
  AddTestCase (new LenaPfFfMacSchedulerTestCase1 (3,6000,397000,201000,errorModel), TestCase::EXTENSIVE);
  AddTestCase (new LenaPfFfMacSchedulerTestCase1 (6,6000,198500,97000,errorModel), TestCase::EXTENSIVE);
  AddTestCase (new LenaPfFfMacSchedulerTestCase1 (12,6000,99250,48667,errorModel), TestCase::EXTENSIVE);
  AddTestCase (new LenaPfFfMacSchedulerTestCase1 (15,6000,79400,38993,errorModel), TestCase::EXTENSIVE);

  // DOWNLINK - DISTANCE 10000 -> MCS 14 -> Itbs 13 (from table 7.1.7.2.1-1 of 36.213)
  // 1 user -> 24 PRB at Itbs 13 -> 871 -> 775000 bytes/sec

  // after the patch enforcing min 3 PRBs per UE:
  // 12 users -> 3 PRB at Itbs 8 -> 49 bytes * 8/12 UE/TTI -> 32667 bytes/sec
  // 15 users -> 3 PRB at Itbs 8 -> 49 bytes * 8/15 UE/TTI -> 26133 bytes/sec
  AddTestCase (new LenaPfFfMacSchedulerTestCase1 (1,10000,775000,437000,errorModel), TestCase::EXTENSIVE);
  AddTestCase (new LenaPfFfMacSchedulerTestCase1 (3,10000,258333,137000,errorModel), TestCase::EXTENSIVE);
  AddTestCase (new LenaPfFfMacSchedulerTestCase1 (6,10000,129167,67000,errorModel), TestCase::EXTENSIVE);
  AddTestCase (new LenaPfFfMacSchedulerTestCase1 (12,10000,64583,32667,errorModel), TestCase::EXTENSIVE);
  AddTestCase (new LenaPfFfMacSchedulerTestCase1 (15,10000,51667,26133,errorModel), TestCase::EXTENSIVE);
 
  // DONWLINK - DISTANCE 20000 -> MCS 8 -> Itbs 8 (from table 7.1.7.2.1-1 of 36.213)
  // 1 user -> 24 PRB at Itbs 8 -> 421 -> 421000 bytes/sec

  // after the patch enforcing min 3 PRBs per UE:
  // 12 users -> 3 PRB at Itbs 2 -> 26 bytes * 8/12 UE/TTI -> 12000 bytes/sec
  // 15 users -> 3 PRB at Itbs 2 -> 26 bytes * 8/15 UE/TTI -> 9600 bytes/sec
  AddTestCase (new LenaPfFfMacSchedulerTestCase1 (1,20000,421000,137000,errorModel), TestCase::EXTENSIVE);
  AddTestCase (new LenaPfFfMacSchedulerTestCase1 (3,20000,140333,41000,errorModel), TestCase::EXTENSIVE);
  AddTestCase (new LenaPfFfMacSchedulerTestCase1 (6,20000,70167,22000,errorModel), TestCase::EXTENSIVE);
  AddTestCase (new LenaPfFfMacSchedulerTestCase1 (12,20000,35083,12000,errorModel), TestCase::EXTENSIVE);
  AddTestCase (new LenaPfFfMacSchedulerTestCase1 (15,20000,28067,9600,errorModel), TestCase::EXTENSIVE);


  // Test Case 2: fairness check

  return oss.str ();
}

LenaPfFfMacSchedulerTestCase1::LenaPfFfMacSchedulerTestCase1 (uint16_t nUser, uint16_t dist, double thrRefDl, double thrRefUl, bool errorModelEnabled)
  : TestCase (BuildNameString (nUser, dist)),
    m_nUser (nUser),
    m_nLc (nLc),
    m_dist (dist),
    m_thrRefDl (thrRefDl),
    m_thrRefUl (thrRefUl),

(-)ns-3.18/src/lte/test/lte-test-pf-ff-mac-scheduler.h (-1 / +1 lines)

Lines 41-47	Link Here

class LenaPfFfMacSchedulerTestCase1 : public TestCase

class LenaPfFfMacSchedulerTestCase1 : public TestCase

public:

public:

  LenaPfFfMacSchedulerTestCase1 (uint16_t nUser, uint16_t nLc, uint16_t dist, double thrRefDl, double thrRefUl, bool errorModelEnabled);

  LenaPfFfMacSchedulerTestCase1 (uint16_t nUser, uint16_t dist, double thrRefDl, double thrRefUl, bool errorModelEnabled);

  virtual ~LenaPfFfMacSchedulerTestCase1 ();

  virtual ~LenaPfFfMacSchedulerTestCase1 ();

private:

private:




  : TestCase (BuildNameString (nUser, dist)),              
    m_nUser (nUser),
    m_dist (dist),
    m_tbSize (tbSize),
    m_blerRef (blerRef),
    m_toleranceRxPackets (toleranceRxPackets)
{  
}

LenaDataPhyErrorModelTestCase::~LenaDataPhyErrorModelTestCase ()

: TestCase (BuildNameString (nEnb, dist)),              
m_nEnb (nEnb),
m_dist (dist),
m_tbSize (tbSize),
m_blerRef (blerRef)
{
}

(-)ns-3.18/src/lte/test/lte-test-phy-error-model.h (-2 lines)

Lines 46-52	Link Here

  static std::string BuildNameString (uint16_t nUser, uint16_t dist);

  static std::string BuildNameString (uint16_t nUser, uint16_t dist);

  uint16_t m_nUser;

  uint16_t m_nUser;

  uint16_t m_dist;

  uint16_t m_dist;

  uint16_t m_tbSize;

  double m_blerRef;

  double m_blerRef;

  uint16_t m_toleranceRxPackets;

  uint16_t m_toleranceRxPackets;

Lines 65-71	Link Here

    static std::string BuildNameString (uint16_t nUser, uint16_t dist);

    static std::string BuildNameString (uint16_t nUser, uint16_t dist);

    uint16_t m_nEnb;

    uint16_t m_nEnb;

    uint16_t m_dist;

    uint16_t m_dist;

    uint16_t m_tbSize;

    double m_blerRef;

    double m_blerRef;

};

};




  // 3 users -> 8 PRB at Itbs 26 -> 749 -> 749000 > 232000 -> throughput = 232000 bytes/sec 
  // 6 users -> 4 PRB at Itbs 26 -> 373 -> 373000 > 232000 -> throughput = 232000 bytes/sec
  // 12 users -> 2 PRB at Itbs 26 -> 185 -> 185000 < 232000 -> throughput = 185000 bytes/sec
  AddTestCase (new LenaPssFfMacSchedulerTestCase1 (1,0,232000,232000,200,1,errorModel), TestCase::EXTENSIVE);
  AddTestCase (new LenaPssFfMacSchedulerTestCase1 (3,0,232000,232000,200,1,errorModel), TestCase::EXTENSIVE);
  AddTestCase (new LenaPssFfMacSchedulerTestCase1 (6,0,232000,232000,200,1,errorModel), TestCase::EXTENSIVE);

  //AddTestCase (new LenaPssFfMacSchedulerTestCase1 (12,0,183000,185000,200,1,errorModel));// simulation time = 1.5, otherwise, ul test will fail

  // DOWNLINK - DISTANCE 4800 -> MCS 22 -> Itbs 20 (from table 7.1.7.2.1-1 of 36.213)
  // Traffic info

  // 6 users -> 4 PRB at Itbs 13 -> 125 -> 125000 < 232000 -> throughput = 125000 bytes/sec
  // after the patch enforcing min 3 PRBs per UE:
  // 12 users -> 3 PRB at Itbs 13 -> 93  bytes * 8/12 UE/TTI  -> 62000 < 232000 -> throughput = 62000  bytes/sec
  AddTestCase (new LenaPssFfMacSchedulerTestCase1 (1,4800,232000,232000,200,1,errorModel), TestCase::EXTENSIVE);
  AddTestCase (new LenaPssFfMacSchedulerTestCase1 (3,4800,232000,232000,200,1,errorModel), TestCase::EXTENSIVE);
  AddTestCase (new LenaPssFfMacSchedulerTestCase1 (6,4800,230500,125000,200,1,errorModel), TestCase::EXTENSIVE);
  //AddTestCase (new LenaPssFfMacSchedulerTestCase1 (12,4800,115250,62000,200,1,errorModel)); // simulation time = 1.5, otherwise, ul test will fail

  // DOWNLINK - DISTANCE 6000 -> MCS 20 -> Itbs 18 (from table 7.1.7.2.1-1 of 36.213)
  // Traffic info

  // 6 users -> 4 PRB at Itbs 11 -> 97 -> 97000 < 232000 -> throughput = 97000 bytes/sec
  // after the patch enforcing min 3 PRBs per UE:
  // 12 users -> 3 PRB at Itbs 11 -> 73 bytes * 8/12 UE/TTI -> 48667 < 232000 -> throughput = 48667 bytes/sec
  AddTestCase (new LenaPssFfMacSchedulerTestCase1 (1,6000,232000,232000,200,1,errorModel), TestCase::EXTENSIVE);
  AddTestCase (new LenaPssFfMacSchedulerTestCase1 (3,6000,232000,201000,200,1,errorModel), TestCase::EXTENSIVE);
  AddTestCase (new LenaPssFfMacSchedulerTestCase1 (6,6000,198500,97000,200,1,errorModel), TestCase::EXTENSIVE);
  //AddTestCase (new LenaPssFfMacSchedulerTestCase1 (12,6000,99250,48667,200,1, errorModel)); // simulation time = 1.5, otherwise, ul test will fail

  // DOWNLINK - DISTANCE 10000 -> MCS 14 -> Itbs 13 (from table 7.1.7.2.1-1 of 36.213)
  // Traffic info

  // 6 users -> 4 PRB at Itbs 8 -> 67 -> 67000 < 232000 -> throughput = 67000 bytes/sec
  // after the patch enforcing min 3 PRBs per UE:
  // 12 users -> 3 PRB at Itbs 8 -> 49 bytes * 8/12 UE/TTI -> 32667 < 232000 -> throughput = 32667  bytes/sec
  AddTestCase (new LenaPssFfMacSchedulerTestCase1 (1,10000,232000,232000,200,1,errorModel), TestCase::EXTENSIVE);
  AddTestCase (new LenaPssFfMacSchedulerTestCase1 (3,10000,232000,137000,200,1,errorModel), TestCase::EXTENSIVE);
  AddTestCase (new LenaPssFfMacSchedulerTestCase1 (6,10000,129166,67000,200,1,errorModel), TestCase::EXTENSIVE);
  //AddTestCase (new LenaPssFfMacSchedulerTestCase1 (12,10000,64583,32667,200,1,errorModel));// simulation time = 1.5, otherwise, ul test will fail

  // Test Case 2: homogeneous flow test in PSS (different distance)
  // Traffic1 info

}


LenaPssFfMacSchedulerTestCase1::LenaPssFfMacSchedulerTestCase1 (uint16_t nUser, uint16_t dist, double thrRefDl, double thrRefUl, uint16_t packetSize, uint16_t interval,bool errorModelEnabled)
  : TestCase (BuildNameString (nUser, dist)),
    m_nUser (nUser),
    m_nLc (nLc),
    m_dist (dist),
    m_packetSize (packetSize),
    m_interval (interval),




class LenaPssFfMacSchedulerTestCase1 : public TestCase
{
public:
  LenaPssFfMacSchedulerTestCase1 (uint16_t nUser, uint16_t dist, double thrRefDl, double thrRefUl, uint16_t packetSize, uint16_t interval, bool  errorModelEnabled);
  virtual ~LenaPssFfMacSchedulerTestCase1 ();

private:
  static std::string BuildNameString (uint16_t nUser, uint16_t dist);
  virtual void DoRun (void);
  uint16_t m_nUser;
  uint16_t m_nLc;
  uint16_t m_dist;
  uint16_t m_packetSize;  // byte
  uint16_t m_interval;    // ms




  // 9 users -> 3 PRB at Itbs 26 -> 277 bytes * 8/9 UE/TTI ->  246220 bytes/sec
  // 12 users -> 3 PRB at Itbs 26 -> 277 bytes * 8/12 UE/TTI -> 184670 bytes/sec
  // 15 users -> 3 PRB at Itbs 26 -> 277 bytes * 8/15 UE/TTI -> 147730 bytes/sec
  AddTestCase (new LenaRrFfMacSchedulerTestCase (1,0,2196000,2292000,errorModel), TestCase::EXTENSIVE);
  AddTestCase (new LenaRrFfMacSchedulerTestCase (3,0,749000,749000,errorModel), TestCase::QUICK);
  AddTestCase (new LenaRrFfMacSchedulerTestCase (6,0,373000,373000,errorModel), TestCase::EXTENSIVE);
  AddTestCase (new LenaRrFfMacSchedulerTestCase (9,0,185000,246220,errorModel), TestCase::EXTENSIVE);
  AddTestCase (new LenaRrFfMacSchedulerTestCase (12,0,185000,184670,errorModel), TestCase::EXTENSIVE);
  AddTestCase (new LenaRrFfMacSchedulerTestCase (15,0,148000,147730,errorModel), TestCase::EXTENSIVE);

  // DOWNLINK - DISTANCE 4800 -> MCS 22 -> Itbs 20 (from table 7.1.7.2.1-1 of 36.213)
  // 1 user -> 24 PRB at Itbs 20 -> 1383 -> 1383000 bytes/sec

  // 9 users -> 3 PRB at Itbs 13 -> 93  bytes * 8/9 UE/TTI  -> 82667 bytes/sec
  // 12 users -> 3 PRB at Itbs 13 -> 93  bytes * 8/12 UE/TTI  -> 62000 bytes/sec
  // 15 users -> 3 PRB at Itbs 13 -> 93  bytes * 8/15 UE/TTI  -> 49600 bytes/sec
  AddTestCase (new LenaRrFfMacSchedulerTestCase (1,4800,1383000,807000,errorModel), TestCase::EXTENSIVE);
  AddTestCase (new LenaRrFfMacSchedulerTestCase (3,4800,469000,253000,errorModel), TestCase::EXTENSIVE);
  AddTestCase (new LenaRrFfMacSchedulerTestCase (6,4800,233000,125000,errorModel), TestCase::EXTENSIVE);
  AddTestCase (new LenaRrFfMacSchedulerTestCase (9,4800,113000,82667,errorModel), TestCase::EXTENSIVE);
  AddTestCase (new LenaRrFfMacSchedulerTestCase (12,4800,113000,62000,errorModel), TestCase::EXTENSIVE);
  AddTestCase (new LenaRrFfMacSchedulerTestCase (15,4800,90400,49600,errorModel), TestCase::EXTENSIVE);

  // DOWNLINK - DISTANCE 6000 -> MCS 20 -> Itbs 18 (from table 7.1.7.2.1-1 of 36.213)
  // 1 user -> 24 PRB at Itbs 15 -> 1191 -> 1191000 bytes/sec

  // 9 users -> 3 PRB at Itbs 11 -> 73 bytes * 8/9 UE/TTI -> 64889 bytes/sec
  // 12 users -> 3 PRB at Itbs 11 -> 73 bytes * 8/12 UE/TTI -> 48667 bytes/sec
  // 15 users -> 3 PRB at Itbs 11 -> 73 bytes * 8/15 UE/TTI -> 38993 bytes/sec
  AddTestCase (new LenaRrFfMacSchedulerTestCase (1,6000,1191000,621000,errorModel), TestCase::EXTENSIVE);
  AddTestCase (new LenaRrFfMacSchedulerTestCase (3,6000,389000,201000,errorModel), TestCase::EXTENSIVE);
  AddTestCase (new LenaRrFfMacSchedulerTestCase (6,6000,193000,97000,errorModel), TestCase::EXTENSIVE);
  AddTestCase (new LenaRrFfMacSchedulerTestCase (9,6000,97000,64889,errorModel), TestCase::EXTENSIVE);
  AddTestCase (new LenaRrFfMacSchedulerTestCase (12,6000,97000,48667,errorModel), TestCase::EXTENSIVE);
  AddTestCase (new LenaRrFfMacSchedulerTestCase (15,6000,77600,38993,errorModel), TestCase::EXTENSIVE);

  // DOWNLINK - DISTANCE 20000 -> MCS 8 -> Itbs 8 (from table 7.1.7.2.1-1 of 36.213)
  // 1 user -> 24 PRB at Itbs 8 -> 421 -> 421000 bytes/sec

  // 9 users -> 3 PRB at Itbs 2 -> 18 bytes * 8/9 UE/TTI -> 16000 bytes/sec
  // 12 users -> 3 PRB at Itbs 2 -> 18 bytes * 8/12 UE/TTI -> 12000 bytes/sec
  // 15 users -> 3 PRB at Itbs 2 -> 18 bytes * 8/15 UE/TTI -> 9600 bytes/sec
  AddTestCase (new LenaRrFfMacSchedulerTestCase (1,20000,421000,137000,errorModel), TestCase::EXTENSIVE);
  AddTestCase (new LenaRrFfMacSchedulerTestCase (3,20000,137000,41000,errorModel), TestCase::EXTENSIVE);
  AddTestCase (new LenaRrFfMacSchedulerTestCase (6,20000,67000,22000,errorModel), TestCase::EXTENSIVE);
  AddTestCase (new LenaRrFfMacSchedulerTestCase (9,20000,32000,16000,errorModel), TestCase::EXTENSIVE);
  AddTestCase (new LenaRrFfMacSchedulerTestCase (12,20000,32000,12000,errorModel), TestCase::EXTENSIVE);
  AddTestCase (new LenaRrFfMacSchedulerTestCase (15,20000,25600,9600,errorModel), TestCase::EXTENSIVE);

}


  return oss.str ();
}

LenaRrFfMacSchedulerTestCase::LenaRrFfMacSchedulerTestCase (uint16_t nUser, uint16_t dist, double thrRefDl, double thrRefUl, bool errorModelEnabled)
  : TestCase (BuildNameString (nUser, dist)),              
    m_nUser (nUser),
    m_nLc (nLc),
    m_dist (dist),
    m_thrRefDl (thrRefDl),
    m_thrRefUl (thrRefUl),

(-)ns-3.18/src/lte/test/lte-test-rr-ff-mac-scheduler.h (-1 / +1 lines)

Lines 40-46	Link Here

class LenaRrFfMacSchedulerTestCase : public TestCase

class LenaRrFfMacSchedulerTestCase : public TestCase

public:

public:

  LenaRrFfMacSchedulerTestCase (uint16_t nUser, uint16_t nLc, uint16_t dist, double thrRefDl, double thrRefUl, bool errorModelEnabled);

  LenaRrFfMacSchedulerTestCase (uint16_t nUser, uint16_t dist, double thrRefDl, double thrRefUl, bool errorModelEnabled);

  virtual ~LenaRrFfMacSchedulerTestCase ();

  virtual ~LenaRrFfMacSchedulerTestCase ();

private:

private:




  // 6 users -> 4 PRB at Itbs 26 -> 373 -> 373000 bytes/sec
  // after the patch enforcing min 3 PRBs per UE:
  // 12 users -> 3 PRB at Itbs 26 -> 277 bytes * 8/12 UE/TTI -> 184670 bytes/sec
  AddTestCase (new LenaTdBetFfMacSchedulerTestCase1 (1,0,2196000,2292000, errorModel), TestCase::EXTENSIVE);
  AddTestCase (new LenaTdBetFfMacSchedulerTestCase1 (3,0,732000,749000, errorModel), TestCase::EXTENSIVE);
  AddTestCase (new LenaTdBetFfMacSchedulerTestCase1 (6,0,366000,373000, errorModel), TestCase::EXTENSIVE);
  AddTestCase (new LenaTdBetFfMacSchedulerTestCase1 (12,0,183000,184670, errorModel), TestCase::EXTENSIVE);

  // DOWNLINK - DISTANCE 4800 -> MCS 22 -> Itbs 20 (from table 7.1.7.2.1-1 of 36.213)
  // 1 user -> 24 PRB at Itbs 20 -> 1383 -> 1383000 bytes/sec

  // 6 users -> 4 PRB at Itbs 13 -> 125 -> 125000 bytes/sec
  // after the patch enforcing min 3 PRBs per UE:
  // 12 users -> 3 PRB at Itbs 13 -> 93  bytes * 8/12 UE/TTI  -> 62000 bytes/sec
  AddTestCase (new LenaTdBetFfMacSchedulerTestCase1 (1,4800,1383000,807000, errorModel), TestCase::EXTENSIVE);
  AddTestCase (new LenaTdBetFfMacSchedulerTestCase1 (3,4800,461000,253000, errorModel), TestCase::EXTENSIVE);
  AddTestCase (new LenaTdBetFfMacSchedulerTestCase1 (6,4800,230500,125000, errorModel), TestCase::EXTENSIVE);
  AddTestCase (new LenaTdBetFfMacSchedulerTestCase1 (12,4800,115250,62000, errorModel), TestCase::EXTENSIVE);

  // DOWNLINK - DISTANCE 6000 -> MCS 20 -> Itbs 18 (from table 7.1.7.2.1-1 of 36.213)
  // 1 user -> 24 PRB at Itbs 18 -> 1191 -> 1191000 byte/sec

  // 3 users -> 8 PRB at Itbs 11 -> 201 -> 201000 bytes/sec
  // 6 users -> 4 PRB at Itbs 11 -> 97 -> 97000 bytes/sec
  // 12 users -> 3 PRB at Itbs 11 -> 73 bytes * 8/12 UE/TTI -> 48667 bytes/sec
  AddTestCase (new LenaTdBetFfMacSchedulerTestCase1 (1,6000,1191000,621000,errorModel), TestCase::EXTENSIVE);
  AddTestCase (new LenaTdBetFfMacSchedulerTestCase1 (3,6000,397000,201000,errorModel), TestCase::EXTENSIVE);
  AddTestCase (new LenaTdBetFfMacSchedulerTestCase1 (6,6000,198500,97000,errorModel), TestCase::EXTENSIVE);
  AddTestCase (new LenaTdBetFfMacSchedulerTestCase1 (12,6000,99250,48667,errorModel), TestCase::EXTENSIVE);
  
  // DOWNLINK - DISTANCE 10000 -> MCS 14 -> Itbs 13 (from table 7.1.7.2.1-1 of 36.213)
  // 1 user -> 24 PRB at Itbs 13 -> 775 -> 775000 byte/sec

  // 6 users -> 4 PRB at Itbs 8 -> 67 -> 67000 bytes/sec
  // after the patch enforcing min 3 PRBs per UE:
  // 12 users -> 3 PRB at Itbs 8 -> 49 bytes * 8/12 UE/TTI -> 32667 bytes/sec
  AddTestCase (new LenaTdBetFfMacSchedulerTestCase1 (1,10000,775000,421000,errorModel), TestCase::EXTENSIVE);
  AddTestCase (new LenaTdBetFfMacSchedulerTestCase1 (3,10000,258333,137000,errorModel), TestCase::EXTENSIVE);
  AddTestCase (new LenaTdBetFfMacSchedulerTestCase1 (6,10000,129166,67000,errorModel), TestCase::EXTENSIVE);
  AddTestCase (new LenaTdBetFfMacSchedulerTestCase1 (12,10000,64583,32667,errorModel), TestCase::EXTENSIVE);

  // DOWNLINK - DISTANCE 20000 -> MCS 8 -> Itbs 8 (from table 7.1.7.2.1-1 of 36.213)
  // 1 user -> 24 PRB at Itbs 8 -> 421 -> 421000 bytes/sec

  // 6 users -> 4 PRB at Itbs 2 -> 22 -> 22000 bytes/sec
  // after the patch enforcing min 3 PRBs per UE:
  // 12 users -> 3 PRB at Itbs 2 -> 18 bytes * 8/12 UE/TTI -> 12000 bytes/sec
  AddTestCase (new LenaTdBetFfMacSchedulerTestCase1 (1,20000,421000,137000,errorModel), TestCase::EXTENSIVE);
  AddTestCase (new LenaTdBetFfMacSchedulerTestCase1 (3,20000,140333,41000,errorModel), TestCase::EXTENSIVE);
  AddTestCase (new LenaTdBetFfMacSchedulerTestCase1 (6,20000,70166,22000,errorModel), TestCase::EXTENSIVE);
  AddTestCase (new LenaTdBetFfMacSchedulerTestCase1 (12,20000,35083,12000,errorModel), TestCase::EXTENSIVE);

  // Test Case 2: fairness check


  return oss.str ();
}

LenaTdBetFfMacSchedulerTestCase1::LenaTdBetFfMacSchedulerTestCase1 (uint16_t nUser, uint16_t dist, double thrRefDl, double thrRefUl, bool errorModelEnabled)
  : TestCase (BuildNameString (nUser, dist)),
    m_nUser (nUser),
    m_nLc (nLc),
    m_dist (dist),
    m_thrRefDl (thrRefDl),
    m_thrRefUl (thrRefUl),




class LenaTdBetFfMacSchedulerTestCase1 : public TestCase
{
public:
  LenaTdBetFfMacSchedulerTestCase1 (uint16_t nUser, uint16_t dist, double thrRefDl, double thrRefUl,bool errorModelEnabled);
  virtual ~LenaTdBetFfMacSchedulerTestCase1 ();

private:
  static std::string BuildNameString (uint16_t nUser, uint16_t dist);
  virtual void DoRun (void);
  uint16_t m_nUser;
  uint16_t m_nLc;
  uint16_t m_dist;
  double m_thrRefDl;
  double m_thrRefUl;




  // 6 users -> 4 PRB at Itbs 26 -> 373 -> 373000 bytes/sec
  // after the patch enforcing min 3 PRBs per UE:
  // 12 users -> 3 PRB at Itbs 26 -> 277 bytes * 8/12 UE/TTI -> 184670 bytes/sec
  AddTestCase (new LenaTdMtFfMacSchedulerTestCase (1,0,2196000,2292000, errorModel), TestCase::EXTENSIVE);
  AddTestCase (new LenaTdMtFfMacSchedulerTestCase (3,0,2196000,749000,errorModel), TestCase::QUICK);
  AddTestCase (new LenaTdMtFfMacSchedulerTestCase (6,0,2196000,373000, errorModel), TestCase::EXTENSIVE);
  AddTestCase (new LenaTdMtFfMacSchedulerTestCase (12,0,2196000,184670, errorModel), TestCase::EXTENSIVE);
  
  // DOWNLINK - DISTANCE 4800 -> MCS 22 -> Itbs 20 (from table 7.1.7.2.1-1 of 36.213)
  // 1 user -> 24 PRB at Itbs 20 -> 1383 -> 1383000 bytes/sec for one UE; 0 bytes/sec for other UEs

  // 6 users -> 4 PRB at Itbs 13 -> 125 -> 125000 bytes/sec
  // after the patch enforcing min 3 PRBs per UE:
  // 12 users -> 3 PRB at Itbs 13 -> 93  bytes * 8/12 UE/TTI  -> 62000 bytes/sec
  AddTestCase (new LenaTdMtFfMacSchedulerTestCase (1,4800,1383000,807000,errorModel), TestCase::EXTENSIVE);
  AddTestCase (new LenaTdMtFfMacSchedulerTestCase (3,4800,1383000,253000,errorModel), TestCase::EXTENSIVE);
  AddTestCase (new LenaTdMtFfMacSchedulerTestCase (6,4800,1383000,125000,errorModel), TestCase::EXTENSIVE);
  AddTestCase (new LenaTdMtFfMacSchedulerTestCase (12,4800,1383000,62000,errorModel), TestCase::EXTENSIVE);

  // DOWNLINK - DISTANCE 6000 -> MCS 20 -> Itbs 18 (from table 7.1.7.2.1-1 of 36.213)
  // 1 user -> 24 PRB at Itbs 18 -> 1191 -> 1191000 byte/sec for one UE; 0 bytes/sec for other UEs

  // 6 users -> 4 PRB at Itbs 11 -> 97 -> 97000 bytes/sec
  // after the patch enforcing min 3 PRBs per UE:
  // 12 users -> 3 PRB at Itbs 11 -> 73 bytes * 8/12 UE/TTI -> 48667 bytes/sec
  AddTestCase (new LenaTdMtFfMacSchedulerTestCase (1,6000,1191000,621000, errorModel), TestCase::EXTENSIVE);
  AddTestCase (new LenaTdMtFfMacSchedulerTestCase (3,6000,1191000,201000, errorModel), TestCase::EXTENSIVE);
  AddTestCase (new LenaTdMtFfMacSchedulerTestCase (6,6000,1191000,97000, errorModel), TestCase::EXTENSIVE);
  AddTestCase (new LenaTdMtFfMacSchedulerTestCase (12,6000,1191000,48667, errorModel), TestCase::EXTENSIVE);

  // DOWNLINK - DISTANCE 10000 -> MCS 14 -> Itbs 13 (from table 7.1.7.2.1-1 of 36.213)
  // 1 user -> 24 PRB at Itbs 13 -> 775 -> 775000 byte/sec for one UE; 0 bytes/sec for other UEs

  // 6 users -> 4 PRB at Itbs 8 -> 67 -> 67000 bytes/sec
  // after the patch enforcing min 3 PRBs per UE:
  // 12 users -> 3 PRB at Itbs 8 -> 49 bytes * 8/12 UE/TTI -> 32667 bytes/sec
  AddTestCase (new LenaTdMtFfMacSchedulerTestCase (1,10000,775000,437000,errorModel), TestCase::EXTENSIVE);
  AddTestCase (new LenaTdMtFfMacSchedulerTestCase (3,10000,775000,137000,errorModel), TestCase::EXTENSIVE);
  AddTestCase (new LenaTdMtFfMacSchedulerTestCase (6,10000,775000,67000,errorModel), TestCase::EXTENSIVE);
  AddTestCase (new LenaTdMtFfMacSchedulerTestCase (12,10000,775000,32667,errorModel), TestCase::EXTENSIVE);
 
  // DONWLINK - DISTANCE 20000 -> MCS 8 -> Itbs 8 (from table 7.1.7.2.1-1 of 36.213)
  // 1 user -> 24 PRB at Itbs 8 -> 421 -> 421000 bytes/sec for one UE; 0 bytes/sec for other UEs

  // 6 users -> 4 PRB at Itbs 2 -> 32 -> 22000 bytes/sec
  // after the patch enforcing min 3 PRBs per UE:
  // 12 users -> 3 PRB at Itbs 2 -> 26 bytes * 8/12 UE/TTI -> 12000 bytes/sec
  AddTestCase (new LenaTdMtFfMacSchedulerTestCase (1,20000,421000,137000,errorModel), TestCase::EXTENSIVE);
  AddTestCase (new LenaTdMtFfMacSchedulerTestCase (3,20000,421000,41000,errorModel), TestCase::EXTENSIVE);
  AddTestCase (new LenaTdMtFfMacSchedulerTestCase (6,20000,421000,22000,errorModel), TestCase::EXTENSIVE);
  AddTestCase (new LenaTdMtFfMacSchedulerTestCase (12,20000,421000,12000,errorModel), TestCase::EXTENSIVE);

}


  return oss.str ();
}

LenaTdMtFfMacSchedulerTestCase::LenaTdMtFfMacSchedulerTestCase (uint16_t nUser, uint16_t dist, double thrRefDl, double thrRefUl, bool errorModelEnabled)
  : TestCase (BuildNameString (nUser, dist)),
    m_nUser (nUser),
    m_nLc (nLc),
    m_dist (dist),
    m_thrRefDl (thrRefDl),
    m_thrRefUl (thrRefUl),

(-)ns-3.18/src/lte/test/lte-test-tdmt-ff-mac-scheduler.h (-1 / +1 lines)

Lines 42-48	Link Here

class LenaTdMtFfMacSchedulerTestCase : public TestCase

class LenaTdMtFfMacSchedulerTestCase : public TestCase

public:

public:

  LenaTdMtFfMacSchedulerTestCase (uint16_t nUser, uint16_t nLc, uint16_t dist, double thrRefDl, double thrRefUl,bool errorModelEnabled);

  LenaTdMtFfMacSchedulerTestCase (uint16_t nUser, uint16_t dist, double thrRefDl, double thrRefUl,bool errorModelEnabled);

  virtual ~LenaTdMtFfMacSchedulerTestCase ();

  virtual ~LenaTdMtFfMacSchedulerTestCase ();

private:

private:




  // 3 users -> 8 PRB at Itbs 26 -> 749 -> 749000 > 232000 -> throughput = 232000 bytes/sec 
  // 6 users -> 4 PRB at Itbs 26 -> 373 -> 373000 > 232000 -> throughput = 232000 bytes/sec
  // 12 users -> 2 PRB at Itbs 26 -> 185 -> 185000 < 232000 -> throughput = 185000 bytes/sec
  AddTestCase (new LenaTdTbfqFfMacSchedulerTestCase1 (1,0,232000,232000,200,1,errorModel), TestCase::EXTENSIVE);
  AddTestCase (new LenaTdTbfqFfMacSchedulerTestCase1 (3,0,232000,232000,200,1,errorModel), TestCase::EXTENSIVE);
  AddTestCase (new LenaTdTbfqFfMacSchedulerTestCase1 (6,0,232000,232000,200,1,errorModel), TestCase::EXTENSIVE);
  //AddTestCase (new LenaTdTbfqFfMacSchedulerTestCase1 (12,0,183000,185000,200,1,errorModel));// simulation time = 1.5, otherwise, ul test will fail

  // DOWNLINK - DISTANCE 4800 -> MCS 22 -> Itbs 20 (from table 7.1.7.2.1-1 of 36.213)
  // Traffic info

  // 6 users -> 4 PRB at Itbs 13 -> 125 -> 125000 < 232000 -> throughput = 125000 bytes/sec
  // after the patch enforcing min 3 PRBs per UE:
  // 12 users -> 3 PRB at Itbs 13 -> 93  bytes * 8/12 UE/TTI  -> 62000 < 232000 -> throughput = 62000  bytes/sec
  AddTestCase (new LenaTdTbfqFfMacSchedulerTestCase1 (1,4800,232000,232000,200,1,errorModel), TestCase::EXTENSIVE);
  AddTestCase (new LenaTdTbfqFfMacSchedulerTestCase1 (3,4800,232000,232000,200,1,errorModel), TestCase::EXTENSIVE);
  AddTestCase (new LenaTdTbfqFfMacSchedulerTestCase1 (6,4800,230500,125000,200,1,errorModel), TestCase::EXTENSIVE);
  //AddTestCase (new LenaTdTbfqFfMacSchedulerTestCase1 (12,4800,115250,62000,200,1,errorModel)); // simulation time = 1.5, otherwise, ul test will fail

  // DOWNLINK - DISTANCE 6000 -> MCS 20 -> Itbs 18 (from table 7.1.7.2.1-1 of 36.213)
  // Traffic info

  // 6 users -> 4 PRB at Itbs 11 -> 97 -> 97000 < 232000 -> throughput = 97000 bytes/sec
  // after the patch enforcing min 3 PRBs per UE:
  // 12 users -> 3 PRB at Itbs 11 -> 73 bytes * 8/12 UE/TTI -> 48667 < 232000 -> throughput = 48667 bytes/sec
  AddTestCase (new LenaTdTbfqFfMacSchedulerTestCase1 (1,6000,232000,232000,200,1,errorModel), TestCase::EXTENSIVE);
  AddTestCase (new LenaTdTbfqFfMacSchedulerTestCase1 (3,6000,232000,201000,200,1,errorModel), TestCase::EXTENSIVE);
  AddTestCase (new LenaTdTbfqFfMacSchedulerTestCase1 (6,6000,198500,97000,200,1,errorModel), TestCase::EXTENSIVE);
  //AddTestCase (new LenaTdTbfqFfMacSchedulerTestCase1 (12,6000,99250,48667,200,1, errorModel)); // simulation time = 1.5, otherwise, ul test will fail

  // DOWNLINK - DISTANCE 10000 -> MCS 14 -> Itbs 13 (from table 7.1.7.2.1-1 of 36.213)
  // Traffic info

  // 6 users -> 4 PRB at Itbs 8 -> 67 -> 67000 < 232000 -> throughput = 67000 bytes/sec
  // after the patch enforcing min 3 PRBs per UE:
  // 12 users -> 3 PRB at Itbs 8 -> 49 bytes * 8/12 UE/TTI -> 32667 < 232000 -> throughput = 32667  bytes/sec
  AddTestCase (new LenaTdTbfqFfMacSchedulerTestCase1 (1,10000,232000,232000,200,1,errorModel), TestCase::EXTENSIVE);
  AddTestCase (new LenaTdTbfqFfMacSchedulerTestCase1 (3,10000,232000,137000,200,1,errorModel), TestCase::EXTENSIVE);
  AddTestCase (new LenaTdTbfqFfMacSchedulerTestCase1 (6,10000,129166,67000,200,1,errorModel), TestCase::EXTENSIVE);
  //AddTestCase (new LenaTdTbfqFfMacSchedulerTestCase1 (12,10000,64583,32667,200,1,errorModel));// simulation time = 1.5, otherwise, ul test will fail

  // Test Case 2: homogeneous flow test in TDTBFQ (different distance)
  // Traffic1 info

}


LenaTdTbfqFfMacSchedulerTestCase1::LenaTdTbfqFfMacSchedulerTestCase1 (uint16_t nUser, uint16_t dist, double thrRefDl, double thrRefUl, uint16_t packetSize, uint16_t interval,bool errorModelEnabled)
  : TestCase (BuildNameString (nUser, dist)),
    m_nUser (nUser),
    m_nLc (nLc),
    m_dist (dist),
    m_packetSize (packetSize),
    m_interval (interval),




class LenaTdTbfqFfMacSchedulerTestCase1 : public TestCase
{
public:
  LenaTdTbfqFfMacSchedulerTestCase1 (uint16_t nUser, uint16_t dist, double thrRefDl, double thrRefUl, uint16_t packetSize, uint16_t interval, bool  errorModelEnabled);
  virtual ~LenaTdTbfqFfMacSchedulerTestCase1 ();

private:
  static std::string BuildNameString (uint16_t nUser, uint16_t dist);
  virtual void DoRun (void);
  uint16_t m_nUser;
  uint16_t m_nLc;
  uint16_t m_dist;
  uint16_t m_packetSize;  // byte
  uint16_t m_interval;    // ms




  // 6 users -> 4 PRB at Itbs 26 -> 373 -> 373000 bytes/sec
  // after the patch enforcing min 3 PRBs per UE:
  // 12 users -> 3 PRB at Itbs 26 -> 277 bytes * 8/12 UE/TTI -> 184670 bytes/sec
  AddTestCase (new LenaTtaFfMacSchedulerTestCase (1,0,2196000,2292000, errorModel), TestCase::EXTENSIVE);
  AddTestCase (new LenaTtaFfMacSchedulerTestCase (3,0,2196000,749000,errorModel), TestCase::QUICK);
  AddTestCase (new LenaTtaFfMacSchedulerTestCase (6,0,2196000,373000, errorModel), TestCase::EXTENSIVE);
  AddTestCase (new LenaTtaFfMacSchedulerTestCase (12,0,2196000,184670, errorModel), TestCase::EXTENSIVE);
  AddTestCase (new LenaTtaFfMacSchedulerTestCase (15,0,2196000,147730, errorModel), TestCase::EXTENSIVE);

  // DOWNLINK - DISTANCE 4800 -> MCS 22 -> Itbs 20 (from table 7.1.7.2.1-1 of 36.213)
  // 1 user -> 24 PRB at Itbs 15 -> 1383 -> 1383000 bytes/sec for one UE; 0 bytes/sec for other UEs

  // 6 users -> 4 PRB at Itbs 13 -> 125 -> 125000 bytes/sec
  // after the patch enforcing min 3 PRBs per UE:
  // 12 users -> 3 PRB at Itbs 13 -> 93  bytes * 8/12 UE/TTI  -> 62000 bytes/sec
  AddTestCase (new LenaTtaFfMacSchedulerTestCase (1,4800,1383000,807000,errorModel), TestCase::EXTENSIVE);
  AddTestCase (new LenaTtaFfMacSchedulerTestCase (3,4800,1383000,253000,errorModel), TestCase::EXTENSIVE);
  AddTestCase (new LenaTtaFfMacSchedulerTestCase (6,4800,1383000,125000,errorModel), TestCase::EXTENSIVE);
  AddTestCase (new LenaTtaFfMacSchedulerTestCase (12,4800,1383000,62000,errorModel), TestCase::EXTENSIVE);


  // DOWNLINK - DISTANCE 6000 -> MCS 20 -> Itbs 18 (from table 7.1.7.2.1-1 of 36.213)

  // 6 users -> 4 PRB at Itbs 11 -> 97 -> 97000 bytes/sec
  // after the patch enforcing min 3 PRBs per UE:
  // 12 users -> 3 PRB at Itbs 11 -> 73 bytes * 8/12 UE/TTI -> 48667 bytes/sec
  AddTestCase (new LenaTtaFfMacSchedulerTestCase (1,6000,1191000,621000, errorModel), TestCase::EXTENSIVE);
  AddTestCase (new LenaTtaFfMacSchedulerTestCase (3,6000,1191000,201000, errorModel), TestCase::EXTENSIVE);
  AddTestCase (new LenaTtaFfMacSchedulerTestCase (6,6000,1191000,97000, errorModel), TestCase::EXTENSIVE);
  AddTestCase (new LenaTtaFfMacSchedulerTestCase (12,6000,1191000,48667, errorModel), TestCase::EXTENSIVE);

  // DOWNLINK - DISTANCE 10000 -> MCS 14 -> Itbs 13 (from table 7.1.7.2.1-1 of 36.213)
  // 1 user -> 24 PRB at Itbs 8 -> 775 -> 775000 bytes/sec for one UE; 0 bytes/sec for other UEs

  // 6 users -> 4 PRB at Itbs 8 -> 67 -> 67000 bytes/sec
  // after the patch enforcing min 3 PRBs per UE:
  // 12 users -> 3 PRB at Itbs 8 -> 49 bytes * 8/12 UE/TTI -> 32667 bytes/sec
  AddTestCase (new LenaTtaFfMacSchedulerTestCase (1,10000,775000,437000,errorModel), TestCase::EXTENSIVE);
  AddTestCase (new LenaTtaFfMacSchedulerTestCase (3,10000,775000,137000,errorModel), TestCase::EXTENSIVE);
  AddTestCase (new LenaTtaFfMacSchedulerTestCase (6,10000,775000,67000,errorModel), TestCase::EXTENSIVE);
  AddTestCase (new LenaTtaFfMacSchedulerTestCase (12,10000,775000,32667,errorModel), TestCase::EXTENSIVE);
 
  // DONWLINK - DISTANCE 20000 -> MCS 8 -> Itbs 8 (from table 7.1.7.2.1-1 of 36.213)
  // 1 user -> 24 PRB at Itbs 8 -> 421 -> 421000 bytes/sec for one UE; 0 bytes/sec for other UEs

  // 6 users -> 4 PRB at Itbs 2 -> 32 -> 22000 bytes/sec
  // after the patch enforcing min 3 PRBs per UE:
  // 12 users -> 3 PRB at Itbs 2 -> 26 bytes * 8/12 UE/TTI -> 12000 bytes/sec
  AddTestCase (new LenaTtaFfMacSchedulerTestCase (1,20000,421000,137000,errorModel), TestCase::EXTENSIVE);
  AddTestCase (new LenaTtaFfMacSchedulerTestCase (3,20000,421000,41000,errorModel), TestCase::EXTENSIVE);
  AddTestCase (new LenaTtaFfMacSchedulerTestCase (6,20000,421000,22000,errorModel), TestCase::EXTENSIVE);
  AddTestCase (new LenaTtaFfMacSchedulerTestCase (12,20000,421000,12000,errorModel), TestCase::EXTENSIVE);

}


  return oss.str ();
}

LenaTtaFfMacSchedulerTestCase::LenaTtaFfMacSchedulerTestCase (uint16_t nUser, uint16_t dist, double thrRefDl, double thrRefUl, bool errorModelEnabled)
  : TestCase (BuildNameString (nUser, dist)),
    m_nUser (nUser),
    m_nLc (nLc),
    m_dist (dist),
    m_thrRefDl (thrRefDl),
    m_thrRefUl (thrRefUl),

(-)ns-3.18/src/lte/test/lte-test-tta-ff-mac-scheduler.h (-1 / +1 lines)

Lines 42-48	Link Here

class LenaTtaFfMacSchedulerTestCase : public TestCase

class LenaTtaFfMacSchedulerTestCase : public TestCase

public:

public:

  LenaTtaFfMacSchedulerTestCase (uint16_t nUser, uint16_t nLc, uint16_t dist, double thrRefDl, double thrRefUl,bool errorModelEnabled);

  LenaTtaFfMacSchedulerTestCase (uint16_t nUser, uint16_t dist, double thrRefDl, double thrRefUl,bool errorModelEnabled);

  virtual ~LenaTtaFfMacSchedulerTestCase ();

  virtual ~LenaTtaFfMacSchedulerTestCase ();

private:

private:

(-)ns-3.18/src/mesh/bindings/modulegen__gcc_ILP32.py (-12 / +7 lines)

Lines 27-33	Link Here

    ## wifi-mode.h (module 'wifi'): ns3::WifiModulationClass [enumeration]

    ## wifi-mode.h (module 'wifi'): ns3::WifiModulationClass [enumeration]

    module.add_enum('WifiModulationClass', ['WIFI_MOD_CLASS_UNKNOWN', 'WIFI_MOD_CLASS_IR', 'WIFI_MOD_CLASS_FHSS', 'WIFI_MOD_CLASS_DSSS', 'WIFI_MOD_CLASS_ERP_PBCC', 'WIFI_MOD_CLASS_DSSS_OFDM', 'WIFI_MOD_CLASS_ERP_OFDM', 'WIFI_MOD_CLASS_OFDM', 'WIFI_MOD_CLASS_HT'], import_from_module='ns.wifi')

    module.add_enum('WifiModulationClass', ['WIFI_MOD_CLASS_UNKNOWN', 'WIFI_MOD_CLASS_IR', 'WIFI_MOD_CLASS_FHSS', 'WIFI_MOD_CLASS_DSSS', 'WIFI_MOD_CLASS_ERP_PBCC', 'WIFI_MOD_CLASS_DSSS_OFDM', 'WIFI_MOD_CLASS_ERP_OFDM', 'WIFI_MOD_CLASS_OFDM', 'WIFI_MOD_CLASS_HT'], import_from_module='ns.wifi')

    ## wifi-phy-standard.h (module 'wifi'): ns3::WifiPhyStandard [enumeration]

    ## wifi-phy-standard.h (module 'wifi'): ns3::WifiPhyStandard [enumeration]

    module.add_enum('WifiPhyStandard', ['WIFI_PHY_STANDARD_80211a', 'WIFI_PHY_STANDARD_80211b', 'WIFI_PHY_STANDARD_80211g', 'WIFI_PHY_STANDARD_80211_10MHZ', 'WIFI_PHY_STANDARD_80211_5MHZ', 'WIFI_PHY_STANDARD_holland', 'WIFI_PHY_STANDARD_80211p_CCH', 'WIFI_PHY_STANDARD_80211p_SCH', 'WIFI_PHY_STANDARD_80211n_2_4GHZ', 'WIFI_PHY_STANDARD_80211n_5GHZ'], import_from_module='ns.wifi')

    module.add_enum('WifiPhyStandard', ['WIFI_PHY_STANDARD_80211a', 'WIFI_PHY_STANDARD_80211b', 'WIFI_PHY_STANDARD_80211g', 'WIFI_PHY_STANDARD_80211_10MHZ', 'WIFI_PHY_STANDARD_80211_5MHZ', 'WIFI_PHY_STANDARD_holland', 'WIFI_PHY_STANDARD_80211n_2_4GHZ', 'WIFI_PHY_STANDARD_80211n_5GHZ'], import_from_module='ns.wifi')

    ## wifi-mode.h (module 'wifi'): ns3::WifiCodeRate [enumeration]

    ## wifi-mode.h (module 'wifi'): ns3::WifiCodeRate [enumeration]

    module.add_enum('WifiCodeRate', ['WIFI_CODE_RATE_UNDEFINED', 'WIFI_CODE_RATE_3_4', 'WIFI_CODE_RATE_2_3', 'WIFI_CODE_RATE_1_2', 'WIFI_CODE_RATE_5_6'], import_from_module='ns.wifi')

    module.add_enum('WifiCodeRate', ['WIFI_CODE_RATE_UNDEFINED', 'WIFI_CODE_RATE_3_4', 'WIFI_CODE_RATE_2_3', 'WIFI_CODE_RATE_1_2', 'WIFI_CODE_RATE_5_6'], import_from_module='ns.wifi')

    ## qos-utils.h (module 'wifi'): ns3::AcIndex [enumeration]

    ## qos-utils.h (module 'wifi'): ns3::AcIndex [enumeration]

Lines 502-513	Link Here

502

    module.add_enum('dot11sSynchronizationProtocolIdentifier', ['SYNC_NEIGHBOUR_OFFSET', 'SYNC_NULL'])

502

    module.add_enum('dot11sSynchronizationProtocolIdentifier', ['SYNC_NEIGHBOUR_OFFSET', 'SYNC_NULL'])

503

    ## ie-dot11s-configuration.h (module 'mesh'): ns3::dot11s::dot11sCongestionControlMode [enumeration]

503

    ## ie-dot11s-configuration.h (module 'mesh'): ns3::dot11s::dot11sCongestionControlMode [enumeration]

504

    module.add_enum('dot11sCongestionControlMode', ['CONGESTION_SIGNALING', 'CONGESTION_NULL'])

504

    module.add_enum('dot11sCongestionControlMode', ['CONGESTION_SIGNALING', 'CONGESTION_NULL'])

505

    ## ie-dot11s-configuration.h (module 'mesh'): ns3::dot11s::dot11sAuthenticationProtocol [enumeration]

506

    module.add_enum('dot11sAuthenticationProtocol', ['AUTH_NULL', 'AUTH_SAE'])

505

    ## ie-dot11s-configuration.h (module 'mesh'): ns3::dot11s::dot11sPathSelectionMetric [enumeration]

507

    ## ie-dot11s-configuration.h (module 'mesh'): ns3::dot11s::dot11sPathSelectionMetric [enumeration]

506

    module.add_enum('dot11sPathSelectionMetric', ['METRIC_AIRTIME'])

508

    module.add_enum('dot11sPathSelectionMetric', ['METRIC_AIRTIME'])

507

    ## ie-dot11s-peer-management.h (module 'mesh'): ns3::dot11s::PmpReasonCode [enumeration]

509

    ## ie-dot11s-peer-management.h (module 'mesh'): ns3::dot11s::PmpReasonCode [enumeration]

508

    module.add_enum('PmpReasonCode', ['REASON11S_PEERING_CANCELLED', 'REASON11S_MESH_MAX_PEERS', 'REASON11S_MESH_CAPABILITY_POLICY_VIOLATION', 'REASON11S_MESH_CLOSE_RCVD', 'REASON11S_MESH_MAX_RETRIES', 'REASON11S_MESH_CONFIRM_TIMEOUT', 'REASON11S_MESH_INVALID_GTK', 'REASON11S_MESH_INCONSISTENT_PARAMETERS', 'REASON11S_MESH_INVALID_SECURITY_CAPABILITY', 'REASON11S_RESERVED'])

510

    module.add_enum('PmpReasonCode', ['REASON11S_PEERING_CANCELLED', 'REASON11S_MESH_MAX_PEERS', 'REASON11S_MESH_CAPABILITY_POLICY_VIOLATION', 'REASON11S_MESH_CLOSE_RCVD', 'REASON11S_MESH_MAX_RETRIES', 'REASON11S_MESH_CONFIRM_TIMEOUT', 'REASON11S_MESH_INVALID_GTK', 'REASON11S_MESH_INCONSISTENT_PARAMETERS', 'REASON11S_MESH_INVALID_SECURITY_CAPABILITY', 'REASON11S_RESERVED'])

509

    ## ie-dot11s-configuration.h (module 'mesh'): ns3::dot11s::dot11sAuthenticationProtocol [enumeration]

510

    module.add_enum('dot11sAuthenticationProtocol', ['AUTH_NULL', 'AUTH_SAE'])

511

    ## ie-dot11s-preq.h (module 'mesh'): ns3::dot11s::DestinationAddressUnit [class]

511

    ## ie-dot11s-preq.h (module 'mesh'): ns3::dot11s::DestinationAddressUnit [class]

512

    module.add_class('DestinationAddressUnit', parent=root_module['ns3::SimpleRefCount< ns3::dot11s::DestinationAddressUnit, ns3::empty, ns3::DefaultDeleter<ns3::dot11s::DestinationAddressUnit> >'])

512

    module.add_class('DestinationAddressUnit', parent=root_module['ns3::SimpleRefCount< ns3::dot11s::DestinationAddressUnit, ns3::empty, ns3::DefaultDeleter<ns3::dot11s::DestinationAddressUnit> >'])

513

    ## ie-dot11s-configuration.h (module 'mesh'): ns3::dot11s::Dot11sMeshCapability [class]

513

    ## ie-dot11s-configuration.h (module 'mesh'): ns3::dot11s::Dot11sMeshCapability [class]

Lines 3615-3620	Link Here

3615

    return

3615

    return

3616

3617

def register_Ns3Int64x64_t_methods(root_module, cls):

3617

def register_Ns3Int64x64_t_methods(root_module, cls):

3618

    cls.add_binary_comparison_operator('<=')

3618

    cls.add_binary_comparison_operator('!=')

3619

    cls.add_binary_comparison_operator('!=')

3619

    cls.add_inplace_numeric_operator('+=', param('ns3::int64x64_t const &', 'right'))

3620

    cls.add_inplace_numeric_operator('+=', param('ns3::int64x64_t const &', 'right'))

3620

    cls.add_binary_numeric_operator('*', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('long long unsigned int const', 'right'))

3621

    cls.add_binary_numeric_operator('*', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('long long unsigned int const', 'right'))

Lines 3672-3678	Link Here

3672

    cls.add_inplace_numeric_operator('-=', param('ns3::int64x64_t const &', 'right'))

3673

    cls.add_inplace_numeric_operator('-=', param('ns3::int64x64_t const &', 'right'))

3673

    cls.add_inplace_numeric_operator('/=', param('ns3::int64x64_t const &', 'right'))

3674

    cls.add_inplace_numeric_operator('/=', param('ns3::int64x64_t const &', 'right'))

3674

    cls.add_output_stream_operator()

3675

    cls.add_output_stream_operator()

3675

    cls.add_binary_comparison_operator('<=')

3676

    cls.add_binary_comparison_operator('==')

3676

    cls.add_binary_comparison_operator('==')

3677

    cls.add_binary_comparison_operator('>=')

3677

    cls.add_binary_comparison_operator('>=')

3678

    ## int64x64-double.h (module 'core'): ns3::int64x64_t::int64x64_t() [constructor]

3678

    ## int64x64-double.h (module 'core'): ns3::int64x64_t::int64x64_t() [constructor]

Lines 4612-4617	Link Here

4612

    return

4612

    return

4613

4614

def register_Ns3Time_methods(root_module, cls):

4614

def register_Ns3Time_methods(root_module, cls):

4615

    cls.add_binary_comparison_operator('<=')

4615

    cls.add_binary_comparison_operator('!=')

4616

    cls.add_binary_comparison_operator('!=')

4616

    cls.add_inplace_numeric_operator('+=', param('ns3::Time const &', 'right'))

4617

    cls.add_inplace_numeric_operator('+=', param('ns3::Time const &', 'right'))

4617

    cls.add_binary_numeric_operator('+', root_module['ns3::Time'], root_module['ns3::Time'], param('ns3::Time const &', 'right'))

4618

    cls.add_binary_numeric_operator('+', root_module['ns3::Time'], root_module['ns3::Time'], param('ns3::Time const &', 'right'))

Lines 4620-4626	Link Here

4620

    cls.add_binary_comparison_operator('>')

4621

    cls.add_binary_comparison_operator('>')

4621

    cls.add_inplace_numeric_operator('-=', param('ns3::Time const &', 'right'))

4622

    cls.add_inplace_numeric_operator('-=', param('ns3::Time const &', 'right'))

4622

    cls.add_output_stream_operator()

4623

    cls.add_output_stream_operator()

4623

    cls.add_binary_comparison_operator('<=')

4624

    cls.add_binary_comparison_operator('==')

4624

    cls.add_binary_comparison_operator('==')

4625

    cls.add_binary_comparison_operator('>=')

4625

    cls.add_binary_comparison_operator('>=')

4626

    ## nstime.h (module 'core'): ns3::Time::Time() [constructor]

4626

    ## nstime.h (module 'core'): ns3::Time::Time() [constructor]

Lines 5239-5249	Link Here

5239

                   'bool',

5239

                   'bool',

5240

[],

5240

[],

5241

                   is_pure_virtual=True, is_const=True, is_virtual=True)

5241

                   is_pure_virtual=True, is_const=True, is_virtual=True)

5242

    ## wifi-mac.h (module 'wifi'): void ns3::WifiMac::ConfigureCCHDcf(ns3::Ptr<ns3::Dcf> dcf, uint32_t cwmin, uint32_t cwmax, ns3::AcIndex ac) [member function]

5243

    cls.add_method('ConfigureCCHDcf',

5244

                   'void',

5245

                   [param('ns3::Ptr< ns3::Dcf >', 'dcf'), param('uint32_t', 'cwmin'), param('uint32_t', 'cwmax'), param('ns3::AcIndex', 'ac')],

5246

                   visibility='protected')

5247

    ## wifi-mac.h (module 'wifi'): void ns3::WifiMac::ConfigureDcf(ns3::Ptr<ns3::Dcf> dcf, uint32_t cwmin, uint32_t cwmax, ns3::AcIndex ac) [member function]

5242

    ## wifi-mac.h (module 'wifi'): void ns3::WifiMac::ConfigureDcf(ns3::Ptr<ns3::Dcf> dcf, uint32_t cwmin, uint32_t cwmax, ns3::AcIndex ac) [member function]

5248

    cls.add_method('ConfigureDcf',

5243

    cls.add_method('ConfigureDcf',

5249

                   'void',

5244

                   'void',

Lines 11502-11509	Link Here

11502

def register_Ns3FlameFlameProtocolMac_methods(root_module, cls):

11497

def register_Ns3FlameFlameProtocolMac_methods(root_module, cls):

11503

    ## flame-protocol-mac.h (module 'mesh'): ns3::flame::FlameProtocolMac::FlameProtocolMac(ns3::flame::FlameProtocolMac const & arg0) [copy constructor]

11498

    ## flame-protocol-mac.h (module 'mesh'): ns3::flame::FlameProtocolMac::FlameProtocolMac(ns3::flame::FlameProtocolMac const & arg0) [copy constructor]

11504

    cls.add_constructor([param('ns3::flame::FlameProtocolMac const &', 'arg0')])

11499

    cls.add_constructor([param('ns3::flame::FlameProtocolMac const &', 'arg0')])

11505

    ## flame-protocol-mac.h (module 'mesh'): ns3::flame::FlameProtocolMac::FlameProtocolMac(uint32_t arg0, ns3::Ptr<ns3::flame::FlameProtocol> arg1) [constructor]

11500

    ## flame-protocol-mac.h (module 'mesh'): ns3::flame::FlameProtocolMac::FlameProtocolMac(ns3::Ptr<ns3::flame::FlameProtocol> arg0) [constructor]

11506

    cls.add_constructor([param('uint32_t', 'arg0'), param('ns3::Ptr< ns3::flame::FlameProtocol >', 'arg1')])

11501

    cls.add_constructor([param('ns3::Ptr< ns3::flame::FlameProtocol >', 'arg0')])

11507

    ## flame-protocol-mac.h (module 'mesh'): int64_t ns3::flame::FlameProtocolMac::AssignStreams(int64_t stream) [member function]

11502

    ## flame-protocol-mac.h (module 'mesh'): int64_t ns3::flame::FlameProtocolMac::AssignStreams(int64_t stream) [member function]

11508

    cls.add_method('AssignStreams',

11503

    cls.add_method('AssignStreams',

11509

                   'int64_t',

11504

                   'int64_t',

(-)ns-3.18/src/mesh/bindings/modulegen__gcc_LP64.py (-12 / +7 lines)

Lines 27-33	Link Here

    ## wifi-mode.h (module 'wifi'): ns3::WifiModulationClass [enumeration]

    ## wifi-mode.h (module 'wifi'): ns3::WifiModulationClass [enumeration]

    module.add_enum('WifiModulationClass', ['WIFI_MOD_CLASS_UNKNOWN', 'WIFI_MOD_CLASS_IR', 'WIFI_MOD_CLASS_FHSS', 'WIFI_MOD_CLASS_DSSS', 'WIFI_MOD_CLASS_ERP_PBCC', 'WIFI_MOD_CLASS_DSSS_OFDM', 'WIFI_MOD_CLASS_ERP_OFDM', 'WIFI_MOD_CLASS_OFDM', 'WIFI_MOD_CLASS_HT'], import_from_module='ns.wifi')

    module.add_enum('WifiModulationClass', ['WIFI_MOD_CLASS_UNKNOWN', 'WIFI_MOD_CLASS_IR', 'WIFI_MOD_CLASS_FHSS', 'WIFI_MOD_CLASS_DSSS', 'WIFI_MOD_CLASS_ERP_PBCC', 'WIFI_MOD_CLASS_DSSS_OFDM', 'WIFI_MOD_CLASS_ERP_OFDM', 'WIFI_MOD_CLASS_OFDM', 'WIFI_MOD_CLASS_HT'], import_from_module='ns.wifi')

    ## wifi-phy-standard.h (module 'wifi'): ns3::WifiPhyStandard [enumeration]

    ## wifi-phy-standard.h (module 'wifi'): ns3::WifiPhyStandard [enumeration]

    module.add_enum('WifiPhyStandard', ['WIFI_PHY_STANDARD_80211a', 'WIFI_PHY_STANDARD_80211b', 'WIFI_PHY_STANDARD_80211g', 'WIFI_PHY_STANDARD_80211_10MHZ', 'WIFI_PHY_STANDARD_80211_5MHZ', 'WIFI_PHY_STANDARD_holland', 'WIFI_PHY_STANDARD_80211p_CCH', 'WIFI_PHY_STANDARD_80211p_SCH', 'WIFI_PHY_STANDARD_80211n_2_4GHZ', 'WIFI_PHY_STANDARD_80211n_5GHZ'], import_from_module='ns.wifi')

    module.add_enum('WifiPhyStandard', ['WIFI_PHY_STANDARD_80211a', 'WIFI_PHY_STANDARD_80211b', 'WIFI_PHY_STANDARD_80211g', 'WIFI_PHY_STANDARD_80211_10MHZ', 'WIFI_PHY_STANDARD_80211_5MHZ', 'WIFI_PHY_STANDARD_holland', 'WIFI_PHY_STANDARD_80211n_2_4GHZ', 'WIFI_PHY_STANDARD_80211n_5GHZ'], import_from_module='ns.wifi')

    ## wifi-mode.h (module 'wifi'): ns3::WifiCodeRate [enumeration]

    ## wifi-mode.h (module 'wifi'): ns3::WifiCodeRate [enumeration]

    module.add_enum('WifiCodeRate', ['WIFI_CODE_RATE_UNDEFINED', 'WIFI_CODE_RATE_3_4', 'WIFI_CODE_RATE_2_3', 'WIFI_CODE_RATE_1_2', 'WIFI_CODE_RATE_5_6'], import_from_module='ns.wifi')

    module.add_enum('WifiCodeRate', ['WIFI_CODE_RATE_UNDEFINED', 'WIFI_CODE_RATE_3_4', 'WIFI_CODE_RATE_2_3', 'WIFI_CODE_RATE_1_2', 'WIFI_CODE_RATE_5_6'], import_from_module='ns.wifi')

    ## qos-utils.h (module 'wifi'): ns3::AcIndex [enumeration]

    ## qos-utils.h (module 'wifi'): ns3::AcIndex [enumeration]

Lines 500-513	Link Here

500

    module.add_enum('dot11sSynchronizationProtocolIdentifier', ['SYNC_NEIGHBOUR_OFFSET', 'SYNC_NULL'])

500

    module.add_enum('dot11sSynchronizationProtocolIdentifier', ['SYNC_NEIGHBOUR_OFFSET', 'SYNC_NULL'])

501

    ## ie-dot11s-configuration.h (module 'mesh'): ns3::dot11s::dot11sCongestionControlMode [enumeration]

501

    ## ie-dot11s-configuration.h (module 'mesh'): ns3::dot11s::dot11sCongestionControlMode [enumeration]

502

    module.add_enum('dot11sCongestionControlMode', ['CONGESTION_SIGNALING', 'CONGESTION_NULL'])

502

    module.add_enum('dot11sCongestionControlMode', ['CONGESTION_SIGNALING', 'CONGESTION_NULL'])

503

    ## ie-dot11s-configuration.h (module 'mesh'): ns3::dot11s::dot11sAuthenticationProtocol [enumeration]

504

    module.add_enum('dot11sAuthenticationProtocol', ['AUTH_NULL', 'AUTH_SAE'])

503

    ## ie-dot11s-configuration.h (module 'mesh'): ns3::dot11s::dot11sPathSelectionMetric [enumeration]

505

    ## ie-dot11s-configuration.h (module 'mesh'): ns3::dot11s::dot11sPathSelectionMetric [enumeration]

504

    module.add_enum('dot11sPathSelectionMetric', ['METRIC_AIRTIME'])

506

    module.add_enum('dot11sPathSelectionMetric', ['METRIC_AIRTIME'])

505

    ## ie-dot11s-peer-management.h (module 'mesh'): ns3::dot11s::PmpReasonCode [enumeration]

507

    ## ie-dot11s-peer-management.h (module 'mesh'): ns3::dot11s::PmpReasonCode [enumeration]

506

    module.add_enum('PmpReasonCode', ['REASON11S_PEERING_CANCELLED', 'REASON11S_MESH_MAX_PEERS', 'REASON11S_MESH_CAPABILITY_POLICY_VIOLATION', 'REASON11S_MESH_CLOSE_RCVD', 'REASON11S_MESH_MAX_RETRIES', 'REASON11S_MESH_CONFIRM_TIMEOUT', 'REASON11S_MESH_INVALID_GTK', 'REASON11S_MESH_INCONSISTENT_PARAMETERS', 'REASON11S_MESH_INVALID_SECURITY_CAPABILITY', 'REASON11S_RESERVED'])

508

    module.add_enum('PmpReasonCode', ['REASON11S_PEERING_CANCELLED', 'REASON11S_MESH_MAX_PEERS', 'REASON11S_MESH_CAPABILITY_POLICY_VIOLATION', 'REASON11S_MESH_CLOSE_RCVD', 'REASON11S_MESH_MAX_RETRIES', 'REASON11S_MESH_CONFIRM_TIMEOUT', 'REASON11S_MESH_INVALID_GTK', 'REASON11S_MESH_INCONSISTENT_PARAMETERS', 'REASON11S_MESH_INVALID_SECURITY_CAPABILITY', 'REASON11S_RESERVED'])

507

    ## ie-dot11s-configuration.h (module 'mesh'): ns3::dot11s::dot11sPathSelectionProtocol [enumeration]

509

    ## ie-dot11s-configuration.h (module 'mesh'): ns3::dot11s::dot11sPathSelectionProtocol [enumeration]

508

    module.add_enum('dot11sPathSelectionProtocol', ['PROTOCOL_HWMP'])

510

    module.add_enum('dot11sPathSelectionProtocol', ['PROTOCOL_HWMP'])

509

    ## ie-dot11s-configuration.h (module 'mesh'): ns3::dot11s::dot11sAuthenticationProtocol [enumeration]

510

    module.add_enum('dot11sAuthenticationProtocol', ['AUTH_NULL', 'AUTH_SAE'])

511

    ## ie-dot11s-preq.h (module 'mesh'): ns3::dot11s::DestinationAddressUnit [class]

511

    ## ie-dot11s-preq.h (module 'mesh'): ns3::dot11s::DestinationAddressUnit [class]

512

    module.add_class('DestinationAddressUnit', parent=root_module['ns3::SimpleRefCount< ns3::dot11s::DestinationAddressUnit, ns3::empty, ns3::DefaultDeleter<ns3::dot11s::DestinationAddressUnit> >'])

512

    module.add_class('DestinationAddressUnit', parent=root_module['ns3::SimpleRefCount< ns3::dot11s::DestinationAddressUnit, ns3::empty, ns3::DefaultDeleter<ns3::dot11s::DestinationAddressUnit> >'])

513

    ## ie-dot11s-configuration.h (module 'mesh'): ns3::dot11s::Dot11sMeshCapability [class]

513

    ## ie-dot11s-configuration.h (module 'mesh'): ns3::dot11s::Dot11sMeshCapability [class]

Lines 3615-3620	Link Here

3615

    return

3615

    return

3616

3617

def register_Ns3Int64x64_t_methods(root_module, cls):

3617

def register_Ns3Int64x64_t_methods(root_module, cls):

3618

    cls.add_binary_comparison_operator('<=')

3618

    cls.add_binary_comparison_operator('!=')

3619

    cls.add_binary_comparison_operator('!=')

3619

    cls.add_inplace_numeric_operator('+=', param('ns3::int64x64_t const &', 'right'))

3620

    cls.add_inplace_numeric_operator('+=', param('ns3::int64x64_t const &', 'right'))

3620

    cls.add_binary_numeric_operator('*', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('long long unsigned int const', 'right'))

3621

    cls.add_binary_numeric_operator('*', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('long long unsigned int const', 'right'))

Lines 3672-3678	Link Here

3672

    cls.add_inplace_numeric_operator('-=', param('ns3::int64x64_t const &', 'right'))

3673

    cls.add_inplace_numeric_operator('-=', param('ns3::int64x64_t const &', 'right'))

3673

    cls.add_inplace_numeric_operator('/=', param('ns3::int64x64_t const &', 'right'))

3674

    cls.add_inplace_numeric_operator('/=', param('ns3::int64x64_t const &', 'right'))

3674

    cls.add_output_stream_operator()

3675

    cls.add_output_stream_operator()

3675

    cls.add_binary_comparison_operator('<=')

3676

    cls.add_binary_comparison_operator('==')

3676

    cls.add_binary_comparison_operator('==')

3677

    cls.add_binary_comparison_operator('>=')

3677

    cls.add_binary_comparison_operator('>=')

3678

    ## int64x64-double.h (module 'core'): ns3::int64x64_t::int64x64_t() [constructor]

3678

    ## int64x64-double.h (module 'core'): ns3::int64x64_t::int64x64_t() [constructor]

Lines 4612-4617	Link Here

4612

    return

4612

    return

4613

4614

def register_Ns3Time_methods(root_module, cls):

4614

def register_Ns3Time_methods(root_module, cls):

4615

    cls.add_binary_comparison_operator('<=')

4615

    cls.add_binary_comparison_operator('!=')

4616

    cls.add_binary_comparison_operator('!=')

4616

    cls.add_inplace_numeric_operator('+=', param('ns3::Time const &', 'right'))

4617

    cls.add_inplace_numeric_operator('+=', param('ns3::Time const &', 'right'))

4617

    cls.add_binary_numeric_operator('+', root_module['ns3::Time'], root_module['ns3::Time'], param('ns3::Time const &', 'right'))

4618

    cls.add_binary_numeric_operator('+', root_module['ns3::Time'], root_module['ns3::Time'], param('ns3::Time const &', 'right'))

Lines 4620-4626	Link Here

4620

    cls.add_binary_comparison_operator('>')

4621

    cls.add_binary_comparison_operator('>')

4621

    cls.add_inplace_numeric_operator('-=', param('ns3::Time const &', 'right'))

4622

    cls.add_inplace_numeric_operator('-=', param('ns3::Time const &', 'right'))

4622

    cls.add_output_stream_operator()

4623

    cls.add_output_stream_operator()

4623

    cls.add_binary_comparison_operator('<=')

4624

    cls.add_binary_comparison_operator('==')

4624

    cls.add_binary_comparison_operator('==')

4625

    cls.add_binary_comparison_operator('>=')

4625

    cls.add_binary_comparison_operator('>=')

4626

    ## nstime.h (module 'core'): ns3::Time::Time() [constructor]

4626

    ## nstime.h (module 'core'): ns3::Time::Time() [constructor]

Lines 5239-5249	Link Here

5239

                   'bool',

5239

                   'bool',

5240

[],

5240

[],

5241

                   is_pure_virtual=True, is_const=True, is_virtual=True)

5241

                   is_pure_virtual=True, is_const=True, is_virtual=True)

5242

    ## wifi-mac.h (module 'wifi'): void ns3::WifiMac::ConfigureCCHDcf(ns3::Ptr<ns3::Dcf> dcf, uint32_t cwmin, uint32_t cwmax, ns3::AcIndex ac) [member function]

5243

    cls.add_method('ConfigureCCHDcf',

5244

                   'void',

5245

                   [param('ns3::Ptr< ns3::Dcf >', 'dcf'), param('uint32_t', 'cwmin'), param('uint32_t', 'cwmax'), param('ns3::AcIndex', 'ac')],

5246

                   visibility='protected')

5247

    ## wifi-mac.h (module 'wifi'): void ns3::WifiMac::ConfigureDcf(ns3::Ptr<ns3::Dcf> dcf, uint32_t cwmin, uint32_t cwmax, ns3::AcIndex ac) [member function]

5242

    ## wifi-mac.h (module 'wifi'): void ns3::WifiMac::ConfigureDcf(ns3::Ptr<ns3::Dcf> dcf, uint32_t cwmin, uint32_t cwmax, ns3::AcIndex ac) [member function]

5248

    cls.add_method('ConfigureDcf',

5243

    cls.add_method('ConfigureDcf',

5249

                   'void',

5244

                   'void',

Lines 11502-11509	Link Here

11502

def register_Ns3FlameFlameProtocolMac_methods(root_module, cls):

11497

def register_Ns3FlameFlameProtocolMac_methods(root_module, cls):

11503

    ## flame-protocol-mac.h (module 'mesh'): ns3::flame::FlameProtocolMac::FlameProtocolMac(ns3::flame::FlameProtocolMac const & arg0) [copy constructor]

11498

    ## flame-protocol-mac.h (module 'mesh'): ns3::flame::FlameProtocolMac::FlameProtocolMac(ns3::flame::FlameProtocolMac const & arg0) [copy constructor]

11504

    cls.add_constructor([param('ns3::flame::FlameProtocolMac const &', 'arg0')])

11499

    cls.add_constructor([param('ns3::flame::FlameProtocolMac const &', 'arg0')])

11505

    ## flame-protocol-mac.h (module 'mesh'): ns3::flame::FlameProtocolMac::FlameProtocolMac(uint32_t arg0, ns3::Ptr<ns3::flame::FlameProtocol> arg1) [constructor]

11500

    ## flame-protocol-mac.h (module 'mesh'): ns3::flame::FlameProtocolMac::FlameProtocolMac(ns3::Ptr<ns3::flame::FlameProtocol> arg0) [constructor]

11506

    cls.add_constructor([param('uint32_t', 'arg0'), param('ns3::Ptr< ns3::flame::FlameProtocol >', 'arg1')])

11501

    cls.add_constructor([param('ns3::Ptr< ns3::flame::FlameProtocol >', 'arg0')])

11507

    ## flame-protocol-mac.h (module 'mesh'): int64_t ns3::flame::FlameProtocolMac::AssignStreams(int64_t stream) [member function]

11502

    ## flame-protocol-mac.h (module 'mesh'): int64_t ns3::flame::FlameProtocolMac::AssignStreams(int64_t stream) [member function]

11508

    cls.add_method('AssignStreams',

11503

    cls.add_method('AssignStreams',

11509

                   'int64_t',

11504

                   'int64_t',




                      &AirtimeLinkMetricCalculator::SetHeaderTid),
                    MakeUintegerChecker<uint8_t> (0)
                    )
    .AddAttribute ( "Dot11sMeshHeaderLength",
                    "Length of the mesh header",
                    UintegerValue (6),
                    MakeUintegerAccessor (
                      &AirtimeLinkMetricCalculator::m_meshHeaderLength),
                    MakeUintegerChecker<uint16_t> (0)
                    )
  ;
  return tid;
}
AirtimeLinkMetricCalculator::AirtimeLinkMetricCalculator ()
  m_overheadNanosec (0)
{
}
void




  void SetTestLength (uint16_t testLength);
  void SetHeaderTid (uint8_t tid);
private:
  /// Overhead expressed in nanoseconds:DIFS + SIFS + 2 * PREAMBLE + ACK
  uint32_t m_overheadNanosec;
  /// Bt value
  uint32_t m_testLength;
  /// header length (used in overhead)
  uint16_t m_headerLength;
  /// meshHeader length (minimum 6 octets)
  uint16_t m_meshHeaderLength;
  Ptr<Packet> m_testFrame;
  WifiMacHeader m_testHeader;
};

(-)ns-3.18/src/mesh/model/flame/flame-protocol-mac.cc (-2 / +2 lines)

Lines 25-32	Link Here

namespace ns3 {

namespace ns3 {

namespace flame {

namespace flame {

NS_LOG_COMPONENT_DEFINE ("FlameProtocolMac");

NS_LOG_COMPONENT_DEFINE ("FlameProtocolMac");

FlameProtocolMac::FlameProtocolMac (uint32_t ifIndex, Ptr<FlameProtocol> protocol) :

FlameProtocolMac::FlameProtocolMac (Ptr<FlameProtocol> protocol) :

  m_protocol (protocol), m_ifIndex (ifIndex)

  m_protocol (protocol)

FlameProtocolMac::~FlameProtocolMac ()

FlameProtocolMac::~FlameProtocolMac ()

(-)ns-3.18/src/mesh/model/flame/flame-protocol-mac.h (-2 / +1 lines)

Lines 34-40	Link Here

class FlameProtocolMac : public MeshWifiInterfaceMacPlugin

class FlameProtocolMac : public MeshWifiInterfaceMacPlugin

public:

public:

  FlameProtocolMac (uint32_t, Ptr<FlameProtocol>);

  FlameProtocolMac (Ptr<FlameProtocol>);

  ~FlameProtocolMac ();

  ~FlameProtocolMac ();

  ///\name Inherited from MAC plugin

  ///\name Inherited from MAC plugin

  //\{

  //\{

Lines 56-62	Link Here

   * \{

   * \{

*/

*/

  Ptr<FlameProtocol> m_protocol;

  Ptr<FlameProtocol> m_protocol;

  uint32_t m_ifIndex;

  Ptr<MeshWifiInterfaceMac> m_parent;

  Ptr<MeshWifiInterfaceMac> m_parent;

  ///\}

  ///\}

  ///\name Statistics:

  ///\name Statistics:

(-)ns-3.18/src/mesh/model/flame/flame-protocol.cc (-1 / +1 lines)

Lines 305-311	Link Here

305

          return false;

305

          return false;

306

307

      // Installing plugins:

307

      // Installing plugins:

308

      Ptr<FlameProtocolMac> flameMac = Create<FlameProtocolMac> (wifiNetDev->GetIfIndex (), this);

308

      Ptr<FlameProtocolMac> flameMac = Create<FlameProtocolMac> (this);

309

      m_interfaces[wifiNetDev->GetIfIndex ()] = flameMac;

309

      m_interfaces[wifiNetDev->GetIfIndex ()] = flameMac;

310

      mac->SetBeaconGeneration (false);

310

      mac->SetBeaconGeneration (false);

311

      mac->InstallPlugin (flameMac);

311

      mac->InstallPlugin (flameMac);

(-)ns-3.18/src/mesh/test/flame/flame-test-suite.cc (-3 lines)

Lines 73-80	Link Here

  void TestExpire ();

  void TestExpire ();

  ///\}

  ///\}

private:

private:

  bool error;

  Mac48Address dst;

  Mac48Address dst;

  Mac48Address hop;

  Mac48Address hop;

  uint32_t iface;

  uint32_t iface;

Lines 88-94	Link Here

FlameRtableTest::FlameRtableTest () :

FlameRtableTest::FlameRtableTest () :

  TestCase ("FlameRtable"),

  TestCase ("FlameRtable"),

  error (false),

  dst ("01:00:00:01:00:01"),

  dst ("01:00:00:01:00:01"),

  hop ("01:00:00:01:00:03"),

  hop ("01:00:00:01:00:03"),

  iface (8010),

  iface (8010),




 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 *
 * Author: George Riley <riley@ece.gatech.edu>
 *
 * Some updates to this code were developed under a research contract
 * sponsored by the Army Research Laboratory. (April 30, 2013)
 */

#include "distributed-simulator-impl.h"

  m_pLBTS = new LbtsMessage[m_systemCount];
  m_grantedTime = Seconds (0);
#else
  NS_UNUSED (m_systemCount);
  NS_FATAL_ERROR ("Can't use distributed simulator without MPI compiled in");
#endif


(-)ns-3.18/src/mpi/model/distributed-simulator-impl.h (-3 lines)

Lines 14-22	Link Here

 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

 * Author: George Riley <riley@ece.gatech.edu>

 * Author: George Riley <riley@ece.gatech.edu>

 * Some updates to this code were developed under a research contract

 * sponsored by the Army Research Laboratory. (April 30, 2013)

*/

*/

#ifndef DISTRIBUTED_SIMULATOR_IMPL_H

#ifndef DISTRIBUTED_SIMULATOR_IMPL_H

(-)ns-3.18/src/mpi/model/mpi-receiver.cc (+6 lines)

Lines 46-49	Link Here

  m_rxCallback (p);

  m_rxCallback (p);

void

MpiReceiver::DoDispose(void)

  m_rxCallback = MakeNullCallback<void, Ptr<Packet> >();

} // namespace ns3

} // namespace ns3

(-)ns-3.18/src/mpi/model/mpi-receiver.h (+2 lines)

Lines 56-61	Link Here

*/

*/

  void SetReceiveCallback (Callback<void, Ptr<Packet> > callback);

  void SetReceiveCallback (Callback<void, Ptr<Packet> > callback);

private:

private:

  virtual void DoDispose (void);

  Callback<void, Ptr<Packet> > m_rxCallback;

  Callback<void, Ptr<Packet> > m_rxCallback;

};

};

(-)ns-3.18/src/netanim/examples/wireless-animation.cc (+1 lines)

Lines 157-162	Link Here

157

  AnimationInterface::SetNodeColor (wifiApNode, 0, 255, 0); // Optional

157

  AnimationInterface::SetNodeColor (wifiApNode, 0, 255, 0); // Optional

158

  AnimationInterface::SetNodeColor (wifiStaNodes, 255, 0, 0); // Optional

158

  AnimationInterface::SetNodeColor (wifiStaNodes, 255, 0, 0); // Optional

159

  AnimationInterface::SetNodeColor (csmaNodes, 0, 0, 255); // Optional

159

  AnimationInterface::SetNodeColor (csmaNodes, 0, 0, 255); // Optional

160

  AnimationInterface::SetBoundary (0, 0, 35, 35); // Optional

160

161

  AnimationInterface anim ("wireless-animation.xml"); // Mandatory

162

  AnimationInterface anim ("wireless-animation.xml"); // Mandatory

162

163

(-)ns-3.18/src/netanim/model/animation-interface.cc (+28 lines)

Lines 59-64	Link Here

std::map <uint32_t, std::string> AnimationInterface::nodeDescriptions;

std::map <uint32_t, std::string> AnimationInterface::nodeDescriptions;

std::map <uint32_t, Rgb> AnimationInterface::nodeColors;

std::map <uint32_t, Rgb> AnimationInterface::nodeColors;

std::map <P2pLinkNodeIdPair, LinkProperties, LinkPairCompare> AnimationInterface::linkProperties;

std::map <P2pLinkNodeIdPair, LinkProperties, LinkPairCompare> AnimationInterface::linkProperties;

Rectangle * AnimationInterface::userBoundary = 0;

AnimationInterface::AnimationInterface (const std::string fn, uint64_t maxPktsPerFile, bool usingXML)

AnimationInterface::AnimationInterface (const std::string fn, uint64_t maxPktsPerFile, bool usingXML)

Lines 78-83	Link Here

AnimationInterface::~AnimationInterface ()

AnimationInterface::~AnimationInterface ()

  if (userBoundary)

      delete userBoundary;

  StopAnimation ();

  StopAnimation ();

Lines 1701-1706	Link Here

1701

1706

1702

1707

1703

1708

1709

void AnimationInterface::SetBoundary (double minX, double minY, double maxX, double maxY)

1710

1711

  if (initialized)

1712

    NS_FATAL_ERROR ("SetBoundary must be used prior to creating the AnimationInterface object");

1713

  NS_ASSERT (minX < maxX);

1714

  NS_ASSERT (minY < maxY);

1715

  if (!userBoundary)

1716

1717

      userBoundary = new Rectangle;

1718

1719

  userBoundary->xMax = maxX;

1720

  userBoundary->yMax = maxY;

1721

  userBoundary->xMin = minX;

1722

  userBoundary->yMin = minY;

1723

1724

1704

void AnimationInterface::SetNodeColor (Ptr <Node> n, uint8_t r, uint8_t g, uint8_t b)

1725

void AnimationInterface::SetNodeColor (Ptr <Node> n, uint8_t r, uint8_t g, uint8_t b)

1705

1726

1706

  if (initialized)

1727

  if (initialized)

Lines 1855-1860	Link Here

1855

1876

1856

std::string AnimationInterface::GetXMLOpen_topology (double minX, double minY, double maxX, double maxY)

1877

std::string AnimationInterface::GetXMLOpen_topology (double minX, double minY, double maxX, double maxY)

1857

1878

1879

  if (userBoundary)

1880

1881

      minX = userBoundary->xMin;

1882

      minY = userBoundary->yMin;

1883

      maxX = userBoundary->xMax;

1884

      maxY = userBoundary->yMax;

1885

1858

  std::ostringstream oss;

1886

  std::ostringstream oss;

1859

  oss << "<topology minX = \"" << minX << "\" minY = \"" << minY

1887

  oss << "<topology minX = \"" << minX << "\" minY = \"" << minY

1860

      << "\" maxX = \"" << maxX << "\" maxY = \"" << maxY

1888

      << "\" maxX = \"" << maxX << "\" maxY = \"" << maxY




#include "ns3/lte-ue-net-device.h"
#include "ns3/lte-enb-net-device.h"
#include "ns3/uan-phy-gen.h"
#include "ns3/rectangle.h"

namespace ns3 {



struct LinkPairCompare
{
  bool operator () (P2pLinkNodeIdPair first, P2pLinkNodeIdPair second) const
    {
      //Check if they are the same node pairs but flipped
      if (  ((first.fromNode == second.fromNode) && (first.toNode == second.toNode)) ||

  static void SetConstantPosition (Ptr <Node> n, double x, double y, double z=0);

  /**
   * \brief Helper function to set the topology boundary rectangle
   * \param minX X value of the lower left corner
   * \param minY Y value of the lower left corner
   * \param maxX X value of the upper right corner
   * \param maxX Y value of the upper right corner
   *
   */
  static void SetBoundary (double minX, double minY, double maxX, double maxY);

  /**
   * \brief Helper function to set a brief description for a given node
   * \param n Ptr to the node
   * \param descr A string to briefly describe the node

  double m_topoMinY;
  double m_topoMaxX;
  double m_topoMaxY;
  static Rectangle * userBoundary;

  std::string GetPacketMetadata (Ptr<const Packet> p);





/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/*
 * Copyright (c) 2013 PIOTR JURKIEWICZ
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License version 2 as
 * published by the Free Software Foundation;
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 *
 * Author: Piotr Jurkiewicz <piotr.jerzy.jurkiewicz@gmail.com>
 */
/*
 * Note:  CRC tables such as below are found in many projects;
 * below is the oldest reference (and copyright) to original work 
 * of this nature that we could find.
 *
 * COPYRIGHT (C) 1986 Gary S. Brown.  You may use this program, or
 * code or tables extracted from it, as desired without restriction.
 */
#include <stdint.h>

namespace ns3 {

static uint32_t crc32table[256] = {
0x00000000,0x77073096,0xEE0E612C,0x990951BA,0x076DC419,0x706AF48F,0xE963A535,0x9E6495A3,
0x0EDB8832,0x79DCB8A4,0xE0D5E91E,0x97D2D988,0x09B64C2B,0x7EB17CBD,0xE7B82D07,0x90BF1D91,
0x1DB71064,0x6AB020F2,0xF3B97148,0x84BE41DE,0x1ADAD47D,0x6DDDE4EB,0xF4D4B551,0x83D385C7,
0x136C9856,0x646BA8C0,0xFD62F97A,0x8A65C9EC,0x14015C4F,0x63066CD9,0xFA0F3D63,0x8D080DF5,
0x3B6E20C8,0x4C69105E,0xD56041E4,0xA2677172,0x3C03E4D1,0x4B04D447,0xD20D85FD,0xA50AB56B,
0x35B5A8FA,0x42B2986C,0xDBBBC9D6,0xACBCF940,0x32D86CE3,0x45DF5C75,0xDCD60DCF,0xABD13D59,
0x26D930AC,0x51DE003A,0xC8D75180,0xBFD06116,0x21B4F4B5,0x56B3C423,0xCFBA9599,0xB8BDA50F,
0x2802B89E,0x5F058808,0xC60CD9B2,0xB10BE924,0x2F6F7C87,0x58684C11,0xC1611DAB,0xB6662D3D,
0x76DC4190,0x01DB7106,0x98D220BC,0xEFD5102A,0x71B18589,0x06B6B51F,0x9FBFE4A5,0xE8B8D433,
0x7807C9A2,0x0F00F934,0x9609A88E,0xE10E9818,0x7F6A0DBB,0x086D3D2D,0x91646C97,0xE6635C01,
0x6B6B51F4,0x1C6C6162,0x856530D8,0xF262004E,0x6C0695ED,0x1B01A57B,0x8208F4C1,0xF50FC457,
0x65B0D9C6,0x12B7E950,0x8BBEB8EA,0xFCB9887C,0x62DD1DDF,0x15DA2D49,0x8CD37CF3,0xFBD44C65,
0x4DB26158,0x3AB551CE,0xA3BC0074,0xD4BB30E2,0x4ADFA541,0x3DD895D7,0xA4D1C46D,0xD3D6F4FB,
0x4369E96A,0x346ED9FC,0xAD678846,0xDA60B8D0,0x44042D73,0x33031DE5,0xAA0A4C5F,0xDD0D7CC9,
0x5005713C,0x270241AA,0xBE0B1010,0xC90C2086,0x5768B525,0x206F85B3,0xB966D409,0xCE61E49F,
0x5EDEF90E,0x29D9C998,0xB0D09822,0xC7D7A8B4,0x59B33D17,0x2EB40D81,0xB7BD5C3B,0xC0BA6CAD,
0xEDB88320,0x9ABFB3B6,0x03B6E20C,0x74B1D29A,0xEAD54739,0x9DD277AF,0x04DB2615,0x73DC1683,
0xE3630B12,0x94643B84,0x0D6D6A3E,0x7A6A5AA8,0xE40ECF0B,0x9309FF9D,0x0A00AE27,0x7D079EB1,
0xF00F9344,0x8708A3D2,0x1E01F268,0x6906C2FE,0xF762575D,0x806567CB,0x196C3671,0x6E6B06E7,
0xFED41B76,0x89D32BE0,0x10DA7A5A,0x67DD4ACC,0xF9B9DF6F,0x8EBEEFF9,0x17B7BE43,0x60B08ED5,
0xD6D6A3E8,0xA1D1937E,0x38D8C2C4,0x4FDFF252,0xD1BB67F1,0xA6BC5767,0x3FB506DD,0x48B2364B,
0xD80D2BDA,0xAF0A1B4C,0x36034AF6,0x41047A60,0xDF60EFC3,0xA867DF55,0x316E8EEF,0x4669BE79,
0xCB61B38C,0xBC66831A,0x256FD2A0,0x5268E236,0xCC0C7795,0xBB0B4703,0x220216B9,0x5505262F,
0xC5BA3BBE,0xB2BD0B28,0x2BB45A92,0x5CB36A04,0xC2D7FFA7,0xB5D0CF31,0x2CD99E8B,0x5BDEAE1D,
0x9B64C2B0,0xEC63F226,0x756AA39C,0x026D930A,0x9C0906A9,0xEB0E363F,0x72076785,0x05005713,
0x95BF4A82,0xE2B87A14,0x7BB12BAE,0x0CB61B38,0x92D28E9B,0xE5D5BE0D,0x7CDCEFB7,0x0BDBDF21,
0x86D3D2D4,0xF1D4E242,0x68DDB3F8,0x1FDA836E,0x81BE16CD,0xF6B9265B,0x6FB077E1,0x18B74777,
0x88085AE6,0xFF0F6A70,0x66063BCA,0x11010B5C,0x8F659EFF,0xF862AE69,0x616BFFD3,0x166CCF45,
0xA00AE278,0xD70DD2EE,0x4E048354,0x3903B3C2,0xA7672661,0xD06016F7,0x4969474D,0x3E6E77DB,
0xAED16A4A,0xD9D65ADC,0x40DF0B66,0x37D83BF0,0xA9BCAE53,0xDEBB9EC5,0x47B2CF7F,0x30B5FFE9,
0xBDBDF21C,0xCABAC28A,0x53B39330,0x24B4A3A6,0xBAD03605,0xCDD70693,0x54DE5729,0x23D967BF,
0xB3667A2E,0xC4614AB8,0x5D681B02,0x2A6F2B94,0xB40BBE37,0xC30C8EA1,0x5A05DF1B,0x2D02EF8D 
};

uint32_t
CRC32Calculate (const uint8_t *data, int length)
{
  uint32_t crc = 0xffffffff;

  while (length--)
    {
      crc = (crc >> 8) ^ crc32table[(crc & 0xFF) ^ *data++];
    }
  return ~crc;
}

} // namespace ns3





/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/*
 * Copyright (c) 2013 PIOTR JURKIEWICZ
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License version 2 as
 * published by the Free Software Foundation;
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 *
 * Author: Piotr Jurkiewicz <piotr.jerzy.jurkiewicz@gmail.com>
 */
#ifndef CRC32_H
#define CRC32_H
#include <stdint.h>

namespace ns3 {

/**
 * \param data buffer to calculate the checksum for
 * \param length the length of the buffer (bytes)
 * \returns the computed crc.
 *
 */
uint32_t CRC32Calculate (const uint8_t *data, int length);

} // namespace ns3

#endif




#include "ns3/log.h"
#include "ns3/trailer.h"
#include "ethernet-trailer.h"
#include "crc32.h"

NS_LOG_COMPONENT_DEFINE ("EthernetTrailer");



  buffer = new uint8_t[len];
  p->CopyData (buffer, len);
  crc = CRC32Calculate (buffer, len);
  delete[] buffer;
  return (m_fcs == crc);
}


  buffer = new uint8_t[len];
  p->CopyData (buffer, len);
  m_fcs = CRC32Calculate (buffer, len);
  delete[] buffer;
}


  return size;
}

// This code is copied from /lib/crc32.c in the linux kernel.
// It assumes little endian ordering.
uint32_t
EthernetTrailer::DoCalcFcs (uint8_t const *buffer, size_t len) const
{
  NS_LOG_FUNCTION (this << &buffer << len);
  uint32_t crc = 0xffffffff;
  int i;

  while (len--)
    {
      crc ^= *buffer++;
      for (i = 0; i < 8; i++)
        {
          crc = (crc >> 1) ^ ((crc & 1) ? 0xedb88320 : 0);
        }
    }
  return ~crc;
}

} // namespace ns3

(-)ns-3.18/src/network/utils/ethernet-trailer.h (-2 lines)

Lines 104-111	Link Here

104

  bool m_calcFcs;

104

  bool m_calcFcs;

105

  uint32_t m_fcs; /// Value of the fcs contained in the trailer

105

  uint32_t m_fcs; /// Value of the fcs contained in the trailer

106

107

  uint32_t DoCalcFcs (uint8_t const *buffer, size_t len) const;

108

109

};

107

};

110

108

111

} // namespace ns3

109

} // namespace ns3

(-)ns-3.18/src/network/wscript (+2 lines)

Lines 25-30	Link Here

        'model/trailer.cc',

        'model/trailer.cc',

        'utils/address-utils.cc',

        'utils/address-utils.cc',

        'utils/ascii-file.cc',

        'utils/ascii-file.cc',

        'utils/crc32.cc',

        'utils/data-rate.cc',

        'utils/data-rate.cc',

        'utils/drop-tail-queue.cc',

        'utils/drop-tail-queue.cc',

        'utils/error-model.cc',

        'utils/error-model.cc',

Lines 102-107	Link Here

102

        'utils/address-utils.h',

103

        'utils/address-utils.h',

103

        'utils/ascii-file.h',

104

        'utils/ascii-file.h',

104

        'utils/ascii-test.h',

105

        'utils/ascii-test.h',

106

        'utils/crc32.h',

105

        'utils/data-rate.h',

107

        'utils/data-rate.h',

106

        'utils/drop-tail-queue.h',

108

        'utils/drop-tail-queue.h',

107

        'utils/error-model.h',

109

        'utils/error-model.h',

(-)ns-3.18/src/uan/examples/uan-rc-example.cc (-3 / +1 lines)

Lines 174-180	Link Here

174

              "NumberOfRates", UintegerValue (m_numRates),

174

              "NumberOfRates", UintegerValue (m_numRates),

175

              "NumberOfNodes", UintegerValue (nNodes),

175

              "NumberOfNodes", UintegerValue (nNodes),

176

              "MaxReservations", UintegerValue (a),

176

              "MaxReservations", UintegerValue (a),

177

              "RetryRate", DoubleValue (1/30.0),

178

              "SIFS", TimeValue (m_sifs),

177

              "SIFS", TimeValue (m_sifs),

179

              "MaxPropDelay", TimeValue (pDelay),

178

              "MaxPropDelay", TimeValue (pDelay),

180

              "FrameSize", UintegerValue (m_pktSize));

179

              "FrameSize", UintegerValue (m_pktSize));

Lines 186-193	Link Here

186

185

187

  uan.SetMac ("ns3::UanMacRc",

186

  uan.SetMac ("ns3::UanMacRc",

188

              "NumberOfRates", UintegerValue (m_numRates),

187

              "NumberOfRates", UintegerValue (m_numRates),

189

              "MaxPropDelay", TimeValue (pDelay),

188

              "MaxPropDelay", TimeValue (pDelay));

190

              "RetryRate", DoubleValue (1.0/100.0));

191

  NodeContainer nodes;

189

  NodeContainer nodes;

192

  nodes.Create (nNodes);

190

  nodes.Create (nNodes);

193

  NetDeviceContainer devices = uan.Install (nodes, chan);

191

  NetDeviceContainer devices = uan.Install (nodes, chan);




                   UintegerValue (1023),
                   MakeUintegerAccessor (&UanMacRcGw::m_numRates),
                   MakeUintegerChecker<uint32_t> ())
    .AddAttribute ("RetryRate",
                   "Number of retry rates per second at non-gateway nodes",
                   DoubleValue (1 / 10.0),
                   MakeDoubleAccessor (&UanMacRcGw::m_retryRate),
                   MakeDoubleChecker<double> ())
    .AddAttribute ("MaxPropDelay",
                   "Maximum propagation delay between gateway and non-gateway nodes",
                   TimeValue (Seconds (2)),

                   DoubleValue (0.01),
                   MakeDoubleAccessor (&UanMacRcGw::m_retryStep),
                   MakeDoubleChecker<double> ())
    .AddAttribute ("NumberOfRetryRates",
                   "Number of retry rates",
                   UintegerValue (100),
                   MakeUintegerAccessor (&UanMacRcGw::m_numRetryRates),
                   MakeUintegerChecker<uint16_t> ())
    .AddAttribute ("TotalRate",
                   "Total available channel rate in bps (for a single channel, without splitting reservation channel)",
                   UintegerValue (4096),

(-)ns-3.18/src/uan/model/uan-mac-rc-gw.h (-2 lines)

Lines 116-122	Link Here

116

  uint32_t m_ctsSizeN;

116

  uint32_t m_ctsSizeN;

117

  uint32_t m_ctsSizeG;

117

  uint32_t m_ctsSizeG;

118

  uint32_t m_ackSize;

118

  uint32_t m_ackSize;

119

  double m_retryRate;

120

  uint16_t m_currentRetryRate;

119

  uint16_t m_currentRetryRate;

121

  uint32_t m_currentRateNum;

120

  uint32_t m_currentRateNum;

122

  uint32_t m_numNodes;

121

  uint32_t m_numNodes;

Lines 124-130	Link Here

124

  uint32_t m_rateStep;

123

  uint32_t m_rateStep;

125

  uint32_t m_frameSize;

124

  uint32_t m_frameSize;

126

125

127

  uint16_t m_numRetryRates;

128

  double m_minRetryRate;

126

  double m_minRetryRate;

129

  double m_retryStep;

127

  double m_retryStep;

130

128

(-)ns-3.18/src/uan/model/uan-mac-rc.cc (-5 lines)

Lines 244-254	Link Here

244

                   DoubleValue (0.01),

244

                   DoubleValue (0.01),

245

                   MakeDoubleAccessor (&UanMacRc::m_retryStep),

245

                   MakeDoubleAccessor (&UanMacRc::m_retryStep),

246

                   MakeDoubleChecker<double> ())

246

                   MakeDoubleChecker<double> ())

247

    .AddAttribute ("NumberOfRetryRates",

248

                   "Number of retry rates",

249

                   UintegerValue (100),

250

                   MakeUintegerAccessor (&UanMacRc::m_numRetryRates),

251

                   MakeUintegerChecker<uint16_t> ())

252

    .AddAttribute ("MaxPropDelay",

247

    .AddAttribute ("MaxPropDelay",

253

                   "Maximum possible propagation delay to gateway",

248

                   "Maximum possible propagation delay to gateway",

254

                   TimeValue (Seconds (2)),

249

                   TimeValue (Seconds (2)),

(-)ns-3.18/src/uan/model/uan-mac-rc.h (-1 lines)

Lines 185-191	Link Here

185

  Time m_sifs;

185

  Time m_sifs;

186

  Time m_learnedProp;

186

  Time m_learnedProp;

187

188

  uint16_t m_numRetryRates;

189

  double m_minRetryRate;

188

  double m_minRetryRate;

190

  double m_retryStep;

189

  double m_retryStep;

191

190




    ## wifi-mode.h (module 'wifi'): ns3::WifiModulationClass [enumeration]
    module.add_enum('WifiModulationClass', ['WIFI_MOD_CLASS_UNKNOWN', 'WIFI_MOD_CLASS_IR', 'WIFI_MOD_CLASS_FHSS', 'WIFI_MOD_CLASS_DSSS', 'WIFI_MOD_CLASS_ERP_PBCC', 'WIFI_MOD_CLASS_DSSS_OFDM', 'WIFI_MOD_CLASS_ERP_OFDM', 'WIFI_MOD_CLASS_OFDM', 'WIFI_MOD_CLASS_HT'])
    ## wifi-phy-standard.h (module 'wifi'): ns3::WifiPhyStandard [enumeration]
    module.add_enum('WifiPhyStandard', ['WIFI_PHY_STANDARD_80211a', 'WIFI_PHY_STANDARD_80211b', 'WIFI_PHY_STANDARD_80211g', 'WIFI_PHY_STANDARD_80211_10MHZ', 'WIFI_PHY_STANDARD_80211_5MHZ', 'WIFI_PHY_STANDARD_holland', 'WIFI_PHY_STANDARD_80211n_2_4GHZ', 'WIFI_PHY_STANDARD_80211n_5GHZ'])
    ## qos-tag.h (module 'wifi'): ns3::UserPriority [enumeration]
    module.add_enum('UserPriority', ['UP_BK', 'UP_BE', 'UP_EE', 'UP_CL', 'UP_VI', 'UP_VO', 'UP_NC'])
    ## wifi-mode.h (module 'wifi'): ns3::WifiCodeRate [enumeration]

                   'bool', 
                   [], 
                   is_pure_virtual=True, is_const=True, is_virtual=True)
    ## wifi-mac.h (module 'wifi'): void ns3::WifiMac::ConfigureCCHDcf(ns3::Ptr<ns3::Dcf> dcf, uint32_t cwmin, uint32_t cwmax, ns3::AcIndex ac) [member function]
    cls.add_method('ConfigureCCHDcf', 
                   'void', 
                   [param('ns3::Ptr< ns3::Dcf >', 'dcf'), param('uint32_t', 'cwmin'), param('uint32_t', 'cwmax'), param('ns3::AcIndex', 'ac')], 
                   visibility='protected')
    ## wifi-mac.h (module 'wifi'): void ns3::WifiMac::ConfigureDcf(ns3::Ptr<ns3::Dcf> dcf, uint32_t cwmin, uint32_t cwmax, ns3::AcIndex ac) [member function]
    cls.add_method('ConfigureDcf', 
                   'void', 




    ## wifi-mode.h (module 'wifi'): ns3::WifiModulationClass [enumeration]
    module.add_enum('WifiModulationClass', ['WIFI_MOD_CLASS_UNKNOWN', 'WIFI_MOD_CLASS_IR', 'WIFI_MOD_CLASS_FHSS', 'WIFI_MOD_CLASS_DSSS', 'WIFI_MOD_CLASS_ERP_PBCC', 'WIFI_MOD_CLASS_DSSS_OFDM', 'WIFI_MOD_CLASS_ERP_OFDM', 'WIFI_MOD_CLASS_OFDM', 'WIFI_MOD_CLASS_HT'])
    ## wifi-phy-standard.h (module 'wifi'): ns3::WifiPhyStandard [enumeration]
    module.add_enum('WifiPhyStandard', ['WIFI_PHY_STANDARD_80211a', 'WIFI_PHY_STANDARD_80211b', 'WIFI_PHY_STANDARD_80211g', 'WIFI_PHY_STANDARD_80211_10MHZ', 'WIFI_PHY_STANDARD_80211_5MHZ', 'WIFI_PHY_STANDARD_holland', 'WIFI_PHY_STANDARD_80211n_2_4GHZ', 'WIFI_PHY_STANDARD_80211n_5GHZ'])
    ## qos-tag.h (module 'wifi'): ns3::UserPriority [enumeration]
    module.add_enum('UserPriority', ['UP_BK', 'UP_BE', 'UP_EE', 'UP_CL', 'UP_VI', 'UP_VO', 'UP_NC'])
    ## wifi-mode.h (module 'wifi'): ns3::WifiCodeRate [enumeration]

                   'bool', 
                   [], 
                   is_pure_virtual=True, is_const=True, is_virtual=True)
    ## wifi-mac.h (module 'wifi'): void ns3::WifiMac::ConfigureCCHDcf(ns3::Ptr<ns3::Dcf> dcf, uint32_t cwmin, uint32_t cwmax, ns3::AcIndex ac) [member function]
    cls.add_method('ConfigureCCHDcf', 
                   'void', 
                   [param('ns3::Ptr< ns3::Dcf >', 'dcf'), param('uint32_t', 'cwmin'), param('uint32_t', 'cwmax'), param('ns3::AcIndex', 'ac')], 
                   visibility='protected')
    ## wifi-mac.h (module 'wifi'): void ns3::WifiMac::ConfigureDcf(ns3::Ptr<ns3::Dcf> dcf, uint32_t cwmin, uint32_t cwmax, ns3::AcIndex ac) [member function]
    cls.add_method('ConfigureDcf', 
                   'void', 

(-)ns-3.18/src/wifi/helper/wifi-helper.cc (+8 lines)

Lines 26-31	Link Here

#include "ns3/dca-txop.h"

#include "ns3/dca-txop.h"

#include "ns3/edca-txop-n.h"

#include "ns3/edca-txop-n.h"

#include "ns3/minstrel-wifi-manager.h"

#include "ns3/minstrel-wifi-manager.h"

#include "ns3/ap-wifi-mac.h"

#include "ns3/wifi-phy.h"

#include "ns3/wifi-phy.h"

#include "ns3/wifi-remote-station-manager.h"

#include "ns3/wifi-remote-station-manager.h"

#include "ns3/wifi-channel.h"

#include "ns3/wifi-channel.h"

Lines 215-220	Link Here

215

              rmac->GetAttribute ("BK_EdcaTxopN", ptr);

216

              rmac->GetAttribute ("BK_EdcaTxopN", ptr);

216

              Ptr<EdcaTxopN> bk_edcaTxopN = ptr.Get<EdcaTxopN> ();

217

              Ptr<EdcaTxopN> bk_edcaTxopN = ptr.Get<EdcaTxopN> ();

217

              currentStream += bk_edcaTxopN->AssignStreams (currentStream);

218

              currentStream += bk_edcaTxopN->AssignStreams (currentStream);

219

220

              // if an AP, handle any beacon jitter

221

              Ptr<ApWifiMac> apmac = DynamicCast<ApWifiMac> (rmac);

222

              if (apmac)

223

224

                  currentStream += apmac->AssignStreams (currentStream);

225

218

226

219

227

220

228

(-)ns-3.18/src/wifi/model/aarfcd-wifi-manager.h (-1 lines)

Lines 77-83	Link Here

  // aarf-cd fields below

  // aarf-cd fields below

  uint32_t m_minRtsWnd;

  uint32_t m_minRtsWnd;

  uint32_t m_maxRtsWnd;

  uint32_t m_maxRtsWnd;

  bool m_rtsFailsAsDataFails;

  bool m_turnOffRtsAfterRateDecrease;

  bool m_turnOffRtsAfterRateDecrease;

  bool m_turnOnRtsAfterRateIncrease;

  bool m_turnOnRtsAfterRateIncrease;

};

};

(-)ns-3.18/src/wifi/model/ap-wifi-mac.cc (-1 / +27 lines)

Lines 55-60	Link Here

                   MakeTimeAccessor (&ApWifiMac::GetBeaconInterval,

                   MakeTimeAccessor (&ApWifiMac::GetBeaconInterval,

                                     &ApWifiMac::SetBeaconInterval),

                                     &ApWifiMac::SetBeaconInterval),

                   MakeTimeChecker ())

                   MakeTimeChecker ())

    .AddAttribute ("BeaconJitter", "A uniform random variable to cause the initial beacon starting time (after simulation time 0) to be distributed between 0 and the BeaconInterval.",

                   StringValue ("ns3::UniformRandomVariable"),

                   MakePointerAccessor (&ApWifiMac::m_beaconJitter),

                   MakePointerChecker<UniformRandomVariable> ())

    .AddAttribute ("EnableBeaconJitter", "If beacons are enabled, whether to jitter the initial send event.",

                   BooleanValue (false),

                   MakeBooleanAccessor (&ApWifiMac::m_enableBeaconJitter),

                   MakeBooleanChecker ())

    .AddAttribute ("BeaconGeneration", "Whether or not beacons are generated.",

    .AddAttribute ("BeaconGeneration", "Whether or not beacons are generated.",

                   BooleanValue (true),

                   BooleanValue (true),

                   MakeBooleanAccessor (&ApWifiMac::SetBeaconGeneration,

                   MakeBooleanAccessor (&ApWifiMac::SetBeaconGeneration,

Lines 172-177	Link Here

172

  SendOneBeacon ();

180

  SendOneBeacon ();

173

181

174

182

183

int64_t

184

ApWifiMac::AssignStreams (int64_t stream)

185

186

  NS_LOG_FUNCTION (this << stream);

187

  m_beaconJitter->SetStream (stream);

188

  return 1;

189

190

175

void

191

void

176

ApWifiMac::ForwardDown (Ptr<const Packet> packet, Mac48Address from,

192

ApWifiMac::ForwardDown (Ptr<const Packet> packet, Mac48Address from,

177

                        Mac48Address to)

193

                        Mac48Address to)

Lines 648-654	Link Here

648

  m_beaconEvent.Cancel ();

664

  m_beaconEvent.Cancel ();

649

  if (m_enableBeaconGeneration)

665

  if (m_enableBeaconGeneration)

650

666

651

      m_beaconEvent = Simulator::ScheduleNow (&ApWifiMac::SendOneBeacon, this);

667

      if (m_enableBeaconJitter)

668

669

          int64_t jitter = m_beaconJitter->GetValue (0, m_beaconInterval.GetMicroSeconds ());

670

          NS_LOG_DEBUG ("Scheduling initial beacon for access point " << GetAddress() << " at time " << jitter << " microseconds");

671

          m_beaconEvent = Simulator::Schedule (MicroSeconds (jitter), &ApWifiMac::SendOneBeacon, this);

672

673

      else

674

675

          NS_LOG_DEBUG ("Scheduling initial beacon for access point " << GetAddress() << " at time 0");

676

          m_beaconEvent = Simulator::ScheduleNow (&ApWifiMac::SendOneBeacon, this);

677

652

678

653

  RegularWifiMac::DoInitialize ();

679

  RegularWifiMac::DoInitialize ();

654

680

(-)ns-3.18/src/wifi/model/ap-wifi-mac.h (+13 lines)

Lines 26-31	Link Here

#include "ht-capabilities.h"

#include "ht-capabilities.h"

#include "amsdu-subframe-header.h"

#include "amsdu-subframe-header.h"

#include "supported-rates.h"

#include "supported-rates.h"

#include "ns3/random-variable-stream.h"

namespace ns3 {

namespace ns3 {

Lines 95-100	Link Here

*/

*/

  void StartBeaconing (void);

  void StartBeaconing (void);

/**

100

  * Assign a fixed random variable stream number to the random variables

101

  * used by this model.  Return the number of streams (possibly zero) that

102

  * have been assigned.

103

104

  * \param stream first stream index to use

105

  * \return the number of stream indices assigned by this model

106

*/

107

  int64_t AssignStreams (int64_t stream);

108

private:

109

private:

  virtual void Receive (Ptr<Packet> packet, const WifiMacHeader *hdr);

110

  virtual void Receive (Ptr<Packet> packet, const WifiMacHeader *hdr);

100

  virtual void TxOk (const WifiMacHeader &hdr);

111

  virtual void TxOk (const WifiMacHeader &hdr);

Lines 128-133	Link Here

128

  Time m_beaconInterval;

139

  Time m_beaconInterval;

129

  bool m_enableBeaconGeneration;

140

  bool m_enableBeaconGeneration;

130

  EventId m_beaconEvent;

141

  EventId m_beaconEvent;

142

  Ptr<UniformRandomVariable> m_beaconJitter;

143

  bool m_enableBeaconJitter;

131

};

144

};

132

145

133

} // namespace ns3

146

} // namespace ns3

(-)ns-3.18/src/wifi/model/dcf-manager.cc (-1 / +9 lines)

Lines 287-292	Link Here

287

DcfManager::SetupPhyListener (Ptr<WifiPhy> phy)

287

DcfManager::SetupPhyListener (Ptr<WifiPhy> phy)

288

289

  NS_LOG_FUNCTION (this << phy);

289

  NS_LOG_FUNCTION (this << phy);

290

  if (m_phyListener != 0)

291

292

      delete m_phyListener;

293

290

  m_phyListener = new PhyListener (this);

294

  m_phyListener = new PhyListener (this);

291

  phy->RegisterListener (m_phyListener);

295

  phy->RegisterListener (m_phyListener);

292

296

Lines 294-299	Link Here

294

DcfManager::SetupLowListener (Ptr<MacLow> low)

298

DcfManager::SetupLowListener (Ptr<MacLow> low)

295

299

296

  NS_LOG_FUNCTION (this << low);

300

  NS_LOG_FUNCTION (this << low);

301

  if (m_lowListener != 0)

302

303

      delete m_lowListener;

304

297

  m_lowListener = new LowDcfListener (this);

305

  m_lowListener = new LowDcfListener (this);

298

  low->RegisterDcfListener (m_lowListener);

306

  low->RegisterDcfListener (m_lowListener);

299

307

Lines 748-754	Link Here

748

DcfManager::NotifyNavStartNow (Time duration)

756

DcfManager::NotifyNavStartNow (Time duration)

749

757

750

  NS_LOG_FUNCTION (this << duration);

758

  NS_LOG_FUNCTION (this << duration);

751

  NS_ASSERT (m_lastNavStart < Simulator::Now ());

759

  NS_ASSERT (m_lastNavStart <= Simulator::Now ());

752

  MY_DEBUG ("nav start for=" << duration);

760

  MY_DEBUG ("nav start for=" << duration);

753

  UpdateBackoff ();

761

  UpdateBackoff ();

754

  Time newNavEnd = Simulator::Now () + duration;

762

  Time newNavEnd = Simulator::Now () + duration;

(-)ns-3.18/src/wifi/model/dcf-manager.h (-1 lines)

Lines 324-330	Link Here

324

  Time m_lastSwitchingStart;

324

  Time m_lastSwitchingStart;

325

  Time m_lastSwitchingDuration;

325

  Time m_lastSwitchingDuration;

326

  bool m_rxing;

326

  bool m_rxing;

327

  bool m_sleeping;

328

  Time m_eifsNoDifs;

327

  Time m_eifsNoDifs;

329

  EventId m_accessTimeout;

328

  EventId m_accessTimeout;

330

  uint32_t m_slotTimeUs;

329

  uint32_t m_slotTimeUs;

(-)ns-3.18/src/wifi/model/ideal-wifi-manager.h (-2 lines)

Lines 77-84	Link Here

  double m_ber;

  double m_ber;

  Thresholds m_thresholds;

  Thresholds m_thresholds;

  double m_minSnr;

  double m_maxSnr;

};

};

} // namespace ns3

} // namespace ns3




{
  WifiPreamble preamble;
  Time txTime = Seconds (0);
  WifiTxVector rtsTxVector = GetRtsTxVector (packet, hdr);
  WifiTxVector dataTxVector = GetDataTxVector (packet, hdr);
   //standard says RTS packets can have GF format sec 9.6.0e.1 page 110 bullet b 2
  if ( m_phy->GetGreenfield()&& m_stationManager->GetGreenfieldSupported (m_currentHdr.GetAddr1 ()))
    preamble= WIFI_PREAMBLE_HT_GF;
  else if (rtsTxVector.GetMode().GetModulationClass () == WIFI_MOD_CLASS_HT)
    preamble= WIFI_PREAMBLE_HT_MF;
  else
    preamble=WIFI_PREAMBLE_LONG;
  if (params.MustSendRts ())
    {
      WifiTxVector rtsTxVector = GetRtsTxVector (packet, hdr);
      //standard says RTS packets can have GF format sec 9.6.0e.1 page 110 bullet b 2
      if (m_phy->GetGreenfield () && m_stationManager->GetGreenfieldSupported (m_currentHdr.GetAddr1 ()))
        {
          preamble = WIFI_PREAMBLE_HT_GF;
        }
      else if (rtsTxVector.GetMode ().GetModulationClass () == WIFI_MOD_CLASS_HT)
        {
          preamble = WIFI_PREAMBLE_HT_MF;
        }
      else
        {
          preamble = WIFI_PREAMBLE_LONG;
        }
      txTime += m_phy->CalculateTxDuration (GetRtsSize (), rtsTxVector, preamble);
      txTime += GetCtsDuration (hdr->GetAddr1 (), rtsTxVector);
      txTime += Time (GetSifs () * 2);
    }
  WifiTxVector dataTxVector = GetDataTxVector (packet, hdr);
  //standard says RTS packets can have GF format sec 9.6.0e.1 page 110 bullet b 2
  if ( m_phy->GetGreenfield()&& m_stationManager->GetGreenfieldSupported (m_currentHdr.GetAddr1 ()))
    preamble= WIFI_PREAMBLE_HT_GF;

void
MacLow::NavCounterResetCtsMissed (Time rtsEndRxTime)
{
  if (m_phy->GetLastRxStartTime () < rtsEndRxTime)
    {
      DoNavResetNow (Seconds (0.0));
    }




  uint32_t GetRtsSize (void) const;
  uint32_t GetCtsSize (void) const;
  uint32_t GetSize (Ptr<const Packet> packet, const WifiMacHeader *hdr) const;
  void ForwardDown (Ptr<const Packet> packet, const WifiMacHeader *hdr,
void ForwardDown (Ptr<const Packet> packet, const WifiMacHeader *hdr,
                    WifiTxVector txVector, WifiPreamble preamble);
  WifiTxVector GetRtsTxVector (Ptr<const Packet> packet, const WifiMacHeader *hdr) const;
  WifiTxVector GetDataTxVector (Ptr<const Packet> packet, const WifiMacHeader *hdr) const;

  void NotifyAckTimeoutResetNow ();
  void NotifyCtsTimeoutStartNow (Time duration);
  void NotifyCtsTimeoutResetNow ();
  void MaybeCancelPrevious (void);

  void NavCounterResetCtsMissed (Time rtsEndRxTime);
  void NormalAckTimeout (void);


  void SendRtsForPacket (void);
  void SendDataPacket (void);
  void SendCurrentTxPacket (void);
  void StartDataTxTimers (WifiTxVector dataTxVector);
  virtual void DoDispose (void);
  /**

(-)ns-3.18/src/wifi/model/minstrel-wifi-manager.cc (-5 lines)

Lines 101-111	Link Here

101

                   DoubleValue (75),

101

                   DoubleValue (75),

102

                   MakeDoubleAccessor (&MinstrelWifiManager::m_ewmaLevel),

102

                   MakeDoubleAccessor (&MinstrelWifiManager::m_ewmaLevel),

103

                   MakeDoubleChecker<double> ())

103

                   MakeDoubleChecker<double> ())

104

    .AddAttribute ("SegmentSize",

105

                   "The largest allowable segment size packet",

106

                   DoubleValue (6000),

107

                   MakeDoubleAccessor (&MinstrelWifiManager::m_segmentSize),

108

                   MakeDoubleChecker <double> ())

109

    .AddAttribute ("SampleColumn",

104

    .AddAttribute ("SampleColumn",

110

                   "The number of columns used for sampling",

105

                   "The number of columns used for sampling",

111

                   DoubleValue (10),

106

                   DoubleValue (10),

(-)ns-3.18/src/wifi/model/minstrel-wifi-manager.h (-1 lines)

Lines 161-167	Link Here

161

  Time m_updateStats;  ///< how frequent do we calculate the stats(1/10 seconds)

161

  Time m_updateStats;  ///< how frequent do we calculate the stats(1/10 seconds)

162

  double m_lookAroundRate;  ///< the % to try other rates than our current rate

162

  double m_lookAroundRate;  ///< the % to try other rates than our current rate

163

  double m_ewmaLevel;  ///< exponential weighted moving average

163

  double m_ewmaLevel;  ///< exponential weighted moving average

164

  uint32_t m_segmentSize;  ///< largest allowable segment size

165

  uint32_t m_sampleCol;  ///< number of sample columns

164

  uint32_t m_sampleCol;  ///< number of sample columns

166

  uint32_t m_pktLen;  ///< packet length used  for calculate mode TxTime

165

  uint32_t m_pktLen;  ///< packet length used  for calculate mode TxTime

167

  uint32_t m_nsupported;  ///< modes supported

166

  uint32_t m_nsupported;  ///< modes supported




{
  NS_LOG_FUNCTION (this);
  delete m_rxMiddle;
  m_rxMiddle = 0;

  delete m_txMiddle;
  m_txMiddle = 0;

  delete m_dcfManager;
  m_dcfManager = 0;

  m_low->Dispose ();
  m_low = 0;

  m_phy = 0;
  m_stationManager = 0;

  m_dca->Dispose ();
  m_dca = 0;

  for (EdcaQueues::iterator i = m_edca.begin (); i != m_edca.end (); ++i)
    {
      i->second = 0;
    }
}



  switch (standard)
    {
    case WIFI_PHY_STANDARD_80211p_CCH:
    case WIFI_PHY_STANDARD_80211p_SCH:
      cwmin = 15;
      cwmax = 511;
      break;

    case WIFI_PHY_STANDARD_holland:
    case WIFI_PHY_STANDARD_80211a:
    case WIFI_PHY_STANDARD_80211g:

  // Now we configure the EDCA functions
  for (EdcaQueues::iterator i = m_edca.begin (); i != m_edca.end (); ++i)
    {
      ConfigureDcf (i->second, cwmin, cwmax, i->first);
      if (standard == WIFI_PHY_STANDARD_80211p_CCH)
        {
          ConfigureCCHDcf (i->second, cwmin, cwmax, i->first);
        }
      else
        {
          ConfigureDcf (i->second, cwmin, cwmax, i->first);
        }
    }
}


(-)ns-3.18/src/wifi/model/wifi-mac-header.cc (-1 / +1 lines)

Lines 46-52	Link Here

};

};

WifiMacHeader::WifiMacHeader ()

WifiMacHeader::WifiMacHeader ()

  : m_ctrlPwrMgt (0),

    m_ctrlMoreData (0),

    m_ctrlMoreData (0),

    m_ctrlWep (0),

    m_ctrlWep (0),

    m_ctrlOrder (1),

    m_ctrlOrder (1),

(-)ns-3.18/src/wifi/model/wifi-mac-header.h (-1 lines)

Lines 208-214	Link Here

208

  uint8_t m_ctrlFromDs;

208

  uint8_t m_ctrlFromDs;

209

  uint8_t m_ctrlMoreFrag;

209

  uint8_t m_ctrlMoreFrag;

210

  uint8_t m_ctrlRetry;

210

  uint8_t m_ctrlRetry;

211

  uint8_t m_ctrlPwrMgt;

212

  uint8_t m_ctrlMoreData;

211

  uint8_t m_ctrlMoreData;

213

  uint8_t m_ctrlWep;

212

  uint8_t m_ctrlWep;

214

  uint8_t m_ctrlOrder;

213

  uint8_t m_ctrlOrder;




  if (!m_queue.empty ())
    {
      PacketQueueI it;
      NS_ASSERT (type <= 4);
      for (it = m_queue.begin (); it != m_queue.end (); ++it)
        {
          if (it->hdr.IsQosData ())

  if (!m_queue.empty ())
    {
      PacketQueueI it;
      NS_ASSERT (type <= 4);
      for (it = m_queue.begin (); it != m_queue.end (); ++it)
        {
          if (it->hdr.IsQosData ())

  if (!m_queue.empty ())
    {
      PacketQueueI it;
      NS_ASSERT (type <= 4);
      for (it = m_queue.begin (); it != m_queue.end (); it++)
        {
          if (GetAddressForPacket (type, it) == addr)

(-)ns-3.18/src/wifi/model/wifi-mac-queue.h (-1 lines)

Lines 141-147	Link Here

141

};

141

};

142

143

  PacketQueue m_queue;

143

  PacketQueue m_queue;

144

  WifiMacParameters *m_parameters;

145

  uint32_t m_size;

144

  uint32_t m_size;

146

  uint32_t m_maxSize;

145

  uint32_t m_maxSize;

147

  Time m_maxDelay;

146

  Time m_maxDelay;




    case WIFI_PHY_STANDARD_holland:
      Configure80211a ();
      break;
    case WIFI_PHY_STANDARD_80211p_CCH:
      Configure80211p_CCH ();
      break;
    case WIFI_PHY_STANDARD_80211p_SCH:
      Configure80211p_SCH ();
      break;
    case WIFI_PHY_STANDARD_80211n_2_4GHZ:
      Configure80211n_2_4Ghz ();
      break;

}

void
WifiMac::Configure80211p_CCH (void)
{
  Configure80211_10Mhz ();
}

void
WifiMac::Configure80211p_SCH (void)
{
  Configure80211_10Mhz ();
}
void
WifiMac::Configure80211n_2_4Ghz (void)
{
  Configure80211g ();

      break;
    }
}

void
WifiMac::ConfigureCCHDcf (Ptr<Dcf> dcf, uint32_t cwmin, uint32_t cwmax, enum AcIndex ac)
{
  /* see IEEE 1609.4-2006 section 6.3.1, Table 1 */
  switch (ac)
    {
    case AC_VO:
      dcf->SetMinCw ((cwmin + 1) / 4 - 1);
      dcf->SetMaxCw ((cwmin + 1) / 2 - 1);
      dcf->SetAifsn (2);
      break;
    case AC_VI:
      dcf->SetMinCw ((cwmin + 1) / 4 - 1);
      dcf->SetMaxCw ((cwmin + 1) / 2 - 1);
      dcf->SetAifsn (3);
      break;
    case AC_BE:
      dcf->SetMinCw ((cwmin + 1) / 2 - 1);
      dcf->SetMaxCw (cwmin);
      dcf->SetAifsn (6);
      break;
    case AC_BK:
      dcf->SetMinCw (cwmin);
      dcf->SetMaxCw (cwmax);
      dcf->SetAifsn (9);
      break;
    case AC_BE_NQOS:
      dcf->SetMinCw (cwmin);
      dcf->SetMaxCw (cwmax);
      dcf->SetAifsn (2);
      break;
    case AC_UNDEF:
      NS_FATAL_ERROR ("I don't know what to do with this");
      break;
    }
}
} // namespace ns3

(-)ns-3.18/src/wifi/model/wifi-mac.h (-3 lines)

Lines 238-244	Link Here

238

239

protected:

239

protected:

240

  void ConfigureDcf (Ptr<Dcf> dcf, uint32_t cwmin, uint32_t cwmax, enum AcIndex ac);

240

  void ConfigureDcf (Ptr<Dcf> dcf, uint32_t cwmin, uint32_t cwmax, enum AcIndex ac);

241

  void ConfigureCCHDcf (Ptr<Dcf> dcf, uint32_t cwmin, uint32_t cwmax, enum AcIndex ac);

242

private:

241

private:

243

  static Time GetDefaultMaxPropagationDelay (void);

242

  static Time GetDefaultMaxPropagationDelay (void);

244

  static Time GetDefaultSlot (void);

243

  static Time GetDefaultSlot (void);

Lines 268-275	Link Here

268

  void Configure80211g (void);

267

  void Configure80211g (void);

269

  void Configure80211_10Mhz (void);

268

  void Configure80211_10Mhz (void);

270

  void Configure80211_5Mhz ();

269

  void Configure80211_5Mhz ();

271

  void Configure80211p_CCH (void);

272

  void Configure80211p_SCH (void);

273

  void Configure80211n_2_4Ghz (void);

270

  void Configure80211n_2_4Ghz (void);

274

  void Configure80211n_5Ghz (void);

271

  void Configure80211n_5Ghz (void);

275

272

(-)ns-3.18/src/wifi/model/wifi-net-device.h (-1 lines)

Lines 119-125	Link Here

119

  void ForwardUp (Ptr<Packet> packet, Mac48Address from, Mac48Address to);

119

  void ForwardUp (Ptr<Packet> packet, Mac48Address from, Mac48Address to);

120

  void LinkUp (void);

120

  void LinkUp (void);

121

  void LinkDown (void);

121

  void LinkDown (void);

122

  void Setup (void);

123

  Ptr<WifiChannel> DoGetChannel (void) const;

122

  Ptr<WifiChannel> DoGetChannel (void) const;

124

  void CompleteConfig (void);

123

  void CompleteConfig (void);

125

124

(-)ns-3.18/src/wifi/model/wifi-phy-standard.h (-4 lines)

Lines 45-54	Link Here

   *  ACM MOBICOM, 2001.

   *  ACM MOBICOM, 2001.

*/

*/

  WIFI_PHY_STANDARD_holland,

  WIFI_PHY_STANDARD_holland,

  /** \deprecated see <A HREF="http://www.nsnam.org/bugzilla/show_bug.cgi?id=945">bug 945</A> */

  WIFI_PHY_STANDARD_80211p_CCH,

  /** \deprecated see <A HREF="http://www.nsnam.org/bugzilla/show_bug.cgi?id=945">bug 945</A> */

  WIFI_PHY_STANDARD_80211p_SCH,

  // 11n support

  // 11n support

  WIFI_PHY_STANDARD_80211n_2_4GHZ,

  WIFI_PHY_STANDARD_80211n_2_4GHZ,

  // needed for different mac parameters

  // needed for different mac parameters

(-)ns-3.18/src/wifi/model/wifi-phy-state-helper.cc (-1 / +4 lines)

Lines 420-426	Link Here

420

    case WifiPhy::TX:

420

    case WifiPhy::TX:

421

      break;

421

      break;

422

423

  m_startCcaBusy = now;

423

  if (GetState () != WifiPhy::CCA_BUSY)

424

425

      m_startCcaBusy = now;

426

424

  m_endCcaBusy = std::max (m_endCcaBusy, now + duration);

427

  m_endCcaBusy = std::max (m_endCcaBusy, now + duration);

425

428

426

429




    }
  if(HasHtSupported())
      {
        if (!found)
          {
            uint8_t mcs = GetDefaultMcs (); 
            mode=  m_wifiPhy->McsToWifiMode (mcs); 
          }
        for (WifiMcsListIterator i = m_bssBasicMcsSet.begin ();
             i != m_bssBasicMcsSet.end (); i++)
          {
            WifiMode thismode=  m_wifiPhy->McsToWifiMode (*i); 
            if ((!found || thismode.GetPhyRate () > mode.GetPhyRate ())
                && thismode.GetPhyRate () <= reqMode.GetPhyRate ()
                && thismode.GetModulationClass () == reqMode.GetModulationClass ())
              {
                mode = thismode;
                // We've found a potentially-suitable transmit rate, but we
                // need to continue and consider all the basic rates before
                // we can be sure we've got the right one.
                found = true;
              }
          }
      }
  // If we found a suitable rate in the BSSBasicRateSet, then we are
  // done and can return that mode.
  if (found)

          found = true;
        }
    }
  if(HasHtSupported())
    {
      for (uint32_t idx = 0; idx < m_wifiPhy->GetNMcs (); idx++)
          {
            uint8_t thismcs = m_wifiPhy->GetMcs (idx);
            WifiMode thismode=  m_wifiPhy->McsToWifiMode (thismcs);
             if (thismode.IsMandatory ()
          && (!found || thismode.GetPhyRate () > mode.GetPhyRate ())
          && thismode.GetPhyRate () <= reqMode.GetPhyRate ()
          && thismode.GetModulationClass () == reqMode.GetModulationClass ())
        {
          uint8_t thismcs = m_wifiPhy->GetMcs (idx);
          WifiMode thismode=  m_wifiPhy->McsToWifiMode (thismcs);
          if (thismode.IsMandatory ()
              && (!found || thismode.GetPhyRate () > mode.GetPhyRate ())
              && thismode.GetPhyRate () <= reqMode.GetPhyRate ()
              && thismode.GetModulationClass () == reqMode.GetModulationClass ())
            {
              mode = thismode;
              // As above; we've found a potentially-suitable transmit
              // rate, but we need to continue and consider all the
              // mandatory rates before we can be sure we've got the right
              // one.
              found = true;
            }
            
        }
    }

  /**
   * If we still haven't found a suitable rate for the response then

  if (!found)
    {
      NS_FATAL_ERROR ("Can't find response rate for " << reqMode
                      << ". Check standard and selected rates match.");
    }

  return mode;




  WifiMcsList m_bssBasicMcsSet;

  bool m_htSupported;
  bool m_isLowLatency;
  uint32_t m_maxSsrc;
  uint32_t m_maxSlrc;
  uint32_t m_rtsCtsThreshold;
  uint32_t m_fragmentationThreshold;
  uint8_t m_defaultTxPowerLevel;
  WifiMode m_nonUnicastMode;

  /**
   * The trace source fired when the transmission of a single RTS has failed
   */




    case WIFI_PHY_STANDARD_holland:
      ConfigureHolland ();
      break;
    case WIFI_PHY_STANDARD_80211p_CCH:
      Configure80211p_CCH ();
      break;
    case WIFI_PHY_STANDARD_80211p_SCH:
      Configure80211p_SCH ();
      break;
    case WIFI_PHY_STANDARD_80211n_2_4GHZ:
      m_channelStartingFrequency=2407;
      Configure80211n ();

}

void
YansWifiPhy::Configure80211p_CCH (void)
{
  NS_LOG_FUNCTION (this);
  m_channelStartingFrequency = 5e3; // 802.11p works over the 5Ghz freq range

  m_deviceRateSet.push_back (WifiPhy::GetOfdmRate3MbpsBW10MHz ());
  m_deviceRateSet.push_back (WifiPhy::GetOfdmRate4_5MbpsBW10MHz ());
  m_deviceRateSet.push_back (WifiPhy::GetOfdmRate6MbpsBW10MHz ());
  m_deviceRateSet.push_back (WifiPhy::GetOfdmRate9MbpsBW10MHz ());
  m_deviceRateSet.push_back (WifiPhy::GetOfdmRate12MbpsBW10MHz ());
  m_deviceRateSet.push_back (WifiPhy::GetOfdmRate18MbpsBW10MHz ());
  m_deviceRateSet.push_back (WifiPhy::GetOfdmRate24MbpsBW10MHz ());
  m_deviceRateSet.push_back (WifiPhy::GetOfdmRate27MbpsBW10MHz ());
}

void
YansWifiPhy::Configure80211p_SCH (void)
{
  NS_LOG_FUNCTION (this);
  m_channelStartingFrequency = 5e3; // 802.11p works over the 5Ghz freq range

  m_deviceRateSet.push_back (WifiPhy::GetOfdmRate3MbpsBW10MHz ());
  m_deviceRateSet.push_back (WifiPhy::GetOfdmRate4_5MbpsBW10MHz ());
  m_deviceRateSet.push_back (WifiPhy::GetOfdmRate6MbpsBW10MHz ());
  m_deviceRateSet.push_back (WifiPhy::GetOfdmRate9MbpsBW10MHz ());
  m_deviceRateSet.push_back (WifiPhy::GetOfdmRate12MbpsBW10MHz ());
  m_deviceRateSet.push_back (WifiPhy::GetOfdmRate18MbpsBW10MHz ());
  m_deviceRateSet.push_back (WifiPhy::GetOfdmRate24MbpsBW10MHz ());
  m_deviceRateSet.push_back (WifiPhy::GetOfdmRate27MbpsBW10MHz ());
}

void
YansWifiPhy::RegisterListener (WifiPhyListener *listener)
{
  m_state->RegisterListener (listener);




  virtual void SetNumberOfTransmitAntennas (uint32_t tx);
  virtual uint32_t GetNumberOfTransmitAntennas (void) const;
  /**
   * \param the number of receivers on this node.
   */
  virtual void SetNumberOfReceiveAntennas (uint32_t rx) ;
  /**
   * \returns the number of receivers on this node.
   */
  virtual uint32_t GetNumberOfReceiveAntennas (void) const;
  /**

  void Configure80211_10Mhz (void);
  void Configure80211_5Mhz ();
  void ConfigureHolland (void);
  void Configure80211p_CCH (void);
  void Configure80211p_SCH (void);
  void Configure80211n (void);
  double GetEdThresholdW (void) const;
  double DbmToW (double dbm) const;


  // number of transmitters
  uint32_t m_numberOfTransmitters;
  // number of receivers
  uint32_t m_numberOfReceivers;
  //if true use LDPC
  bool     m_ldpc;




#include "ns3/mac-rx-middle.h"
#include "ns3/pointer.h"
#include "ns3/rng-seed-manager.h"
#include "ns3/edca-txop-n.h"
#include "ns3/config.h"
#include "ns3/boolean.h"

namespace ns3 {

// helper function to assign streams to random variables, to control 
// randomness in the tests
static void
AssignWifiRandomStreams (Ptr<WifiMac> mac, int64_t stream)
{
  int64_t currentStream = stream;
  Ptr<RegularWifiMac> rmac = DynamicCast<RegularWifiMac> (mac);
  if (rmac)
    {
      PointerValue ptr;
      rmac->GetAttribute ("DcaTxop", ptr);
      Ptr<DcaTxop> dcaTxop = ptr.Get<DcaTxop> ();
      currentStream += dcaTxop->AssignStreams (currentStream);

      rmac->GetAttribute ("VO_EdcaTxopN", ptr);
      Ptr<EdcaTxopN> vo_edcaTxopN = ptr.Get<EdcaTxopN> ();
      currentStream += vo_edcaTxopN->AssignStreams (currentStream);

      rmac->GetAttribute ("VI_EdcaTxopN", ptr);
      Ptr<EdcaTxopN> vi_edcaTxopN = ptr.Get<EdcaTxopN> ();
      currentStream += vi_edcaTxopN->AssignStreams (currentStream);

      rmac->GetAttribute ("BE_EdcaTxopN", ptr);
      Ptr<EdcaTxopN> be_edcaTxopN = ptr.Get<EdcaTxopN> ();
      currentStream += be_edcaTxopN->AssignStreams (currentStream);

      rmac->GetAttribute ("BK_EdcaTxopN", ptr);
      Ptr<EdcaTxopN> bk_edcaTxopN = ptr.Get<EdcaTxopN> ();
      currentStream += bk_edcaTxopN->AssignStreams (currentStream);
    }
}

class WifiTest : public TestCase
{
public:

  m_propDelay.SetTypeId ("ns3::ConstantSpeedPropagationDelayModel");
  m_manager.SetTypeId ("ns3::ConstantRateWifiManager");

  // Assign a seed and run number, and later fix the assignment of streams to
  // WiFi random variables, so that the first backoff used is zero slots
  RngSeedManager::SetSeed (1);
  RngSeedManager::SetRun (17);

  // Disable the initial jitter of AP beacons (test case was written before
  // beacon jitter was added)
  Config::SetDefault ("ns3::ApWifiMac::EnableBeaconJitter", BooleanValue (false));

  Ptr<YansWifiChannel> channel = CreateObject<YansWifiChannel> ();
  Ptr<PropagationDelayModel> propDelay = m_propDelay.Create<PropagationDelayModel> ();
  Ptr<PropagationLossModel> propLoss = CreateObject<RandomPropagationLossModel> ();

  Ptr<WifiNetDevice> txDev = CreateObject<WifiNetDevice> ();
  Ptr<WifiMac> txMac = m_mac.Create<WifiMac> ();
  txMac->ConfigureStandard (WIFI_PHY_STANDARD_80211a);
  // Fix the stream assignment to the Dcf Txop objects (backoffs)
  // The below stream assignment will result in the DcaTxop object
  // using a backoff value of zero for this test when the 
  // DcaTxop::EndTxNoAck() calls to StartBackoffNow()
  AssignWifiRandomStreams (txMac, 23);

  Ptr<ConstantPositionMobilityModel> txMobility = CreateObject<ConstantPositionMobilityModel> ();
  Ptr<YansWifiPhy> txPhy = CreateObject<YansWifiPhy> ();

(-)ns-3.18/src/wimax/model/snr-to-block-error-rate-manager.h (-1 lines)

Lines 92-98	Link Here

  void ActivateLoss (bool loss);

  void ActivateLoss (bool loss);

private:

private:

  void ClearRecords (void);

  void ClearRecords (void);

  double m_speed; // in m/s

  uint8_t m_activateLoss;

  uint8_t m_activateLoss;

  static const unsigned int TRACE_FILE_PATH_SIZE = 1024;

  static const unsigned int TRACE_FILE_PATH_SIZE = 1024;

  char m_traceFilePath[TRACE_FILE_PATH_SIZE];

  char m_traceFilePath[TRACE_FILE_PATH_SIZE];

(-)ns-3.18/src/wimax/model/ss-service-flow-manager.cc (-1 lines)

Lines 44-50	Link Here

SsServiceFlowManager::SsServiceFlowManager (Ptr<SubscriberStationNetDevice> device)

SsServiceFlowManager::SsServiceFlowManager (Ptr<SubscriberStationNetDevice> device)

  : m_device (device),

  : m_device (device),

    m_sfidIndex (100),

    m_maxDsaReqRetries (100),

    m_maxDsaReqRetries (100),

    m_dsaReq (DsaReq ()),

    m_dsaReq (DsaReq ()),

    m_dsaAck (DsaAck ()),

    m_dsaAck (DsaAck ()),

(-)ns-3.18/src/wimax/model/ss-service-flow-manager.h (-2 lines)

Lines 91-98	Link Here

private:

private:

  Ptr<SubscriberStationNetDevice> m_device;

  Ptr<SubscriberStationNetDevice> m_device;

  uint32_t m_sfidIndex;

  uint8_t m_maxDsaReqRetries;

  uint8_t m_maxDsaReqRetries;

  EventId m_dsaRspTimeoutEvent;

  EventId m_dsaRspTimeoutEvent;

Return to bug 1784