diff -Naur ns-3.24.1/AUTHORS ns-3.25/AUTHORS
--- ns-3.24.1/AUTHORS 2015-09-23 12:28:41.000000000 -0700
+++ ns-3.25/AUTHORS 2016-03-23 21:36:52.000000000 -0700
@@ -1,3 +1,4 @@
+John Abraham (john.abraham.in@gmail.com)
Alexander Afanasyev (alexander.afanasyev@ucla.edu)
Rohit Agarwal (mindprince@gmail.com)
Kirill Andreev (andreev@iitp.ru)
@@ -34,6 +35,7 @@
Luca Costantino (luca.costantino@gmail.com)
Matthieu Coudron (matthieu.coudron@lip6.fr)
Alexander D'souza (moijes12@gmail.com)
+Ankit Deepak (adadeepak8@gmail.com)
Sébastien Deronne (sebastien.deronne@gmail.com)
Craig Dowell (craigdo@ee.washington.edu)
Gilaras Drakeson (gilaras@gmail.com)
@@ -67,6 +69,7 @@
Kim Højgaard-Hansen (kimrhh@gmail.com)
Chris Hood (chood8@gatech.edu)
Blake Hurd (naimorai@gmail.com)
+Pasquale Imputato (p.imputato@gmail.com)
ishan (ishan.chhabra@gmail.com)
Mohamed Amine Ismail (amine.ismail@inria.fr, iamine@udcast.com)
Jared Ivey (j.ivey@gatech.edu)
@@ -76,9 +79,10 @@
Liu Jian (liujatp@gmail.com)
Piotr Jurkiewicz (piotr.jerzy.jurkiewicz@gmail.com)
Evgeny Kalishenko (ydginster@gmail.com)
+Tanmay Kathpalia (tanmay.kathpalia@landisgyr.com)
Konstantinos Katsaros (dinos.katsaros@gmail.com)
Morteza Kheirkhah (m.kheirkhah@sussex.ac.uk)
-Flavio Kobuta (flaviokubota@gmail.com)
+Flavio Kubota (flaviokubota@gmail.com)
Joe Kopena (tjkopena@cs.drexel.edu)
Christopher Kosecki (christopher.l.kosecki.ctr@mail.mil)
Aleksey Kovalenko (kovalenko@iitp.ru)
diff -Naur ns-3.24.1/bindings/python/ns3modulegen_core_customizations.py ns-3.25/bindings/python/ns3modulegen_core_customizations.py
--- ns-3.24.1/bindings/python/ns3modulegen_core_customizations.py 2015-09-23 12:28:41.000000000 -0700
+++ ns-3.25/bindings/python/ns3modulegen_core_customizations.py 2016-03-23 21:36:52.000000000 -0700
@@ -240,7 +240,17 @@
else:
kwargs = {}
try:
- arguments.append(Parameter.new(str(param_ctype), arg_name, **kwargs))
+ param = Parameter.new(str(param_ctype), arg_name, **kwargs)
+ cpp_class = getattr(param, "cpp_class", None)
+ if isinstance(cpp_class, cppclass.CppClass):
+ # check if the "helper class" can be constructed
+ if cpp_class.helper_class is not None:
+ cpp_class.helper_class.generate_forward_declarations(
+ MemoryCodeSink())
+ if cpp_class.helper_class.cannot_be_constructed:
+ cpp_class.helper_class = None
+ cpp_class.helper_class_disabled = True
+ arguments.append(param)
except (typehandlers.TypeLookupError, typehandlers.TypeConfigurationError) as ex:
warnings.warn("***** Unable to register callback; parameter '%s %s' error (used in %s): %r"
% (arg_type, arg_name, cls_name, ex),
diff -Naur ns-3.24.1/bindings/python/wscript ns-3.25/bindings/python/wscript
--- ns-3.24.1/bindings/python/wscript 2015-09-23 12:28:41.000000000 -0700
+++ ns-3.25/bindings/python/wscript 2016-03-23 21:36:52.000000000 -0700
@@ -14,7 +14,7 @@
# after = TaskGen.after
# https://github.com/gjcarneiro/pybindgen
-REQUIRED_PYBINDGEN_VERSION = '0.17.0.post41+ngd10fa60'
+REQUIRED_PYBINDGEN_VERSION = '0.17.0.post49+ng0e4e3bc'
REQUIRED_PYGCCXML_VERSION = (0, 9, 5)
RUN_ME=-3
diff -Naur ns-3.24.1/CHANGES.html ns-3.25/CHANGES.html
--- ns-3.24.1/CHANGES.html 2015-09-23 12:28:41.000000000 -0700
+++ ns-3.25/CHANGES.html 2016-03-23 21:36:52.000000000 -0700
@@ -51,6 +51,76 @@
us a note on ns-developers mailing list.
+Changes from ns-3.24 to ns-3.25
+New API:
+
+ - In 'src/internet/test', a new environment is created to test TCP properties.
+ - The 'src/traffic-control' module has been added, with new API for adding and configuring queue discs and packet filters.
+ - Related to traffic control, a new interface has been added to the
+NetDevice to provide a queue interface to access device queue state and
+register callbacks used for flow control.
+ - In 'src/wifi', a new rate control (MinstrelHT) has been added for
+802.11n/ac modes.
+ - In 'src/wifi', a new helper (WifiMacHelper) is added and is a merged helper from all previously existing MAC helpers (NqosWifiMacHelper, QosWifiMacHelper, HtWifiMacHelper and VhtWifiMacHelper).
+ - It is now possible to use RIPv2 in IPv4 network simulations.
+
+Changes to existing API:
+
+ - TCP-related changes:
+
+ - Classes TcpRfc793, TcpTahoe, and TcpReno were removed.
+ - The 'TcpNewReno' log component was effectively replaced by 'TcpCongestionOps'
+
- TCP Hybla and HighSpeed have been added.
+ - Added the concept of Congestion State Machine inside TcpSocketBase.
+ - Merged Fast Recovery and Fast Retransmit inside TcpSocketBase.
+ - Some member variables have been moved from TcpSocketBase inside TcpSocketState. Attributes are not touched.
+ - Congestion control splitted from TcpSocketBase as subclass of TcpCongestionOps.
+ - Added Rx and Tx callbacks on TcpSocketBase.
+ - Added BytesInFlight trace source on TcpSocketBase. The trace is updated when the implementation requests the value.
+ - Added attributes about the number of connection and data retransmission attempts.
+
+
+ - ns-3 is now capable of serializing SLL (a.k.a. cooked) headers.
+ This is used in DCE to allow the generation of pcap directly readable by wireshark.
+
+ - In the WifiHelper class in the wifi module, Default has been declared deprecated. This is now immediately handled by the constructor of the class.
+ - The API for configuring 802.11n/ac aggregation has been modified to be more user friendly. As any MAC layer attributes, aggregation parameters can now also be configured through WifiMacHelper::SetType.
+ - The class Queue and subclasses derived from it have been changed in two ways:
+
+ - Queues no longer enqueue simple Packets but instead enqueue QueueItem objects, which include Packet but possibly other information such as headers.
+ - The attributes governing the mode of operation (packets or bytes) and the maximum size have been moved to base class Queue.
+
+
+ - Users of advanced queues (RED, CoDel) who have been using them directly in the NetDevice will need to adjust to the following changes:
+
+ - RED and CoDel are no longer specializations of the Queue classe, but are now specializations of the new QueueDisc class. This means that RED and CoDel can now be installed in the context of the new Traffic Control layer instead of as queues in (some) NetDevices. The reason for such a change is to make the ns-3 stack much more similar to that of real operating systems (Linux has been taken as a reference). Queuing disciplines such as RED and CoDel can now be tested with all the NetDevices, including WifiNetDevices.
+ - NetDevices still use queues to buffer packets. The only subclass of Queue currently available for this purpose is DropTailQueue. If one wants to approximate the old behavior, one needs to set the DropTailQueue MaxPackets attribute to very low values, e.g., 1.
+ - The Traffic Control layer features a mechanism by which packets dropped by the NetDevice are requeued in the queue disc (more precisely: if NetDevice::Send returns false, the packet is requeued), so that they are retransmitted later. This means that the MAC drop traces may include packets that have not been actually lost, because they have been dropped by the device, requeued by the traffic control layer and successfully retransmitted. To get the correct number of packets that have been actually lost, one has to subtract the number of packets requeued from the number of packets dropped as reported by the MAC drop trace.
+
+
+
+Changes to build system:
+
+ - Waf was upgraded to 1.8.19
+ - A new waf build option, --check-profile, was added to allow users to check the currently active build profile. It is discussed in bug 2202 in the tracker.
+
+Changed behavior:
+This section is for behavioral changes to the models that were not due to a bug fix.
+
+ - TCP behavioral changes:
+
+ - TCP closes connection after a number of failed segment retries,
+ rather than trying indefinitely. The maximum number of retries, for both SYN
+ attempts and data attempts, is controlled by attributes.
+ - Congestion algorithms not compliant with Fast Retransmit
+ and Fast Recovery (TCP 793, Reno, Tahoe) have been removed.
+
+
+ - 802.11n/ac MPDU aggregation is now enabled by default for both AC_BE and AC_VI.
+ - The introduction of the traffic control layer leads to some additional buffering by default in the stack; when a device queue fills up, additional packets become enqueued at the traffic control layer.
+
+
+
Changes from ns-3.23 to ns-3.24
New API:
diff -Naur ns-3.24.1/doc/doxygen.conf ns-3.25/doc/doxygen.conf
--- ns-3.24.1/doc/doxygen.conf 2015-09-23 12:28:41.000000000 -0700
+++ ns-3.25/doc/doxygen.conf 2016-03-23 21:36:52.000000000 -0700
@@ -40,7 +40,7 @@
# could be handy for archiving the generated documentation or if some version
# control system is used.
-PROJECT_NUMBER = "3.24"
+PROJECT_NUMBER = "3-dev"
# Using the PROJECT_BRIEF tag one can provide an optional one line description
# for a project that appears at the top of each page and should give viewer a
diff -Naur ns-3.24.1/doc/main.h ns-3.25/doc/main.h
--- ns-3.24.1/doc/main.h 2015-09-23 12:28:41.000000000 -0700
+++ ns-3.25/doc/main.h 2016-03-23 21:36:52.000000000 -0700
@@ -55,6 +55,7 @@
* - spectrum
* - stats
* - tap-bridge
+ * - traffic-control
* - test
* - topology-read
* - uan
diff -Naur ns-3.24.1/doc/manual/source/attributes.rst ns-3.25/doc/manual/source/attributes.rst
--- ns-3.24.1/doc/manual/source/attributes.rst 2015-09-23 12:28:41.000000000 -0700
+++ ns-3.25/doc/manual/source/attributes.rst 2016-03-23 21:36:52.000000000 -0700
@@ -41,8 +41,8 @@
| :cpp:class:`ObjectFactory` | Affects all instances created with |
| | the factory. |
+---------------------------------------+-------------------------------------+
-| :cpp:func:`XHelperSetAttribute ()` | Affects all instances created by |
-| | the helper. |
+| Helper methods with (string/ | Affects all instances created by |
+| AttributeValue) parameter pairs | the helper. |
+---------------------------------------+-------------------------------------+
| | :cpp:func:`MyClass::SetX ()` | Alters this particular instance. |
| | :cpp:func:`Object::SetAttribute ()` | Generally this is the only form |
@@ -691,12 +691,12 @@
Let's assume our new class, called :cpp:class:`ns3::MyMobility`,
is a type of mobility model. First, the class should inherit from
-it's parent class, :cpp:class:`ns3::MobilityModel`.
+its parent class, :cpp:class:`ns3::MobilityModel`.
In the ``my-mobility.h`` header file::
namespace ns3 {
- class MyClass : public MobilityModel
+ class MyMobility : public MobilityModel
{
This requires we declare the :cpp:func:`GetTypeId ()` function.
diff -Naur ns-3.24.1/doc/manual/source/conf.py ns-3.25/doc/manual/source/conf.py
--- ns-3.24.1/doc/manual/source/conf.py 2015-09-23 12:28:41.000000000 -0700
+++ ns-3.25/doc/manual/source/conf.py 2016-03-23 21:36:52.000000000 -0700
@@ -48,9 +48,9 @@
# built documents.
#
# The short X.Y version.
-version = 'ns-3.24'
+version = 'ns-3.25'
# The full version, including alpha/beta/rc tags.
-release = 'ns-3.24'
+release = 'ns-3.25'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
diff -Naur ns-3.24.1/doc/manual/source/logging.rst ns-3.25/doc/manual/source/logging.rst
--- ns-3.24.1/doc/manual/source/logging.rst 2015-09-23 12:28:41.000000000 -0700
+++ ns-3.25/doc/manual/source/logging.rst 2016-03-23 21:36:52.000000000 -0700
@@ -424,6 +424,11 @@
Run some example programs with all log components turned on (e.g.
``NS_LOG="***"``).
+* Use an explicit cast for any variable of type uint8_t or int8_t,
+ e.g., ``NS_LOG_LOGIC ("Variable i is " << static_cast (i));``.
+ Without the cast, the integer is interpreted as a char, and the result
+ will be most likely not in line with the expectations.
+ This is a well documented C++ 'feature'.
diff -Naur ns-3.24.1/doc/manual/source/python.rst ns-3.25/doc/manual/source/python.rst
--- ns-3.24.1/doc/manual/source/python.rst 2015-09-23 12:28:41.000000000 -0700
+++ ns-3.25/doc/manual/source/python.rst 2016-03-23 21:36:52.000000000 -0700
@@ -77,7 +77,7 @@
.. sourcecode:: bash
- $ ./waf --shell
+ $ ./waf shell
$ python examples/wireless/mixed-wireless.py
and the other is to use the --pyrun option to waf:
@@ -90,14 +90,14 @@
.. sourcecode:: bash
- $ ./waf --shell
+ $ ./waf shell
$ gdb --args python examples/wireless/mixed-wireless.py
To run your own Python script that calls |ns3| and that has this path, ``/path/to/your/example/my-script.py``, do the following:
.. sourcecode:: bash
- $ ./waf --shell
+ $ ./waf shell
$ python /path/to/your/example/my-script.py
Caveats
diff -Naur ns-3.24.1/doc/models/Makefile ns-3.25/doc/models/Makefile
--- ns-3.24.1/doc/models/Makefile 2015-09-28 20:17:55.000000000 -0700
+++ ns-3.25/doc/models/Makefile 2016-03-23 21:36:52.000000000 -0700
@@ -17,6 +17,7 @@
source/internet-models.rst \
source/network.rst \
source/emulation-overview.rst \
+ source/traffic-control.rst \
$(SRC)/antenna/doc/source/antenna.rst \
$(SRC)/antenna/doc/source/antenna-design.rst \
$(SRC)/antenna/doc/source/antenna-user.rst \
@@ -61,7 +62,7 @@
$(SRC)/internet/doc/ipv6.rst \
$(SRC)/internet/doc/routing-overview.rst \
$(SRC)/internet/doc/tcp.rst \
- $(SRC)/internet/doc/codel.rst \
+ $(SRC)/internet-apps/doc/internet-apps.rst \
$(SRC)/mobility/doc/mobility.rst \
$(SRC)/olsr/doc/olsr.rst \
$(SRC)/openflow/doc/openflow-switch.rst \
@@ -74,6 +75,11 @@
$(SRC)/wimax/doc/wimax.rst \
$(SRC)/uan/doc/uan.rst \
$(SRC)/topology-read/doc/topology.rst \
+ $(SRC)/traffic-control/doc/traffic-control-layer.rst \
+ $(SRC)/traffic-control/doc/queue-discs.rst \
+ $(SRC)/traffic-control/doc/pfifo-fast.rst \
+ $(SRC)/traffic-control/doc/red.rst \
+ $(SRC)/traffic-control/doc/codel.rst \
$(SRC)/spectrum/doc/spectrum.rst \
$(SRC)/stats/doc/adaptor.rst \
$(SRC)/stats/doc/aggregator.rst \
@@ -109,6 +115,8 @@
$(SRC)/internet/doc/routing-specialization.dia \
$(SRC)/wifi/doc/source/figures/WifiArchitecture.dia \
$(SRC)/wifi/doc/source/figures/snir.dia \
+ $(SRC)/wifi/doc/source/figures/clear-channel.eps \
+ $(SRC)/wifi/doc/source/figures/nist-frame-success-rate.eps \
$(SRC)/wimax/doc/WimaxArchitecture.dia \
$(SRC)/lte/doc/source/figures/epc-ctrl-arch.dia \
$(SRC)/lte/doc/source/figures/epc-data-flow-dl.dia \
@@ -261,6 +269,8 @@
$(SRC)/spectrum/doc/spectrum-tv-rand-geo-points.eps \
$(SRC)/spectrum/doc/spectrum-tv-8vsb.png \
$(SRC)/spectrum/doc/spectrum-tv-cofdm.png \
+ $(SRC)/traffic-control/doc/classful-queue-disc.dia \
+ $(SRC)/traffic-control/doc/multi-queue-aware-queue-disc.dia \
$(SRC)/lr-wpan/doc/lr-wpan-arch.dia \
$(SRC)/lr-wpan/doc/lr-wpan-data-example.dia \
$(SRC)/lr-wpan/doc/lr-wpan-primitives.dia \
@@ -347,12 +357,16 @@
$(FIGURES)/auvmobility-classes.eps \
$(FIGURES)/spectrum-analyzer-example.eps \
$(FIGURES)/spectrum-tv-rand-geo-points.eps \
+ $(FIGURES)/classful-queue-disc.eps \
+ $(FIGURES)/multi-queue-aware-queue-disc.eps \
$(FIGURES)/lr-wpan-primitives.eps \
$(FIGURES)/lr-wpan-data-example.eps \
$(FIGURES)/lr-wpan-arch.eps \
$(FIGURES)/802-15-4-ber.eps \
$(FIGURES)/802-15-4-per-sens.eps \
- $(FIGURES)/802-15-4-psr-distance.eps
+ $(FIGURES)/802-15-4-psr-distance.eps \
+ $(FIGURES)/clear-channel.eps \
+ $(FIGURES)/nist-frame-success-rate.eps
# rescale pdf figures as necessary
$(FIGURES)/testbed.pdf_width = 5in
@@ -405,6 +419,8 @@
$(FIGURES)/spectrum-tv-rand-geo-points.pdf_width = 8cm
$(FIGURES)/lr-wpan-primitives.pdf_width = 3in
$(FIGURES)/lr-wpan-arch.pdf_width = 2in
+$(FIGURES)/clear-channel.pdf_width = 12cm
+$(FIGURES)/nist-frame-success-rate.pdf_width = 12cm
IMAGES_PNG = ${IMAGES_EPS:.eps=.png}
IMAGES_PDF = ${IMAGES_EPS:.eps=.pdf}
diff -Naur ns-3.24.1/doc/models/source/conf.py ns-3.25/doc/models/source/conf.py
--- ns-3.24.1/doc/models/source/conf.py 2015-09-23 12:28:41.000000000 -0700
+++ ns-3.25/doc/models/source/conf.py 2016-03-23 21:36:52.000000000 -0700
@@ -48,9 +48,9 @@
# built documents.
#
# The short X.Y version.
-version = 'ns-3.24'
+version = 'ns-3.25'
# The full version, including alpha/beta/rc tags.
-release = 'ns-3.24'
+release = 'ns-3.25'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
diff -Naur ns-3.24.1/doc/models/source/emulation-overview.rst ns-3.25/doc/models/source/emulation-overview.rst
--- ns-3.24.1/doc/models/source/emulation-overview.rst 2015-09-23 12:28:41.000000000 -0700
+++ ns-3.25/doc/models/source/emulation-overview.rst 2016-03-23 21:36:52.000000000 -0700
@@ -11,7 +11,7 @@
system, different capabilities can be provided. For instance, the
FdNetDevice can be associated with an underlying packet socket to provide
emulation capabilities. This allows |ns3| simulations
-to send data on a "real" network. The second kind, called a ``Tap``
+to send data on a "real" network. The second kind, called a ``TapBridge``
``NetDevice`` allows a "real" host to participate in an |ns3| simulation as if
it were one of the simulated nodes. An |ns3| simulation may be constructed with
any combination of simulated or emulated devices.
@@ -80,7 +80,8 @@
behavior of native applications and protocol suites in the presence of large
simulated |ns3| networks.
-.. toctree::
+For more details:
+
+* :doc:`FdNetDevice ` chapter.
+* :doc:`TapBridge ` chapter.
- fd-net-device
- tap
diff -Naur ns-3.24.1/doc/models/source/index.rst ns-3.25/doc/models/source/index.rst
--- ns-3.24.1/doc/models/source/index.rst 2015-09-23 12:28:41.000000000 -0700
+++ ns-3.25/doc/models/source/index.rst 2016-03-23 21:36:52.000000000 -0700
@@ -31,6 +31,7 @@
dsr
emulation-overview
energy
+ fd-net-device
flow-monitor
internet-models
lr-wpan
@@ -45,7 +46,9 @@
propagation
spectrum
sixlowpan
+ tap
topology
+ traffic-control
uan
wave
wifi
diff -Naur ns-3.24.1/doc/models/source/internet-models.rst ns-3.25/doc/models/source/internet-models.rst
--- ns-3.24.1/doc/models/source/internet-models.rst 2015-09-23 12:28:41.000000000 -0700
+++ ns-3.25/doc/models/source/internet-models.rst 2016-03-23 21:36:52.000000000 -0700
@@ -1,5 +1,5 @@
-Internet Models
----------------
+Internet Models (IP, TCP, Routing, UDP, Internet Applications, Codel)
+---------------------------------------------------------------------
.. toctree::
@@ -8,4 +8,4 @@
ipv6
routing-overview
tcp
- codel
+ internet-apps
diff -Naur ns-3.24.1/doc/models/source/traffic-control.rst ns-3.25/doc/models/source/traffic-control.rst
--- ns-3.24.1/doc/models/source/traffic-control.rst 1969-12-31 16:00:00.000000000 -0800
+++ ns-3.25/doc/models/source/traffic-control.rst 2016-03-23 21:36:52.000000000 -0700
@@ -0,0 +1,10 @@
+Traffic Control Layer
+---------------------------------------------------------------------
+
+.. toctree::
+
+ traffic-control-layer
+ queue-discs
+ pfifo-fast
+ red
+ codel
diff -Naur ns-3.24.1/doc/tutorial/source/conceptual-overview.rst ns-3.25/doc/tutorial/source/conceptual-overview.rst
--- ns-3.24.1/doc/tutorial/source/conceptual-overview.rst 2015-09-23 12:28:41.000000000 -0700
+++ ns-3.25/doc/tutorial/source/conceptual-overview.rst 2016-03-23 21:36:53.000000000 -0700
@@ -308,12 +308,14 @@
of the documentation. A good place to start is the ``NS-3 Modules``
"book" in the |ns3| navigation tree. If you expand ``Modules``
you will see a list of |ns3| module documentation. The concept of
-module here ties directly into the module include files discussed above. The |ns3| logging subsystem is discussed in the ``C++ Constructs Used by All Modules``
-section, so go ahead and expand that documentation node. Now, expand the
-``Debugging`` book and then select the ``Logging`` page.
+module here ties directly into the module include files discussed above. The |ns3| logging subsystem is discussed in the :ref:`UsingLogging` section, so
+we'll get to it later in this tutorial, but you can find out about the above
+statement by looking at the ``Core`` module, then expanding the
+``Debugging tools`` book, and then selecting the ``Logging`` page. Click
+on ``Logging``.
You should now be looking at the Doxygen documentation for the Logging module.
-In the list of ``#define``'s at the top of the page you will see the entry
+In the list of ``Macros``'s at the top of the page you will see the entry
for ``NS_LOG_COMPONENT_DEFINE``. Before jumping in, it would probably be
good to look for the "Detailed Description" of the logging module to get a
feel for the overall operation. You can either scroll down or select the
@@ -469,7 +471,7 @@
pointToPoint.SetChannelAttribute ("Delay", StringValue ("2ms"));
tells the ``PointToPointHelper`` to use the value "2ms" (two milliseconds)
-as the value of the transmission delay of every point to point channel it
+as the value of the propagation delay of every point to point channel it
subsequently creates.
NetDeviceContainer
diff -Naur ns-3.24.1/doc/tutorial/source/conf.py ns-3.25/doc/tutorial/source/conf.py
--- ns-3.24.1/doc/tutorial/source/conf.py 2015-09-23 12:28:41.000000000 -0700
+++ ns-3.25/doc/tutorial/source/conf.py 2016-03-23 21:36:53.000000000 -0700
@@ -48,9 +48,9 @@
# built documents.
#
# The short X.Y version.
-version = 'ns-3.24'
+version = 'ns-3.25'
# The full version, including alpha/beta/rc tags.
-release = 'ns-3.24'
+release = 'ns-3.25'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
diff -Naur ns-3.24.1/doc/tutorial/source/getting-started.rst ns-3.25/doc/tutorial/source/getting-started.rst
--- ns-3.24.1/doc/tutorial/source/getting-started.rst 2015-09-23 12:28:41.000000000 -0700
+++ ns-3.25/doc/tutorial/source/getting-started.rst 2016-03-23 21:36:53.000000000 -0700
@@ -96,17 +96,17 @@
$ cd
$ mkdir workspace
$ cd workspace
- $ wget http://www.nsnam.org/release/ns-allinone-3.24.tar.bz2
- $ tar xjf ns-allinone-3.24.tar.bz2
+ $ wget http://www.nsnam.org/release/ns-allinone-3.25.tar.bz2
+ $ tar xjf ns-allinone-3.25.tar.bz2
-If you change into the directory ``ns-allinone-3.24`` you should see a
+If you change into the directory ``ns-allinone-3.25`` you should see a
number of files and directories:
::
$ ls
- bake constants.py ns-3.24 README
- build.py netanim-3.106 pybindgen-0.17.0.post41+ngd10fa60 util.py
+ bake constants.py ns-3.25 README
+ build.py netanim-3.107 pybindgen-0.17.0.post49+ng0e4e3bc util.py
You are now ready to build the base |ns3| distribution and may skip ahead
to the section on building |ns3|.
@@ -166,10 +166,10 @@
There are a few configuration targets available:
-1. ``ns-3.24``: the module corresponding to the release; it will download
+1. ``ns-3.25``: the module corresponding to the release; it will download
components similar to the release tarball.
2. ``ns-3-dev``: a similar module but using the development code tree
-3. ``ns-allinone-3.24``: the module that includes other optional features
+3. ``ns-allinone-3.25``: the module that includes other optional features
such as click routing, openflow for |ns3|, and the Network Simulation
Cradle
4. ``ns-3-allinone``: similar to the released version of the allinone
@@ -187,7 +187,7 @@
`"ns-3 Releases"
`_
web page and clicking on the latest release link. We'll proceed in
-this tutorial example with ``ns-3.24``.
+this tutorial example with ``ns-3.25``.
We are now going to use the bake tool to pull down the various pieces of
|ns3| you will be using. First, we'll say a word about running bake.
@@ -213,7 +213,7 @@
Step into the workspace directory and type the following into your shell::
- $ ./bake.py configure -e ns-3.24
+ $ ./bake.py configure -e ns-3.25
Next, we'l ask bake to check whether we have enough tools to download
various components. Type::
@@ -264,15 +264,15 @@
>> Searching for system dependency g++ - OK
>> Searching for system dependency qt4 - OK
>> Downloading pygccxml - OK
- >> Downloading netanim-3.106 - OK
- >> Downloading pybindgen-0.17.0.post41+ngd10fa60 (target directory:pybindgen) - OK
- >> Downloading ns-3.24 - OK
+ >> Downloading netanim-3.107 - OK
+ >> Downloading pybindgen-0.17.0.post49+ng0e4e3bc (target directory:pybindgen) - OK
+ >> Downloading ns-3.25 - OK
The above suggests that five sources have been downloaded. Check the
``source`` directory now and type ``ls``; one should see::
$ ls
- gccxml netanim-3.106 ns-3.24 pybindgen pygccxml pygccxml-1.0.0.zip
+ gccxml netanim-3.107 ns-3.25 pybindgen pygccxml pygccxml-1.0.0.zip
You are now ready to build the |ns3| distribution.
@@ -291,7 +291,7 @@
If you downloaded
using a tarball you should have a directory called something like
-``ns-allinone-3.24`` under your ``~/workspace`` directory.
+``ns-allinone-3.25`` under your ``~/workspace`` directory.
Type the following::
$ ./build.py --enable-examples --enable-tests
@@ -307,35 +307,34 @@
script builds the various pieces you downloaded. Eventually you should see the
following::
- Waf: Leaving directory `/path/to/workspace/ns-allinone-3.24/ns-3.24/build'
+ Waf: Leaving directory `/path/to/workspace/ns-allinone-3.25/ns-3.25/build'
'build' finished successfully (6m25.032s)
Modules built:
- antenna aodv applications
- bridge buildings config-store
- core csma csma-layout
+ antenna aodv applications
+ bridge buildings config-store
+ core csma csma-layout
dsdv dsr energy
fd-net-device flow-monitor internet
- lr-wpan lte mesh
- mobility mpi netanim (no Python)
- network nix-vector-routing olsr
- point-to-point point-to-point-layout propagation
- sixlowpan spectrum stats
- tap-bridge test (no Python) topology-read
- uan virtual-net-device wave
- wifi wimax
+ internet-apps lr-wpan lte
+ mesh mobility mpi
+ netanim (no Python) network nix-vector-routing
+ olsr openflow (no Python) point-to-point
+ point-to-point-layout propagation sixlowpan
+ spectrum stats tap-bridge
+ test (no Python) topology-read traffic-control
+ uan virtual-net-device visualizer
+ wave wifi wimax
- Modules not built (see ns-3 tutorial for explanation):
- brite click openflow
- visualizer
+Modules not built (see ns-3 tutorial for explanation):
+brite click
- Leaving directory `./ns-3.24'
+ Leaving directory `./ns-3.25'
Regarding the portion about modules not built::
Modules not built (see ns-3 tutorial for explanation):
- brite click openflow
- visualizer
+ brite click
This just means that some |ns3| modules that have dependencies on
outside libraries may not have been built, or that the configuration
@@ -357,9 +356,9 @@
>> Building gccxml-ns3 - OK
>> Building pygccxml - OK
- >> Building netanim-3.106 - OK
- >> Building pybindgen-0.17.0.post41+ngd10fa60 - OK
- >> Building ns-3.24 - OK
+ >> Building netanim-3.107 - OK
+ >> Building pybindgen-0.17.0.post49+ng0e4e3bc - OK
+ >> Building ns-3.25 - OK
*Hint: you can also perform both steps, download and build, by calling 'bake.py deploy'.*
@@ -504,6 +503,13 @@
Okay, sorry, I made you build the |ns3| part of the system twice,
but now you know how to change the configuration and build optimized code.
+A command exists for checking which profile is currently active
+for an already configured project:
+
+ $ ./waf --check-profile
+ Waf: Entering directory `/path/to/ns-3-allinone/ns-3.25/build'
+ Build profile: debug
+
The build.py script discussed above supports also the ``--enable-examples``
and ``enable-tests`` arguments, but in general, does not directly support
other waf options; for example, this will not work:
diff -Naur ns-3.24.1/doc/tutorial-pt-br/source/conf.py ns-3.25/doc/tutorial-pt-br/source/conf.py
--- ns-3.24.1/doc/tutorial-pt-br/source/conf.py 2015-09-23 12:28:41.000000000 -0700
+++ ns-3.25/doc/tutorial-pt-br/source/conf.py 2016-03-23 21:36:52.000000000 -0700
@@ -50,9 +50,9 @@
# built documents.
#
# The short X.Y version.
-version = 'ns-3.24'
+version = 'ns-3.25'
# The full version, including alpha/beta/rc tags.
-release = 'ns-3.24'
+release = 'ns-3.25'
# The language for content autogenerated by . Refer to babel documentation
# for a list of supported languages.
diff -Naur ns-3.24.1/examples/energy/energy-model-example.cc ns-3.25/examples/energy/energy-model-example.cc
--- ns-3.24.1/examples/energy/energy-model-example.cc 2015-09-23 12:28:41.000000000 -0700
+++ ns-3.25/examples/energy/energy-model-example.cc 2016-03-23 21:36:53.000000000 -0700
@@ -189,8 +189,8 @@
wifiPhy.SetChannel (wifiChannelPtr);
/** MAC layer **/
- // Add a non-QoS upper MAC, and disable rate control
- NqosWifiMacHelper wifiMac = NqosWifiMacHelper::Default ();
+ // Add a MAC and disable rate control
+ WifiMacHelper wifiMac;
wifi.SetRemoteStationManager ("ns3::ConstantRateWifiManager", "DataMode",
StringValue (phyMode), "ControlMode",
StringValue (phyMode));
diff -Naur ns-3.24.1/examples/energy/energy-model-with-harvesting-example.cc ns-3.25/examples/energy/energy-model-with-harvesting-example.cc
--- ns-3.24.1/examples/energy/energy-model-with-harvesting-example.cc 2015-09-23 12:28:41.000000000 -0700
+++ ns-3.25/examples/energy/energy-model-with-harvesting-example.cc 2016-03-23 21:36:53.000000000 -0700
@@ -241,8 +241,8 @@
wifiPhy.SetChannel (wifiChannelPtr);
/** MAC layer **/
- // Add a non-QoS upper MAC, and disable rate control
- NqosWifiMacHelper wifiMac = NqosWifiMacHelper::Default ();
+ // Add a MAC and disable rate control
+ WifiMacHelper wifiMac;
wifi.SetRemoteStationManager ("ns3::ConstantRateWifiManager", "DataMode",
StringValue (phyMode), "ControlMode",
StringValue (phyMode));
diff -Naur ns-3.24.1/examples/ipv6/fragmentation-ipv6.cc ns-3.25/examples/ipv6/fragmentation-ipv6.cc
--- ns-3.24.1/examples/ipv6/fragmentation-ipv6.cc 2015-09-23 12:28:41.000000000 -0700
+++ ns-3.25/examples/ipv6/fragmentation-ipv6.cc 2016-03-23 21:36:53.000000000 -0700
@@ -32,7 +32,7 @@
#include "ns3/core-module.h"
#include "ns3/internet-module.h"
#include "ns3/csma-module.h"
-#include "ns3/applications-module.h"
+#include "ns3/internet-apps-module.h"
#include "ns3/ipv6-static-routing-helper.h"
#include "ns3/ipv6-routing-table-entry.h"
diff -Naur ns-3.24.1/examples/ipv6/fragmentation-ipv6-two-MTU.cc ns-3.25/examples/ipv6/fragmentation-ipv6-two-MTU.cc
--- ns-3.24.1/examples/ipv6/fragmentation-ipv6-two-MTU.cc 2015-09-23 12:28:41.000000000 -0700
+++ ns-3.25/examples/ipv6/fragmentation-ipv6-two-MTU.cc 2016-03-23 21:36:53.000000000 -0700
@@ -34,7 +34,7 @@
#include "ns3/core-module.h"
#include "ns3/internet-module.h"
#include "ns3/csma-module.h"
-#include "ns3/applications-module.h"
+#include "ns3/internet-apps-module.h"
#include "ns3/ipv6-static-routing-helper.h"
#include "ns3/ipv6-routing-table-entry.h"
diff -Naur ns-3.24.1/examples/ipv6/icmpv6-redirect.cc ns-3.25/examples/ipv6/icmpv6-redirect.cc
--- ns-3.24.1/examples/ipv6/icmpv6-redirect.cc 2015-09-23 12:28:41.000000000 -0700
+++ ns-3.25/examples/ipv6/icmpv6-redirect.cc 2016-03-23 21:36:53.000000000 -0700
@@ -44,7 +44,7 @@
#include "ns3/core-module.h"
#include "ns3/internet-module.h"
#include "ns3/csma-module.h"
-#include "ns3/applications-module.h"
+#include "ns3/internet-apps-module.h"
#include "ns3/ipv6-static-routing-helper.h"
#include "ns3/ipv6-routing-table-entry.h"
diff -Naur ns-3.24.1/examples/ipv6/loose-routing-ipv6.cc ns-3.25/examples/ipv6/loose-routing-ipv6.cc
--- ns-3.24.1/examples/ipv6/loose-routing-ipv6.cc 2015-09-23 12:28:41.000000000 -0700
+++ ns-3.25/examples/ipv6/loose-routing-ipv6.cc 2016-03-23 21:36:53.000000000 -0700
@@ -42,7 +42,7 @@
#include "ns3/core-module.h"
#include "ns3/internet-module.h"
#include "ns3/csma-module.h"
-#include "ns3/applications-module.h"
+#include "ns3/internet-apps-module.h"
#include "ns3/ipv6-header.h"
using namespace ns3;
diff -Naur ns-3.24.1/examples/ipv6/ping6.cc ns-3.25/examples/ipv6/ping6.cc
--- ns-3.24.1/examples/ipv6/ping6.cc 2015-09-23 12:28:41.000000000 -0700
+++ ns-3.25/examples/ipv6/ping6.cc 2016-03-23 21:36:53.000000000 -0700
@@ -33,7 +33,7 @@
#include "ns3/core-module.h"
#include "ns3/internet-module.h"
#include "ns3/csma-module.h"
-#include "ns3/applications-module.h"
+#include "ns3/internet-apps-module.h"
using namespace ns3;
diff -Naur ns-3.24.1/examples/ipv6/radvd.cc ns-3.25/examples/ipv6/radvd.cc
--- ns-3.24.1/examples/ipv6/radvd.cc 2015-09-23 12:28:41.000000000 -0700
+++ ns-3.25/examples/ipv6/radvd.cc 2016-03-23 21:36:53.000000000 -0700
@@ -35,7 +35,7 @@
#include "ns3/core-module.h"
#include "ns3/internet-module.h"
#include "ns3/csma-module.h"
-#include "ns3/applications-module.h"
+#include "ns3/internet-apps-module.h"
#include "ns3/radvd.h"
#include "ns3/radvd-interface.h"
diff -Naur ns-3.24.1/examples/ipv6/radvd-two-prefix.cc ns-3.25/examples/ipv6/radvd-two-prefix.cc
--- ns-3.24.1/examples/ipv6/radvd-two-prefix.cc 2015-09-23 12:28:41.000000000 -0700
+++ ns-3.25/examples/ipv6/radvd-two-prefix.cc 2016-03-23 21:36:53.000000000 -0700
@@ -36,7 +36,7 @@
#include "ns3/core-module.h"
#include "ns3/internet-module.h"
#include "ns3/csma-module.h"
-#include "ns3/applications-module.h"
+#include "ns3/internet-apps-module.h"
#include "ns3/ipv6-routing-table-entry.h"
#include "ns3/radvd.h"
diff -Naur ns-3.24.1/examples/ipv6/wscript ns-3.25/examples/ipv6/wscript
--- ns-3.24.1/examples/ipv6/wscript 2015-09-23 12:28:41.000000000 -0700
+++ ns-3.25/examples/ipv6/wscript 2016-03-23 21:36:53.000000000 -0700
@@ -1,30 +1,30 @@
## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-
def build(bld):
- obj = bld.create_ns3_program('icmpv6-redirect', ['csma', 'internet', 'applications'])
+ obj = bld.create_ns3_program('icmpv6-redirect', ['csma', 'internet', 'internet-apps'])
obj.source = 'icmpv6-redirect.cc'
- obj = bld.create_ns3_program('ping6', ['csma', 'internet', 'applications'])
+ obj = bld.create_ns3_program('ping6', ['csma', 'internet', 'internet-apps'])
obj.source = 'ping6.cc'
- obj = bld.create_ns3_program('radvd', ['csma', 'internet', 'applications'])
+ obj = bld.create_ns3_program('radvd', ['csma', 'internet', 'internet-apps'])
obj.source = 'radvd.cc'
- obj = bld.create_ns3_program('radvd-two-prefix', ['csma', 'internet', 'applications'])
+ obj = bld.create_ns3_program('radvd-two-prefix', ['csma', 'internet', 'internet-apps'])
obj.source = 'radvd-two-prefix.cc'
obj = bld.create_ns3_program('test-ipv6', ['point-to-point', 'internet'])
obj.source = 'test-ipv6.cc'
- obj = bld.create_ns3_program('fragmentation-ipv6', ['csma', 'internet', 'applications'])
+ obj = bld.create_ns3_program('fragmentation-ipv6', ['csma', 'internet', 'internet-apps'])
obj.source = 'fragmentation-ipv6.cc'
- obj = bld.create_ns3_program('fragmentation-ipv6-two-MTU', ['csma', 'internet', 'applications'])
+ obj = bld.create_ns3_program('fragmentation-ipv6-two-MTU', ['csma', 'internet', 'internet-apps'])
obj.source = 'fragmentation-ipv6-two-MTU.cc'
- obj = bld.create_ns3_program('loose-routing-ipv6', ['csma', 'internet', 'applications'])
+ obj = bld.create_ns3_program('loose-routing-ipv6', ['csma', 'internet', 'internet-apps'])
obj.source = 'loose-routing-ipv6.cc'
- obj = bld.create_ns3_program('wsn-ping6', ['lr-wpan', 'internet', 'sixlowpan', 'mobility', 'applications'])
+ obj = bld.create_ns3_program('wsn-ping6', ['lr-wpan', 'internet', 'sixlowpan', 'mobility', 'internet-apps'])
obj.source = 'wsn-ping6.cc'
diff -Naur ns-3.24.1/examples/ipv6/wsn-ping6.cc ns-3.25/examples/ipv6/wsn-ping6.cc
--- ns-3.24.1/examples/ipv6/wsn-ping6.cc 2015-09-23 12:28:41.000000000 -0700
+++ ns-3.25/examples/ipv6/wsn-ping6.cc 2016-03-23 21:36:53.000000000 -0700
@@ -36,7 +36,7 @@
#include "ns3/internet-module.h"
#include "ns3/sixlowpan-module.h"
#include "ns3/lr-wpan-module.h"
-#include "ns3/applications-module.h"
+#include "ns3/internet-apps-module.h"
#include "ns3/mobility-module.h"
using namespace ns3;
diff -Naur ns-3.24.1/examples/routing/global-routing-multi-switch-plus-router.cc ns-3.25/examples/routing/global-routing-multi-switch-plus-router.cc
--- ns-3.24.1/examples/routing/global-routing-multi-switch-plus-router.cc 1969-12-31 16:00:00.000000000 -0800
+++ ns-3.25/examples/routing/global-routing-multi-switch-plus-router.cc 2016-03-23 21:36:53.000000000 -0700
@@ -0,0 +1,810 @@
+/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
+/*
+ * Copyright (c) 2015 - Chip Webb
+ *
+ * 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: Chip Webb
+ *
+ */
+
+// ###################################################################### //
+// Network topology //
+// ---------------------------------------------------------------------- //
+// //
+// This example shows two L2 LANs connected by a WAN link and illustrates //
+// a network that has multiple L2 switches between L3 routers. //
+// //
+// It serves as a test case to verify a patch to global-router-interface //
+// that fixes a previous bug (#2102 in the ns-3 tracker) but is also //
+// another example program. //
+// //
+// The LANs are "top" [192.168.1/24] and "bottom" [192.168.2/24]. //
+// Each LAN network is interconnected by several L2 switches, and each //
+// LAN has its own router to act as a gateway with the WAN. Each LAN //
+// has two endpoints upon which is installed a UDP echo client or server //
+// that are used to test connectivity over the LANs & WAN. //
+// //
+// One pair of UDP endpoints (t3 and b3) have LAN connections with only //
+// one switch between them and their local routers. This path works with //
+// unpatched ns3 code (3.24 & earlier) as well as with the patch applied. //
+// //
+// Another pair of endpoints (t2 and b2) have LAN connections with //
+// a chain of multiple switches between them and their local router. //
+// This path will only work after applying the associated patch. //
+// //
+// The LAN links are modeled by half-duplex Ethernet CSMA links which //
+// have command-line-configurable data rate and latency. //
+// //
+// There are two types of CSMA links: 100Mbit and 10Mbit. The 100Mbit //
+// links are called csmaX, are denoted by [X] in the diagram and can //
+// be controlled with the --csmaXRate and --csmaXDelay command line args. //
+// The 10Mbit links are called csmaY, are denoted by [Y] in the diagram //
+// and can be controlled with the --csmaYRate and --csmaYDelay command //
+// line arguments. Both the top and bottom LAN have a mixture of //
+// 100Mbit/s and 10Mbit/s links. //
+// //
+// The WAN is modeled by a point-to-point link which has configurable //
+// data rate and latency. Unlike many typical home/work networks, //
+// the routers do not perform NAT. //
+// //
+// The WAN link is denoted by [P] in the diagram, and the //
+// speed and latency can be set from the command line with the //
+// --p2pRate and --p2pDelay options. The default for this link is 5Mbit/s //
+// and 50ms delay //
+// //
+// Note: Names in parenthesis after NetDevices are pcap tap locations. //
+// //
+// ---------------------------------------------------------------------- //
+// //
+// 192.168. 192.168. //
+// .1.2 .1.3 //
+// --------- --------- //
+// | t2 | | t3 | //
+// | UDP | | UDP | //
+// | echo | | echo | Node t2 is a UDP echo client (multi-switch) //
+// | client| | server| Node t3 is a UDP echo server (single-switch) //
+// --------- --------- //
+// CSMA(t2) CSMA(t3) //
+// [X] [X] //
+// [X] [X] //
+// CSMA [X] //
+// --------- [X] //
+// | ts4 | [X] Nodes ts1, ts2, ts3 and ts4 are L2 switches //
+// | (sw) | [X] The top LAN is subnet 192.168.1.* //
+// --------- [X] //
+// CSMA [X] The long chain of switches is designed //
+// [Y] [X] to test whether global-router-interface //
+// [Y] [X] can fully enumerate an IP subnet that has //
+// CSMA [X] multiple interconnected L2 switches. //
+// --------- [X] The problem is documented in Bug #2102. //
+// | ts3 | [X] //
+// | (sw) | [X] //
+// --------- [X] //
+// CSMA [X] //
+// [X] [X] //
+// [X] [X] //
+// CSMA [X] //
+// --------- [X] //
+// | ts2 | [X] //
+// | (sw) | [X] //
+// --------- [X] //
+// CSMA [X] //
+// [Y] [X] //
+// [Y] [X] //
+// CSMA CSMA //
+// ------------------ //
+// | ts1 (switch) | //
+// ------------------ //
+// CSMA //
+// [Y] //
+// [Y] //
+// CSMA(trlan) 192.168.1.1 //
+// ------------------ //
+// | tr (router) | Node tr is an L3 router //
+// ------------------ (between 192.168.1.* & 76.1.1.*) //
+// P2P(trwan) 76.1.1.1 //
+// [P] //
+// [P] //
+// [P] //
+// [P] //
+// [P] The WAN is 76.1.1.* //
+// [P] //
+// [P] //
+// [P] //
+// P2P(brwan) 76.1.1.2 //
+// ------------------ //
+// | br (router) | Node br is an L3 router //
+// ------------------ (between 192.168.2.* & 76.1.1.*) //
+// CSMA(brlan) 192.168.2.1 //
+// [X] //
+// [X] //
+// CSMA //
+// ------------------ Nodes bs1 to bs5 are L2 switches //
+// | bs1 (switch) | The bottom LAN is subnet 192.168.2.* //
+// ------------------ //
+// CSMA CSMA //
+// [Y] [Y] //
+// [Y] [Y] //
+// CSMA [Y] //
+// --------- [Y] //
+// | bs2 | [Y] //
+// | (sw) | [Y] //
+// --------- [Y] //
+// CSMA [Y] //
+// [X] [Y] //
+// [X] [Y] //
+// CSMA [Y] //
+// --------- [Y] //
+// | bs3 | [Y] //
+// | (sw) | [Y] //
+// --------- [Y] //
+// CSMA [Y] //
+// [Y] [Y] //
+// [Y] [Y] //
+// CSMA [Y] //
+// --------- [Y] //
+// | bs4 | [Y] //
+// | (sw) | [Y] //
+// --------- [Y] //
+// CSMA [Y] //
+// [X] [Y] //
+// [X] [Y] //
+// CSMA [Y] //
+// --------- [Y] //
+// | bs5 | [Y] //
+// | (sw) | [Y] //
+// --------- [Y] //
+// CSMA [Y] //
+// [Y] [Y] //
+// [Y] [Y] //
+// CSMA(b2) CSMA(b3) //
+// --------- --------- //
+// | b2 | | b3 | //
+// | UDP | | UDP | //
+// | echo | | echo | Node b2 is a UDP echo server (multi-switch) //
+// | server| | client| Node b3 is a UDP echo client (single-switch) //
+// --------- --------- //
+// 192.168. 192.168. //
+// .2.2 .2.3 //
+// //
+// ---------------------------------------------------------------------- //
+// Explanation //
+// ---------------------------------------------------------------------- //
+// //
+// UDP packet flows are configured between nodes on the top and bottom //
+// LANs (using UDP echo client & server). //
+// //
+// The network carrying the "multi switch" UDP flow is connected with //
+// multiple L2 switches between L3 nodes so it should only work if the //
+// global-router-interface source code properly supports bridging. //
+// //
+// The network carrying the "single switch" UDP flow is connected with //
+// only one L2 switch between L3 nodes so it should work with or //
+// without the patch //
+// //
+// = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = //
+// Traffic summary: //
+// ---------------------------------------------------------------------- //
+// //
+// - UDP flow from t2 (192.168.1.2) to b2 (192.168.2.2) [Multi Switch] //
+// from b3 (192.168.2.3) to t3 (192.168.1.3) [Single Switch] //
+// //
+// = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = //
+// Node List & IP addresses assigned during simulation //
+// ---------------------------------------------------------------------- //
+// t2 : 192.168.1.2 : Top multi-switch UDP echo client //
+// t3 : 192.168.1.3 : Top single-switch UDP echo server //
+// : //
+// ts1 : : Top switch 1 (bridge) //
+// ts2 : : Top switch 2 (bridge) //
+// ts3 : : Top switch 3 (bridge) //
+// ts4 : : Top switch 4 (bridge) //
+// : //
+// tr : 192.168.1.1 : Router connecting top LAN (192.168.1.*) //
+// : 76.1.1.1 : to the WAN //
+// : //
+// br : 76.1.1.2 : Router connecting the WAN //
+// : 192.168.2.1 : to bot LAN (192.168.2.*) //
+// : //
+// bs1 : : Bottom switch 1 (bridge) //
+// bs2 : : Bottom switch 2 (bridge) //
+// bs3 : : Bottom switch 3 (bridge) //
+// bs4 : : Bottom switch 4 (bridge) //
+// bs5 : : Bottom switch 5 (bridge) //
+// : //
+// b2 : 192.168.2.2 : Bottom multi-switch UDP echo server //
+// b3 : 192.168.2.3 : Bottom single-switch UDP echo client //
+// : //
+// ---------------------------------------------------------------------- //
+// Author: Chip Webb //
+// ###################################################################### //
+
+#include
+#include
+
+#include "ns3/core-module.h"
+#include "ns3/network-module.h"
+#include "ns3/applications-module.h"
+#include "ns3/bridge-module.h"
+#include "ns3/csma-module.h"
+#include "ns3/point-to-point-module.h"
+#include "ns3/internet-module.h"
+
+using namespace ns3;
+
+// ########################################################################
+// Main routine
+// ########################################################################
+NS_LOG_COMPONENT_DEFINE ("GlobalRoutingMultiSwitchPlusRouter");
+
+#define vssearch(loc,vec) std::find ((vec).begin (), (vec).end (), (loc)) != (vec).end ()
+
+int
+main (int argc, char *argv[])
+{
+ // ----------------------------------------------------------------------
+ // Default values for command line arguments
+ // ----------------------------------------------------------------------
+ bool verbose = true;
+
+ int simDurationSeconds = 60;
+
+ bool enableUdpMultiSW = true;
+ bool enableUdpSingleSW = true;
+
+ std::string pcapLocations = "";
+ uint32_t snapLen = PcapFile::SNAPLEN_DEFAULT;
+
+ std::string csmaXLinkDataRate = "100Mbps";
+ std::string csmaXLinkDelay = "500ns";
+
+ std::string csmaYLinkDataRate = "10Mbps";
+ std::string csmaYLinkDelay = "500ns";
+
+ std::string p2pLinkDataRate = "5Mbps";
+ std::string p2pLinkDelay = "50ms";
+
+ uint16_t udpEchoPort = 9; // The well-known UDP echo port
+
+
+ // ----------------------------------------------------------------------
+ // Create command line options and get them
+ // ----------------------------------------------------------------------
+ CommandLine cmd;
+
+ cmd.Usage ("NOTE: valid --pcap arguments are: 't2,t3,b2,b3,trlan,trwan,brlan,brwan'");
+
+ cmd.AddValue ("verbose", "Enable printing informational messages", verbose);
+
+ cmd.AddValue ("duration", "Duration of simulation.", simDurationSeconds);
+
+ cmd.AddValue ("udpMultiSW", "Enable udp over multi-switch links", enableUdpMultiSW);
+ cmd.AddValue ("udpSingleSW", "Enable udp over single-switch links", enableUdpSingleSW);
+
+ cmd.AddValue ("pcap", "Comma separated list of PCAP Locations to tap", pcapLocations);
+ cmd.AddValue ("snapLen", "PCAP packet capture length", snapLen);
+
+ cmd.AddValue ("csmaXRate", "CSMA X Link data rate", csmaXLinkDataRate);
+ cmd.AddValue ("csmaXDelay", "CSMA X Link delay", csmaXLinkDelay);
+
+ cmd.AddValue ("csmaYRate", "CSMA Y Link data rate", csmaYLinkDataRate);
+ cmd.AddValue ("csmaYDelay", "CSMA Y Link delay", csmaYLinkDelay);
+
+ cmd.AddValue ("p2pRate", "P2P Link data rate", p2pLinkDataRate);
+ cmd.AddValue ("p2pDelay", "P2P Link delay", p2pLinkDelay);
+
+ cmd.Parse (argc, argv);
+
+ // --------------------------------------------------------------------
+ // Users may find it convenient to turn on explicit debugging
+ // for selected modules; the below lines suggest how to do this
+ // --------------------------------------------------------------------
+ if (verbose)
+ {
+ LogComponentEnable ("GlobalRoutingMultiSwitchPlusRouter", LOG_LEVEL_INFO);
+ }
+
+
+ // ======================================================================
+ // Define the list of valid PCAP taps
+ // ----------------------------------------------------------------------
+ std::vector pcapTaps;
+ pcapTaps.push_back ("t2"); // multi-switch UDP echo client
+ pcapTaps.push_back ("t3"); // single-switch UDP echo server
+ pcapTaps.push_back ("b2"); // multi-switch UDP echo server
+ pcapTaps.push_back ("b3"); // single-switch UDP echo client
+ pcapTaps.push_back ("trlan"); // top router LAN side
+ pcapTaps.push_back ("trwan"); // top router WAN side
+ pcapTaps.push_back ("brlan"); // bottom router LAN side
+ pcapTaps.push_back ("brwan"); // bottom router WAN side
+
+ // ----------------------------------------------------------------------
+ // Parse the pcapLocations string into pcapLocationVec
+ // ----------------------------------------------------------------------
+ std::vector pcapLocationVec;
+ if (pcapLocations != "")
+ {
+ std::stringstream sStream (pcapLocations);
+
+ while ( sStream.good () )
+ {
+ std::string substr;
+ getline ( sStream, substr, ',' );
+ if (vssearch (substr,pcapTaps))
+ {
+ pcapLocationVec.push_back ( substr );
+ }
+ else
+ {
+ NS_LOG_ERROR ("WARNING: Unrecognized PCAP location: <" + substr + ">");
+ }
+ }
+
+ for (std::vector::const_iterator
+ ploc = pcapLocationVec.begin ();
+ ploc != pcapLocationVec.end ();
+ ++ploc)
+ {
+ NS_LOG_INFO ("PCAP capture at: <" + *ploc + ">");
+ }
+ }
+
+
+ // ======================================================================
+ // Set some simulator-wide values
+ // ======================================================================
+
+ // ----------------------------------------------------------------------
+ // Set PCAP packet capture maximum packet length
+ // ----------------------------------------------------------------------
+ if (snapLen != PcapFile::SNAPLEN_DEFAULT)
+ {
+ Config::SetDefault ("ns3::PcapFileWrapper::CaptureSize", UintegerValue (snapLen));
+ }
+
+ // ======================================================================
+ // Create the nodes & links required for the topology shown in comments above.
+ // ----------------------------------------------------------------------
+ NS_LOG_INFO ("INFO: Create nodes."); // - - - - - - - - - - - - - - - -
+ // Node IP : Description
+ // - - - - - - - - - - - - - - - -
+ Ptr t2 = CreateObject (); // 192.168.1.2 : Top multi-switch udp echo client
+ Ptr t3 = CreateObject (); // 192.168.1.3 : Top single-switch udp echo server
+ // :
+ Ptr ts1 = CreateObject (); // : Top switch #1 (bridge)
+ Ptr ts2 = CreateObject (); // : Top switch #2 (bridge)
+ Ptr ts3 = CreateObject (); // : Top switch #3 (bridge)
+ Ptr ts4 = CreateObject (); // : Top switch #4 (bridge)
+ // :
+ Ptr tr = CreateObject (); // 192.168.1.1 : Router connecting top LAN & WAN
+ // 76.1.1.1 :
+ // :
+ Ptr br = CreateObject (); // 76.1.1.2 : Router connecting WAN & bottom LANs
+ // 192.168.2.1 :
+ // :
+ Ptr bs1 = CreateObject (); // : Bottom switch #1 (bridge)
+ Ptr bs2 = CreateObject (); // : Bottom switch #2 (bridge)
+ Ptr bs3 = CreateObject (); // : Bottom switch #3 (bridge)
+ Ptr bs4 = CreateObject (); // : Bottom switch #4 (bridge)
+ Ptr bs5 = CreateObject (); // : Bottom switch #5 (bridge)
+ // :
+ Ptr b2 = CreateObject (); // 192.168.2.2 : Bottom multi-switch udp echo server
+
+ Ptr b3 = CreateObject (); // 192.168.2.3 : Bottom single-switch udp echo client
+ // - - - - - - - - - - - - - - - -
+
+ // ----------------------------------------------------------------------
+ // Give the nodes names
+ // ----------------------------------------------------------------------
+ Names::Add ("t2", t2);
+ Names::Add ("t3", t3);
+ Names::Add ("ts1", ts1);
+ Names::Add ("ts2", ts2);
+ Names::Add ("ts3", ts3);
+ Names::Add ("ts4", ts4);
+ Names::Add ("tr", tr);
+ Names::Add ("br", br);
+ Names::Add ("bs1", bs1);
+ Names::Add ("bs2", bs2);
+ Names::Add ("bs3", bs3);
+ Names::Add ("bs4", bs4);
+ Names::Add ("bs5", bs5);
+ Names::Add ("b2", b2);
+ Names::Add ("b3", b3);
+
+ // ======================================================================
+ // Create CSMA links to use for connecting LAN nodes together
+ // ----------------------------------------------------------------------
+
+ // ----------------------------------------
+ // CSMA [X]
+ // ----------------------------------------
+ NS_LOG_INFO ("L2: Create a " <<
+ csmaXLinkDataRate << " " <<
+ csmaXLinkDelay << " CSMA link for csmaX for LANs.");
+ CsmaHelper csmaX;
+ csmaX.SetChannelAttribute ("DataRate", StringValue (csmaXLinkDataRate));
+ csmaX.SetChannelAttribute ("Delay", StringValue (csmaXLinkDelay));
+
+ // ----------------------------------------
+ // CSMA [Y]
+ // ----------------------------------------
+ NS_LOG_INFO ("L2: Create a " <<
+ csmaYLinkDataRate << " " <<
+ csmaYLinkDelay << " CSMA link for csmaY for LANs.");
+ CsmaHelper csmaY;
+ csmaY.SetChannelAttribute ("DataRate", StringValue (csmaYLinkDataRate));
+ csmaY.SetChannelAttribute ("Delay", StringValue (csmaYLinkDelay));
+
+ // ----------------------------------------------------------------------
+ // Now, connect the top LAN nodes together with csma links.
+ // ----------------------------------------------------------------------
+ NS_LOG_INFO ("L2: Connect nodes on top LAN together with half-duplex CSMA links.");
+
+ // Multi-switch top LAN chain: t2-ts4-ts3-ts2-ts1-tr
+ NetDeviceContainer link_t2_ts4 = csmaX.Install (NodeContainer (t2, ts4));
+ NetDeviceContainer link_ts4_ts3 = csmaY.Install (NodeContainer (ts4, ts3));
+ NetDeviceContainer link_ts3_ts2 = csmaX.Install (NodeContainer (ts3, ts2));
+ NetDeviceContainer link_ts2_ts1 = csmaY.Install (NodeContainer (ts2, ts1));
+
+ // Single-switch top LAN link: t3-ts1-tr
+ NetDeviceContainer link_t3_ts1 = csmaX.Install (NodeContainer (t3, ts1));
+
+ // Common link for top LAN between ts1 and tr (for t2 and t3 to get to tr)
+ NetDeviceContainer link_tr_ts1 = csmaY.Install (NodeContainer (tr, ts1));
+
+ // ----------------------------------------------------------------------
+ // And repeat above steps to connect the bottom LAN nodes together
+ // ----------------------------------------------------------------------
+ NS_LOG_INFO ("L2: Connect nodes on bottom LAN together with half-duplex CSMA links.");
+
+ // Multi-switch bottom LAN chain: b2-bs5-bs4-bs3-bs2-bs1-br
+ NetDeviceContainer link_b2_bs5 = csmaY.Install (NodeContainer (b2, bs5));
+ NetDeviceContainer link_bs5_bs4 = csmaX.Install (NodeContainer (bs5, bs4));
+ NetDeviceContainer link_bs4_bs3 = csmaY.Install (NodeContainer (bs4, bs3));
+ NetDeviceContainer link_bs3_bs2 = csmaX.Install (NodeContainer (bs3, bs2));
+ NetDeviceContainer link_bs2_bs1 = csmaY.Install (NodeContainer (bs2, bs1));
+
+ // Single-switch bottom LAN link: b3-bs1-br
+ NetDeviceContainer link_b3_bs1 = csmaY.Install (NodeContainer (b3, bs1));
+
+ // Common link for bottom LAN between bs1 and br (for b2 and b3 to get to br)
+ NetDeviceContainer link_br_bs1 = csmaX.Install (NodeContainer (br, bs1));
+
+
+ // ======================================================================
+ // Create a point-to-point link for connecting WAN nodes together
+ // (this type of link is full-duplex)
+ // ----------------------------------------------------------------------
+ NS_LOG_INFO ("L2: Create a " <<
+ p2pLinkDataRate << " " <<
+ p2pLinkDelay << " Point-to-Point link for the WAN.");
+
+ PointToPointHelper p2p;
+ p2p.SetDeviceAttribute ("DataRate", StringValue (p2pLinkDataRate));
+ p2p.SetChannelAttribute ("Delay", StringValue (p2pLinkDelay));
+
+ // ----------------------------------------------------------------------
+ // Now, connect top router to bottom router with a p2p WAN link
+ // ----------------------------------------------------------------------
+ NS_LOG_INFO ("L2: Connect the routers together with the Point-to-Point WAN link.");
+
+ NetDeviceContainer link_tr_br;
+ link_tr_br = p2p.Install (NodeContainer (tr,br));
+
+ // ======================================================================
+ // Manually create the list of NetDevices for each switch
+ // ----------------------------------------------------------------------
+
+ // Top Switch 4 NetDevices
+ NetDeviceContainer ts4nd;
+ ts4nd.Add (link_t2_ts4.Get (1));
+ ts4nd.Add (link_ts4_ts3.Get (0));
+
+ // Top Switch 3 NetDevices
+ NetDeviceContainer ts3nd;
+ ts3nd.Add (link_ts4_ts3.Get (1));
+ ts3nd.Add (link_ts3_ts2.Get (0));
+
+ // Top Switch 2 NetDevices
+ NetDeviceContainer ts2nd;
+ ts2nd.Add (link_ts3_ts2.Get (1));
+ ts2nd.Add (link_ts2_ts1.Get (0));
+
+ // Top Switch 1 NetDevices
+ NetDeviceContainer ts1nd;
+ ts1nd.Add (link_ts2_ts1.Get (1));
+ ts1nd.Add (link_t3_ts1.Get (1));
+ ts1nd.Add (link_tr_ts1.Get (1));
+
+
+ // Bottom Switch 1 NetDevices
+ NetDeviceContainer bs1nd;
+ bs1nd.Add (link_br_bs1.Get (1));
+ bs1nd.Add (link_bs2_bs1.Get (1));
+ bs1nd.Add (link_b3_bs1.Get (1));
+
+ // Bottom Switch 2 NetDevices
+ NetDeviceContainer bs2nd;
+ bs2nd.Add (link_bs2_bs1.Get (0));
+ bs2nd.Add (link_bs3_bs2.Get (1));
+
+ // Bottom Switch 3 NetDevices
+ NetDeviceContainer bs3nd;
+ bs3nd.Add (link_bs3_bs2.Get (0));
+ bs3nd.Add (link_bs4_bs3.Get (1));
+
+ // Bottom Switch 4 NetDevices
+ NetDeviceContainer bs4nd;
+ bs4nd.Add (link_bs4_bs3.Get (0));
+ bs4nd.Add (link_bs5_bs4.Get (1));
+
+ // Bottom Switch 5 NetDevices
+ NetDeviceContainer bs5nd;
+ bs5nd.Add (link_bs5_bs4.Get (0));
+ bs5nd.Add (link_b2_bs5.Get (1));
+
+
+ // ======================================================================
+ // Install bridging code on each switch
+ // ----------------------------------------------------------------------
+ BridgeHelper bridge;
+
+ bridge.Install (ts1, ts1nd);
+ bridge.Install (ts2, ts2nd);
+ bridge.Install (ts3, ts3nd);
+ bridge.Install (ts4, ts4nd);
+
+ bridge.Install (bs1, bs1nd);
+ bridge.Install (bs2, bs2nd);
+ bridge.Install (bs3, bs3nd);
+ bridge.Install (bs4, bs4nd);
+ bridge.Install (bs5, bs5nd);
+
+ // ======================================================================
+ // Install the L3 internet stack (TCP/IP)
+ // ----------------------------------------------------------------------
+ InternetStackHelper ns3IpStack;
+
+ // ----------------------------------------------------------------------
+ // Install the L3 internet stack on UDP endpoints
+ // ----------------------------------------------------------------------
+ NS_LOG_INFO ("L3: Install the ns3 IP stack on udp client and server nodes.");
+ NodeContainer endpointNodes (t2, t3, b2, b3);
+ ns3IpStack.Install (endpointNodes);
+
+ // ----------------------------------------------------------------------
+ // Install the L3 internet stack on routers.
+ // ----------------------------------------------------------------------
+ NS_LOG_INFO ("L3: Install the ns3 IP stack on routers.");
+ NodeContainer routerNodes (tr, br);
+ ns3IpStack.Install (routerNodes);
+
+ // ======================================================================
+ // Assign top LAN IP addresses
+ // ----------------------------------------------------------------------
+ NS_LOG_INFO ("L3: Assign top LAN IP Addresses.");
+
+ NetDeviceContainer topLanIpDevices; // - - - - - -- - - - - - -
+ topLanIpDevices.Add (link_tr_ts1.Get (0)); // NOTE: order matters here
+ topLanIpDevices.Add (link_t2_ts4.Get (0)); // for IP address
+ topLanIpDevices.Add (link_t3_ts1.Get (0)); // assignment
+ // - - - - - -- - - - - - -
+ Ipv4AddressHelper ipv4;
+ ipv4.SetBase ("192.168.1.0", "255.255.255.0");
+ ipv4.Assign (topLanIpDevices);
+
+ // ----------------------------------------------------------------------
+ // Assign bottom LAN IP addresses
+ // ----------------------------------------------------------------------
+ NS_LOG_INFO ("L3: Assign bottom LAN IP Addresses.");
+
+ NetDeviceContainer botLanIpDevices; // - - - - - -- - - - - - -
+ botLanIpDevices.Add (link_br_bs1.Get (0)); // NOTE: order matters here
+ botLanIpDevices.Add (link_b2_bs5.Get (0)); // for IP address
+ botLanIpDevices.Add (link_b3_bs1.Get (0)); // assignment
+ // - - - - - -- - - - - - -
+
+ ipv4.SetBase ("192.168.2.0", "255.255.255.0");
+ ipv4.Assign (botLanIpDevices);
+
+ // ----------------------------------------------------------------------
+ // Assign WAN IP addresses
+ // ----------------------------------------------------------------------
+ NS_LOG_INFO ("L3: Assign WAN IP Addresses.");
+
+ ipv4.SetBase ("76.1.1.0", "255.255.255.0");
+ ipv4.Assign (link_tr_br);
+
+
+ // ======================================================================
+ // Calculate and populate routing tables
+ // ----------------------------------------------------------------------
+ NS_LOG_INFO ("L3: Populate routing tables.");
+ Ipv4GlobalRoutingHelper::PopulateRoutingTables ();
+
+
+ // ======================================================================
+ // Multi-Switch UDP traffic generation
+ // ----------------------------------------------------------------------
+ ApplicationContainer apps;
+
+ if (enableUdpMultiSW)
+ {
+ // ------------------------------------------------------------------
+ // Install multi-switch UDP echo server on b2
+ // ------------------------------------------------------------------
+ NS_LOG_INFO ("APP: Multi-Switch UDP server (on node b2 of bottom LAN)");
+
+ UdpEchoServerHelper server (udpEchoPort);
+
+ ApplicationContainer serverApp = server.Install (b2);
+ serverApp.Start (Seconds (0.5));
+ serverApp.Stop (Seconds (simDurationSeconds));
+
+ // ------------------------------------------------------------------
+ // Install multi-switch UDP echo client on t2
+ // ------------------------------------------------------------------
+ NS_LOG_INFO ("APP: Multi-Switch UDP client (on node t2 of top LAN)");
+
+ Time interPacketInterval = Seconds (0.005);
+ uint32_t packetSize = 1000;
+ uint32_t maxPacketCount = (simDurationSeconds - 2.0) / 0.005;
+
+ UdpEchoClientHelper client (Ipv4Address ("192.168.2.2"), udpEchoPort);
+
+ client.SetAttribute ("MaxPackets", UintegerValue (maxPacketCount));
+ client.SetAttribute ("Interval", TimeValue (interPacketInterval));
+ client.SetAttribute ("PacketSize", UintegerValue (packetSize));
+
+ ApplicationContainer clientApp = client.Install (t2);
+ clientApp.Start (Seconds (0.5));
+ clientApp.Stop (Seconds (simDurationSeconds));
+ }
+
+ // ======================================================================
+ // Single-Switch UDP traffic generation
+ // ----------------------------------------------------------------------
+ if (enableUdpSingleSW)
+ {
+ // ------------------------------------------------------------------
+ // Install single-switch UDP echo server on t3
+ // ------------------------------------------------------------------
+ NS_LOG_INFO ("APP: Single-Switch UDP server (on node t3 of top LAN)");
+
+ UdpEchoServerHelper server (udpEchoPort);
+
+ ApplicationContainer serverApp = server.Install (t3);
+ serverApp.Start (Seconds (0.5));
+ serverApp.Stop (Seconds (simDurationSeconds));
+
+ // ------------------------------------------------------------------
+ // Install single-switch UDP echo client on b3
+ // ------------------------------------------------------------------
+ NS_LOG_INFO ("APP: Single-Switch UDP client (on node b3 bottom LAN)");
+
+ Time interPacketInterval = Seconds (0.005);
+ uint32_t packetSize = 1000;
+ uint32_t maxPacketCount = (simDurationSeconds - 2.0) / 0.005;
+
+ UdpEchoClientHelper client (Ipv4Address ("192.168.1.3"), udpEchoPort);
+
+ client.SetAttribute ("MaxPackets", UintegerValue (maxPacketCount));
+ client.SetAttribute ("Interval", TimeValue (interPacketInterval));
+ client.SetAttribute ("PacketSize", UintegerValue (packetSize));
+
+ ApplicationContainer clientApp = client.Install (b3);
+ clientApp.Start (Seconds (0.5));
+ clientApp.Stop (Seconds (simDurationSeconds));
+ }
+
+
+ // ======================================================================
+ // Print routing tables at T=0.1
+ // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ // NOTE: Node 0 and Node 13 must have non-empty tables (except for local
+ // loopback and local LAN) if routing is operating correctly.
+ // ----------------------------------------------------------------------
+ NS_LOG_INFO ("Set up to print routing tables at T=0.1s");
+
+ Ptr routingStream =
+ Create ("global-routing-multi-switch-plus-router.routes", std::ios::out);
+
+ Ipv4GlobalRoutingHelper g;
+ g.PrintRoutingTableAllAt (Seconds (0.1), routingStream);
+
+
+ // ======================================================================
+ // Configure PCAP traces
+ // ----------------------------------------------------------------------
+ NS_LOG_INFO ("Configure PCAP Tracing (if any configured).");
+
+ // - - - - - - - - - - - - - -
+ // multi-switch UDP echo client
+ // - - - - - - - - - - - - - -
+ if (vssearch ("t2",pcapLocationVec))
+ {
+ csmaX.EnablePcap ("t2.pcap", topLanIpDevices.Get (1), true, true);
+ }
+
+ // - - - - - - - - - - - - - -
+ // multi-switch UDP echo server
+ // - - - - - - - - - - - - - -
+ if (vssearch ("b2",pcapLocationVec))
+ {
+ csmaY.EnablePcap ("b2.pcap", botLanIpDevices.Get (1), true, true);
+ }
+
+ // - - - - - - - - - - - - - -
+ // single-switch UDP echo client
+ // - - - - - - - - - - - - - -
+ if (vssearch ("b3",pcapLocationVec))
+ {
+ csmaY.EnablePcap ("b3.pcap", botLanIpDevices.Get (2), true, true);
+ }
+
+ // - - - - - - - - - - - - - -
+ // single-switch UDP echo server
+ // - - - - - - - - - - - - - -
+ if (vssearch ("t3",pcapLocationVec))
+ {
+ csmaX.EnablePcap ("t3.pcap", topLanIpDevices.Get (2), true, true);
+ }
+
+ // - - - - - - - - - - - - - -
+ // top router, LAN side
+ // - - - - - - - - - - - - - -
+ if (vssearch ("trlan",pcapLocationVec))
+ {
+ csmaY.EnablePcap ("trlan.pcap", topLanIpDevices.Get (0), true, true);
+ }
+
+ // - - - - - - - - - - - - - -
+ // bottom router, LAN side
+ // - - - - - - - - - - - - - -
+ if (vssearch ("brlan",pcapLocationVec))
+ {
+ csmaX.EnablePcap ("brlan.pcap", botLanIpDevices.Get (0), true, true);
+ }
+
+ // - - - - - - - - - - - - - -
+ // top router, WAN side
+ // - - - - - - - - - - - - - -
+ if (vssearch ("trwan",pcapLocationVec))
+ {
+ p2p.EnablePcap ("trwan.pcap", link_tr_br.Get (0), true, true);
+ }
+
+ // - - - - - - - - - - - - - -
+ // bottom router, WAN side
+ // - - - - - - - - - - - - - -
+ if (vssearch ("brwan",pcapLocationVec))
+ {
+ p2p.EnablePcap ("brwan.pcap", link_tr_br.Get (1), true, true);
+ }
+
+
+ // ======================================================================
+ // Now, do the actual simulation.
+ // ----------------------------------------------------------------------
+ NS_LOG_INFO ("Run Simulation for " << simDurationSeconds << " seconds.");
+
+ Simulator::Stop (Seconds (simDurationSeconds));
+ Simulator::Run ();
+
+ Simulator::Destroy ();
+ NS_LOG_INFO ("Done.");
+
+}
diff -Naur ns-3.24.1/examples/routing/manet-routing-compare.cc ns-3.25/examples/routing/manet-routing-compare.cc
--- ns-3.24.1/examples/routing/manet-routing-compare.cc 2015-09-23 12:28:41.000000000 -0700
+++ ns-3.25/examples/routing/manet-routing-compare.cc 2016-03-23 21:36:53.000000000 -0700
@@ -257,8 +257,8 @@
wifiChannel.AddPropagationLoss ("ns3::FriisPropagationLossModel");
wifiPhy.SetChannel (wifiChannel.Create ());
- // Add a non-QoS upper mac, and disable rate control
- NqosWifiMacHelper wifiMac = NqosWifiMacHelper::Default ();
+ // Add a mac and disable rate control
+ WifiMacHelper wifiMac;
wifi.SetRemoteStationManager ("ns3::ConstantRateWifiManager",
"DataMode",StringValue (phyMode),
"ControlMode",StringValue (phyMode));
diff -Naur ns-3.24.1/examples/routing/ripng-simple-network.cc ns-3.25/examples/routing/ripng-simple-network.cc
--- ns-3.24.1/examples/routing/ripng-simple-network.cc 2015-09-23 12:28:41.000000000 -0700
+++ ns-3.25/examples/routing/ripng-simple-network.cc 2016-03-23 21:36:53.000000000 -0700
@@ -55,7 +55,7 @@
#include "ns3/core-module.h"
#include "ns3/internet-module.h"
#include "ns3/csma-module.h"
-#include "ns3/applications-module.h"
+#include "ns3/internet-apps-module.h"
#include "ns3/ipv6-static-routing-helper.h"
#include "ns3/ipv6-routing-table-entry.h"
@@ -162,6 +162,8 @@
Ipv6ListRoutingHelper listRH;
listRH.Add (ripNgRouting, 0);
+ Ipv6StaticRoutingHelper staticRh;
+ listRH.Add (staticRh, 5);
InternetStackHelper internetv6;
internetv6.SetIpv4StackInstall (false);
diff -Naur ns-3.24.1/examples/routing/rip-simple-network.cc ns-3.25/examples/routing/rip-simple-network.cc
--- ns-3.24.1/examples/routing/rip-simple-network.cc 1969-12-31 16:00:00.000000000 -0800
+++ ns-3.25/examples/routing/rip-simple-network.cc 2016-03-23 21:36:53.000000000 -0700
@@ -0,0 +1,258 @@
+/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
+/*
+ * Copyright (c) 2016 Universita' di Firenze, Italy
+ *
+ * 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: Tommaso Pecorella
+ */
+
+// Network topology
+//
+// SRC
+// |<=== source network
+// A-----B
+// \ / \ all networks have cost 1, except
+// \ / | for the direct link from C to D, which
+// C / has cost 10
+// | /
+// |/
+// D
+// |<=== target network
+// DST
+//
+//
+// A, B, C and D are RIPng routers.
+// A and D are configured with static addresses.
+// SRC and DST will exchange packets.
+//
+// After about 3 seconds, the topology is built, and Echo Reply will be received.
+// After 40 seconds, the link between B and D will break, causing a route failure.
+// After 44 seconds from the failure, the routers will recovery from the failure.
+// Split Horizoning should affect the recovery time, but it is not. See the manual
+// for an explanation of this effect.
+//
+// If "showPings" is enabled, the user will see:
+// 1) if the ping has been acknowledged
+// 2) if a Destination Unreachable has been received by the sender
+// 3) nothing, when the Echo Request has been received by the destination but
+// the Echo Reply is unable to reach the sender.
+// Examining the .pcap files with Wireshark can confirm this effect.
+
+
+#include
+#include "ns3/core-module.h"
+#include "ns3/internet-module.h"
+#include "ns3/csma-module.h"
+#include "ns3/internet-apps-module.h"
+#include "ns3/ipv4-static-routing-helper.h"
+#include "ns3/ipv4-routing-table-entry.h"
+
+using namespace ns3;
+
+NS_LOG_COMPONENT_DEFINE ("RipSimpleRouting");
+
+void TearDownLink (Ptr nodeA, Ptr nodeB, uint32_t interfaceA, uint32_t interfaceB)
+{
+ nodeA->GetObject ()->SetDown (interfaceA);
+ nodeB->GetObject ()->SetDown (interfaceB);
+}
+
+int main (int argc, char **argv)
+{
+ bool verbose = false;
+ bool printRoutingTables = false;
+ bool showPings = false;
+ std::string SplitHorizon ("PoisonReverse");
+
+ CommandLine cmd;
+ cmd.AddValue ("verbose", "turn on log components", verbose);
+ cmd.AddValue ("printRoutingTables", "Print routing tables at 30, 60 and 90 seconds", printRoutingTables);
+ cmd.AddValue ("showPings", "Show Ping6 reception", showPings);
+ cmd.AddValue ("splitHorizonStrategy", "Split Horizon strategy to use (NoSplitHorizon, SplitHorizon, PoisonReverse)", SplitHorizon);
+ cmd.Parse (argc, argv);
+
+ if (verbose)
+ {
+ LogComponentEnableAll (LogLevel (LOG_PREFIX_TIME | LOG_PREFIX_NODE));
+ LogComponentEnable ("RipSimpleRouting", LOG_LEVEL_INFO);
+ LogComponentEnable ("Rip", LOG_LEVEL_ALL);
+ LogComponentEnable ("Ipv4Interface", LOG_LEVEL_ALL);
+ LogComponentEnable ("Icmpv4L4Protocol", LOG_LEVEL_ALL);
+ LogComponentEnable ("Ipv4L3Protocol", LOG_LEVEL_ALL);
+ LogComponentEnable ("ArpCache", LOG_LEVEL_ALL);
+ LogComponentEnable ("V4Ping", LOG_LEVEL_ALL);
+ }
+
+ if (SplitHorizon == "NoSplitHorizon")
+ {
+ Config::SetDefault ("ns3::Rip::SplitHorizon", EnumValue (RipNg::NO_SPLIT_HORIZON));
+ }
+ else if (SplitHorizon == "SplitHorizon")
+ {
+ Config::SetDefault ("ns3::Rip::SplitHorizon", EnumValue (RipNg::SPLIT_HORIZON));
+ }
+ else
+ {
+ Config::SetDefault ("ns3::Rip::SplitHorizon", EnumValue (RipNg::POISON_REVERSE));
+ }
+
+ NS_LOG_INFO ("Create nodes.");
+ Ptr src = CreateObject ();
+ Names::Add ("SrcNode", src);
+ Ptr dst = CreateObject ();
+ Names::Add ("DstNode", dst);
+ Ptr a = CreateObject ();
+ Names::Add ("RouterA", a);
+ Ptr b = CreateObject ();
+ Names::Add ("RouterB", b);
+ Ptr c = CreateObject ();
+ Names::Add ("RouterC", c);
+ Ptr d = CreateObject ();
+ Names::Add ("RouterD", d);
+ NodeContainer net1 (src, a);
+ NodeContainer net2 (a, b);
+ NodeContainer net3 (a, c);
+ NodeContainer net4 (b, c);
+ NodeContainer net5 (c, d);
+ NodeContainer net6 (b, d);
+ NodeContainer net7 (d, dst);
+ NodeContainer routers (a, b, c, d);
+ NodeContainer nodes (src, dst);
+
+
+ NS_LOG_INFO ("Create channels.");
+ CsmaHelper csma;
+ csma.SetChannelAttribute ("DataRate", DataRateValue (5000000));
+ csma.SetChannelAttribute ("Delay", TimeValue (MilliSeconds (2)));
+ NetDeviceContainer ndc1 = csma.Install (net1);
+ NetDeviceContainer ndc2 = csma.Install (net2);
+ NetDeviceContainer ndc3 = csma.Install (net3);
+ NetDeviceContainer ndc4 = csma.Install (net4);
+ NetDeviceContainer ndc5 = csma.Install (net5);
+ NetDeviceContainer ndc6 = csma.Install (net6);
+ NetDeviceContainer ndc7 = csma.Install (net7);
+
+ NS_LOG_INFO ("Create IPv4 and routing");
+ RipHelper ripRouting;
+
+ // Rule of thumb:
+ // Interfaces are added sequentially, starting from 0
+ // However, interface 0 is always the loopback...
+ ripRouting.ExcludeInterface (a, 1);
+ ripRouting.ExcludeInterface (d, 3);
+
+ ripRouting.SetInterfaceMetric (c, 3, 10);
+ ripRouting.SetInterfaceMetric (d, 1, 10);
+
+ Ipv4ListRoutingHelper listRH;
+ listRH.Add (ripRouting, 0);
+// Ipv4StaticRoutingHelper staticRh;
+// listRH.Add (staticRh, 5);
+
+ InternetStackHelper internet;
+ internet.SetIpv6StackInstall (false);
+ internet.SetRoutingHelper (listRH);
+ internet.Install (routers);
+
+ InternetStackHelper internetNodes;
+ internetNodes.SetIpv6StackInstall (false);
+ internetNodes.Install (nodes);
+
+ // Assign addresses.
+ // The source and destination networks have global addresses
+ // The "core" network just needs link-local addresses for routing.
+ // We assign global addresses to the routers as well to receive
+ // ICMPv6 errors.
+ NS_LOG_INFO ("Assign IPv4 Addresses.");
+ Ipv4AddressHelper ipv4;
+
+ ipv4.SetBase (Ipv4Address ("10.0.0.0"), Ipv4Mask ("255.255.255.0"));
+ Ipv4InterfaceContainer iic1 = ipv4.Assign (ndc1);
+
+ ipv4.SetBase (Ipv4Address ("10.0.1.0"), Ipv4Mask ("255.255.255.0"));
+ Ipv4InterfaceContainer iic2 = ipv4.Assign (ndc2);
+
+ ipv4.SetBase (Ipv4Address ("10.0.2.0"), Ipv4Mask ("255.255.255.0"));
+ Ipv4InterfaceContainer iic3 = ipv4.Assign (ndc3);
+
+ ipv4.SetBase (Ipv4Address ("10.0.3.0"), Ipv4Mask ("255.255.255.0"));
+ Ipv4InterfaceContainer iic4 = ipv4.Assign (ndc4);
+
+ ipv4.SetBase (Ipv4Address ("10.0.4.0"), Ipv4Mask ("255.255.255.0"));
+ Ipv4InterfaceContainer iic5 = ipv4.Assign (ndc5);
+
+ ipv4.SetBase (Ipv4Address ("10.0.5.0"), Ipv4Mask ("255.255.255.0"));
+ Ipv4InterfaceContainer iic6 = ipv4.Assign (ndc6);
+
+ ipv4.SetBase (Ipv4Address ("10.0.6.0"), Ipv4Mask ("255.255.255.0"));
+ Ipv4InterfaceContainer iic7 = ipv4.Assign (ndc7);
+
+ Ptr staticRouting;
+ staticRouting = Ipv4RoutingHelper::GetRouting (src->GetObject ()->GetRoutingProtocol ());
+ staticRouting->SetDefaultRoute ("10.0.0.2", 1 );
+ staticRouting = Ipv4RoutingHelper::GetRouting (dst->GetObject ()->GetRoutingProtocol ());
+ staticRouting->SetDefaultRoute ("10.0.6.1", 1 );
+
+ if (printRoutingTables)
+ {
+ RipHelper routingHelper;
+
+ Ptr routingStream = Create (&std::cout);
+
+ routingHelper.PrintRoutingTableAt (Seconds (30.0), a, routingStream);
+ routingHelper.PrintRoutingTableAt (Seconds (30.0), b, routingStream);
+ routingHelper.PrintRoutingTableAt (Seconds (30.0), c, routingStream);
+ routingHelper.PrintRoutingTableAt (Seconds (30.0), d, routingStream);
+
+ routingHelper.PrintRoutingTableAt (Seconds (60.0), a, routingStream);
+ routingHelper.PrintRoutingTableAt (Seconds (60.0), b, routingStream);
+ routingHelper.PrintRoutingTableAt (Seconds (60.0), c, routingStream);
+ routingHelper.PrintRoutingTableAt (Seconds (60.0), d, routingStream);
+
+ routingHelper.PrintRoutingTableAt (Seconds (90.0), a, routingStream);
+ routingHelper.PrintRoutingTableAt (Seconds (90.0), b, routingStream);
+ routingHelper.PrintRoutingTableAt (Seconds (90.0), c, routingStream);
+ routingHelper.PrintRoutingTableAt (Seconds (90.0), d, routingStream);
+ }
+
+ NS_LOG_INFO ("Create Applications.");
+ uint32_t packetSize = 1024;
+ Time interPacketInterval = Seconds (1.0);
+ V4PingHelper ping ("10.0.6.2");
+
+ ping.SetAttribute ("Interval", TimeValue (interPacketInterval));
+ ping.SetAttribute ("Size", UintegerValue (packetSize));
+ if (showPings)
+ {
+ ping.SetAttribute ("Verbose", BooleanValue (true));
+ }
+ ApplicationContainer apps = ping.Install (src);
+ apps.Start (Seconds (1.0));
+ apps.Stop (Seconds (110.0));
+
+ AsciiTraceHelper ascii;
+ csma.EnableAsciiAll (ascii.CreateFileStream ("rip-simple-routing.tr"));
+ csma.EnablePcapAll ("rip-simple-routing", true);
+
+ Simulator::Schedule (Seconds (40), &TearDownLink, b, d, 3, 2);
+
+ /* Now, do the actual simulation. */
+ NS_LOG_INFO ("Run Simulation.");
+ Simulator::Stop (Seconds (131.0));
+ Simulator::Run ();
+ Simulator::Destroy ();
+ NS_LOG_INFO ("Done.");
+}
+
diff -Naur ns-3.24.1/examples/routing/simple-routing-ping6.cc ns-3.25/examples/routing/simple-routing-ping6.cc
--- ns-3.24.1/examples/routing/simple-routing-ping6.cc 2015-09-23 12:28:41.000000000 -0700
+++ ns-3.25/examples/routing/simple-routing-ping6.cc 2016-03-23 21:36:53.000000000 -0700
@@ -32,7 +32,7 @@
#include "ns3/core-module.h"
#include "ns3/internet-module.h"
#include "ns3/csma-module.h"
-#include "ns3/applications-module.h"
+#include "ns3/internet-apps-module.h"
#include "ns3/ipv6-static-routing-helper.h"
#include "ns3/ipv6-routing-table-entry.h"
diff -Naur ns-3.24.1/examples/routing/simple-routing-ping6.py ns-3.25/examples/routing/simple-routing-ping6.py
--- ns-3.24.1/examples/routing/simple-routing-ping6.py 2015-09-23 12:28:41.000000000 -0700
+++ ns-3.25/examples/routing/simple-routing-ping6.py 2016-03-23 21:36:53.000000000 -0700
@@ -27,7 +27,7 @@
# router
#
-import ns.applications
+import ns.internet_apps
import ns.core
import ns.csma
import ns.internet
@@ -84,7 +84,7 @@
packetSize = 1024;
maxPacketCount = 5;
interPacketInterval = ns.core.Seconds(1.);
- ping6 = ns.applications.Ping6Helper();
+ ping6 = ns.internet_apps.Ping6Helper();
ping6.SetLocal(i1.GetAddress(0, 1));
ping6.SetRemote(i2.GetAddress(1, 1));
diff -Naur ns-3.24.1/examples/routing/wscript ns-3.25/examples/routing/wscript
--- ns-3.24.1/examples/routing/wscript 2015-09-23 12:28:41.000000000 -0700
+++ ns-3.25/examples/routing/wscript 2016-03-23 21:36:53.000000000 -0700
@@ -30,7 +30,7 @@
obj.source = 'mixed-global-routing.cc'
obj = bld.create_ns3_program('simple-routing-ping6',
- ['csma', 'internet', 'applications'])
+ ['csma', 'internet', 'internet-apps'])
obj.source = 'simple-routing-ping6.cc'
obj = bld.create_ns3_program('manet-routing-compare',
@@ -38,7 +38,15 @@
obj.source = 'manet-routing-compare.cc'
obj = bld.create_ns3_program('ripng-simple-network',
- ['csma', 'internet', 'applications'])
+ ['csma', 'internet', 'internet-apps'])
obj.source = 'ripng-simple-network.cc'
- bld.register_ns3_script('simple-routing-ping6.py', ['csma', 'internet', 'applications'])
+ bld.register_ns3_script('simple-routing-ping6.py', ['csma', 'internet', 'internet-apps'])
+
+ obj = bld.create_ns3_program('rip-simple-network',
+ ['csma', 'internet', 'internet-apps'])
+ obj.source = 'rip-simple-network.cc'
+
+ obj = bld.create_ns3_program('global-routing-multi-switch-plus-router',
+ ['core', 'network', 'applications', 'internet', 'bridge', 'csma', 'point-to-point', 'csma', 'internet'])
+ obj.source = 'global-routing-multi-switch-plus-router.cc'
diff -Naur ns-3.24.1/examples/stats/wifi-example-sim.cc ns-3.25/examples/stats/wifi-example-sim.cc
--- ns-3.24.1/examples/stats/wifi-example-sim.cc 2015-09-23 12:28:41.000000000 -0700
+++ ns-3.25/examples/stats/wifi-example-sim.cc 2016-03-23 21:36:53.000000000 -0700
@@ -122,8 +122,8 @@
nodes.Create (2);
NS_LOG_INFO ("Installing WiFi and Internet stack.");
- WifiHelper wifi = WifiHelper::Default ();
- NqosWifiMacHelper wifiMac = NqosWifiMacHelper::Default ();
+ WifiHelper wifi;
+ WifiMacHelper wifiMac;
wifiMac.SetType ("ns3::AdhocWifiMac");
YansWifiPhyHelper wifiPhy = YansWifiPhyHelper::Default ();
YansWifiChannelHelper wifiChannel = YansWifiChannelHelper::Default ();
diff -Naur ns-3.24.1/examples/tcp/tcp-pcap-nanosec-example.cc ns-3.25/examples/tcp/tcp-pcap-nanosec-example.cc
--- ns-3.24.1/examples/tcp/tcp-pcap-nanosec-example.cc 1969-12-31 16:00:00.000000000 -0800
+++ ns-3.25/examples/tcp/tcp-pcap-nanosec-example.cc 2016-03-23 21:36:53.000000000 -0700
@@ -0,0 +1,159 @@
+/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
+/*
+ * 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
+ */
+
+// ============================================================ //
+// BASED ON tcp-bulk-send.cc //
+// ============================================================ //
+
+// Network topology
+//
+// n0 ----------- n1
+// 500 Kbps
+// 5 ms
+//
+// - Flow from n0 to n1 using BulkSendApplication.
+// - Tracing of queues and packet receptions to file "tcp-pcap-nanosec-example.pcap"
+// when tracing is turned on.
+// - Trace file timestamps are recorded in nanoseconds, when requested
+//
+
+
+// ============================================================ //
+// NOTE: You can check the "magic" number of a pcap file with //
+// the following command: //
+// //
+// od -N4 -tx1 filename.pcap //
+// //
+// ============================================================ //
+
+#include
+#include
+#include "ns3/core-module.h"
+#include "ns3/point-to-point-module.h"
+#include "ns3/internet-module.h"
+#include "ns3/applications-module.h"
+#include "ns3/network-module.h"
+
+using namespace ns3;
+
+NS_LOG_COMPONENT_DEFINE ("TcpPcapNanosecExample");
+
+int
+main (int argc, char *argv[])
+{
+
+ bool tracing = false;
+ bool nanosec = false;
+ uint32_t maxBytes = 0;
+
+//
+// Allow the user to override any of the defaults at
+// run-time, via command-line arguments
+//
+ CommandLine cmd;
+ cmd.AddValue ("tracing", "Flag to enable tracing", tracing);
+ cmd.AddValue ("nanosec", "Flag to use nanosecond timestamps for pcap as default", nanosec);
+ cmd.AddValue ("maxBytes",
+ "Total number of bytes for application to send", maxBytes);
+ cmd.Parse (argc, argv);
+
+//
+// If requested via the --nanosec cmdline flag, generate nanosecond timestamp for pcap traces
+//
+ if (nanosec)
+ {
+ Config::SetDefault ("ns3::PcapFileWrapper::NanosecMode", BooleanValue (true));
+ }
+
+//
+// Explicitly create the nodes required by the topology (shown above).
+//
+ NS_LOG_INFO ("Create nodes.");
+ NodeContainer nodes;
+ nodes.Create (2);
+
+ NS_LOG_INFO ("Create channels.");
+
+//
+// Explicitly create the point-to-point link required by the topology (shown above).
+//
+ PointToPointHelper pointToPoint;
+ pointToPoint.SetDeviceAttribute ("DataRate", StringValue ("500Kbps"));
+ pointToPoint.SetChannelAttribute ("Delay", StringValue ("5ms"));
+
+ NetDeviceContainer devices;
+ devices = pointToPoint.Install (nodes);
+
+//
+// Install the internet stack on the nodes
+//
+ InternetStackHelper internet;
+ internet.Install (nodes);
+
+//
+// We've got the "hardware" in place. Now we need to add IP addresses.
+//
+ NS_LOG_INFO ("Assign IP Addresses.");
+ Ipv4AddressHelper ipv4;
+ ipv4.SetBase ("10.1.1.0", "255.255.255.0");
+ Ipv4InterfaceContainer i = ipv4.Assign (devices);
+
+ NS_LOG_INFO ("Create Applications.");
+
+//
+// Create a BulkSendApplication and install it on node 0
+//
+ uint16_t port = 9; // well-known echo port number
+
+
+ BulkSendHelper source ("ns3::TcpSocketFactory",
+ InetSocketAddress (i.GetAddress (1), port));
+ // Set the amount of data to send in bytes. Zero is unlimited.
+ source.SetAttribute ("MaxBytes", UintegerValue (maxBytes));
+ ApplicationContainer sourceApps = source.Install (nodes.Get (0));
+ sourceApps.Start (Seconds (0.0));
+ sourceApps.Stop (Seconds (10.0));
+
+//
+// Create a PacketSinkApplication and install it on node 1
+//
+ PacketSinkHelper sink ("ns3::TcpSocketFactory",
+ InetSocketAddress (Ipv4Address::GetAny (), port));
+ ApplicationContainer sinkApps = sink.Install (nodes.Get (1));
+ sinkApps.Start (Seconds (0.0));
+ sinkApps.Stop (Seconds (10.0));
+
+//
+// Set up tracing if enabled
+//
+ if (tracing)
+ {
+ AsciiTraceHelper ascii;
+ pointToPoint.EnablePcapAll ("tcp-pcap-nanosec-example", false);
+ }
+
+//
+// Now, do the actual simulation.
+//
+ NS_LOG_INFO ("Run Simulation.");
+ Simulator::Stop (Seconds (10.0));
+ Simulator::Run ();
+ Simulator::Destroy ();
+ NS_LOG_INFO ("Done.");
+
+ Ptr sink1 = DynamicCast (sinkApps.Get (0));
+ std::cout << "Total Bytes Received: " << sink1->GetTotalRx () << std::endl;
+}
diff -Naur ns-3.24.1/examples/tcp/tcp-variants-comparison.cc ns-3.25/examples/tcp/tcp-variants-comparison.cc
--- ns-3.24.1/examples/tcp/tcp-variants-comparison.cc 2015-09-23 12:28:41.000000000 -0700
+++ ns-3.25/examples/tcp/tcp-variants-comparison.cc 2016-03-23 21:36:53.000000000 -0700
@@ -49,6 +49,7 @@
#include "ns3/event-id.h"
#include "ns3/flow-monitor-helper.h"
#include "ns3/ipv4-global-routing-helper.h"
+#include "ns3/traffic-control-module.h"
using namespace ns3;
@@ -160,40 +161,39 @@
std::string transport_prot = "TcpWestwood";
double error_p = 0.0;
std::string bandwidth = "2Mbps";
+ std::string delay = "0.01ms";
std::string access_bandwidth = "10Mbps";
std::string access_delay = "45ms";
bool tracing = false;
- std::string tr_file_name = "";
- std::string cwnd_tr_file_name = "";
- std::string ssthresh_tr_file_name = "";
- std::string rtt_tr_file_name = "";
- std::string rto_tr_file_name = "";
+ std::string prefix_file_name = "TcpVariantsComparison";
double data_mbytes = 0;
uint32_t mtu_bytes = 400;
uint16_t num_flows = 1;
float duration = 100;
uint32_t run = 0;
- bool flow_monitor = true;
+ bool flow_monitor = false;
+ bool pcap = false;
+ std::string queue_disc_type = "ns3::PfifoFastQueueDisc";
CommandLine cmd;
- cmd.AddValue ("transport_prot", "Transport protocol to use: TcpTahoe, TcpReno, TcpNewReno, TcpWestwood, TcpWestwoodPlus ", transport_prot);
+ cmd.AddValue ("transport_prot", "Transport protocol to use: TcpNewReno, "
+ " TcpWestwood, TcpWestwoodPlus ", transport_prot);
cmd.AddValue ("error_p", "Packet error rate", error_p);
cmd.AddValue ("bandwidth", "Bottleneck bandwidth", bandwidth);
+ cmd.AddValue ("delay", "Bottleneck delay", delay);
cmd.AddValue ("access_bandwidth", "Access link bandwidth", access_bandwidth);
- cmd.AddValue ("delay", "Access link delay", access_delay);
+ cmd.AddValue ("access_delay", "Access link delay", access_delay);
cmd.AddValue ("tracing", "Flag to enable/disable tracing", tracing);
- cmd.AddValue ("tr_name", "Name of output trace file", tr_file_name);
- cmd.AddValue ("cwnd_tr_name", "Name of output trace file", cwnd_tr_file_name);
- cmd.AddValue ("ssthresh_tr_name", "Name of output trace file", ssthresh_tr_file_name);
- cmd.AddValue ("rtt_tr_name", "Name of output trace file", rtt_tr_file_name);
- cmd.AddValue ("rto_tr_name", "Name of output trace file", rto_tr_file_name);
+ cmd.AddValue ("prefix_name", "Prefix of output trace file", prefix_file_name);
cmd.AddValue ("data", "Number of Megabytes of data to transmit", data_mbytes);
cmd.AddValue ("mtu", "Size of IP packets to send in bytes", mtu_bytes);
cmd.AddValue ("num_flows", "Number of flows", num_flows);
cmd.AddValue ("duration", "Time to allow flows to run in seconds", duration);
cmd.AddValue ("run", "Run index (for setting repeatable seeds)", run);
cmd.AddValue ("flow_monitor", "Enable flow monitor", flow_monitor);
+ cmd.AddValue ("pcap_tracing", "Enable or disable PCAP tracing", pcap);
+ cmd.AddValue ("queue_disc_type", "Queue disc type for gateway (e.g. ns3::CoDelQueueDisc)", queue_disc_type);
cmd.Parse (argc, argv);
SeedManager::SetSeed (1);
@@ -202,7 +202,7 @@
// User may find it convenient to enable logging
//LogComponentEnable("TcpVariantsComparison", LOG_LEVEL_ALL);
//LogComponentEnable("BulkSendApplication", LOG_LEVEL_INFO);
- //LogComponentEnable("DropTailQueue", LOG_LEVEL_ALL);
+ //LogComponentEnable("PfifoFastQueueDisc", LOG_LEVEL_ALL);
// Calculate the ADU size
Header* temp_header = new Ipv4Header ();
@@ -213,23 +213,19 @@
uint32_t tcp_header = temp_header->GetSerializedSize ();
NS_LOG_LOGIC ("TCP Header size is: " << tcp_header);
delete temp_header;
- uint32_t tcp_adu_size = mtu_bytes - (ip_header + tcp_header);
+ uint32_t tcp_adu_size = mtu_bytes - 20 - (ip_header + tcp_header);
NS_LOG_LOGIC ("TCP ADU size is: " << tcp_adu_size);
// Set the simulation start and stop time
float start_time = 0.1;
float stop_time = start_time + duration;
+ // 4 MB of TCP buffer
+ Config::SetDefault ("ns3::TcpSocket::RcvBufSize", UintegerValue (1 << 21));
+ Config::SetDefault ("ns3::TcpSocket::SndBufSize", UintegerValue (1 << 21));
+
// Select TCP variant
- if (transport_prot.compare ("TcpTahoe") == 0)
- {
- Config::SetDefault ("ns3::TcpL4Protocol::SocketType", TypeIdValue (TcpTahoe::GetTypeId ()));
- }
- else if (transport_prot.compare ("TcpReno") == 0)
- {
- Config::SetDefault ("ns3::TcpL4Protocol::SocketType", TypeIdValue (TcpReno::GetTypeId ()));
- }
- else if (transport_prot.compare ("TcpNewReno") == 0)
+ if (transport_prot.compare ("TcpNewReno") == 0)
{
Config::SetDefault ("ns3::TcpL4Protocol::SocketType", TypeIdValue (TcpNewReno::GetTypeId ()));
}
@@ -269,13 +265,20 @@
PointToPointHelper UnReLink;
UnReLink.SetDeviceAttribute ("DataRate", StringValue (bandwidth));
- UnReLink.SetChannelAttribute ("Delay", StringValue ("0.01ms"));
+ UnReLink.SetChannelAttribute ("Delay", StringValue (delay));
UnReLink.SetDeviceAttribute ("ReceiveErrorModel", PointerValue (&error_model));
InternetStackHelper stack;
stack.InstallAll ();
+ TrafficControlHelper tchPfifo;
+ uint32_t handle = tchPfifo.SetRootQueueDisc ("ns3::PfifoFastQueueDisc");
+ tchPfifo.AddPacketFilter (handle, "ns3::PfifoFastIpv4PacketFilter");
+
+ TrafficControlHelper tchCoDel;
+ tchCoDel.SetRootQueueDisc ("ns3::CoDelQueueDisc");
+
Ipv4AddressHelper address;
address.SetBase ("10.0.0.0", "255.255.255.0");
@@ -284,14 +287,43 @@
PointToPointHelper LocalLink;
LocalLink.SetDeviceAttribute ("DataRate", StringValue (access_bandwidth));
LocalLink.SetChannelAttribute ("Delay", StringValue (access_delay));
+
Ipv4InterfaceContainer sink_interfaces;
+
+ DataRate access_b (access_bandwidth);
+ DataRate bottle_b (bandwidth);
+ Time access_d (access_delay);
+ Time bottle_d (delay);
+
+ Config::SetDefault ("ns3::CoDelQueueDisc::Mode", EnumValue (Queue::QUEUE_MODE_BYTES));
+
+ uint32_t size = (std::min (access_b, bottle_b).GetBitRate () / 8) *
+ ((access_d + bottle_d) * 2).GetSeconds ();
+
+ Config::SetDefault ("ns3::PfifoFastQueueDisc::Limit", UintegerValue (size / mtu_bytes));
+ Config::SetDefault ("ns3::CoDelQueueDisc::MaxBytes", UintegerValue (size));
+
for (int i = 0; i < num_flows; i++)
{
NetDeviceContainer devices;
devices = LocalLink.Install (sources.Get (i), gateways.Get (0));
+ tchPfifo.Install (devices);
address.NewNetwork ();
Ipv4InterfaceContainer interfaces = address.Assign (devices);
+
devices = UnReLink.Install (gateways.Get (0), sinks.Get (i));
+ if (queue_disc_type.compare ("ns3::PfifoFastQueueDisc") == 0)
+ {
+ tchPfifo.Install (devices);
+ }
+ else if (queue_disc_type.compare ("ns3::CoDelQueueDisc") == 0)
+ {
+ tchCoDel.Install (devices);
+ }
+ else
+ {
+ NS_FATAL_ERROR ("Queue not recognized. Allowed values are ns3::CoDelQueueDisc or ns3::PfifoFastQueueDisc");
+ }
address.NewNetwork ();
interfaces = address.Assign (devices);
sink_interfaces.Add (interfaces.Get (1));
@@ -308,11 +340,13 @@
{
AddressValue remoteAddress (InetSocketAddress (sink_interfaces.GetAddress (i, 0), port));
- if (transport_prot.compare ("TcpTahoe") == 0
- || transport_prot.compare ("TcpReno") == 0
- || transport_prot.compare ("TcpNewReno") == 0
+ if (transport_prot.compare ("TcpNewReno") == 0
|| transport_prot.compare ("TcpWestwood") == 0
- || transport_prot.compare ("TcpWestwoodPlus") == 0)
+ || transport_prot.compare ("TcpWestwoodPlus") == 0
+ || transport_prot.compare ("TcpHybla") == 0
+ || transport_prot.compare ("TcpHighSpeed") == 0
+ || transport_prot.compare ("TcpBic") == 0
+ || transport_prot.compare ("TcpCubic") == 0)
{
Config::SetDefault ("ns3::TcpSocket::SegmentSize", UintegerValue (tcp_adu_size));
BulkSendHelper ftp ("ns3::TcpSocketFactory", Address ());
@@ -339,39 +373,24 @@
// Set up tracing if enabled
if (tracing)
{
- if (tr_file_name.compare ("") != 0)
- {
- std::ofstream ascii;
- Ptr ascii_wrap;
- ascii.open (tr_file_name.c_str ());
- ascii_wrap = new OutputStreamWrapper (tr_file_name.c_str (), std::ios::out);
- stack.EnableAsciiIpv4All (ascii_wrap);
- }
-
- if (cwnd_tr_file_name.compare ("") != 0)
- {
- Simulator::Schedule (Seconds (0.00001), &TraceCwnd, cwnd_tr_file_name);
- }
-
- if (ssthresh_tr_file_name.compare ("") != 0)
- {
- Simulator::Schedule (Seconds (0.00001), &TraceSsThresh, ssthresh_tr_file_name);
- }
-
- if (rtt_tr_file_name.compare ("") != 0)
- {
- Simulator::Schedule (Seconds (0.00001), &TraceRtt, rtt_tr_file_name);
- }
-
- if (rto_tr_file_name.compare ("") != 0)
- {
- Simulator::Schedule (Seconds (0.00001), &TraceRto, rto_tr_file_name);
- }
-
+ std::ofstream ascii;
+ Ptr ascii_wrap;
+ ascii.open ((prefix_file_name + "-ascii").c_str ());
+ ascii_wrap = new OutputStreamWrapper ((prefix_file_name + "-ascii").c_str (),
+ std::ios::out);
+ stack.EnableAsciiIpv4All (ascii_wrap);
+
+ Simulator::Schedule (Seconds (0.00001), &TraceCwnd, prefix_file_name + "-cwnd.data");
+ Simulator::Schedule (Seconds (0.00001), &TraceSsThresh, prefix_file_name + "-ssth.data");
+ Simulator::Schedule (Seconds (0.00001), &TraceRtt, prefix_file_name + "-rtt.data");
+ Simulator::Schedule (Seconds (0.00001), &TraceRto, prefix_file_name + "-rto.data");
}
- UnReLink.EnablePcapAll ("TcpVariantsComparison", true);
- LocalLink.EnablePcapAll ("TcpVariantsComparison", true);
+ if (pcap)
+ {
+ UnReLink.EnablePcapAll (prefix_file_name, true);
+ LocalLink.EnablePcapAll (prefix_file_name, true);
+ }
// Flow monitor
FlowMonitorHelper flowHelper;
@@ -385,7 +404,7 @@
if (flow_monitor)
{
- flowHelper.SerializeToXmlFile ("TcpVariantsComparison.flowmonitor", true, true);
+ flowHelper.SerializeToXmlFile (prefix_file_name + ".flowmonitor", true, true);
}
Simulator::Destroy ();
diff -Naur ns-3.24.1/examples/tcp/wscript ns-3.25/examples/tcp/wscript
--- ns-3.24.1/examples/tcp/wscript 2015-09-23 12:28:41.000000000 -0700
+++ ns-3.25/examples/tcp/wscript 2016-03-23 21:36:53.000000000 -0700
@@ -25,6 +25,10 @@
['point-to-point', 'applications', 'internet'])
obj.source = 'tcp-bulk-send.cc'
+ obj = bld.create_ns3_program('tcp-pcap-nanosec-example',
+ ['point-to-point', 'applications', 'internet'])
+ obj.source = 'tcp-pcap-nanosec-example.cc'
+
obj = bld.create_ns3_program('tcp-nsc-comparison',
['point-to-point', 'internet', 'applications', 'flow-monitor'])
diff -Naur ns-3.24.1/examples/traffic-control/examples-to-run.py ns-3.25/examples/traffic-control/examples-to-run.py
--- ns-3.24.1/examples/traffic-control/examples-to-run.py 1969-12-31 16:00:00.000000000 -0800
+++ ns-3.25/examples/traffic-control/examples-to-run.py 2016-03-23 21:36:53.000000000 -0700
@@ -0,0 +1,20 @@
+#! /usr/bin/env python
+## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-
+
+# A list of C++ examples to run in order to ensure that they remain
+# buildable and runnable over time. Each tuple in the list contains
+#
+# (example_name, do_run, do_valgrind_run).
+#
+# See test.py for more information.
+cpp_examples = [
+ ("traffic-control", "True", "True"),
+]
+
+# A list of Python examples to run in order to ensure that they remain
+# runnable over time. Each tuple in the list contains
+#
+# (example_name, do_run).
+#
+# See test.py for more information.
+python_examples = []
diff -Naur ns-3.24.1/examples/traffic-control/traffic-control.cc ns-3.25/examples/traffic-control/traffic-control.cc
--- ns-3.24.1/examples/traffic-control/traffic-control.cc 1969-12-31 16:00:00.000000000 -0800
+++ ns-3.25/examples/traffic-control/traffic-control.cc 2016-03-23 21:36:53.000000000 -0700
@@ -0,0 +1,186 @@
+/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
+/*
+ * Copyright (c) 2015 Universita' degli Studi di Napoli "Federico II"
+ *
+ * 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: Pasquale Imputato
+ * Author: Stefano Avallone
+ */
+
+#include "ns3/core-module.h"
+#include "ns3/network-module.h"
+#include "ns3/internet-module.h"
+#include "ns3/point-to-point-module.h"
+#include "ns3/applications-module.h"
+#include "ns3/traffic-control-module.h"
+
+// This simple example shows how to use TrafficControlHelper to install a
+// QueueDisc on a device.
+//
+// The default QueueDisc is a pfifo_fast with max number of packets equal to
+// 1000 (as in Linux). However, in this example, we change from the default
+// to instead use a ns3::RedQueueDisc with a MaxPackets value of 10000.
+//
+// Network topology
+//
+// 10.1.1.0
+// n0 -------------- n1
+// point-to-point
+//
+// The output will consist of a number of traced changes to queue lengths
+// such as:
+//
+// DevicePacketsInQueue 0 to 1
+// TcPacketsInQueue 5 to 4
+// TcPacketsInQueue 4 to 5
+// DevicePacketsInQueue 1 to 0
+//
+// and an average throughput:
+//
+// Average throughput: 8.72854 Mbit/s
+//
+// The final output displays the number of drops at the TC layer and the
+// netdevice layer. These statistics highlight the fact that for
+// PointToPointNetDevice, the drops at the device layer are actually
+// requeued at the TC layer, so the true packet drops (39 in this case)
+// must be traced at the TC layer.
+//
+// *** Source stats ***
+// Number of packets dropped by the TC layer: 39
+// Number of packets dropped by the netdevice: 3914
+// Number of packets requeued by the TC layer: 3914
+// Number of actually lost packets: 39
+//
+// If one were to increase the size of the PointToPointNetDevice's
+// DropTailQueue from 1 to a larger number (e.g. 1000), one would observe
+// that the number of packets dropped would go to zero, but the latency
+// and QoS would not be controllable. This is the so-called bufferbloat
+// problem, and illustrates the importance of having a small device queue
+// so that the standing queues build in the traffic control layer where
+// they can be managed by advanced queue discs rather than in the
+// device layer.
+
+using namespace ns3;
+
+NS_LOG_COMPONENT_DEFINE ("TrafficControlExample");
+
+void
+TcPacketsInQueueTrace (uint32_t oldValue, uint32_t newValue)
+{
+ std::cout << "TcPacketsInQueue " << oldValue << " to " << newValue << std::endl;
+}
+
+void
+DevicePacketsInQueueTrace (uint32_t oldValue, uint32_t newValue)
+{
+ std::cout << "DevicePacketsInQueue " << oldValue << " to " << newValue << std::endl;
+}
+
+int
+main (int argc, char *argv[])
+{
+ double simulationTime = 10; //seconds
+ std::string transportProt = "Tcp";
+ std::string socketType;
+
+ CommandLine cmd;
+ cmd.AddValue ("transportProt", "Transport protocol to use: Tcp, Udp", transportProt);
+ cmd.Parse (argc, argv);
+
+ if (transportProt.compare ("Tcp") == 0)
+ {
+ socketType = "ns3::TcpSocketFactory";
+ }
+ else
+ {
+ socketType = "ns3::UdpSocketFactory";
+ }
+
+ NodeContainer nodes;
+ nodes.Create (2);
+
+ PointToPointHelper pointToPoint;
+ pointToPoint.SetDeviceAttribute ("DataRate", StringValue ("10Mbps"));
+ pointToPoint.SetChannelAttribute ("Delay", StringValue ("2ms"));
+ pointToPoint.SetQueue ("ns3::DropTailQueue", "Mode", StringValue ("QUEUE_MODE_PACKETS"), "MaxPackets", UintegerValue (1));
+
+ NetDeviceContainer devices;
+ devices = pointToPoint.Install (nodes);
+
+ InternetStackHelper stack;
+ stack.Install (nodes);
+
+ TrafficControlHelper tch;
+ uint16_t handle = tch.SetRootQueueDisc ("ns3::RedQueueDisc");
+ // Add the internal queue used by Red
+ tch.AddInternalQueues (handle, 1, "ns3::DropTailQueue", "MaxPackets", UintegerValue (10000));
+ QueueDiscContainer qdiscs = tch.Install (devices);
+
+ Ptr q = qdiscs.Get (1);
+ q->TraceConnectWithoutContext ("PacketsInQueue", MakeCallback (&TcPacketsInQueueTrace));
+
+ Ptr nd = devices.Get (1);
+ Ptr ptpnd = DynamicCast (nd);
+ Ptr queue = ptpnd->GetQueue ();
+ queue->TraceConnectWithoutContext ("PacketsInQueue", MakeCallback (&DevicePacketsInQueueTrace));
+
+ Ipv4AddressHelper address;
+ address.SetBase ("10.1.1.0", "255.255.255.0");
+
+ Ipv4InterfaceContainer interfaces = address.Assign (devices);
+
+ //Flow
+ uint16_t port = 7;
+ Address localAddress (InetSocketAddress (Ipv4Address::GetAny (), port));
+ PacketSinkHelper packetSinkHelper (socketType, localAddress);
+ ApplicationContainer sinkApp = packetSinkHelper.Install (nodes.Get (0));
+
+ sinkApp.Start (Seconds (0.0));
+ sinkApp.Stop (Seconds (simulationTime + 0.1));
+
+ uint32_t payloadSize = 1448;
+ Config::SetDefault ("ns3::TcpSocket::SegmentSize", UintegerValue (payloadSize));
+
+ OnOffHelper onoff (socketType, Ipv4Address::GetAny ());
+ onoff.SetAttribute ("OnTime", StringValue ("ns3::ConstantRandomVariable[Constant=1]"));
+ onoff.SetAttribute ("OffTime", StringValue ("ns3::ConstantRandomVariable[Constant=0]"));
+ onoff.SetAttribute ("PacketSize", UintegerValue (payloadSize));
+ onoff.SetAttribute ("DataRate", StringValue ("50Mbps")); //bit/s
+ ApplicationContainer apps;
+
+ AddressValue remoteAddress (InetSocketAddress (interfaces.GetAddress (0), port));
+ onoff.SetAttribute ("Remote", remoteAddress);
+ apps.Add (onoff.Install (nodes.Get (1)));
+ apps.Start (Seconds (1.0));
+ apps.Stop (Seconds (simulationTime + 0.1));
+
+ Simulator::Stop (Seconds (simulationTime + 0.1));
+ Simulator::Run ();
+ Simulator::Destroy ();
+
+ double thr = 0;
+ uint32_t totalPacketsThr = DynamicCast (sinkApp.Get (0))->GetTotalRx ();
+ thr = totalPacketsThr * 8 / (simulationTime * 1000000.0); //Mbit/s
+ std::cout << "Average throughput: " << thr << " Mbit/s" <GetTotalDroppedPackets () << std::endl;
+ std::cout << "Number of packets dropped by the netdevice: " << queue->GetTotalDroppedPackets () << std::endl;
+ std::cout << "Number of packets requeued by the TC layer: " << q->GetTotalRequeuedPackets () << std::endl;
+ std::cout << "Number of actually lost packets: " << q->GetTotalDroppedPackets ()
+ + queue->GetTotalDroppedPackets ()
+ - q->GetTotalRequeuedPackets () << std::endl;
+
+ return 0;
+}
diff -Naur ns-3.24.1/examples/traffic-control/wscript ns-3.25/examples/traffic-control/wscript
--- ns-3.24.1/examples/traffic-control/wscript 1969-12-31 16:00:00.000000000 -0800
+++ ns-3.25/examples/traffic-control/wscript 2016-03-23 21:36:53.000000000 -0700
@@ -0,0 +1,6 @@
+## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-
+
+def build(bld):
+ obj = bld.create_ns3_program('traffic-control',
+ ['internet', 'point-to-point', 'applications', 'traffic-control'])
+ obj.source = 'traffic-control.cc'
diff -Naur ns-3.24.1/examples/tutorial/third.cc ns-3.25/examples/tutorial/third.cc
--- ns-3.24.1/examples/tutorial/third.cc 2015-09-23 12:28:41.000000000 -0700
+++ ns-3.25/examples/tutorial/third.cc 2016-03-23 21:36:53.000000000 -0700
@@ -102,11 +102,10 @@
YansWifiPhyHelper phy = YansWifiPhyHelper::Default ();
phy.SetChannel (channel.Create ());
- WifiHelper wifi = WifiHelper::Default ();
+ WifiHelper wifi;
wifi.SetRemoteStationManager ("ns3::AarfWifiManager");
- NqosWifiMacHelper mac = NqosWifiMacHelper::Default ();
-
+ WifiMacHelper mac;
Ssid ssid = Ssid ("ns-3-ssid");
mac.SetType ("ns3::StaWifiMac",
"Ssid", SsidValue (ssid),
diff -Naur ns-3.24.1/examples/tutorial/third.py ns-3.25/examples/tutorial/third.py
--- ns-3.24.1/examples/tutorial/third.py 2015-09-23 12:28:41.000000000 -0700
+++ ns-3.25/examples/tutorial/third.py 2016-03-23 21:36:53.000000000 -0700
@@ -86,10 +86,10 @@
phy = ns.wifi.YansWifiPhyHelper.Default()
phy.SetChannel(channel.Create())
-wifi = ns.wifi.WifiHelper.Default()
+wifi = ns.wifi.WifiHelper()
wifi.SetRemoteStationManager("ns3::AarfWifiManager")
-mac = ns.wifi.NqosWifiMacHelper.Default()
+mac = ns.wifi.WifiMacHelper()
ssid = ns.wifi.Ssid ("ns-3-ssid")
mac.SetType ("ns3::StaWifiMac", "Ssid", ns.wifi.SsidValue(ssid), "ActiveProbing", ns.core.BooleanValue(False))
diff -Naur ns-3.24.1/examples/wireless/80211n-mimo.cc ns-3.25/examples/wireless/80211n-mimo.cc
--- ns-3.24.1/examples/wireless/80211n-mimo.cc 1969-12-31 16:00:00.000000000 -0800
+++ ns-3.25/examples/wireless/80211n-mimo.cc 2016-03-23 21:36:53.000000000 -0700
@@ -0,0 +1,319 @@
+/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */
+/*
+ * 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
+ *
+ * Authors: Sébastien Deronne
+ */
+
+// This example is used to validate 802.11n MIMO.
+//
+// It outputs plots of the throughput versus the distance
+// for every HT MCS value and from 1 to 4 MIMO streams.
+//
+// The simulation assumes a single station in an infrastructure network:
+//
+// STA AP
+// * *
+// | |
+// n1 n2
+//
+// The user can choose whether UDP or TCP should be used and can configure
+// some 802.11n parameters (frequency, channel width and guard interval).
+
+#include "ns3/core-module.h"
+#include "ns3/network-module.h"
+#include "ns3/applications-module.h"
+#include "ns3/wifi-module.h"
+#include "ns3/mobility-module.h"
+#include "ns3/ipv4-global-routing-helper.h"
+#include "ns3/internet-module.h"
+#include "ns3/gnuplot.h"
+#include
+#include
+#include
+
+using namespace ns3;
+
+int main (int argc, char *argv[])
+{
+ std::ofstream file ("80211n-mimo-throughput.plt");
+
+ std::vector modes;
+ modes.push_back ("HtMcs0");
+ modes.push_back ("HtMcs1");
+ modes.push_back ("HtMcs2");
+ modes.push_back ("HtMcs3");
+ modes.push_back ("HtMcs4");
+ modes.push_back ("HtMcs5");
+ modes.push_back ("HtMcs6");
+ modes.push_back ("HtMcs7");
+ modes.push_back ("HtMcs8");
+ modes.push_back ("HtMcs9");
+ modes.push_back ("HtMcs10");
+ modes.push_back ("HtMcs11");
+ modes.push_back ("HtMcs12");
+ modes.push_back ("HtMcs13");
+ modes.push_back ("HtMcs14");
+ modes.push_back ("HtMcs15");
+ modes.push_back ("HtMcs16");
+ modes.push_back ("HtMcs17");
+ modes.push_back ("HtMcs18");
+ modes.push_back ("HtMcs19");
+ modes.push_back ("HtMcs20");
+ modes.push_back ("HtMcs21");
+ modes.push_back ("HtMcs22");
+ modes.push_back ("HtMcs23");
+ modes.push_back ("HtMcs24");
+ modes.push_back ("HtMcs25");
+ modes.push_back ("HtMcs26");
+ modes.push_back ("HtMcs27");
+ modes.push_back ("HtMcs28");
+ modes.push_back ("HtMcs29");
+ modes.push_back ("HtMcs30");
+ modes.push_back ("HtMcs31");
+
+ bool udp = true;
+ double simulationTime = 5; //seconds
+ double frequency = 5.0; //whether 2.4 or 5.0 GHz
+ double step = 5; //meters
+ bool shortGuardInterval = false;
+ bool channelBonding = false;
+
+ CommandLine cmd;
+ cmd.AddValue ("step", "Granularity of the results to be plotted in meters", step);
+ cmd.AddValue ("channelBonding", "Enable/disable channel bonding (channel width = 20 MHz if false, channel width = 40 MHz if true)", channelBonding);
+ cmd.AddValue ("shortGuardInterval", "Enable/disable short guard interval", shortGuardInterval);
+ cmd.AddValue ("frequency", "Whether working in the 2.4 or 5.0 GHz band (other values gets rejected)", frequency);
+ cmd.AddValue ("udp", "UDP if set to 1, TCP otherwise", udp);
+ cmd.Parse (argc,argv);
+
+ Gnuplot plot = Gnuplot ("80211n-mimo-throughput.eps");
+
+ for (uint32_t i = 0; i < modes.size (); i++) //MCS
+ {
+ std::cout << modes[i] << std::endl;
+ Gnuplot2dDataset dataset (modes[i]);
+ for (int d = 0; d <= 100; ) //distance
+ {
+ std::cout << "Distance = " << d << "m: "<< std::endl;
+ uint32_t payloadSize; //1500 byte IP packet
+ if (udp)
+ {
+ payloadSize = 1472; //bytes
+ }
+ else
+ {
+ payloadSize = 1448; //bytes
+ Config::SetDefault ("ns3::TcpSocket::SegmentSize", UintegerValue (payloadSize));
+ }
+
+ uint8_t nStreams = 1 + (i / 8); //number of MIMO streams
+
+ NodeContainer wifiStaNode;
+ wifiStaNode.Create (1);
+ NodeContainer wifiApNode;
+ wifiApNode.Create (1);
+
+ YansWifiChannelHelper channel = YansWifiChannelHelper::Default ();
+ YansWifiPhyHelper phy = YansWifiPhyHelper::Default ();
+ phy.SetChannel (channel.Create ());
+
+ // Set guard interval
+ phy.Set ("ShortGuardEnabled", BooleanValue (shortGuardInterval));
+ // Set MIMO capabilities
+ phy.Set ("TxAntennas", UintegerValue (nStreams));
+ phy.Set ("RxAntennas", UintegerValue (nStreams));
+
+ WifiMacHelper mac;
+ WifiHelper wifi;
+ if (frequency == 5.0)
+ {
+ wifi.SetStandard (WIFI_PHY_STANDARD_80211n_5GHZ);
+ }
+ else if (frequency == 2.4)
+ {
+ wifi.SetStandard (WIFI_PHY_STANDARD_80211n_2_4GHZ);
+ Config::SetDefault ("ns3::LogDistancePropagationLossModel::ReferenceLoss", DoubleValue (40.046));
+ }
+ else
+ {
+ std::cout<<"Wrong frequency value!"< positionAlloc = CreateObject ();
+
+ positionAlloc->Add (Vector (0.0, 0.0, 0.0));
+ positionAlloc->Add (Vector (d, 0.0, 0.0));
+ mobility.SetPositionAllocator (positionAlloc);
+
+ mobility.SetMobilityModel ("ns3::ConstantPositionMobilityModel");
+
+ mobility.Install (wifiApNode);
+ mobility.Install (wifiStaNode);
+
+ /* Internet stack*/
+ InternetStackHelper stack;
+ stack.Install (wifiApNode);
+ stack.Install (wifiStaNode);
+
+ Ipv4AddressHelper address;
+
+ address.SetBase ("192.168.1.0", "255.255.255.0");
+ Ipv4InterfaceContainer staNodeInterface;
+ Ipv4InterfaceContainer apNodeInterface;
+
+ staNodeInterface = address.Assign (staDevice);
+ apNodeInterface = address.Assign (apDevice);
+
+ /* Setting applications */
+ ApplicationContainer serverApp, sinkApp;
+ if (udp)
+ {
+ //UDP flow
+ UdpServerHelper myServer (9);
+ serverApp = myServer.Install (wifiStaNode.Get (0));
+ serverApp.Start (Seconds (0.0));
+ serverApp.Stop (Seconds (simulationTime + 1));
+
+ UdpClientHelper myClient (staNodeInterface.GetAddress (0), 9);
+ myClient.SetAttribute ("MaxPackets", UintegerValue (4294967295u));
+ myClient.SetAttribute ("Interval", TimeValue (Time ("0.00001"))); //packets/s
+ myClient.SetAttribute ("PacketSize", UintegerValue (payloadSize));
+
+ ApplicationContainer clientApp = myClient.Install (wifiApNode.Get (0));
+ clientApp.Start (Seconds (1.0));
+ clientApp.Stop (Seconds (simulationTime + 1));
+ }
+ else
+ {
+ //TCP flow
+ uint16_t port = 50000;
+ Address apLocalAddress (InetSocketAddress (Ipv4Address::GetAny (), port));
+ PacketSinkHelper packetSinkHelper ("ns3::TcpSocketFactory", apLocalAddress);
+ sinkApp = packetSinkHelper.Install (wifiStaNode.Get (0));
+
+ sinkApp.Start (Seconds (0.0));
+ sinkApp.Stop (Seconds (simulationTime + 1));
+
+ OnOffHelper onoff ("ns3::TcpSocketFactory",Ipv4Address::GetAny ());
+ onoff.SetAttribute ("OnTime", StringValue ("ns3::ConstantRandomVariable[Constant=1]"));
+ onoff.SetAttribute ("OffTime", StringValue ("ns3::ConstantRandomVariable[Constant=0]"));
+ onoff.SetAttribute ("PacketSize", UintegerValue (payloadSize));
+ onoff.SetAttribute ("DataRate", DataRateValue (1000000000)); //bit/s
+ ApplicationContainer apps;
+
+ AddressValue remoteAddress (InetSocketAddress (staNodeInterface.GetAddress (0), port));
+ onoff.SetAttribute ("Remote", remoteAddress);
+ apps.Add (onoff.Install (wifiApNode.Get (0)));
+ apps.Start (Seconds (1.0));
+ apps.Stop (Seconds (simulationTime + 1));
+ }
+
+ Ipv4GlobalRoutingHelper::PopulateRoutingTables ();
+
+ Simulator::Stop (Seconds (simulationTime + 1));
+ Simulator::Run ();
+ Simulator::Destroy ();
+
+ double throughput = 0;
+ if (udp)
+ {
+ //UDP
+ uint32_t totalPacketsThrough = DynamicCast (serverApp.Get (0))->GetReceived ();
+ throughput = totalPacketsThrough * payloadSize * 8 / (simulationTime * 1000000.0); //Mbit/s
+ }
+ else
+ {
+ //TCP
+ uint32_t totalPacketsThrough = DynamicCast (sinkApp.Get (0))->GetTotalRx ();
+ throughput = totalPacketsThrough * 8 / (simulationTime * 1000000.0); //Mbit/s
+ }
+ dataset.Add (d, throughput);
+ std::cout << throughput << " Mbit/s" <
+ */
+
+#include "ns3/core-module.h"
+#include "ns3/network-module.h"
+#include "ns3/applications-module.h"
+#include "ns3/wifi-module.h"
+#include "ns3/mobility-module.h"
+#include "ns3/ipv4-global-routing-helper.h"
+#include "ns3/internet-module.h"
+
+// This example shows how the presence of an 802.11b station in an 802.11g network does affect the performance.
+//
+// The example compares different scenarios depending on whether an 802.11b station is associated to the access point
+// and depending on the configuration of the following parameters:
+// - protection mode that is configured on the AP;
+// - whether short PLCP is supported by the 802.11b station;
+// - whether short slot time is supported by both the 802.11g station and the AP.
+//
+// The output results show that the presence of an 802.11b station strongly affects 802.11g performance.
+// Protection mechanisms ensure that the NAV value of 802.11b stations is set correctly in case of 802.11g transmissions.
+// In practice, those protection mechanism add a lot of overhead, resulting in reduced performance. CTS-To-Self introduces
+// less overhead than Rts-Cts, but is not heard by hidden stations (and is thus generally only recommended as a protection
+// mechanism for access points). Since short slot time is disabled once an 802.11b station enters the network, benefits from
+// short slot time are only observed in a pure-G configuration.
+//
+// The user can also select the payload size and can choose either an UDP or a TCP connection.
+// Example: ./waf --run "mixed-bg-network --isUdp=1"
+//
+// Network topology:
+//
+// STA (802.11b) AP (802.11b/g) STA (802.11b/g)
+// * * *
+// | | |
+// n1 n2 n3
+
+using namespace ns3;
+
+NS_LOG_COMPONENT_DEFINE ("ErpAndNonErp");
+
+class Experiment
+{
+public:
+ Experiment ();
+ double Run (bool enableProtection, bool enableShortSlotTime, bool enableShortPlcpPreamble, bool isMixed, bool isUdp, uint32_t payloadSize, uint32_t simulationTime);
+};
+
+Experiment::Experiment ()
+{
+}
+
+double
+Experiment::Run (bool enableProtection, bool enableShortSlotTime, bool enableShortPlcpPreamble, bool isMixed, bool isUdp, uint32_t payloadSize, uint32_t simulationTime)
+{
+ double throughput = 0;
+ uint32_t totalPacketsThrough = 0;
+ uint32_t nWifiB = 0;
+ if (isMixed)
+ {
+ nWifiB = 1;
+ }
+
+ NodeContainer wifiBStaNodes;
+ wifiBStaNodes.Create (nWifiB);
+ NodeContainer wifiGStaNodes;
+ wifiGStaNodes.Create (1);
+ NodeContainer wifiApNode;
+ wifiApNode.Create (1);
+
+ YansWifiChannelHelper channel = YansWifiChannelHelper::Default ();
+ channel.AddPropagationLoss ("ns3::RangePropagationLossModel");
+
+ YansWifiPhyHelper phy = YansWifiPhyHelper::Default ();
+ phy.SetPcapDataLinkType (YansWifiPhyHelper::DLT_IEEE802_11_RADIO);
+ phy.SetChannel (channel.Create ());
+
+ WifiHelper wifi;
+ wifi.SetRemoteStationManager ("ns3::IdealWifiManager");
+
+ // 802.11b STA
+ wifi.SetStandard (WIFI_PHY_STANDARD_80211b);
+
+ WifiMacHelper mac;
+ Ssid ssid = Ssid ("ns-3-ssid");
+
+ mac.SetType ("ns3::StaWifiMac",
+ "Ssid", SsidValue (ssid),
+ "ActiveProbing", BooleanValue (false),
+ "ShortSlotTimeSupported", BooleanValue (enableShortSlotTime));
+
+ // Configure the PLCP preamble type: long or short
+ phy.Set ("ShortPlcpPreambleSupported", BooleanValue (enableShortPlcpPreamble));
+
+ NetDeviceContainer bStaDevice;
+ bStaDevice = wifi.Install (phy, mac, wifiBStaNodes);
+
+ // 802.11b/g STA
+ wifi.SetStandard (WIFI_PHY_STANDARD_80211g);
+ NetDeviceContainer gStaDevice;
+ gStaDevice = wifi.Install (phy, mac, wifiGStaNodes);
+
+ // 802.11b/g AP
+ mac.SetType ("ns3::ApWifiMac",
+ "Ssid", SsidValue (ssid),
+ "BeaconGeneration", BooleanValue (true),
+ "EnableNonErpProtection", BooleanValue (enableProtection),
+ "ShortSlotTimeSupported", BooleanValue (enableShortSlotTime));
+
+ NetDeviceContainer apDevice;
+ apDevice = wifi.Install (phy, mac, wifiApNode);
+
+ // Setting mobility model
+ MobilityHelper mobility;
+ Ptr positionAlloc = CreateObject ();
+
+ positionAlloc->Add (Vector (0.0, 0.0, 0.0));
+ if (isMixed)
+ {
+ positionAlloc->Add (Vector (5.0, 0.0, 0.0));
+ }
+ positionAlloc->Add (Vector (0.0, 5.0, 0.0));
+
+ mobility.SetPositionAllocator (positionAlloc);
+ mobility.SetMobilityModel ("ns3::ConstantPositionMobilityModel");
+ mobility.Install (wifiApNode);
+ mobility.Install (wifiBStaNodes);
+ mobility.Install (wifiGStaNodes);
+
+ // Internet stack
+ InternetStackHelper stack;
+ stack.Install (wifiApNode);
+ stack.Install (wifiBStaNodes);
+ stack.Install (wifiGStaNodes);
+
+ Ipv4AddressHelper address;
+
+ address.SetBase ("192.168.1.0", "255.255.255.0");
+ Ipv4InterfaceContainer bStaInterface;
+ bStaInterface = address.Assign (bStaDevice);
+ Ipv4InterfaceContainer gStaInterface;
+ gStaInterface = address.Assign (gStaDevice);
+ Ipv4InterfaceContainer ApInterface;
+ ApInterface = address.Assign (apDevice);
+
+ // Setting applications
+ if (isUdp)
+ {
+ UdpServerHelper myServer (9);
+ ApplicationContainer serverApp = myServer.Install (wifiApNode);
+ serverApp.Start (Seconds (0.0));
+ serverApp.Stop (Seconds (simulationTime + 1));
+
+ UdpClientHelper myClient (ApInterface.GetAddress (0), 9);
+ myClient.SetAttribute ("MaxPackets", UintegerValue (4294967295u));
+ myClient.SetAttribute ("Interval", TimeValue (Time ("0.0002"))); //packets/s
+ myClient.SetAttribute ("PacketSize", UintegerValue (payloadSize));
+
+ ApplicationContainer clientApp = myClient.Install (wifiGStaNodes);
+ clientApp.Start (Seconds (1.0));
+ clientApp.Stop (Seconds (simulationTime + 1));
+
+ Simulator::Stop (Seconds (simulationTime + 1));
+ Simulator::Run ();
+ Simulator::Destroy ();
+
+ totalPacketsThrough = DynamicCast (serverApp.Get (0))->GetReceived ();
+ throughput = totalPacketsThrough * payloadSize * 8 / (simulationTime * 1000000.0);
+ }
+ else
+ {
+ uint16_t port = 50000;
+ Address apLocalAddress (InetSocketAddress (Ipv4Address::GetAny (), port));
+ PacketSinkHelper packetSinkHelper ("ns3::TcpSocketFactory", apLocalAddress);
+
+ ApplicationContainer sinkApp = packetSinkHelper.Install (wifiApNode.Get (0));
+ sinkApp.Start (Seconds (0.0));
+ sinkApp.Stop (Seconds (simulationTime + 1));
+
+ OnOffHelper onoff ("ns3::TcpSocketFactory",Ipv4Address::GetAny ());
+ onoff.SetAttribute ("OnTime", StringValue ("ns3::ConstantRandomVariable[Constant=1]"));
+ onoff.SetAttribute ("OffTime", StringValue ("ns3::ConstantRandomVariable[Constant=0]"));
+ onoff.SetAttribute ("PacketSize", UintegerValue (payloadSize));
+ onoff.SetAttribute ("DataRate", DataRateValue (54000000)); //bit/s
+
+ AddressValue remoteAddress (InetSocketAddress (ApInterface.GetAddress (0), port));
+ onoff.SetAttribute ("Remote", remoteAddress);
+
+ ApplicationContainer apps;
+ apps.Add (onoff.Install (wifiGStaNodes));
+ apps.Start (Seconds (1.0));
+ apps.Stop (Seconds (simulationTime + 1));
+
+ Simulator::Stop (Seconds (simulationTime + 1));
+ Simulator::Run ();
+ Simulator::Destroy ();
+
+ totalPacketsThrough = DynamicCast (sinkApp.Get (0))->GetTotalRx ();
+ throughput += totalPacketsThrough * 8 / (simulationTime * 1000000.0);
+ }
+
+ return throughput;
+}
+
+int main (int argc, char *argv[])
+{
+ uint32_t payloadSize = 1472; //bytes
+ uint32_t simulationTime = 10; //seconds
+ bool isUdp = true;
+
+ CommandLine cmd;
+ cmd.AddValue ("payloadSize", "Payload size in bytes", payloadSize);
+ cmd.AddValue ("simulationTime", "Simulation time in seconds", simulationTime);
+ cmd.AddValue ("isUdp", "UDP if set to 1, TCP otherwise", isUdp);
+ cmd.Parse (argc, argv);
+
+ Experiment experiment;
+ double throughput = 0;
+ std::cout << "Protection mode" << "\t\t" << "Slot time supported" << "\t\t" << "PLCP preamble supported" << "\t\t" << "Scenario" << "\t" << "Throughput" << std::endl;
+
+ throughput = experiment.Run (false, false, false, false, isUdp, payloadSize, simulationTime);
+ if (throughput < 23 || throughput > 24)
+ {
+ NS_LOG_ERROR ("Obtained throughput " << throughput << " is not in the expected boundaries!");
+ exit (1);
+ }
+ std::cout << "Disabled" << "\t\t" << "Long" << "\t\t\t\t" << "Long" << "\t\t\t\t" << "G-only" << "\t\t" << throughput <<" Mbit/s" << std::endl;
+
+ throughput = experiment.Run (false, true, false, false, isUdp, payloadSize, simulationTime);
+ if (throughput < 29 || throughput > 30)
+ {
+ NS_LOG_ERROR ("Obtained throughput " << throughput << " is not in the expected boundaries!");
+ exit (1);
+ }
+ std::cout << "Disabled" << "\t\t" << "Short" << "\t\t\t\t" << "Long" << "\t\t\t\t" << "G-only" << "\t\t" << throughput <<" Mbit/s" << std::endl;
+
+ throughput = experiment.Run (false, false, false, true, isUdp, payloadSize, simulationTime);
+ if (throughput < 23 || throughput > 24)
+ {
+ NS_LOG_ERROR ("Obtained throughput " << throughput << " is not in the expected boundaries!");
+ exit (1);
+ }
+ std::cout << "Disabled" << "\t\t" << "Long" << "\t\t\t\t" << "Long" << "\t\t\t\t" << "Mixed" << "\t\t" << throughput <<" Mbit/s" << std::endl;
+
+ throughput = experiment.Run (false, false, true, true, isUdp, payloadSize, simulationTime);
+ if (throughput < 23 || throughput > 24)
+ {
+ NS_LOG_ERROR ("Obtained throughput " << throughput << " is not in the expected boundaries!");
+ exit (1);
+ }
+ std::cout << "Disabled" << "\t\t" << "Long" << "\t\t\t\t" << "Short" << "\t\t\t\t" << "Mixed" << "\t\t" << throughput <<" Mbit/s" << std::endl;
+
+ Config::SetDefault ("ns3::WifiRemoteStationManager::ProtectionMode", StringValue ("Rts-Cts"));
+
+ throughput = experiment.Run (true, false, false, true, isUdp, payloadSize, simulationTime);
+ if (throughput < 19 || throughput > 20)
+ {
+ NS_LOG_ERROR ("Obtained throughput " << throughput << " is not in the expected boundaries!");
+ exit (1);
+ }
+ std::cout << "RTS/CTS" << "\t\t\t" << "Long" << "\t\t\t\t" << "Long" << "\t\t\t\t" << "Mixed" << "\t\t" << throughput <<" Mbit/s" << std::endl;
+
+ throughput = experiment.Run (true, false, true, true, isUdp, payloadSize, simulationTime);
+ if (throughput < 19 || throughput > 20)
+ {
+ NS_LOG_ERROR ("Obtained throughput " << throughput << " is not in the expected boundaries!");
+ exit (1);
+ }
+ std::cout << "RTS/CTS" << "\t\t\t" << "Long" << "\t\t\t\t" << "Short" << "\t\t\t\t" << "Mixed" << "\t\t" << throughput <<" Mbit/s" << std::endl;
+
+ Config::SetDefault ("ns3::WifiRemoteStationManager::ProtectionMode", StringValue ("Cts-To-Self"));
+
+ throughput = experiment.Run (true, false, false, true, isUdp, payloadSize, simulationTime);
+ if (throughput < 21 || throughput > 22)
+ {
+ NS_LOG_ERROR ("Obtained throughput " << throughput << " is not in the expected boundaries!");
+ exit (1);
+ }
+ std::cout << "CTS-TO-SELF" << "\t\t" << "Long" << "\t\t\t\t" << "Long" << "\t\t\t\t" << "Mixed" << "\t\t" << throughput <<" Mbit/s" << std::endl;
+
+ throughput = experiment.Run (true, false, true, true, isUdp, payloadSize, simulationTime);
+ if (throughput < 21 || throughput > 22)
+ {
+ NS_LOG_ERROR ("Obtained throughput " << throughput << " is not in the expected boundaries!");
+ exit (1);
+ }
+ std::cout << "CTS-TO-SELF" << "\t\t" << "Long" << "\t\t\t\t" << "Short" << "\t\t\t\t" << "Mixed" << "\t\t" << throughput <<" Mbit/s" << std::endl;
+
+ return 0;
+}
diff -Naur ns-3.24.1/examples/wireless/mixed-wireless.cc ns-3.25/examples/wireless/mixed-wireless.cc
--- ns-3.24.1/examples/wireless/mixed-wireless.cc 2015-09-23 12:28:41.000000000 -0700
+++ ns-3.25/examples/wireless/mixed-wireless.cc 2016-03-23 21:36:53.000000000 -0700
@@ -149,7 +149,7 @@
// our container
//
WifiHelper wifi;
- NqosWifiMacHelper mac = NqosWifiMacHelper::Default ();
+ WifiMacHelper mac;
mac.SetType ("ns3::AdhocWifiMac");
wifi.SetRemoteStationManager ("ns3::ConstantRateWifiManager",
"DataMode", StringValue ("OfdmRate54Mbps"));
@@ -283,8 +283,8 @@
//
// Create an infrastructure network
//
- WifiHelper wifiInfra = WifiHelper::Default ();
- NqosWifiMacHelper macInfra = NqosWifiMacHelper::Default ();
+ WifiHelper wifiInfra;
+ WifiMacHelper macInfra;
wifiPhy.SetChannel (wifiChannel.Create ());
// Create unique ssids for these networks
std::string ssidString ("wifi-infra");
diff -Naur ns-3.24.1/examples/wireless/mixed-wireless.py ns-3.25/examples/wireless/mixed-wireless.py
--- ns-3.24.1/examples/wireless/mixed-wireless.py 2015-09-23 12:28:41.000000000 -0700
+++ ns-3.25/examples/wireless/mixed-wireless.py 2016-03-23 21:36:53.000000000 -0700
@@ -131,7 +131,7 @@
# our container
#
wifi = ns.wifi.WifiHelper()
- mac = ns.wifi.NqosWifiMacHelper.Default()
+ mac = ns.wifi.WifiMacHelper()
mac.SetType("ns3::AdhocWifiMac")
wifi.SetRemoteStationManager("ns3::ConstantRateWifiManager",
"DataMode", ns.core.StringValue("OfdmRate54Mbps"))
@@ -260,7 +260,7 @@
wifiInfra = ns.wifi.WifiHelper.Default()
wifiPhy.SetChannel(wifiChannel.Create())
wifiInfra.SetRemoteStationManager('ns3::ArfWifiManager')
- macInfra = ns.wifi.NqosWifiMacHelper.Default();
+ macInfra = ns.wifi.WifiMacHelper();
macInfra.SetType("ns3::StaWifiMac",
"Ssid", ns.wifi.SsidValue(ssid),
"ActiveProbing", ns.core.BooleanValue(False))
diff -Naur ns-3.24.1/examples/wireless/multirate.cc ns-3.25/examples/wireless/multirate.cc
--- ns-3.24.1/examples/wireless/multirate.cc 2015-09-23 12:28:41.000000000 -0700
+++ ns-3.25/examples/wireless/multirate.cc 2016-03-23 21:36:53.000000000 -0700
@@ -75,7 +75,7 @@
Experiment ();
Experiment (std::string name);
Gnuplot2dDataset Run (const WifiHelper &wifi, const YansWifiPhyHelper &wifiPhy,
- const NqosWifiMacHelper &wifiMac, const YansWifiChannelHelper &wifiChannel, const MobilityHelper &mobility);
+ const WifiMacHelper &wifiMac, const YansWifiChannelHelper &wifiChannel, const MobilityHelper &mobility);
bool CommandSetup (int argc, char **argv);
bool IsRouting () { return (enableRouting == 1) ? 1 : 0; }
@@ -371,7 +371,7 @@
Gnuplot2dDataset
Experiment::Run (const WifiHelper &wifi, const YansWifiPhyHelper &wifiPhy,
- const NqosWifiMacHelper &wifiMac, const YansWifiChannelHelper &wifiChannel, const MobilityHelper &mobility)
+ const WifiMacHelper &wifiMac, const YansWifiChannelHelper &wifiChannel, const MobilityHelper &mobility)
{
@@ -382,7 +382,7 @@
YansWifiPhyHelper phy = wifiPhy;
phy.SetChannel (wifiChannel.Create ());
- NqosWifiMacHelper mac = wifiMac;
+ WifiMacHelper mac = wifiMac;
NetDeviceContainer devices = wifi.Install (phy, mac, c);
@@ -576,8 +576,8 @@
Gnuplot gnuplot;
Gnuplot2dDataset dataset;
- WifiHelper wifi = WifiHelper::Default ();
- NqosWifiMacHelper wifiMac = NqosWifiMacHelper::Default ();
+ WifiHelper wifi;
+ WifiMacHelper wifiMac;
YansWifiPhyHelper wifiPhy = YansWifiPhyHelper::Default ();
YansWifiChannelHelper wifiChannel = YansWifiChannelHelper::Default ();
Ssid ssid = Ssid ("Testbed");
diff -Naur ns-3.24.1/examples/wireless/ofdm-vht-validation.cc ns-3.25/examples/wireless/ofdm-vht-validation.cc
--- ns-3.24.1/examples/wireless/ofdm-vht-validation.cc 2015-09-23 12:28:41.000000000 -0700
+++ ns-3.25/examples/wireless/ofdm-vht-validation.cc 2016-03-23 21:36:53.000000000 -0700
@@ -36,8 +36,8 @@
int main (int argc, char *argv[])
{
uint32_t FrameSize = 2000; //bytes
- std::ofstream yansfile ("yans-frame-success-rate-n.plt");
- std::ofstream nistfile ("nist-frame-success-rate-n.plt");
+ std::ofstream yansfile ("yans-frame-success-rate-ac.plt");
+ std::ofstream nistfile ("nist-frame-success-rate-ac.plt");
std::vector modes;
modes.push_back ("VhtMcs0");
@@ -54,8 +54,8 @@
cmd.AddValue ("FrameSize", "The frame size", FrameSize);
cmd.Parse (argc, argv);
- Gnuplot yansplot = Gnuplot ("yans-frame-success-rate-n.eps");
- Gnuplot nistplot = Gnuplot ("nist-frame-success-rate-n.eps");
+ Gnuplot yansplot = Gnuplot ("yans-frame-success-rate-ac.eps");
+ Gnuplot nistplot = Gnuplot ("nist-frame-success-rate-ac.eps");
Ptr yans = CreateObject ();
Ptr nist = CreateObject ();
diff -Naur ns-3.24.1/examples/wireless/power-adaptation-distance.cc ns-3.25/examples/wireless/power-adaptation-distance.cc
--- ns-3.24.1/examples/wireless/power-adaptation-distance.cc 2015-09-23 12:28:41.000000000 -0700
+++ ns-3.25/examples/wireless/power-adaptation-distance.cc 2016-03-23 21:36:53.000000000 -0700
@@ -172,7 +172,7 @@
WifiMode mode = phy->GetMode (i);
WifiTxVector txVector;
txVector.SetMode (mode);
- timeTable.push_back (std::make_pair (phy->CalculateTxDuration (packetSize, txVector, WIFI_PREAMBLE_LONG, phy->GetFrequency (), 0, 0), mode));
+ timeTable.push_back (std::make_pair (phy->CalculateTxDuration (packetSize, txVector, WIFI_PREAMBLE_LONG, phy->GetFrequency ()), mode));
}
}
@@ -343,9 +343,9 @@
NodeContainer wifiStaNodes;
wifiStaNodes.Create (1);
- WifiHelper wifi = WifiHelper::Default ();
+ WifiHelper wifi;
wifi.SetStandard (WIFI_PHY_STANDARD_80211a);
- NqosWifiMacHelper wifiMac = NqosWifiMacHelper::Default ();
+ WifiMacHelper wifiMac;
YansWifiPhyHelper wifiPhy = YansWifiPhyHelper::Default ();
YansWifiChannelHelper wifiChannel = YansWifiChannelHelper::Default ();
diff -Naur ns-3.24.1/examples/wireless/power-adaptation-interference.cc ns-3.25/examples/wireless/power-adaptation-interference.cc
--- ns-3.24.1/examples/wireless/power-adaptation-interference.cc 2015-09-23 12:28:41.000000000 -0700
+++ ns-3.25/examples/wireless/power-adaptation-interference.cc 2016-03-23 21:36:53.000000000 -0700
@@ -168,7 +168,7 @@
WifiMode mode = phy->GetMode (i);
WifiTxVector txVector;
txVector.SetMode (mode);
- timeTable.push_back (std::make_pair (phy->CalculateTxDuration (packetSize, txVector, WIFI_PREAMBLE_LONG, phy->GetFrequency (), 0, 0), mode));
+ timeTable.push_back (std::make_pair (phy->CalculateTxDuration (packetSize, txVector, WIFI_PREAMBLE_LONG, phy->GetFrequency ()), mode));
}
}
@@ -381,9 +381,9 @@
NodeContainer wifiStaNodes;
wifiStaNodes.Create (2);
- WifiHelper wifi = WifiHelper::Default ();
+ WifiHelper wifi;
wifi.SetStandard (WIFI_PHY_STANDARD_80211a);
- NqosWifiMacHelper wifiMac = NqosWifiMacHelper::Default ();
+ WifiMacHelper wifiMac;
YansWifiPhyHelper wifiPhy = YansWifiPhyHelper::Default ();
YansWifiChannelHelper wifiChannel = YansWifiChannelHelper::Default ();
diff -Naur ns-3.24.1/examples/wireless/rate-adaptation-distance.cc ns-3.25/examples/wireless/rate-adaptation-distance.cc
--- ns-3.24.1/examples/wireless/rate-adaptation-distance.cc 2015-09-23 12:28:41.000000000 -0700
+++ ns-3.25/examples/wireless/rate-adaptation-distance.cc 2016-03-23 21:36:53.000000000 -0700
@@ -43,6 +43,9 @@
* Another example (moving towards the AP):
* ./waf --run "rate-adaptation-distance --manager=ns3::MinstrelWifiManager --outputFileName=minstrel --stepsSize=1 --STA1_x=-200"
*
+ * Example for HT rates with SGI and channel width of 40MHz:
+ * ./waf --run "rate-adaptation-distance --manager=ns3::MinstrelHtWifiManager --outputFileName=minstrelHt --shortGuardInterval=true --channelWidth=40"
+ *
* To enable the log of rate changes:
* export NS_LOG=RateAdaptationDistance=level_info
*/
@@ -134,27 +137,37 @@
}
-void RateCallback (std::string path, uint32_t rate, Mac48Address dest)
+void RateCallback (std::string path, uint64_t rate, Mac48Address dest)
{
- NS_LOG_INFO ((Simulator::Now ()).GetSeconds () << " " << dest << " Rate " << rate);
+ NS_LOG_INFO ((Simulator::Now ()).GetSeconds () << " " << dest << " Rate " << rate / 1000000.0);
}
int main (int argc, char *argv[])
{
- uint32_t rtsThreshold = 2346;
- std::string manager = "ns3::MinstrelWifiManager";
- std::string outputFileName = "minstrel";
+ uint32_t rtsThreshold = 65535;
+ std::string staManager = "ns3::MinstrelHtWifiManager";
+ std::string apManager = "ns3::MinstrelHtWifiManager";
+ std::string standard = "802.11n-5GHz";
+ std::string outputFileName = "minstrelHT";
+ uint32_t BE_MaxAmpduSize = 65535;
+ bool shortGuardInterval = false;
+ uint32_t chWidth = 20;
int ap1_x = 0;
int ap1_y = 0;
int sta1_x = 5;
int sta1_y = 0;
- int steps = 200;
+ int steps = 100;
int stepsSize = 1;
int stepsTime = 1;
CommandLine cmd;
- cmd.AddValue ("manager", "PRC Manager", manager);
+ cmd.AddValue ("staManager", "PRC Manager of the STA", staManager);
+ cmd.AddValue ("apManager", "PRC Manager of the AP", apManager);
+ cmd.AddValue ("standard", "Wifi Phy Standard", standard);
+ cmd.AddValue ("shortGuardInterval", "Enable Short Guard Interval in all stations", shortGuardInterval);
+ cmd.AddValue ("channelWidth", "Channel width of all the stations", chWidth);
cmd.AddValue ("rtsThreshold", "RTS threshold", rtsThreshold);
+ cmd.AddValue ("BE_MaxAmpduSize", "BE Mac A-MPDU size", BE_MaxAmpduSize);
cmd.AddValue ("outputFileName", "Output filename", outputFileName);
cmd.AddValue ("steps", "How many different distances to try", steps);
cmd.AddValue ("stepsTime", "Time on each step", stepsTime);
@@ -175,38 +188,114 @@
NodeContainer wifiStaNodes;
wifiStaNodes.Create (1);
- WifiHelper wifi = WifiHelper::Default ();
- wifi.SetStandard (WIFI_PHY_STANDARD_80211a);
- NqosWifiMacHelper wifiMac = NqosWifiMacHelper::Default ();
+
YansWifiPhyHelper wifiPhy = YansWifiPhyHelper::Default ();
YansWifiChannelHelper wifiChannel = YansWifiChannelHelper::Default ();
-
wifiPhy.SetChannel (wifiChannel.Create ());
+ wifiPhy.Set("ShortGuardEnabled", BooleanValue(shortGuardInterval));
+
NetDeviceContainer wifiApDevices;
NetDeviceContainer wifiStaDevices;
NetDeviceContainer wifiDevices;
- //Configure the STA node
- wifi.SetRemoteStationManager (manager, "RtsCtsThreshold", UintegerValue (rtsThreshold));
-
- Ssid ssid = Ssid ("AP");
- wifiMac.SetType ("ns3::StaWifiMac",
- "Ssid", SsidValue (ssid),
- "ActiveProbing", BooleanValue (false));
- wifiStaDevices.Add (wifi.Install (wifiPhy, wifiMac, wifiStaNodes.Get (0)));
-
- //Configure the AP node
- wifi.SetRemoteStationManager (manager, "RtsCtsThreshold", UintegerValue (rtsThreshold));
-
- ssid = Ssid ("AP");
- wifiMac.SetType ("ns3::ApWifiMac",
- "Ssid", SsidValue (ssid));
- wifiApDevices.Add (wifi.Install (wifiPhy, wifiMac, wifiApNodes.Get (0)));
+ WifiHelper wifi;
+ if (standard == "802.11a" || standard == "802.11b" || standard == "802.11g")
+ {
+ if (standard == "802.11a")
+ {
+ wifi.SetStandard (WIFI_PHY_STANDARD_80211a);
+ }
+ else if (standard == "802.11b")
+ {
+ wifi.SetStandard (WIFI_PHY_STANDARD_80211b);
+ }
+ else if (standard == "802.11g")
+ {
+ wifi.SetStandard (WIFI_PHY_STANDARD_80211g);
+ }
+ NqosWifiMacHelper wifiMac = NqosWifiMacHelper::Default ();
+
+ //Configure the STA node
+ wifi.SetRemoteStationManager (staManager, "RtsCtsThreshold", UintegerValue (rtsThreshold));
+
+ Ssid ssid = Ssid ("AP");
+ wifiMac.SetType ("ns3::StaWifiMac",
+ "Ssid", SsidValue (ssid),
+ "ActiveProbing", BooleanValue (false));
+ wifiStaDevices.Add (wifi.Install (wifiPhy, wifiMac, wifiStaNodes.Get (0)));
+
+ //Configure the AP node
+ wifi.SetRemoteStationManager (apManager, "RtsCtsThreshold", UintegerValue (rtsThreshold));
+
+ ssid = Ssid ("AP");
+ wifiMac.SetType ("ns3::ApWifiMac",
+ "Ssid", SsidValue (ssid));
+ wifiApDevices.Add (wifi.Install (wifiPhy, wifiMac, wifiApNodes.Get (0)));
+ }
+ else if (standard == "802.11n-2.4GHz" || standard == "802.11n-5GHz")
+ {
+ if (standard == "802.11n-2.4GHz")
+ {
+ wifi.SetStandard (WIFI_PHY_STANDARD_80211n_2_4GHZ);
+ }
+ else if (standard == "802.11n-5GHz")
+ {
+ wifi.SetStandard (WIFI_PHY_STANDARD_80211n_5GHZ);
+ }
+
+ HtWifiMacHelper wifiMac = HtWifiMacHelper::Default ();
+
+ //Configure the STA node
+ wifi.SetRemoteStationManager (staManager, "RtsCtsThreshold", UintegerValue (rtsThreshold));
+
+ Ssid ssid = Ssid ("AP");
+ wifiMac.SetType ("ns3::StaWifiMac",
+ "Ssid", SsidValue (ssid),
+ "ActiveProbing", BooleanValue (false),
+ "BE_MaxAmpduSize", UintegerValue (BE_MaxAmpduSize));
+ wifiStaDevices.Add (wifi.Install (wifiPhy, wifiMac, wifiStaNodes.Get (0)));
+
+ //Configure the AP node
+ wifi.SetRemoteStationManager (apManager, "RtsCtsThreshold", UintegerValue (rtsThreshold));
+
+ ssid = Ssid ("AP");
+ wifiMac.SetType ("ns3::ApWifiMac",
+ "Ssid", SsidValue (ssid),
+ "BE_MaxAmpduSize", UintegerValue (BE_MaxAmpduSize));
+ wifiApDevices.Add (wifi.Install (wifiPhy, wifiMac, wifiApNodes.Get (0)));
+ }
+ else if (standard == "802.11ac")
+ {
+ wifi.SetStandard (WIFI_PHY_STANDARD_80211ac);
+ VhtWifiMacHelper wifiMac = VhtWifiMacHelper::Default ();
+
+ //Configure the STA node
+ wifi.SetRemoteStationManager (staManager, "RtsCtsThreshold", UintegerValue (rtsThreshold));
+
+ Ssid ssid = Ssid ("AP");
+ wifiMac.SetType ("ns3::StaWifiMac",
+ "Ssid", SsidValue (ssid),
+ "ActiveProbing", BooleanValue (false),
+ "BE_MaxAmpduSize", UintegerValue (BE_MaxAmpduSize));
+ wifiStaDevices.Add (wifi.Install (wifiPhy, wifiMac, wifiStaNodes.Get (0)));
+
+ //Configure the AP node
+ wifi.SetRemoteStationManager (apManager, "RtsCtsThreshold", UintegerValue (rtsThreshold));
+
+ ssid = Ssid ("AP");
+ wifiMac.SetType ("ns3::ApWifiMac",
+ "Ssid", SsidValue (ssid),
+ "BE_MaxAmpduSize", UintegerValue (BE_MaxAmpduSize));
+ wifiApDevices.Add (wifi.Install (wifiPhy, wifiMac, wifiApNodes.Get (0)));
+ }
wifiDevices.Add (wifiStaDevices);
wifiDevices.Add (wifiApDevices);
+ // Set channel width
+ Config::Set ("/NodeList/*/DeviceList/*/$ns3::WifiNetDevice/Phy/ChannelWidth", UintegerValue (chWidth));
+
// Configure the mobility.
MobilityHelper mobility;
Ptr positionAlloc = CreateObject ();
@@ -239,7 +328,7 @@
ApplicationContainer apps_sink = sink.Install (wifiStaNodes.Get (0));
OnOffHelper onoff ("ns3::UdpSocketFactory", InetSocketAddress (sinkAddress, port));
- onoff.SetConstantRate (DataRate ("54Mb/s"), 1420);
+ onoff.SetConstantRate (DataRate ("200Mb/s"), 1420);
onoff.SetAttribute ("StartTime", TimeValue (Seconds (0.5)));
onoff.SetAttribute ("StopTime", TimeValue (Seconds (simuTime)));
ApplicationContainer apps_source = onoff.Install (wifiApNodes.Get (0));
@@ -256,7 +345,7 @@
MakeCallback (&NodeStatistics::RxCallback, &atpCounter));
//Callbacks to print every change of rate
- Config::Connect ("/NodeList/0/DeviceList/*/$ns3::WifiNetDevice/RemoteStationManager/$" + manager + "/RateChange",
+ Config::Connect ("/NodeList/0/DeviceList/*/$ns3::WifiNetDevice/RemoteStationManager/$" + apManager + "/RateChange",
MakeCallback (RateCallback));
Simulator::Stop (Seconds (simuTime));
diff -Naur ns-3.24.1/examples/wireless/simple-ht-hidden-stations.cc ns-3.25/examples/wireless/simple-ht-hidden-stations.cc
--- ns-3.24.1/examples/wireless/simple-ht-hidden-stations.cc 2015-09-23 12:28:41.000000000 -0700
+++ ns-3.25/examples/wireless/simple-ht-hidden-stations.cc 2016-03-23 21:36:53.000000000 -0700
@@ -52,6 +52,7 @@
uint32_t payloadSize = 1472; //bytes
uint64_t simulationTime = 10; //seconds
uint32_t nMpdus = 1;
+ uint32_t maxAmpduSize = 0;
bool enableRts = 0;
CommandLine cmd;
@@ -72,6 +73,9 @@
Config::SetDefault ("ns3::WifiRemoteStationManager::FragmentationThreshold", StringValue ("990000"));
+ //Set the maximum size for A-MPDU with regards to the payload size
+ maxAmpduSize = nMpdus * (payloadSize + 200);
+
// Set the maximum wireless range to 5 meters in order to reproduce a hidden nodes scenario, i.e. the distance between hidden stations is larger than 5 meters
Config::SetDefault ("ns3::RangePropagationLossModel::MaxRange", DoubleValue (5));
@@ -87,24 +91,16 @@
phy.SetPcapDataLinkType (YansWifiPhyHelper::DLT_IEEE802_11_RADIO);
phy.SetChannel (channel.Create ());
- WifiHelper wifi = WifiHelper::Default ();
+ WifiHelper wifi;
wifi.SetStandard (WIFI_PHY_STANDARD_80211n_5GHZ);
wifi.SetRemoteStationManager ("ns3::ConstantRateWifiManager", "DataMode", StringValue ("HtMcs7"), "ControlMode", StringValue ("HtMcs0"));
- HtWifiMacHelper mac = HtWifiMacHelper::Default ();
+ WifiMacHelper mac;
Ssid ssid = Ssid ("simple-mpdu-aggregation");
mac.SetType ("ns3::StaWifiMac",
"Ssid", SsidValue (ssid),
- "ActiveProbing", BooleanValue (false));
-
- if (nMpdus > 1)
- {
- mac.SetBlockAckThresholdForAc (AC_BE, 2); //enable Block ACK when A-MPDU is enabled
-
- }
- mac.SetMpduAggregatorForAc (AC_BE,"ns3::MpduStandardAggregator",
- "MaxAmpduSize", UintegerValue (nMpdus * (payloadSize + 100))); //enable MPDU aggregation for AC_BE with a maximum aggregated size of nMpdus*(payloadSize+100) bytes,
- //i.e. nMpdus aggregated packets in an A-MPDU
+ "ActiveProbing", BooleanValue (false),
+ "BE_MaxAmpduSize", UintegerValue (maxAmpduSize));
NetDeviceContainer staDevices;
staDevices = wifi.Install (phy, mac, wifiStaNodes);
@@ -112,16 +108,8 @@
mac.SetType ("ns3::ApWifiMac",
"Ssid", SsidValue (ssid),
"BeaconInterval", TimeValue (MicroSeconds (102400)),
- "BeaconGeneration", BooleanValue (true));
-
- if (nMpdus > 1)
- {
- mac.SetBlockAckThresholdForAc (AC_BE, 2); //enable Block ACK when A-MPDU is enabled
-
- }
- mac.SetMpduAggregatorForAc (AC_BE,"ns3::MpduStandardAggregator",
- "MaxAmpduSize", UintegerValue (nMpdus * (payloadSize + 100))); //enable MPDU aggregation for AC_BE with a maximum aggregated size of nMpdus*(payloadSize+100) bytes,
- //i.e. nMpdus aggregated packets in an A-MPDU
+ "BeaconGeneration", BooleanValue (true),
+ "BE_MaxAmpduSize", UintegerValue (maxAmpduSize));
NetDeviceContainer apDevice;
apDevice = wifi.Install (phy, mac, wifiApNode);
diff -Naur ns-3.24.1/examples/wireless/simple-mpdu-aggregation.cc ns-3.25/examples/wireless/simple-mpdu-aggregation.cc
--- ns-3.24.1/examples/wireless/simple-mpdu-aggregation.cc 2015-09-23 12:28:41.000000000 -0700
+++ ns-3.25/examples/wireless/simple-mpdu-aggregation.cc 1969-12-31 16:00:00.000000000 -0800
@@ -1,176 +0,0 @@
-/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/*
- * Copyright (c) 2015 Sébastien Deronne
- *
- * 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: Sébastien Deronne
- */
-
-#include "ns3/core-module.h"
-#include "ns3/network-module.h"
-#include "ns3/applications-module.h"
-#include "ns3/wifi-module.h"
-#include "ns3/mobility-module.h"
-#include "ns3/ipv4-global-routing-helper.h"
-#include "ns3/internet-module.h"
-
-// This is a simple example in order to show how 802.11n MPDU aggregation feature works.
-// The throughput is obtained for a given number of aggregated MPDUs.
-//
-// The number of aggregated MPDUs can be chosen by the user through the nMpdus attibute.
-// A value of 1 means that no MPDU aggregation is performed.
-//
-// Example: ./waf --run "simple-mpdu-aggregation --nMpdus=64"
-//
-// Network topology:
-//
-// Wifi 192.168.1.0
-//
-// AP
-// * *
-// | |
-// n1 n2
-//
-// Packets in this simulation aren't marked with a QosTag so they are considered
-// belonging to BestEffort Access Class (AC_BE).
-
-using namespace ns3;
-
-NS_LOG_COMPONENT_DEFINE ("SimpleMpduAggregation");
-
-int main (int argc, char *argv[])
-{
- uint32_t payloadSize = 1472; //bytes
- uint64_t simulationTime = 10; //seconds
- uint32_t nMpdus = 1;
- bool enableRts = 0;
-
- CommandLine cmd;
- cmd.AddValue ("nMpdus", "Number of aggregated MPDUs", nMpdus); //number of aggregated MPDUs specified by the user
- cmd.AddValue ("payloadSize", "Payload size in bytes", payloadSize);
- cmd.AddValue ("enableRts", "Enable RTS/CTS", enableRts);
- cmd.AddValue ("simulationTime", "Simulation time in seconds", simulationTime);
- cmd.Parse (argc, argv);
-
- if (!enableRts)
- {
- Config::SetDefault ("ns3::WifiRemoteStationManager::RtsCtsThreshold", StringValue ("999999"));
- }
- else
- {
- Config::SetDefault ("ns3::WifiRemoteStationManager::RtsCtsThreshold", StringValue ("0"));
- }
-
- Config::SetDefault ("ns3::WifiRemoteStationManager::FragmentationThreshold", StringValue ("990000"));
-
- NodeContainer wifiStaNode;
- wifiStaNode.Create (1);
- NodeContainer wifiApNode;
- wifiApNode.Create (1);
-
- YansWifiChannelHelper channel = YansWifiChannelHelper::Default ();
- YansWifiPhyHelper phy = YansWifiPhyHelper::Default ();
- phy.SetPcapDataLinkType (YansWifiPhyHelper::DLT_IEEE802_11_RADIO);
- phy.SetChannel (channel.Create ());
-
- WifiHelper wifi = WifiHelper::Default ();
- wifi.SetStandard (WIFI_PHY_STANDARD_80211n_5GHZ);
- wifi.SetRemoteStationManager ("ns3::ConstantRateWifiManager", "DataMode", StringValue ("HtMcs7"), "ControlMode", StringValue ("HtMcs0"));
- HtWifiMacHelper mac = HtWifiMacHelper::Default ();
-
- Ssid ssid = Ssid ("simple-mpdu-aggregation");
- mac.SetType ("ns3::StaWifiMac",
- "Ssid", SsidValue (ssid),
- "ActiveProbing", BooleanValue (false));
-
- if (nMpdus > 1)
- {
- mac.SetBlockAckThresholdForAc (AC_BE, 2); //enable Block ACK when A-MPDU is enabled (i.e. nMpdus > 1)
-
- }
- mac.SetMpduAggregatorForAc (AC_BE,"ns3::MpduStandardAggregator",
- "MaxAmpduSize", UintegerValue (nMpdus * (payloadSize + 100))); //enable MPDU aggregation for AC_BE with a maximum aggregated size of nMpdus*(payloadSize+100) bytes, i.e. nMpdus aggregated packets in an A-MPDU
-
- NetDeviceContainer staDevice;
- staDevice = wifi.Install (phy, mac, wifiStaNode);
-
- mac.SetType ("ns3::ApWifiMac",
- "Ssid", SsidValue (ssid),
- "BeaconInterval", TimeValue (MicroSeconds (102400)),
- "BeaconGeneration", BooleanValue (true));
-
- if (nMpdus > 1)
- {
- mac.SetBlockAckThresholdForAc (AC_BE, 2); //enable Block ACK when A-MPDU is enabled (i.e. nMpdus > 1)
-
- }
- mac.SetMpduAggregatorForAc (AC_BE,"ns3::MpduStandardAggregator",
- "MaxAmpduSize", UintegerValue (nMpdus * (payloadSize + 100))); //enable MPDU aggregation for AC_BE with a maximum aggregated size of nMpdus*(payloadSize+100) bytes, i.e. nMpdus aggregated packets in an A-MPDU
-
- NetDeviceContainer apDevice;
- apDevice = wifi.Install (phy, mac, wifiApNode);
-
- /* Setting mobility model */
- MobilityHelper mobility;
- Ptr positionAlloc = CreateObject ();
-
- positionAlloc->Add (Vector (0.0, 0.0, 0.0));
- positionAlloc->Add (Vector (1.0, 0.0, 0.0));
- mobility.SetPositionAllocator (positionAlloc);
-
- mobility.SetMobilityModel ("ns3::ConstantPositionMobilityModel");
-
- mobility.Install (wifiApNode);
- mobility.Install (wifiStaNode);
-
- /* Internet stack*/
- InternetStackHelper stack;
- stack.Install (wifiApNode);
- stack.Install (wifiStaNode);
-
- Ipv4AddressHelper address;
-
- address.SetBase ("192.168.1.0", "255.255.255.0");
- Ipv4InterfaceContainer StaInterface;
- StaInterface = address.Assign (staDevice);
- Ipv4InterfaceContainer ApInterface;
- ApInterface = address.Assign (apDevice);
-
- /* Setting applications */
- UdpServerHelper myServer (9);
- ApplicationContainer serverApp = myServer.Install (wifiStaNode.Get (0));
- serverApp.Start (Seconds (0.0));
- serverApp.Stop (Seconds (simulationTime + 1));
-
- UdpClientHelper myClient (StaInterface.GetAddress (0), 9);
- myClient.SetAttribute ("MaxPackets", UintegerValue (4294967295u));
- myClient.SetAttribute ("Interval", TimeValue (Time ("0.00002"))); //packets/s
- myClient.SetAttribute ("PacketSize", UintegerValue (payloadSize));
-
- ApplicationContainer clientApp = myClient.Install (wifiApNode.Get (0));
- clientApp.Start (Seconds (1.0));
- clientApp.Stop (Seconds (simulationTime + 1));
-
- Simulator::Stop (Seconds (simulationTime + 1));
-
- Simulator::Run ();
- Simulator::Destroy ();
-
- uint32_t totalPacketsThrough = DynamicCast (serverApp.Get (0))->GetReceived ();
- double throughput = totalPacketsThrough * payloadSize * 8 / (simulationTime * 1000000.0);
- std::cout << "Throughput: " << throughput << " Mbit/s" << '\n';
-
- return 0;
-}
diff -Naur ns-3.24.1/examples/wireless/simple-msdu-aggregation.cc ns-3.25/examples/wireless/simple-msdu-aggregation.cc
--- ns-3.24.1/examples/wireless/simple-msdu-aggregation.cc 2015-09-23 12:28:41.000000000 -0700
+++ ns-3.25/examples/wireless/simple-msdu-aggregation.cc 1969-12-31 16:00:00.000000000 -0800
@@ -1,164 +0,0 @@
-/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */
-/*
- * Copyright (c) 2009 MIRKO BANCHI
- *
- * 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
- *
- * Authors: Mirko Banchi
- * Sébastien Deronne
- */
-#include "ns3/core-module.h"
-#include "ns3/network-module.h"
-#include "ns3/applications-module.h"
-#include "ns3/wifi-module.h"
-#include "ns3/mobility-module.h"
-#include "ns3/ipv4-global-routing-helper.h"
-#include "ns3/internet-module.h"
-
-// This is a simple example in order to show how 802.11n MSDU aggregation feature works.
-// The throughput is obtained for a given number of aggregated MSDUs.
-//
-// The number of aggregated MSDUs can be chosen by the user through the nMsdus attibute.
-// A value of 1 means that no MSDU aggregation is performed.
-//
-// Example: ./waf --run "simple-msdu-aggregation --nMsdus=5"
-//
-// Network topology:
-//
-// Wifi 192.168.1.0
-//
-// AP
-// * *
-// | |
-// n1 n2
-//
-// Packets in this simulation aren't marked with a QosTag so they are considered
-// belonging to BestEffort Access Class (AC_BE).
-
-using namespace ns3;
-
-NS_LOG_COMPONENT_DEFINE ("SimpleMsduAggregation");
-
-int main (int argc, char *argv[])
-{
- uint32_t payloadSize = 1472; //bytes
- uint64_t simulationTime = 10; //seconds
- uint32_t nMsdus = 1;
- bool enableRts = 0;
-
- CommandLine cmd;
- cmd.AddValue ("nMsdus", "Number of aggregated MSDUs", nMsdus); //number of aggregated MSDUs specified by the user
- cmd.AddValue ("payloadSize", "Payload size in bytes", payloadSize);
- cmd.AddValue ("enableRts", "Enable RTS/CTS", enableRts);
- cmd.AddValue ("simulationTime", "Simulation time in seconds", simulationTime);
- cmd.Parse (argc, argv);
-
- if (!enableRts)
- {
- Config::SetDefault ("ns3::WifiRemoteStationManager::RtsCtsThreshold", StringValue ("999999"));
- }
- else
- {
- Config::SetDefault ("ns3::WifiRemoteStationManager::RtsCtsThreshold", StringValue ("0"));
- }
-
- Config::SetDefault ("ns3::WifiRemoteStationManager::FragmentationThreshold", StringValue ("990000"));
-
- NodeContainer wifiStaNode;
- wifiStaNode.Create (1);
- NodeContainer wifiApNode;
- wifiApNode.Create (1);
-
- YansWifiChannelHelper channel = YansWifiChannelHelper::Default ();
- YansWifiPhyHelper phy = YansWifiPhyHelper::Default ();
- phy.SetPcapDataLinkType (YansWifiPhyHelper::DLT_IEEE802_11_RADIO);
- phy.SetChannel (channel.Create ());
-
- WifiHelper wifi = WifiHelper::Default ();
- wifi.SetStandard (WIFI_PHY_STANDARD_80211n_5GHZ);
- wifi.SetRemoteStationManager ("ns3::ConstantRateWifiManager", "DataMode", StringValue ("HtMcs7"), "ControlMode", StringValue ("HtMcs0"));
- HtWifiMacHelper mac = HtWifiMacHelper::Default ();
-
- Ssid ssid = Ssid ("simple-msdu-aggregation");
- mac.SetType ("ns3::StaWifiMac",
- "Ssid", SsidValue (ssid),
- "ActiveProbing", BooleanValue (false));
-
- mac.SetMsduAggregatorForAc (AC_BE, "ns3::MsduStandardAggregator",
- "MaxAmsduSize", UintegerValue (nMsdus * (payloadSize + 100))); //enable MSDU aggregation for AC_BE with a maximum aggregated size of nMsdus*(payloadSize+100) bytes, i.e. nMsdus aggregated packets in an A-MSDU
-
- NetDeviceContainer staDevice;
- staDevice = wifi.Install (phy, mac, wifiStaNode);
-
- mac.SetType ("ns3::ApWifiMac",
- "Ssid", SsidValue (ssid));
-
- mac.SetMsduAggregatorForAc (AC_BE, "ns3::MsduStandardAggregator",
- "MaxAmsduSize", UintegerValue (nMsdus * (payloadSize + 100))); //enable MSDU aggregation for AC_BE with a maximum aggregated size of nMsdus*(payloadSize+100) bytes, i.e. nMsdus aggregated packets in an A-MSDU
-
- NetDeviceContainer apDevice;
- apDevice = wifi.Install (phy, mac, wifiApNode);
-
- /* Setting mobility model */
- MobilityHelper mobility;
- Ptr positionAlloc = CreateObject ();
-
- positionAlloc->Add (Vector (0.0, 0.0, 0.0));
- positionAlloc->Add (Vector (1.0, 0.0, 0.0));
- mobility.SetPositionAllocator (positionAlloc);
-
- mobility.SetMobilityModel ("ns3::ConstantPositionMobilityModel");
-
- mobility.Install (wifiApNode);
- mobility.Install (wifiStaNode);
-
- /* Internet stack*/
- InternetStackHelper stack;
- stack.Install (wifiApNode);
- stack.Install (wifiStaNode);
-
- Ipv4AddressHelper address;
-
- address.SetBase ("192.168.1.0", "255.255.255.0");
- Ipv4InterfaceContainer StaInterface;
- StaInterface = address.Assign (staDevice);
- Ipv4InterfaceContainer ApInterface;
- ApInterface = address.Assign (apDevice);
-
- /* Setting applications */
- UdpServerHelper myServer (9);
- ApplicationContainer serverApp = myServer.Install (wifiStaNode.Get (0));
- serverApp.Start (Seconds (0.0));
- serverApp.Stop (Seconds (simulationTime + 1));
-
- UdpClientHelper myClient (StaInterface.GetAddress (0), 9);
- myClient.SetAttribute ("MaxPackets", UintegerValue (4294967295u));
- myClient.SetAttribute ("Interval", TimeValue (Time ("0.00002"))); //packets/s
- myClient.SetAttribute ("PacketSize", UintegerValue (payloadSize));
-
- ApplicationContainer clientApp = myClient.Install (wifiApNode.Get (0));
- clientApp.Start (Seconds (1.0));
- clientApp.Stop (Seconds (simulationTime + 1));
-
- Simulator::Stop (Seconds (simulationTime + 1));
-
- Simulator::Run ();
- Simulator::Destroy ();
-
- uint32_t totalPacketsThrough = DynamicCast (serverApp.Get (0))->GetReceived ();
- double throughput = totalPacketsThrough * payloadSize * 8 / (simulationTime * 1000000.0);
- std::cout << "Throughput: " << throughput << " Mbit/s" << '\n';
-
- return 0;
-}
diff -Naur ns-3.24.1/examples/wireless/simple-two-level-aggregation.cc ns-3.25/examples/wireless/simple-two-level-aggregation.cc
--- ns-3.24.1/examples/wireless/simple-two-level-aggregation.cc 2015-09-23 12:28:41.000000000 -0700
+++ ns-3.25/examples/wireless/simple-two-level-aggregation.cc 1969-12-31 16:00:00.000000000 -0800
@@ -1,214 +0,0 @@
-/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/*
- * Copyright (c) 2015 Sébastien Deronne
- *
- * 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: Sébastien Deronne
- */
-
-#include "ns3/core-module.h"
-#include "ns3/network-module.h"
-#include "ns3/applications-module.h"
-#include "ns3/wifi-module.h"
-#include "ns3/mobility-module.h"
-#include "ns3/ipv4-global-routing-helper.h"
-#include "ns3/internet-module.h"
-
-// This is a simple example in order to show how 802.11n two-level aggregation feature works.
-// Two-level aggregation is the simultaneous use of MSDU and MPDU aggregation schemes (known as one-level aggregation techniques).
-//
-// The throughput is obtained for a given number of aggregated MSDUs and MPDUs.
-// The number of aggregated MSDUs and MPDUs can be chosen by the user through the nMsdus and nMpdus attibutes, respectively.
-//
-// Example: ./waf --run "simple-two-level-aggregation --nMsdus=3 --nMpdus=8"
-//
-// Network topology:
-//
-// Wifi 192.168.1.0
-//
-// AP
-// * *
-// | |
-// n1 n2
-//
-// Packets in this simulation aren't marked with a QosTag so they are considered
-// belonging to BestEffort Access Class (AC_BE).
-//
-// Throughput gets higher as either nMsdus or nMpdus is increased (one-level aggregation),
-// or when both nMsdus and nMpdus are increases (two-level aggregation).
-// MSDU aggregation offers a better header reduction compare to MPDU aggregation,
-// while MPDU aggregation is more robust against transmission errors than MSDU aggregation.
-// The good setting of nMsdu and nMpdus will depends on various factors (payload size, channel conditions, ...).
-// Since this example considers an ideal channel, the highest throughput is obtained with the largest values for nMsdus and nMpdus parameters.
-// Users should nevertheless take care that the standard rules limit the maximum MSDU size to 7935 bytes and the MPDU size to 65535 bytes.
-// Consequently, more packets should be aggregated if their payload is small with standard-compliant parameters.
-// Users should also note that the maximum duration of the frame is limited by the standard.
-// As a result, higher values for nMsdus and nMpdus may not always provide throughput improvements.
-
-using namespace ns3;
-
-NS_LOG_COMPONENT_DEFINE ("SimpleTwoLevelAggregation");
-
-int main (int argc, char *argv[])
-{
- uint32_t payloadSize = 1472; //bytes
- uint64_t simulationTime = 10; //seconds
- uint32_t nMsdus = 1;
- uint32_t nMpdus = 1;
- bool enableRts = 0;
-
- CommandLine cmd;
- cmd.AddValue ("nMsdus", "Number of aggregated MSDUs", nMsdus); //number of aggregated MSDUs specified by the user
- cmd.AddValue ("nMpdus", "Number of aggregated MPDUs", nMpdus); //number of aggregated MPDUs specified by the user
- cmd.AddValue ("payloadSize", "Payload size in bytes", payloadSize);
- cmd.AddValue ("enableRts", "Enable RTS/CTS", enableRts);
- cmd.AddValue ("simulationTime", "Simulation time in seconds", simulationTime);
- cmd.Parse (argc, argv);
-
- if (!enableRts)
- {
- Config::SetDefault ("ns3::WifiRemoteStationManager::RtsCtsThreshold", StringValue ("999999"));
- }
- else
- {
- Config::SetDefault ("ns3::WifiRemoteStationManager::RtsCtsThreshold", StringValue ("0"));
- }
-
- Config::SetDefault ("ns3::WifiRemoteStationManager::FragmentationThreshold", StringValue ("990000"));
-
- NodeContainer wifiStaNode;
- wifiStaNode.Create (1);
- NodeContainer wifiApNode;
- wifiApNode.Create (1);
-
- YansWifiChannelHelper channel = YansWifiChannelHelper::Default ();
- YansWifiPhyHelper phy = YansWifiPhyHelper::Default ();
- phy.SetPcapDataLinkType (YansWifiPhyHelper::DLT_IEEE802_11_RADIO);
- phy.SetChannel (channel.Create ());
-
- WifiHelper wifi = WifiHelper::Default ();
- wifi.SetStandard (WIFI_PHY_STANDARD_80211n_5GHZ);
- //We consider a constant bitrate since HT rate adaptation algorithms are not supported yet in the simulator
- wifi.SetRemoteStationManager ("ns3::ConstantRateWifiManager",
- "DataMode", StringValue ("HtMcs7"),
- "ControlMode", StringValue ("HtMcs0"));
- HtWifiMacHelper mac = HtWifiMacHelper::Default ();
-
- Ssid ssid = Ssid ("simple-two-level-aggregation");
- mac.SetType ("ns3::StaWifiMac",
- "Ssid", SsidValue (ssid),
- "ActiveProbing", BooleanValue (false));
-
-
- //Enable aggregation at the station side
- if (nMpdus > 1)
- {
- mac.SetBlockAckThresholdForAc (AC_BE, 2); //enable BlockAck when A-MPDU is used
- }
- if (nMsdus > 0)
- {
- mac.SetMpduAggregatorForAc (AC_BE,"ns3::MpduStandardAggregator",
- "MaxAmpduSize", UintegerValue (nMpdus * (nMsdus * (payloadSize + 100)))); //Set the maximum size for A-MPDU with regards to the payload size and the number of MSDUs expected in each MPDU.
- }
- else //MPDU aggregation only (one-level aggregation)
- {
- mac.SetMpduAggregatorForAc (AC_BE,"ns3::MpduStandardAggregator",
- "MaxAmpduSize", UintegerValue (nMpdus * (payloadSize + 200))); //Set the maximum size for A-MPDU with regards to the payload size
- }
- mac.SetMsduAggregatorForAc (AC_BE,"ns3::MsduStandardAggregator",
- "MaxAmsduSize", UintegerValue (nMsdus * (payloadSize + 100))); //Set the maximum size for A-MSDU with regards to the payload size
-
-
- NetDeviceContainer staDevice;
- staDevice = wifi.Install (phy, mac, wifiStaNode);
-
- mac.SetType ("ns3::ApWifiMac",
- "Ssid", SsidValue (ssid),
- "BeaconInterval", TimeValue (MicroSeconds (102400)),
- "BeaconGeneration", BooleanValue (true));
-
- //Enable aggregation at the AP side
- if (nMpdus > 1)
- {
- mac.SetBlockAckThresholdForAc (AC_BE, 2); //enable BlockAck when A-MPDU is used
- }
- if (nMsdus > 0)
- {
- mac.SetMpduAggregatorForAc (AC_BE,"ns3::MpduStandardAggregator",
- "MaxAmpduSize", UintegerValue (nMpdus * (nMsdus * (payloadSize + 100)))); //Set the maximum size for A-MPDU according to the payload size and the number of MSDUs expected in each MPDU.
- }
- else //MPDU aggregation only (one-level aggregation)
- {
- mac.SetMpduAggregatorForAc (AC_BE,"ns3::MpduStandardAggregator",
- "MaxAmpduSize", UintegerValue (nMpdus * (payloadSize + 200))); //Set the maximum size for A-MPDU with regards to the payload size
- }
- mac.SetMsduAggregatorForAc (AC_BE,"ns3::MsduStandardAggregator",
- "MaxAmsduSize", UintegerValue (nMsdus * (payloadSize + 100))); //Set the maximum size for A-MSDU with regards to the payload size
-
- NetDeviceContainer apDevice;
- apDevice = wifi.Install (phy, mac, wifiApNode);
-
- /* Setting mobility model */
- MobilityHelper mobility;
- Ptr positionAlloc = CreateObject ();
-
- positionAlloc->Add (Vector (0.0, 0.0, 0.0));
- positionAlloc->Add (Vector (1.0, 0.0, 0.0));
- mobility.SetPositionAllocator (positionAlloc);
-
- mobility.SetMobilityModel ("ns3::ConstantPositionMobilityModel");
-
- mobility.Install (wifiApNode);
- mobility.Install (wifiStaNode);
-
- /* Internet stack*/
- InternetStackHelper stack;
- stack.Install (wifiApNode);
- stack.Install (wifiStaNode);
-
- Ipv4AddressHelper address;
-
- address.SetBase ("192.168.1.0", "255.255.255.0");
- Ipv4InterfaceContainer StaInterface;
- StaInterface = address.Assign (staDevice);
- Ipv4InterfaceContainer ApInterface;
- ApInterface = address.Assign (apDevice);
-
- /* Setting applications */
- UdpServerHelper myServer (9);
- ApplicationContainer serverApp = myServer.Install (wifiStaNode.Get (0));
- serverApp.Start (Seconds (0.0));
- serverApp.Stop (Seconds (simulationTime + 1));
-
- UdpClientHelper myClient (StaInterface.GetAddress (0), 9);
- myClient.SetAttribute ("MaxPackets", UintegerValue (4294967295u));
- myClient.SetAttribute ("Interval", TimeValue (Time ("0.00002"))); //packets/s
- myClient.SetAttribute ("PacketSize", UintegerValue (payloadSize));
-
- ApplicationContainer clientApp = myClient.Install (wifiApNode.Get (0));
- clientApp.Start (Seconds (1.0));
- clientApp.Stop (Seconds (simulationTime + 1));
-
- Simulator::Stop (Seconds (simulationTime + 1));
-
- Simulator::Run ();
- Simulator::Destroy ();
-
- uint32_t totalPacketsThrough = DynamicCast (serverApp.Get (0))->GetReceived ();
- double throughput = totalPacketsThrough * payloadSize * 8 / (simulationTime * 1000000.0);
- std::cout << "Throughput: " << throughput << " Mbit/s" << '\n';
-
- return 0;
-}
diff -Naur ns-3.24.1/examples/wireless/vht-wifi-network.cc ns-3.25/examples/wireless/vht-wifi-network.cc
--- ns-3.24.1/examples/wireless/vht-wifi-network.cc 2015-09-23 12:28:41.000000000 -0700
+++ ns-3.25/examples/wireless/vht-wifi-network.cc 2016-03-23 21:36:53.000000000 -0700
@@ -94,13 +94,14 @@
// Set guard interval
phy.Set ("ShortGuardEnabled", BooleanValue (k));
- WifiHelper wifi = WifiHelper::Default ();
+ WifiHelper wifi;
wifi.SetStandard (WIFI_PHY_STANDARD_80211ac);
- VhtWifiMacHelper mac = VhtWifiMacHelper::Default ();
+ WifiMacHelper mac;
- StringValue DataRate = VhtWifiMacHelper::DataRateForMcs (i);
- wifi.SetRemoteStationManager ("ns3::ConstantRateWifiManager","DataMode", DataRate,
- "ControlMode", DataRate);
+ std::ostringstream oss;
+ oss << "VhtMcs" << i;
+ wifi.SetRemoteStationManager ("ns3::ConstantRateWifiManager","DataMode", StringValue (oss.str ()),
+ "ControlMode", StringValue (oss.str ()));
Ssid ssid = Ssid ("ns3-80211ac");
diff -Naur ns-3.24.1/examples/wireless/wifi-adhoc.cc ns-3.25/examples/wireless/wifi-adhoc.cc
--- ns-3.24.1/examples/wireless/wifi-adhoc.cc 2015-09-23 12:28:41.000000000 -0700
+++ ns-3.25/examples/wireless/wifi-adhoc.cc 2016-03-23 21:36:53.000000000 -0700
@@ -37,7 +37,7 @@
Experiment ();
Experiment (std::string name);
Gnuplot2dDataset Run (const WifiHelper &wifi, const YansWifiPhyHelper &wifiPhy,
- const NqosWifiMacHelper &wifiMac, const YansWifiChannelHelper &wifiChannel);
+ const WifiMacHelper &wifiMac, const YansWifiChannelHelper &wifiChannel);
private:
void ReceivePacket (Ptr socket);
void SetPosition (Ptr node, Vector position);
@@ -112,7 +112,7 @@
Gnuplot2dDataset
Experiment::Run (const WifiHelper &wifi, const YansWifiPhyHelper &wifiPhy,
- const NqosWifiMacHelper &wifiMac, const YansWifiChannelHelper &wifiChannel)
+ const WifiMacHelper &wifiMac, const YansWifiChannelHelper &wifiChannel)
{
m_bytesTotal = 0;
@@ -125,7 +125,7 @@
YansWifiPhyHelper phy = wifiPhy;
phy.SetChannel (wifiChannel.Create ());
- NqosWifiMacHelper mac = wifiMac;
+ WifiMacHelper mac = wifiMac;
NetDeviceContainer devices = wifi.Install (phy, mac, c);
MobilityHelper mobility;
@@ -172,9 +172,9 @@
Gnuplot gnuplot = Gnuplot ("reference-rates.png");
Experiment experiment;
- WifiHelper wifi = WifiHelper::Default ();
+ WifiHelper wifi;
wifi.SetStandard (WIFI_PHY_STANDARD_80211a);
- NqosWifiMacHelper wifiMac = NqosWifiMacHelper::Default ();
+ WifiMacHelper wifiMac;
YansWifiPhyHelper wifiPhy = YansWifiPhyHelper::Default ();
YansWifiChannelHelper wifiChannel = YansWifiChannelHelper::Default ();
Gnuplot2dDataset dataset;
diff -Naur ns-3.24.1/examples/wireless/wifi-aggregation.cc ns-3.25/examples/wireless/wifi-aggregation.cc
--- ns-3.24.1/examples/wireless/wifi-aggregation.cc 1969-12-31 16:00:00.000000000 -0800
+++ ns-3.25/examples/wireless/wifi-aggregation.cc 2016-03-23 21:36:53.000000000 -0700
@@ -0,0 +1,307 @@
+/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
+/*
+ * Copyright (c) 2016 Sébastien Deronne
+ *
+ * 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: Sébastien Deronne
+ */
+
+#include "ns3/core-module.h"
+#include "ns3/network-module.h"
+#include "ns3/applications-module.h"
+#include "ns3/wifi-module.h"
+#include "ns3/mobility-module.h"
+#include "ns3/ipv4-global-routing-helper.h"
+#include "ns3/internet-module.h"
+
+// This is an example that illustrates how 802.11n aggregation is configured.
+// It defines 4 independant Wi-Fi networks (working on different channels).
+// Each network contains one access point and one station. Each station
+// continously transmits data packets to its respective AP.
+//
+// Network topology (numbers in parentheses are channel numbers):
+//
+// Network A (36) Network B (40) Network C (44) Network D (48)
+// * * * * * * * *
+// | | | | | | | |
+// AP A STA A AP B STA B AP C STA C AP D STA D
+//
+// The aggregation parameters are configured differently on the 4 stations:
+// - station A uses default aggregation parameter values (A-MSDU disabled, A-MPDU enabled with maximum size of 65 kB);
+// - station B doesn't use aggregation (both A-MPDU and A-MSDU are disabled);
+// - station C enables A-MSDU (with maximum size of 8 kB) but disables A-MPDU;
+// - station C uses two-level aggregation (A-MPDU with maximum size of 32 kB and A-MSDU with maximum size of 4 kB).
+//
+// Packets in this simulation aren't marked with a QosTag so they
+// are considered belonging to BestEffort Access Class (AC_BE).
+//
+// The user can select the distance between the stations and the APs and can enable/disable the RTS/CTS mechanism.
+// Example: ./waf --run "wifi-aggregation --distance=10 --enableRts=0 --simulationTime=20"
+//
+// The output prints the throughput measured for the 4 cases/networks decribed above. When default aggregation parameters are enabled, the
+// maximum A-MPDU size is 65 kB and the throughput is maximal. When aggregation is disabled, the thoughput is about the half of the
+// physical bitrate as in legacy wifi networks. When only A-MSDU is enabled, the throughput is increased but is not maximal, since the maximum
+// A-MSDU size is limited to 7935 bytes (whereas the maximum A-MPDU size is limited to 65535 bytes). When A-MSDU and A-MPDU are both enabled
+// (= two-level aggregation), the throughput is slightly smaller than the first scenario since we set a smaller maximum A-MPDU size.
+//
+// When the distance is increased, the frame error rate gets higher, and the output shows how it affects the throughput for the 4 networks.
+// Even through A-MSDU has less overheads than A-MPDU, A-MSDU is less robust against transmission errors than A-MPDU. When the distance is
+// augmented, the throughput for the third scenario is more affected than the throughput obtained in other networks.
+
+using namespace ns3;
+
+NS_LOG_COMPONENT_DEFINE ("SimpleMpduAggregation");
+
+int main (int argc, char *argv[])
+{
+ uint32_t payloadSize = 1472; //bytes
+ uint64_t simulationTime = 10; //seconds
+ double distance = 5; //meters
+ bool enablePcap = 0;
+
+ CommandLine cmd;
+ cmd.AddValue ("payloadSize", "Payload size in bytes", payloadSize);
+ cmd.AddValue ("simulationTime", "Simulation time in seconds", simulationTime);
+ cmd.AddValue ("distance", "Distance in meters between the station and the access point", distance);
+ cmd.AddValue ("enablePcap", "Enable/disable pcap file generation", enablePcap);
+ cmd.Parse (argc, argv);
+
+ NodeContainer wifiStaNode;
+ wifiStaNode.Create (4);
+ NodeContainer wifiApNode;
+ wifiApNode.Create (4);
+
+ YansWifiChannelHelper channel = YansWifiChannelHelper::Default ();
+ YansWifiPhyHelper phy = YansWifiPhyHelper::Default ();
+ phy.SetPcapDataLinkType (YansWifiPhyHelper::DLT_IEEE802_11_RADIO);
+ phy.SetChannel (channel.Create ());
+
+ WifiHelper wifi;
+ wifi.SetStandard (WIFI_PHY_STANDARD_80211n_5GHZ);
+ wifi.SetRemoteStationManager ("ns3::ConstantRateWifiManager", "DataMode", StringValue ("HtMcs7"), "ControlMode", StringValue ("HtMcs0"));
+ WifiMacHelper mac;
+
+ NetDeviceContainer staDeviceA, staDeviceB, staDeviceC, staDeviceD, apDeviceA, apDeviceB, apDeviceC, apDeviceD;
+ Ssid ssid;
+
+ //Network A
+ ssid = Ssid ("network-A");
+ phy.Set ("ChannelNumber", UintegerValue(36));
+ mac.SetType ("ns3::StaWifiMac",
+ "Ssid", SsidValue (ssid),
+ "ActiveProbing", BooleanValue (false));
+ staDeviceA = wifi.Install (phy, mac, wifiStaNode.Get(0));
+
+ mac.SetType ("ns3::ApWifiMac",
+ "Ssid", SsidValue (ssid),
+ "BeaconInterval", TimeValue (MicroSeconds (102400)),
+ "BeaconGeneration", BooleanValue (true));
+ apDeviceA = wifi.Install (phy, mac, wifiApNode.Get(0));
+
+ //Network B
+ ssid = Ssid ("network-B");
+ phy.Set ("ChannelNumber", UintegerValue(40));
+ mac.SetType ("ns3::StaWifiMac",
+ "Ssid", SsidValue (ssid),
+ "ActiveProbing", BooleanValue (false),
+ "BE_MaxAmpduSize", UintegerValue (0)); //Disable A-MPDU
+
+ staDeviceB = wifi.Install (phy, mac, wifiStaNode.Get(1));
+
+ mac.SetType ("ns3::ApWifiMac",
+ "Ssid", SsidValue (ssid),
+ "BeaconInterval", TimeValue (MicroSeconds (102400)),
+ "BeaconGeneration", BooleanValue (true));
+ apDeviceB = wifi.Install (phy, mac, wifiApNode.Get(1));
+
+ //Network C
+ ssid = Ssid ("network-C");
+ phy.Set ("ChannelNumber", UintegerValue(44));
+ mac.SetType ("ns3::StaWifiMac",
+ "Ssid", SsidValue (ssid),
+ "ActiveProbing", BooleanValue (false),
+ "BE_MaxAmpduSize", UintegerValue (0), //Disable A-MPDU
+ "BE_MaxAmsduSize", UintegerValue (7935)); //Enable A-MSDU with the highest maximum size allowed by the standard (7935 bytes)
+
+ staDeviceC = wifi.Install (phy, mac, wifiStaNode.Get(2));
+
+ mac.SetType ("ns3::ApWifiMac",
+ "Ssid", SsidValue (ssid),
+ "BeaconInterval", TimeValue (MicroSeconds (102400)),
+ "BeaconGeneration", BooleanValue (true));
+ apDeviceC = wifi.Install (phy, mac, wifiApNode.Get(2));
+
+ //Network D
+ ssid = Ssid ("network-D");
+ phy.Set ("ChannelNumber", UintegerValue(48));
+ mac.SetType ("ns3::StaWifiMac",
+ "Ssid", SsidValue (ssid),
+ "ActiveProbing", BooleanValue (false),
+ "BE_MaxAmpduSize", UintegerValue (32768), //Enable A-MPDU with a smaller size than the default one
+ "BE_MaxAmsduSize", UintegerValue (3839)); //Enable A-MSDU with the smallest maximum size allowed by the standard (3839 bytes)
+
+ staDeviceD = wifi.Install (phy, mac, wifiStaNode.Get(3));
+
+ mac.SetType ("ns3::ApWifiMac",
+ "Ssid", SsidValue (ssid),
+ "BeaconInterval", TimeValue (MicroSeconds (102400)),
+ "BeaconGeneration", BooleanValue (true));
+ apDeviceD = wifi.Install (phy, mac, wifiApNode.Get(3));
+
+ /* Setting mobility model */
+ MobilityHelper mobility;
+ Ptr positionAlloc = CreateObject ();
+ mobility.SetMobilityModel ("ns3::ConstantPositionMobilityModel");
+
+ //Set position for APs
+ positionAlloc->Add (Vector (0.0, 0.0, 0.0));
+ positionAlloc->Add (Vector (10.0, 0.0, 0.0));
+ positionAlloc->Add (Vector (20.0, 0.0, 0.0));
+ positionAlloc->Add (Vector (30.0, 0.0, 0.0));
+ //Set position for STAs
+ positionAlloc->Add (Vector (distance, 0.0, 0.0));
+ positionAlloc->Add (Vector (10 + distance, 0.0, 0.0));
+ positionAlloc->Add (Vector (20 + distance, 0.0, 0.0));
+ positionAlloc->Add (Vector (30 + distance, 0.0, 0.0));
+ //Remark: while we set these positions 10 meters apart, the networks do not interact
+ //and the only variable that affects transmission performance is the distance.
+
+ mobility.SetPositionAllocator (positionAlloc);
+ mobility.Install (wifiApNode);
+ mobility.Install (wifiStaNode);
+
+ /* Internet stack */
+ InternetStackHelper stack;
+ stack.Install (wifiApNode);
+ stack.Install (wifiStaNode);
+
+ Ipv4AddressHelper address;
+
+ address.SetBase ("192.168.1.0", "255.255.255.0");
+ Ipv4InterfaceContainer StaInterfaceA;
+ StaInterfaceA = address.Assign (staDeviceA);
+ Ipv4InterfaceContainer ApInterfaceA;
+ ApInterfaceA = address.Assign (apDeviceA);
+
+ address.SetBase ("192.168.2.0", "255.255.255.0");
+ Ipv4InterfaceContainer StaInterfaceB;
+ StaInterfaceB = address.Assign (staDeviceB);
+ Ipv4InterfaceContainer ApInterfaceB;
+ ApInterfaceB = address.Assign (apDeviceB);
+
+ address.SetBase ("192.168.3.0", "255.255.255.0");
+ Ipv4InterfaceContainer StaInterfaceC;
+ StaInterfaceC = address.Assign (staDeviceC);
+ Ipv4InterfaceContainer ApInterfaceC;
+ ApInterfaceC = address.Assign (apDeviceC);
+
+ address.SetBase ("192.168.4.0", "255.255.255.0");
+ Ipv4InterfaceContainer StaInterfaceD;
+ StaInterfaceD = address.Assign (staDeviceD);
+ Ipv4InterfaceContainer ApInterfaceD;
+ ApInterfaceD = address.Assign (apDeviceD);
+
+ /* Setting applications */
+ UdpServerHelper myServerA (9);
+ ApplicationContainer serverAppA = myServerA.Install (wifiStaNode.Get (0));
+ serverAppA.Start (Seconds (0.0));
+ serverAppA.Stop (Seconds (simulationTime + 1));
+
+ UdpClientHelper myClientA (StaInterfaceA.GetAddress (0), 9);
+ myClientA.SetAttribute ("MaxPackets", UintegerValue (4294967295u));
+ myClientA.SetAttribute ("Interval", TimeValue (Time ("0.00002"))); //packets/s
+ myClientA.SetAttribute ("PacketSize", UintegerValue (payloadSize));
+
+ ApplicationContainer clientAppA = myClientA.Install (wifiApNode.Get (0));
+ clientAppA.Start (Seconds (1.0));
+ clientAppA.Stop (Seconds (simulationTime + 1));
+
+ UdpServerHelper myServerB (9);
+ ApplicationContainer serverAppB = myServerB.Install (wifiStaNode.Get (1));
+ serverAppB.Start (Seconds (0.0));
+ serverAppB.Stop (Seconds (simulationTime + 1));
+
+ UdpClientHelper myClientB (StaInterfaceB.GetAddress (0), 9);
+ myClientB.SetAttribute ("MaxPackets", UintegerValue (4294967295u));
+ myClientB.SetAttribute ("Interval", TimeValue (Time ("0.00002"))); //packets/s
+ myClientB.SetAttribute ("PacketSize", UintegerValue (payloadSize));
+
+ ApplicationContainer clientAppB = myClientB.Install (wifiApNode.Get (1));
+ clientAppB.Start (Seconds (1.0));
+ clientAppB.Stop (Seconds (simulationTime + 1));
+
+ UdpServerHelper myServerC (9);
+ ApplicationContainer serverAppC = myServerC.Install (wifiStaNode.Get (2));
+ serverAppC.Start (Seconds (0.0));
+ serverAppC.Stop (Seconds (simulationTime + 1));
+
+ UdpClientHelper myClientC (StaInterfaceC.GetAddress (0), 9);
+ myClientC.SetAttribute ("MaxPackets", UintegerValue (4294967295u));
+ myClientC.SetAttribute ("Interval", TimeValue (Time ("0.00002"))); //packets/s
+ myClientC.SetAttribute ("PacketSize", UintegerValue (payloadSize));
+
+ ApplicationContainer clientAppC = myClientC.Install (wifiApNode.Get (2));
+ clientAppC.Start (Seconds (1.0));
+ clientAppC.Stop (Seconds (simulationTime + 1));
+
+ UdpServerHelper myServerD (9);
+ ApplicationContainer serverAppD = myServerD.Install (wifiStaNode.Get (3));
+ serverAppD.Start (Seconds (0.0));
+ serverAppD.Stop (Seconds (simulationTime + 1));
+
+ UdpClientHelper myClientD (StaInterfaceD.GetAddress (0), 9);
+ myClientD.SetAttribute ("MaxPackets", UintegerValue (4294967295u));
+ myClientD.SetAttribute ("Interval", TimeValue (Time ("0.00002"))); //packets/s
+ myClientD.SetAttribute ("PacketSize", UintegerValue (payloadSize));
+
+ ApplicationContainer clientAppD = myClientD.Install (wifiApNode.Get (3));
+ clientAppD.Start (Seconds (1.0));
+ clientAppD.Stop (Seconds (simulationTime + 1));
+
+ if (enablePcap)
+ {
+ phy.EnablePcap ("AP_A", apDeviceA.Get (0));
+ phy.EnablePcap ("STA_A", staDeviceA.Get (0));
+ phy.EnablePcap ("AP_B", apDeviceB.Get (0));
+ phy.EnablePcap ("STA_B", staDeviceB.Get (0));
+ phy.EnablePcap ("AP_C", apDeviceC.Get (0));
+ phy.EnablePcap ("STA_C", staDeviceC.Get (0));
+ phy.EnablePcap ("AP_D", apDeviceD.Get (0));
+ phy.EnablePcap ("STA_D", staDeviceD.Get (0));
+ }
+
+ Simulator::Stop (Seconds (simulationTime + 1));
+ Simulator::Run ();
+ Simulator::Destroy ();
+
+ /* Show results */
+ uint32_t totalPacketsThrough = DynamicCast (serverAppA.Get (0))->GetReceived ();
+ double throughput = totalPacketsThrough * payloadSize * 8 / (simulationTime * 1000000.0);
+ std::cout << "Throughput with default configuration (A-MPDU aggregation enabled, 65kB): " << throughput << " Mbit/s" << '\n';
+
+ totalPacketsThrough = DynamicCast (serverAppB.Get (0))->GetReceived ();
+ throughput = totalPacketsThrough * payloadSize * 8 / (simulationTime * 1000000.0);
+ std::cout << "Throughput with aggregation disabled: " << throughput << " Mbit/s" << '\n';
+
+ totalPacketsThrough = DynamicCast (serverAppC.Get (0))->GetReceived ();
+ throughput = totalPacketsThrough * payloadSize * 8 / (simulationTime * 1000000.0);
+ std::cout << "Throughput with A-MPDU disabled and A-MSDU enabled (8kB): " << throughput << " Mbit/s" << '\n';
+
+ totalPacketsThrough = DynamicCast (serverAppD.Get (0))->GetReceived ();
+ throughput = totalPacketsThrough * payloadSize * 8 / (simulationTime * 1000000.0);
+ std::cout << "Throughput with A-MPDU enabled (32kB) and A-MSDU enabled (4kB): " << throughput << " Mbit/s" << '\n';
+
+ return 0;
+}
diff -Naur ns-3.24.1/examples/wireless/wifi-ap.cc ns-3.25/examples/wireless/wifi-ap.cc
--- ns-3.24.1/examples/wireless/wifi-ap.cc 2015-09-23 12:28:41.000000000 -0700
+++ ns-3.25/examples/wireless/wifi-ap.cc 2016-03-23 21:36:53.000000000 -0700
@@ -128,7 +128,7 @@
// disable fragmentation
Config::SetDefault ("ns3::WifiRemoteStationManager::FragmentationThreshold", StringValue ("2200"));
- WifiHelper wifi = WifiHelper::Default ();
+ WifiHelper wifi;
MobilityHelper mobility;
NodeContainer stas;
NodeContainer ap;
@@ -142,7 +142,7 @@
packetSocket.Install (stas);
packetSocket.Install (ap);
- NqosWifiMacHelper wifiMac = NqosWifiMacHelper::Default ();
+ WifiMacHelper wifiMac;
YansWifiPhyHelper wifiPhy = YansWifiPhyHelper::Default ();
YansWifiChannelHelper wifiChannel = YansWifiChannelHelper::Default ();
wifiPhy.SetChannel (wifiChannel.Create ());
diff -Naur ns-3.24.1/examples/wireless/wifi-ap.py ns-3.25/examples/wireless/wifi-ap.py
--- ns-3.24.1/examples/wireless/wifi-ap.py 2015-09-23 12:28:41.000000000 -0700
+++ ns-3.25/examples/wireless/wifi-ap.py 2016-03-23 21:36:53.000000000 -0700
@@ -124,7 +124,7 @@
ssid = ns.wifi.Ssid("wifi-default")
wifi.SetRemoteStationManager("ns3::ArfWifiManager")
- wifiMac = ns.wifi.NqosWifiMacHelper.Default()
+ wifiMac = ns.wifi.WifiMacHelper()
# setup stas.
wifiMac.SetType("ns3::StaWifiMac",
diff -Naur ns-3.24.1/examples/wireless/wifi-blockack.cc ns-3.25/examples/wireless/wifi-blockack.cc
--- ns-3.24.1/examples/wireless/wifi-blockack.cc 2015-09-23 12:28:41.000000000 -0700
+++ ns-3.25/examples/wireless/wifi-blockack.cc 2016-03-23 21:36:53.000000000 -0700
@@ -19,7 +19,7 @@
*/
/**
- * This is a simple example in order to show how 802.11n compressed block ack mechanism could be used.
+ * This is a simple example in order to show how 802.11e compressed block ack mechanism could be used.
*
* Network topology:
*
@@ -62,25 +62,27 @@
YansWifiPhyHelper phy = YansWifiPhyHelper::Default ();
phy.SetChannel (channel.Create ());
- WifiHelper wifi = WifiHelper::Default ();
- QosWifiMacHelper mac = QosWifiMacHelper::Default ();
+ WifiHelper wifi;
+ WifiMacHelper mac;
/* disable fragmentation */
wifi.SetRemoteStationManager ("ns3::AarfWifiManager", "FragmentationThreshold", UintegerValue (2500));
Ssid ssid ("My-network");
mac.SetType ("ns3::StaWifiMac",
+ "QosSupported", BooleanValue (true),
"Ssid", SsidValue (ssid),
- "ActiveProbing", BooleanValue (false));
+ "ActiveProbing", BooleanValue (false),
/* setting blockack threshold for sta's BE queue */
- mac.SetBlockAckThresholdForAc (AC_BE, 2);
- /* setting block inactivity timeout to 3*1024 = 3072 microseconds */
- //mac.SetBlockAckInactivityTimeoutForAc (AC_BE, 3);
+ "BE_BlockAckThreshold", UintegerValue (2),
+ /* setting block inactivity timeout to 3*1024 = 3072 microseconds */
+ "BE_BlockAckInactivityTimeout", UintegerValue (3));
NetDeviceContainer staDevice = wifi.Install (phy, mac, sta);
mac.SetType ("ns3::ApWifiMac",
- "Ssid", SsidValue (ssid));
- mac.SetBlockAckThresholdForAc (AC_BE, 0);
+ "QosSupported", BooleanValue (true),
+ "Ssid", SsidValue (ssid),
+ "BE_BlockAckThreshold", UintegerValue (0));
NetDeviceContainer apDevice = wifi.Install (phy, mac, ap);
/* Setting mobility model */
diff -Naur ns-3.24.1/examples/wireless/wifi-clear-channel-cmu.cc ns-3.25/examples/wireless/wifi-clear-channel-cmu.cc
--- ns-3.24.1/examples/wireless/wifi-clear-channel-cmu.cc 2015-09-23 12:28:41.000000000 -0700
+++ ns-3.25/examples/wireless/wifi-clear-channel-cmu.cc 2016-03-23 21:36:53.000000000 -0700
@@ -40,7 +40,7 @@
Experiment ();
Experiment (std::string name);
uint32_t Run (const WifiHelper &wifi, const YansWifiPhyHelper &wifiPhy,
- const NqosWifiMacHelper &wifiMac, const YansWifiChannelHelper &wifiChannel);
+ const WifiMacHelper &wifiMac, const YansWifiChannelHelper &wifiChannel);
private:
void ReceivePacket (Ptr socket);
void SetPosition (Ptr node, Vector position);
@@ -116,7 +116,7 @@
uint32_t
Experiment::Run (const WifiHelper &wifi, const YansWifiPhyHelper &wifiPhy,
- const NqosWifiMacHelper &wifiMac, const YansWifiChannelHelper &wifiChannel)
+ const WifiMacHelper &wifiMac, const YansWifiChannelHelper &wifiChannel)
{
m_pktsTotal = 0;
@@ -129,7 +129,7 @@
YansWifiPhyHelper phy = wifiPhy;
phy.SetChannel (wifiChannel.Create ());
- NqosWifiMacHelper mac = wifiMac;
+ WifiMacHelper mac = wifiMac;
NetDeviceContainer devices = wifi.Install (phy, mac, c);
MobilityHelper mobility;
@@ -194,7 +194,7 @@
WifiHelper wifi;
wifi.SetStandard (WIFI_PHY_STANDARD_80211b);
- NqosWifiMacHelper wifiMac = NqosWifiMacHelper::Default ();
+ WifiMacHelper wifiMac;
Config::SetDefault ("ns3::WifiRemoteStationManager::NonUnicastMode",
StringValue (modes[i]));
wifi.SetRemoteStationManager ("ns3::ConstantRateWifiManager",
diff -Naur ns-3.24.1/examples/wireless/wifi-hidden-terminal.cc ns-3.25/examples/wireless/wifi-hidden-terminal.cc
--- ns-3.24.1/examples/wireless/wifi-hidden-terminal.cc 2015-09-23 12:28:41.000000000 -0700
+++ ns-3.25/examples/wireless/wifi-hidden-terminal.cc 2016-03-23 21:36:53.000000000 -0700
@@ -76,7 +76,7 @@
"ControlMode",StringValue ("DsssRate1Mbps"));
YansWifiPhyHelper wifiPhy = YansWifiPhyHelper::Default ();
wifiPhy.SetChannel (wifiChannel);
- NqosWifiMacHelper wifiMac = NqosWifiMacHelper::Default ();
+ WifiMacHelper wifiMac;
wifiMac.SetType ("ns3::AdhocWifiMac"); // use ad-hoc MAC
NetDeviceContainer devices = wifi.Install (wifiPhy, wifiMac, nodes);
diff -Naur ns-3.24.1/examples/wireless/wifi-simple-adhoc.cc ns-3.25/examples/wireless/wifi-simple-adhoc.cc
--- ns-3.24.1/examples/wireless/wifi-simple-adhoc.cc 2015-09-23 12:28:41.000000000 -0700
+++ ns-3.25/examples/wireless/wifi-simple-adhoc.cc 2016-03-23 21:36:53.000000000 -0700
@@ -146,8 +146,8 @@
wifiChannel.AddPropagationLoss ("ns3::FixedRssLossModel","Rss",DoubleValue (rss));
wifiPhy.SetChannel (wifiChannel.Create ());
- // Add a non-QoS upper mac, and disable rate control
- NqosWifiMacHelper wifiMac = NqosWifiMacHelper::Default ();
+ // Add a mac and disable rate control
+ WifiMacHelper wifiMac;
wifi.SetRemoteStationManager ("ns3::ConstantRateWifiManager",
"DataMode",StringValue (phyMode),
"ControlMode",StringValue (phyMode));
diff -Naur ns-3.24.1/examples/wireless/wifi-simple-adhoc-grid.cc ns-3.25/examples/wireless/wifi-simple-adhoc-grid.cc
--- ns-3.24.1/examples/wireless/wifi-simple-adhoc-grid.cc 2015-09-23 12:28:41.000000000 -0700
+++ ns-3.25/examples/wireless/wifi-simple-adhoc-grid.cc 2016-03-23 21:36:53.000000000 -0700
@@ -171,8 +171,8 @@
wifiChannel.AddPropagationLoss ("ns3::FriisPropagationLossModel");
wifiPhy.SetChannel (wifiChannel.Create ());
- // Add a non-QoS upper mac, and disable rate control
- NqosWifiMacHelper wifiMac = NqosWifiMacHelper::Default ();
+ // Add an upper mac and disable rate control
+ WifiMacHelper wifiMac;
wifi.SetStandard (WIFI_PHY_STANDARD_80211b);
wifi.SetRemoteStationManager ("ns3::ConstantRateWifiManager",
"DataMode",StringValue (phyMode),
diff -Naur ns-3.24.1/examples/wireless/wifi-simple-infra.cc ns-3.25/examples/wireless/wifi-simple-infra.cc
--- ns-3.24.1/examples/wireless/wifi-simple-infra.cc 2015-09-23 12:28:41.000000000 -0700
+++ ns-3.25/examples/wireless/wifi-simple-infra.cc 2016-03-23 21:36:53.000000000 -0700
@@ -147,13 +147,13 @@
wifiChannel.AddPropagationLoss ("ns3::FixedRssLossModel","Rss",DoubleValue (rss));
wifiPhy.SetChannel (wifiChannel.Create ());
- // Add a non-QoS upper mac, and disable rate control
- NqosWifiMacHelper wifiMac = NqosWifiMacHelper::Default ();
+ // Add a mac and disable rate control
+ WifiMacHelper wifiMac;
wifi.SetRemoteStationManager ("ns3::ConstantRateWifiManager",
"DataMode",StringValue (phyMode),
"ControlMode",StringValue (phyMode));
- // Setup the rest of the upper mac
+ // Setup the rest of the mac
Ssid ssid = Ssid ("wifi-default");
// setup sta.
wifiMac.SetType ("ns3::StaWifiMac",
diff -Naur ns-3.24.1/examples/wireless/wifi-simple-interference.cc ns-3.25/examples/wireless/wifi-simple-interference.cc
--- ns-3.24.1/examples/wireless/wifi-simple-interference.cc 2015-09-23 12:28:41.000000000 -0700
+++ ns-3.25/examples/wireless/wifi-simple-interference.cc 2016-03-23 21:36:53.000000000 -0700
@@ -200,8 +200,8 @@
wifiChannel.AddPropagationLoss ("ns3::LogDistancePropagationLossModel");
wifiPhy.SetChannel (wifiChannel.Create ());
- // Add a non-QoS upper mac, and disable rate control
- NqosWifiMacHelper wifiMac = NqosWifiMacHelper::Default ();
+ // Add a mac and disable rate control
+ WifiMacHelper wifiMac;
wifi.SetRemoteStationManager ("ns3::ConstantRateWifiManager",
"DataMode",StringValue (phyMode),
"ControlMode",StringValue (phyMode));
diff -Naur ns-3.24.1/examples/wireless/wifi-sleep.cc ns-3.25/examples/wireless/wifi-sleep.cc
--- ns-3.24.1/examples/wireless/wifi-sleep.cc 2015-09-23 12:28:41.000000000 -0700
+++ ns-3.25/examples/wireless/wifi-sleep.cc 2016-03-23 21:36:53.000000000 -0700
@@ -146,8 +146,8 @@
YansWifiChannelHelper wifiChannel = YansWifiChannelHelper::Default ();
wifiPhy.SetChannel (wifiChannel.Create ());
- // Add a non-QoS upper mac, and set the selected tx power level
- NqosWifiMacHelper wifiMac = NqosWifiMacHelper::Default ();
+ // Add a mac and set the selected tx power level
+ WifiMacHelper wifiMac;
wifi.SetRemoteStationManager ("ns3::ArfWifiManager", "DefaultTxPowerLevel", UintegerValue (txPowerLevel));
// Set it to adhoc mode
wifiMac.SetType ("ns3::AdhocWifiMac");
diff -Naur ns-3.24.1/examples/wireless/wifi-tcp.cc ns-3.25/examples/wireless/wifi-tcp.cc
--- ns-3.24.1/examples/wireless/wifi-tcp.cc 1969-12-31 16:00:00.000000000 -0800
+++ ns-3.25/examples/wireless/wifi-tcp.cc 2016-03-23 21:36:53.000000000 -0700
@@ -0,0 +1,197 @@
+/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */
+/*
+ * Copyright (c) 2015, IMDEA Networks Institute
+ *
+ * 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: Hany Assasa
+.*
+ * This is a simple example to test TCP over 802.11n (with MPDU aggregation enabled).
+ *
+ * Network topology:
+ *
+ * Ap STA
+ * * *
+ * | |
+ * n1 n2
+ *
+ * In this example, an HT station sends TCP packets to the access point.
+ * We report the total throughput received during a window of 100ms.
+ * The user can specify the application data rate and choose the variant
+ * of TCP i.e. congestion control algorithm to use.
+ */
+
+#include "ns3/applications-module.h"
+#include "ns3/core-module.h"
+#include "ns3/internet-module.h"
+#include "ns3/mobility-module.h"
+#include "ns3/network-module.h"
+#include "ns3/point-to-point-module.h"
+#include "ns3/wifi-module.h"
+
+NS_LOG_COMPONENT_DEFINE ("wifi-tcp");
+
+using namespace ns3;
+
+Ptr sink; /* Pointer to the packet sink application */
+uint64_t lastTotalRx = 0; /* The value of the last total received bytes */
+
+void
+CalculateThroughput ()
+{
+ Time now = Simulator::Now (); /* Return the simulator's virtual time. */
+ double cur = (sink->GetTotalRx() - lastTotalRx) * (double) 8/1e5; /* Convert Application RX Packets to MBits. */
+ std::cout << now.GetSeconds () << "s: \t" << cur << " Mbit/s" << std::endl;
+ lastTotalRx = sink->GetTotalRx ();
+ Simulator::Schedule (MilliSeconds (100), &CalculateThroughput);
+}
+
+int
+main(int argc, char *argv[])
+{
+ uint32_t payloadSize = 1472; /* Transport layer payload size in bytes. */
+ std::string dataRate = "100Mbps"; /* Application layer datarate. */
+ std::string tcpVariant = "ns3::TcpNewReno"; /* TCP variant type. */
+ std::string phyRate = "HtMcs7"; /* Physical layer bitrate. */
+ double simulationTime = 10; /* Simulation time in seconds. */
+ bool pcapTracing = false; /* PCAP Tracing is enabled or not. */
+
+ /* Command line argument parser setup. */
+ CommandLine cmd;
+ cmd.AddValue ("payloadSize", "Payload size in bytes", payloadSize);
+ cmd.AddValue ("dataRate", "Application data ate", dataRate);
+ cmd.AddValue ("tcpVariant", "Transport protocol to use: TcpTahoe, TcpReno, TcpNewReno, TcpWestwood, TcpWestwoodPlus ", tcpVariant);
+ cmd.AddValue ("phyRate", "Physical layer bitrate", phyRate);
+ cmd.AddValue ("simulationTime", "Simulation time in seconds", simulationTime);
+ cmd.AddValue ("pcap", "Enable/disable PCAP Tracing", pcapTracing);
+ cmd.Parse (argc, argv);
+
+ /* No fragmentation and no RTS/CTS */
+ Config::SetDefault ("ns3::WifiRemoteStationManager::FragmentationThreshold", StringValue ("999999"));
+ Config::SetDefault ("ns3::WifiRemoteStationManager::RtsCtsThreshold", StringValue ("999999"));
+
+ /* Configure TCP Options */
+ Config::SetDefault ("ns3::TcpSocket::SegmentSize", UintegerValue (payloadSize));
+
+ WifiMacHelper wifiMac;
+ WifiHelper wifiHelper;
+ wifiHelper.SetStandard (WIFI_PHY_STANDARD_80211n_5GHZ);
+
+ /* Set up Legacy Channel */
+ YansWifiChannelHelper wifiChannel ;
+ wifiChannel.SetPropagationDelay ("ns3::ConstantSpeedPropagationDelayModel");
+ wifiChannel.AddPropagationLoss ("ns3::FriisPropagationLossModel", "Frequency", DoubleValue (5e9));
+
+ /* Setup Physical Layer */
+ YansWifiPhyHelper wifiPhy = YansWifiPhyHelper::Default ();
+ wifiPhy.SetChannel (wifiChannel.Create ());
+ wifiPhy.Set ("TxPowerStart", DoubleValue (10.0));
+ wifiPhy.Set ("TxPowerEnd", DoubleValue (10.0));
+ wifiPhy.Set ("TxPowerLevels", UintegerValue (1));
+ wifiPhy.Set ("TxGain", DoubleValue (0));
+ wifiPhy.Set ("RxGain", DoubleValue (0));
+ wifiPhy.Set ("RxNoiseFigure", DoubleValue (10));
+ wifiPhy.Set ("CcaMode1Threshold", DoubleValue (-79));
+ wifiPhy.Set ("EnergyDetectionThreshold", DoubleValue (-79 + 3));
+ wifiPhy.SetErrorRateModel ("ns3::YansErrorRateModel");
+ wifiHelper.SetRemoteStationManager ("ns3::ConstantRateWifiManager",
+ "DataMode", StringValue (phyRate),
+ "ControlMode", StringValue ("HtMcs0"));
+
+ NodeContainer networkNodes;
+ networkNodes.Create (2);
+ Ptr apWifiNode = networkNodes.Get (0);
+ Ptr staWifiNode = networkNodes.Get (1);
+
+ /* Configure AP */
+ Ssid ssid = Ssid ("network");
+ wifiMac.SetType ("ns3::ApWifiMac",
+ "Ssid", SsidValue (ssid));
+
+ NetDeviceContainer apDevice;
+ apDevice = wifiHelper.Install (wifiPhy, wifiMac, apWifiNode);
+
+ /* Configure STA */
+ wifiMac.SetType ("ns3::StaWifiMac",
+ "Ssid", SsidValue (ssid),
+ "ActiveProbing", BooleanValue (false));
+
+ NetDeviceContainer staDevices;
+ staDevices = wifiHelper.Install (wifiPhy, wifiMac, staWifiNode);
+
+ /* Mobility model */
+ MobilityHelper mobility;
+ Ptr positionAlloc = CreateObject ();
+ positionAlloc->Add (Vector (0.0, 0.0, 0.0));
+ positionAlloc->Add (Vector (1.0, 1.0, 0.0));
+
+ mobility.SetPositionAllocator (positionAlloc);
+ mobility.SetMobilityModel ("ns3::ConstantPositionMobilityModel");
+ mobility.Install (apWifiNode);
+ mobility.Install (staWifiNode);
+
+ /* Internet stack */
+ InternetStackHelper stack;
+ stack.Install (networkNodes);
+
+ Ipv4AddressHelper address;
+ address.SetBase ("10.0.0.0", "255.255.255.0");
+ Ipv4InterfaceContainer apInterface;
+ apInterface = address.Assign (apDevice);
+ Ipv4InterfaceContainer staInterface;
+ staInterface = address.Assign (staDevices);
+
+ /* Populate routing table */
+ Ipv4GlobalRoutingHelper::PopulateRoutingTables ();
+
+ /* Install TCP Receiver on the access point */
+ PacketSinkHelper sinkHelper ("ns3::TcpSocketFactory", InetSocketAddress (Ipv4Address::GetAny (), 9));
+ ApplicationContainer sinkApp = sinkHelper.Install (apWifiNode);
+ sink = StaticCast (sinkApp.Get (0));
+
+ /* Install TCP/UDP Transmitter on the station */
+ OnOffHelper server ("ns3::TcpSocketFactory", (InetSocketAddress (apInterface.GetAddress (0), 9)));
+ server.SetAttribute ("PacketSize", UintegerValue (payloadSize));
+ server.SetAttribute ("OnTime", StringValue ("ns3::ConstantRandomVariable[Constant=1]"));
+ server.SetAttribute ("OffTime", StringValue ("ns3::ConstantRandomVariable[Constant=0]"));
+ server.SetAttribute ("DataRate", DataRateValue (DataRate (dataRate)));
+ ApplicationContainer serverApp = server.Install (staWifiNode);
+
+ /* Start Applications */
+ sinkApp.Start (Seconds (0.0));
+ serverApp.Start (Seconds (1.0));
+ Simulator::Schedule (Seconds (1.1), &CalculateThroughput);
+
+ /* Enable Traces */
+ if (pcapTracing)
+ {
+ wifiPhy.SetPcapDataLinkType (YansWifiPhyHelper::DLT_IEEE802_11_RADIO);
+ wifiPhy.EnablePcap ("AccessPoint", apDevice);
+ wifiPhy.EnablePcap ("Station", staDevices);
+ }
+
+ /* Start Simulation */
+ Simulator::Stop (Seconds (simulationTime + 1));
+ Simulator::Run ();
+ Simulator::Destroy ();
+
+ double averageThroughput = ((sink->GetTotalRx() * 8) / (1e6 * simulationTime));
+ if (averageThroughput < 50)
+ {
+ NS_LOG_ERROR ("Obtained throughput is not in the expected boundaries!");
+ exit (1);
+ }
+ std::cout << "\nAverage throughtput: " << averageThroughput << " Mbit/s" << std::endl;
+ return 0;
+}
diff -Naur ns-3.24.1/examples/wireless/wifi-timing-attributes.cc ns-3.25/examples/wireless/wifi-timing-attributes.cc
--- ns-3.24.1/examples/wireless/wifi-timing-attributes.cc 2015-09-23 12:28:41.000000000 -0700
+++ ns-3.25/examples/wireless/wifi-timing-attributes.cc 2016-03-23 21:36:53.000000000 -0700
@@ -82,12 +82,12 @@
phy.SetChannel (channel.Create ());
//Default IEEE 802.11n (2.4 GHz)
- WifiHelper wifi = WifiHelper::Default ();
+ WifiHelper wifi;
wifi.SetStandard (WIFI_PHY_STANDARD_80211n_2_4GHZ);
wifi.SetRemoteStationManager ("ns3::ConstantRateWifiManager",
"DataMode", StringValue("OfdmRate65MbpsBW20MHz"),
"ControlMode", StringValue("OfdmRate6_5MbpsBW20MHz"));
- HtWifiMacHelper mac = HtWifiMacHelper::Default ();
+ WifiMacHelper mac;
//Install PHY and MAC
Ssid ssid = Ssid ("ns3-wifi");
diff -Naur ns-3.24.1/examples/wireless/wifi-wired-bridging.cc ns-3.25/examples/wireless/wifi-wired-bridging.cc
--- ns-3.24.1/examples/wireless/wifi-wired-bridging.cc 2015-09-23 12:28:41.000000000 -0700
+++ ns-3.25/examples/wireless/wifi-wired-bridging.cc 2016-03-23 21:36:53.000000000 -0700
@@ -110,8 +110,8 @@
Ipv4InterfaceContainer apInterface;
MobilityHelper mobility;
BridgeHelper bridge;
- WifiHelper wifi = WifiHelper::Default ();
- NqosWifiMacHelper wifiMac = NqosWifiMacHelper::Default ();
+ WifiHelper wifi;
+ WifiMacHelper wifiMac;
YansWifiChannelHelper wifiChannel = YansWifiChannelHelper::Default ();
wifiPhy.SetChannel (wifiChannel.Create ());
diff -Naur ns-3.24.1/examples/wireless/wscript ns-3.25/examples/wireless/wscript
--- ns-3.24.1/examples/wireless/wscript 2015-09-23 12:28:41.000000000 -0700
+++ ns-3.25/examples/wireless/wscript 2016-03-23 21:36:53.000000000 -0700
@@ -22,9 +22,6 @@
obj = bld.create_ns3_program('wifi-wired-bridging', ['internet', 'mobility', 'wifi', 'csma', 'bridge', 'applications'])
obj.source = 'wifi-wired-bridging.cc'
- obj = bld.create_ns3_program('simple-msdu-aggregation', ['internet', 'mobility', 'wifi', 'applications'])
- obj.source = 'simple-msdu-aggregation.cc'
-
obj = bld.create_ns3_program('multirate', ['internet', 'mobility', 'wifi', 'stats', 'flow-monitor', 'olsr', 'applications', 'point-to-point'])
obj.source = 'multirate.cc'
@@ -76,11 +73,17 @@
obj = bld.create_ns3_program('rate-adaptation-distance', ['core', 'mobility', 'wifi', 'applications', 'flow-monitor'])
obj.source = 'rate-adaptation-distance.cc'
- obj = bld.create_ns3_program('simple-mpdu-aggregation', ['internet', 'mobility', 'wifi', 'applications'])
- obj.source = 'simple-mpdu-aggregation.cc'
-
- obj = bld.create_ns3_program('simple-two-level-aggregation', ['internet', 'mobility', 'wifi', 'applications'])
- obj.source = 'simple-two-level-aggregation.cc'
+ obj = bld.create_ns3_program('wifi-aggregation', ['internet', 'mobility', 'wifi', 'applications'])
+ obj.source = 'wifi-aggregation.cc'
obj = bld.create_ns3_program('simple-ht-hidden-stations', ['internet', 'mobility', 'wifi', 'applications'])
obj.source = 'simple-ht-hidden-stations.cc'
+
+ obj = bld.create_ns3_program('80211n-mimo', ['core','internet', 'mobility', 'wifi', 'applications', 'propagation'])
+ obj.source = '80211n-mimo.cc'
+
+ obj = bld.create_ns3_program('mixed-bg-network', ['internet', 'mobility', 'wifi', 'applications'])
+ obj.source = 'mixed-bg-network.cc'
+
+ obj = bld.create_ns3_program('wifi-tcp', ['internet', 'mobility', 'wifi', 'applications'])
+ obj.source = 'wifi-tcp.cc'
diff -Naur ns-3.24.1/RELEASE_NOTES ns-3.25/RELEASE_NOTES
--- ns-3.24.1/RELEASE_NOTES 2015-09-30 12:15:32.000000000 -0700
+++ ns-3.25/RELEASE_NOTES 2016-03-23 21:36:52.000000000 -0700
@@ -9,6 +9,195 @@
Consult the file CHANGES.html for more detailed information about changed
API and behavior across ns-3 releases.
+Release 3.25
+============
+
+Availability
+------------
+This release is available from:
+https://www.nsnam.org/release/ns-allinone-3.25.tar.bz2
+
+Supported platforms
+-------------------
+This release has been tested on the following platforms:
+- Ubuntu 15.10 (64 bit) with g++-5.2.1
+- Ubuntu 14.04 (64 bit) with g++-4.8.2
+- Fedora Core 23 (64 bit) with g++-5.3.1
+- Fedora Core 22 (32 bit) with g++-5.1.1
+- Fedora Core 21 (64 bit) with g++-4.9.2
+- Arch Linux (64 bit) with g++-5.3.0 and clang++-3.7.1
+- CentOS/RHEL 6.7 (64-bit) with g++-4.4.7
+- OS X El Capitan 10.11.4 with Xcode 7.3 and Apple LLVM version 7.3.0
+- OS X El Capitan 10.11.3 with Xcode 7.2.1 and Apple LLVM version 7.0.2
+- OS X Yosemite 10.10.5 with Xcode 7.2.1 and Apple LLVM version 7.0.2
+- FreeBSD 10.2-RELEASE (64 bit) with clang-3.4.1
+
+New user-visible features
+-------------------------
+- (internet) The native TCP implementation has been refactored, for the
+ following improvements:
+ 1) congestion control has been aligned with the Linux architecture,
+ to facilitate easier coding of new congestion control algorithms
+ or porting implementations from the Linux kernel,
+ 2) Fast Retransmit and Fast Recovery algorithms, compliant to RFCs, are
+ shared by all TCP variants, unlike previous releases.
+ 3) TCP Hybla and TCP HighSpeed variants have been added.
+
+- (routing) The PrintRoutingTable* functions now print the following information
+ each time they are called:
+ 1) the node ID,
+ 2) the global time,
+ 3) the local time (allowing for future introduction of per-node clocks),
+ 4) the routing protocol type
+
+- (traffic control) A traffic control sublayer has been added with the aim of
+ introducing an equivalent of the Linux Traffic +Control infrastructure into
+ ns-3. This layer sits in between the NetDevices (L2) and the network
+ protocol (e.g. IP). It is in charge of processing packets and performing
+ actions on them: scheduling, dropping, marking, policing, etc. Initial
+ support for flow control has been added to the PointToPointNetDevice;
+ backward-compatible support for other device types is provided.
+
+- (traffic control) A three band priority queue modelled after Linux
+ pfifo_fast queueing discipline has been added.
+
+- (traffic control) Adaptive RED extensions have been added to the RED model
+
+- (wifi) A number of changes related to improving support for 802.11n/ac
+ models have been introduced.
+ 1) Two rate controls compatible with High Throughput (HT) Wi-Fi modes
+ (e.g. 802.11n/ac), Ideal and MinstrelHT, have been added
+ 2) Support for multiple spatial streams (MIMO) using existing SISO
+ error models
+ 3) The WiFi helper API for the WifiMac sublayer, and the configuration
+ of HT modes and parameters, has been simplified
+ 4) Better support for backward compatibilty with legacy modes
+
+- (wifi) 802.11g was made backward compatible with 802.11b networks
+
+- (internet) L4 protocols (e.g., TCP, UDP, ICMP, etc.) can be demultiplexed
+ by IP according to the incoming interface. In other words, it is now
+ possible to use specialized L4 protocols according to the interface.
+
+- (internet) Ipv6Address::IsAllHostsMulticast() is now deprecated.
+ FF02::3 is not in the official reserved IPv6 multicast address list.
+
+- (internet) Ipv6Address::IsAll[Nodes,Routers]Multicast() now checks the
+ address scope beyond the simple link-local. Nodes are checked for
+ Interface-Local, Link-Local and Realm-Local, Routers for the above plus
+ Site-Local.
+
+- (internet) Ipv6 routing protocols must now *not* forward packets to upper
+ layers unless for extremey specific cases. The Ipv6L3protocol handles
+ almost all the packets directed to the host.
+
+- (internet) Ipv6 can now reject packets directed to an address not configured
+ on the interface they are received from (Strong End System Model, RFC 1222).
+
+- (internet) UDP and Ipv6 RAW sockets can now join Ipv6 multicast groups.
+ Incoming packets will be filtered according to if there's a socket listening
+ to that group. Source filtering is left to the application.
+
+- (network) ns-3 is now capable of serializing cooked (SLL) headers. This is
+ used in DCE to allow the generation of pcap directly readable by wireshark.
+
+- (internet) It is now possible to set custom values for RipNg Link Down
+ (standard is 16).
+
+- (internet) permanent (static) NDISC entries can be created for IPv6
+
+- (internet) IPv4 RIPv2 protocol model is now available.
+
+Bugs fixed
+----------
+- Bug 1132 - useless for loops in block-ack-test-suite.cc
+- Bug 1205 - EDCA is incorrectly modelled as DCF
+- Bug 1571 - TCP zero-window and flow control window updates by the receiver
+- Bug 1631 - Acoustic modem Energy consumption calc is wrong
+- Bug 1761 - Rounding with olsr::EmfToSeconds
+- Bug 1783 - BytesInFlight value fixed
+- Bug 1954 - Serialized size of wifi-net-device differ for TX and RX trace
+- Bug 1999 - PointToPointRemoteChannel invokes PointToPointChannel constructor
+- Bug 2003 - Missing DSSS short PLCP preamble
+- Bug 2041 - TCP RTO needs unit tests
+- Bug 2068 - Timestamp option conforms to RFC 7323
+- Bug 2102 - Make global routing robust to bridged links
+- Bug 2116 - refactoring aggregation API
+- Bug 2120 - 802.11g networks are not compatible with 802.11b clients
+- Bug 2141 - TCP DataSent callback now correctly notifies sent data, without missing bytes in particular conditions
+- Bug 2150 - The TCP sender keeps retransmitting and does not terminate the connection after some retries.
+- Bug 2159 - TCP advertises wrong receive window
+- Bug 2176 - Building IPv4 address from char* doesn't look reliable
+- Bug 2183 - LiIonEnergySourceHelper is not in the energy wscript
+- Bug 2184 - Integer overflow in Wi-Fi MacLow; remove dependency between tx and rx reference number field in MPDU status
+- Bug 2185 - WiFi MacLow may respond to errored frames that it should ignore
+- Bug 2193 - Simulation fails when transmitting very small MPDU subframes
+- Bug 2195 - Udp[*]Client can't send packets to broadcast address
+- Bug 2201 - Simulation fails when active probing is used in 802.11n/ac with channel bonding enabled
+- Bug 2206 - Split internet-apps from applications
+- Bug 2207 - Print node ID and time when printing routing tables
+- Bug 2208 - Interface index based L4 protocols
+- Bug 2210 - set Order field to 0 for HT/VHT
+- Bug 2211 - Ipv{4,6}EndPoint can cause memory corruption
+- Bug 2213 - Inconsistencies may exist between the selected WifiMacHelper and the chosen 802.11 version
+- Bug 2219 - SixLowPanNetDevice hangs trying to decode a IPv6 Fragment extension header
+- Bug 2224 - scope of GetAmpduExist() in EdcaTxopN
+- Bug 2233 - Implement RFC 1222 - Strong End System Model
+- Bug 2234 - Ipv6L3Protocol should trash multicast packets not interesting for the node
+- Bug 2238 - Ipv6 routing reorganization
+- Bug 2242 - Mobility of both sender PHY and receiver PHY set to sender mobility in lr-wpan-phy-test.cc example.
+- Bug 2243 - TCP Socket Fork() fails to copy some parameters, causing connections to close prematurely on retransmit
+- Bug 2246 - Some DSR LogComponents and classes are not defined in a unique way.
+- Bug 2247 - Disabled Fast retransmit after an RTO
+- Bug 2249 - LTE perl speed tests possibly broken
+- Bug 2252 - Nix needs StaticRouting to work
+- Bug 2254 - Ipv[4,6]RawSocket can return the wrong number of bytes sent.
+- Bug 2255 - Ipv6RawSocket does not call data sent callbacks.
+- Bug 2257 - Ipv[4,6]InterfaceContainer::Add are not consistent
+- Bug 2258 - TcpSocketBase updated options and RTT for out of range segments.
+- Bug 2259 - GSL not successfully enabled for Wi-Fi DSSS error rate model
+- Bug 2262 - Corrected initial slow start threshold value
+- Bug 2266 - NixRouting info are not copied during a packet fragmentation.
+- Bug 2267 - Wrong channel bandwidth value in pcap files
+- Bug 2271 - Decision to enable RTS/CTS handshake for A-MPDUs should be based on the comparison between RtsCtsThreshold and the total A-MPDU size
+- Bug 2272 - SixLowPan NetDevice can not send uncompressed packets larger than 802.15.4 MTU
+- Bug 2273 - WeakEs model should be enforced in Static and Global routing
+- Bug 2275 - AdhocWifiMac not compatible with 802.11n/ac
+- Bug 2279 - Ipv[4,6]L3Protocol::GetInterfaceForDevice speedup.
+- Bug 2283 - Add capability to use pcap trace files with nanosecond precision timestamps
+- Bug 2286 - Support for SLL header (de)serialization.
+- Bug 2287 - FlowMonitor is confused by IP over IP.
+- Bug 2288 - Ipv4 broadcast and multicast packets are replicated on all the interfaces.
+- Bug 2289 - RIP v2 implementation
+- Bug 2290 - Cannot run click examples from test.py
+- Bug 2292 - Uninitialized variables since commit 7c60a9f8f271
+- Bug 2293 - Red Queue Estimator spins when trying to compute queue average size under long idle times.
+- Bug 2297 - 802.11n/ac networks are not compatible with legacy clients
+- Bug 2302 - Fixing RTT calculation inside TCP Socket
+- Bug 2303 - WifiMacQueue::GetSize should cleanup queue beforehand
+- Bug 2304 - DSCP Set/Get are using 8 bit values instead of 6
+- Bug 2307 - m_receivedAtLeastOneMpdu is not always reset
+- Bug 2311 - save Ht/Vht capabilities info on a per-station basis
+- Bug 2313 - Assert failed when using aggregation and RTS/CTS
+- Bug 2315 - Problem when BACK Request is part of an A-MPDU
+- Bug 2316 - MacLow shall use a single TXVECTOR for all MPDUs belonging to a same A-MPDU
+- Bug 2317 - Get the non-HT reference rate of a HT MCS
+- Bug 2318 - MPDU Aggregation fails with TCP
+- Bug 2319 - BlockAckTimeout value is too low for 802.11n operating at 2.4 GHz
+- Bug 2320 - Add method to check whether a WifiTxVector contains a valid combination of WifiMode, number of spatial streams and channel width
+- Bug 2321 - Wifi rate managers should not be triggered for each MPDU when A-MPDU is used
+- Bug 2327 - CWmin value selection for 802.11g is not compliant with the standard rules
+- Bug 2328 - changes to antenna configuration should update HT MCS set
+- Bug 2331 - Wrong mobility model in vanet-routing-compare example
+- Bug 2332 - Assert failed when using aggregation and two pairs of AP-STA
+- Bug 2337 - WifiPhy uses channel width in Hz iso MHz
+- Bug 2338 - WifiMode selected for control frames may sometimes be invalid
+
+Known issues
+------------
+In general, known issues are tracked on the project tracker available
+at http://www.nsnam.org/bugzilla/
+
Release 3.24.1
==============
@@ -49,18 +238,13 @@
- Bug 2182 - pybindgen required version is now a string literal
- Bug 2184 - integer overflow in MacLow
-Known issues
-------------
-In general, known issues are tracked on the project tracker available
-at http://www.nsnam.org/bugzilla/
-
Release 3.24
============
Availability
------------
This release is available from:
-http://www.nsnam.org/release/ns-allinone-3.24.tar.bz2
+https://www.nsnam.org/release/ns-allinone-3.24.tar.bz2
Supported platforms
-------------------
@@ -71,7 +255,7 @@
- Ubuntu 14.04 (64 bit) with g++-4.8.2
- Ubuntu 12.04.4 (32/64 bit) with g++-4.6.3
- CentOS/RHEL 6.7 (64-bit) with g++-4.4.7
-- OS X Yosemite 10.10.5 with Xcode 6.4 and Apple LLVM version 6.1.0
+- OS X Yosemite 10.10.4 with Xcode 6.4 and Apple LLVM version 6.1.0
- FreeBSD 10.1-RELEASE (64 bit) with clang-3.4.1
New user-visible features
diff -Naur ns-3.24.1/src/aodv/bindings/callbacks_list.py ns-3.25/src/aodv/bindings/callbacks_list.py
--- ns-3.24.1/src/aodv/bindings/callbacks_list.py 2015-09-23 12:28:41.000000000 -0700
+++ ns-3.25/src/aodv/bindings/callbacks_list.py 2016-03-23 21:36:53.000000000 -0700
@@ -1,6 +1,7 @@
callback_classes = [
['void', 'ns3::Ptr', 'ns3::Ipv4Header const&', 'ns3::Socket::SocketErrno', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'],
['void', 'ns3::Ptr', 'ns3::Ptr', 'ns3::Ipv4Header const&', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'],
+ ['void', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'],
['void', 'ns3::WifiMacHeader const&', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'],
['void', 'ns3::Ipv4Address', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'],
['void', 'ns3::Ptr', 'ns3::Ipv4Address', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'],
@@ -9,4 +10,5 @@
['void', 'ns3::Ptr', 'ns3::Address const&', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'],
['bool', 'ns3::Ptr', 'ns3::Address const&', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'],
['void', 'ns3::Ptr', 'ns3::Ptr', 'unsigned short', 'ns3::Address const&', 'ns3::Address const&', 'ns3::NetDevice::PacketType', 'ns3::empty', 'ns3::empty', 'ns3::empty'],
+ ['unsigned char', 'ns3::Ptr', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'],
]
diff -Naur ns-3.24.1/src/aodv/bindings/modulegen__gcc_ILP32.py ns-3.25/src/aodv/bindings/modulegen__gcc_ILP32.py
--- ns-3.24.1/src/aodv/bindings/modulegen__gcc_ILP32.py 2015-09-23 12:28:41.000000000 -0700
+++ ns-3.25/src/aodv/bindings/modulegen__gcc_ILP32.py 2016-03-23 21:36:53.000000000 -0700
@@ -21,7 +21,7 @@
root_module = module.get_root()
## wifi-mac-header.h (module 'wifi'): ns3::WifiMacType [enumeration]
- module.add_enum('WifiMacType', ['WIFI_MAC_CTL_RTS', 'WIFI_MAC_CTL_CTS', 'WIFI_MAC_CTL_ACK', 'WIFI_MAC_CTL_BACKREQ', 'WIFI_MAC_CTL_BACKRESP', 'WIFI_MAC_CTL_CTLWRAPPER', 'WIFI_MAC_MGT_BEACON', 'WIFI_MAC_MGT_ASSOCIATION_REQUEST', 'WIFI_MAC_MGT_ASSOCIATION_RESPONSE', 'WIFI_MAC_MGT_DISASSOCIATION', 'WIFI_MAC_MGT_REASSOCIATION_REQUEST', 'WIFI_MAC_MGT_REASSOCIATION_RESPONSE', 'WIFI_MAC_MGT_PROBE_REQUEST', 'WIFI_MAC_MGT_PROBE_RESPONSE', 'WIFI_MAC_MGT_AUTHENTICATION', 'WIFI_MAC_MGT_DEAUTHENTICATION', 'WIFI_MAC_MGT_ACTION', 'WIFI_MAC_MGT_ACTION_NO_ACK', 'WIFI_MAC_MGT_MULTIHOP_ACTION', 'WIFI_MAC_DATA', 'WIFI_MAC_DATA_CFACK', 'WIFI_MAC_DATA_CFPOLL', 'WIFI_MAC_DATA_CFACK_CFPOLL', 'WIFI_MAC_DATA_NULL', 'WIFI_MAC_DATA_NULL_CFACK', 'WIFI_MAC_DATA_NULL_CFPOLL', 'WIFI_MAC_DATA_NULL_CFACK_CFPOLL', 'WIFI_MAC_QOSDATA', 'WIFI_MAC_QOSDATA_CFACK', 'WIFI_MAC_QOSDATA_CFPOLL', 'WIFI_MAC_QOSDATA_CFACK_CFPOLL', 'WIFI_MAC_QOSDATA_NULL', 'WIFI_MAC_QOSDATA_NULL_CFPOLL', 'WIFI_MAC_QOSDATA_NULL_CFACK_CFPOLL'], import_from_module='ns.wifi')
+ module.add_enum('WifiMacType', ['WIFI_MAC_CTL_CTLWRAPPER', 'WIFI_MAC_CTL_RTS', 'WIFI_MAC_CTL_CTS', 'WIFI_MAC_CTL_ACK', 'WIFI_MAC_CTL_BACKREQ', 'WIFI_MAC_CTL_BACKRESP', 'WIFI_MAC_MGT_BEACON', 'WIFI_MAC_MGT_ASSOCIATION_REQUEST', 'WIFI_MAC_MGT_ASSOCIATION_RESPONSE', 'WIFI_MAC_MGT_DISASSOCIATION', 'WIFI_MAC_MGT_REASSOCIATION_REQUEST', 'WIFI_MAC_MGT_REASSOCIATION_RESPONSE', 'WIFI_MAC_MGT_PROBE_REQUEST', 'WIFI_MAC_MGT_PROBE_RESPONSE', 'WIFI_MAC_MGT_AUTHENTICATION', 'WIFI_MAC_MGT_DEAUTHENTICATION', 'WIFI_MAC_MGT_ACTION', 'WIFI_MAC_MGT_ACTION_NO_ACK', 'WIFI_MAC_MGT_MULTIHOP_ACTION', 'WIFI_MAC_DATA', 'WIFI_MAC_DATA_CFACK', 'WIFI_MAC_DATA_CFPOLL', 'WIFI_MAC_DATA_CFACK_CFPOLL', 'WIFI_MAC_DATA_NULL', 'WIFI_MAC_DATA_NULL_CFACK', 'WIFI_MAC_DATA_NULL_CFPOLL', 'WIFI_MAC_DATA_NULL_CFACK_CFPOLL', 'WIFI_MAC_QOSDATA', 'WIFI_MAC_QOSDATA_CFACK', 'WIFI_MAC_QOSDATA_CFPOLL', 'WIFI_MAC_QOSDATA_CFACK_CFPOLL', 'WIFI_MAC_QOSDATA_NULL', 'WIFI_MAC_QOSDATA_NULL_CFPOLL', 'WIFI_MAC_QOSDATA_NULL_CFACK_CFPOLL'], import_from_module='ns.wifi')
## address.h (module 'network'): ns3::Address [class]
module.add_class('Address', import_from_module='ns.network')
## address.h (module 'network'): ns3::Address::MaxSize_e [enumeration]
@@ -152,6 +152,8 @@
module.add_enum('State', ['RUNNING', 'EXPIRED', 'SUSPENDED'], outer_class=root_module['ns3::Timer'], import_from_module='ns.core')
## timer-impl.h (module 'core'): ns3::TimerImpl [class]
module.add_class('TimerImpl', allow_subclassing=True, import_from_module='ns.core')
+ ## traced-value.h (module 'core'): ns3::TracedValue [class]
+ module.add_class('TracedValue', import_from_module='ns.core', template_parameters=['unsigned int'])
## type-id.h (module 'core'): ns3::TypeId [class]
module.add_class('TypeId', import_from_module='ns.core')
## type-id.h (module 'core'): ns3::TypeId::AttributeFlag [enumeration]
@@ -182,6 +184,18 @@
module.add_class('Object', import_from_module='ns.core', parent=root_module['ns3::SimpleRefCount< ns3::Object, ns3::ObjectBase, ns3::ObjectDeleter >'])
## object.h (module 'core'): ns3::Object::AggregateIterator [class]
module.add_class('AggregateIterator', import_from_module='ns.core', outer_class=root_module['ns3::Object'])
+ ## packet-filter.h (module 'traffic-control'): ns3::PacketFilter [class]
+ module.add_class('PacketFilter', import_from_module='ns.traffic_control', parent=root_module['ns3::Object'])
+ ## queue.h (module 'network'): ns3::Queue [class]
+ module.add_class('Queue', import_from_module='ns.network', parent=root_module['ns3::Object'])
+ ## queue.h (module 'network'): ns3::Queue::QueueMode [enumeration]
+ module.add_enum('QueueMode', ['QUEUE_MODE_PACKETS', 'QUEUE_MODE_BYTES'], outer_class=root_module['ns3::Queue'], import_from_module='ns.network')
+ ## queue-disc.h (module 'traffic-control'): ns3::QueueDisc [class]
+ module.add_class('QueueDisc', import_from_module='ns.traffic_control', parent=root_module['ns3::Object'])
+ ## queue-disc.h (module 'traffic-control'): ns3::QueueDisc::WakeMode [enumeration]
+ module.add_enum('WakeMode', ['WAKE_ROOT', 'WAKE_CHILD'], outer_class=root_module['ns3::QueueDisc'], import_from_module='ns.traffic-control')
+ ## queue-disc.h (module 'traffic-control'): ns3::QueueDiscClass [class]
+ module.add_class('QueueDiscClass', import_from_module='ns.traffic_control', parent=root_module['ns3::Object'])
## random-variable-stream.h (module 'core'): ns3::RandomVariableStream [class]
module.add_class('RandomVariableStream', import_from_module='ns.core', parent=root_module['ns3::Object'])
## random-variable-stream.h (module 'core'): ns3::SequentialRandomVariable [class]
@@ -202,12 +216,16 @@
module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::Ipv4MulticastRoute', 'ns3::empty', 'ns3::DefaultDeleter'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
## simple-ref-count.h (module 'core'): ns3::SimpleRefCount > [class]
module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::Ipv4Route', 'ns3::empty', 'ns3::DefaultDeleter'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
+ ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount > [class]
+ module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::NetDeviceQueue', 'ns3::empty', 'ns3::DefaultDeleter'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
## simple-ref-count.h (module 'core'): ns3::SimpleRefCount > [class]
module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::NixVector', 'ns3::empty', 'ns3::DefaultDeleter'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
## simple-ref-count.h (module 'core'): ns3::SimpleRefCount > [class]
module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::OutputStreamWrapper', 'ns3::empty', 'ns3::DefaultDeleter'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
## simple-ref-count.h (module 'core'): ns3::SimpleRefCount > [class]
module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::Packet', 'ns3::empty', 'ns3::DefaultDeleter'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
+ ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount > [class]
+ module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::QueueItem', 'ns3::empty', 'ns3::DefaultDeleter'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
## simple-ref-count.h (module 'core'): ns3::SimpleRefCount > [class]
module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::TraceSourceAccessor', 'ns3::empty', 'ns3::DefaultDeleter'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
## socket.h (module 'network'): ns3::Socket [class]
@@ -216,6 +234,8 @@
module.add_enum('SocketErrno', ['ERROR_NOTERROR', 'ERROR_ISCONN', 'ERROR_NOTCONN', 'ERROR_MSGSIZE', 'ERROR_AGAIN', 'ERROR_SHUTDOWN', 'ERROR_OPNOTSUPP', 'ERROR_AFNOSUPPORT', 'ERROR_INVAL', 'ERROR_BADF', 'ERROR_NOROUTETOHOST', 'ERROR_NODEV', 'ERROR_ADDRNOTAVAIL', 'ERROR_ADDRINUSE', 'SOCKET_ERRNO_LAST'], outer_class=root_module['ns3::Socket'], import_from_module='ns.network')
## socket.h (module 'network'): ns3::Socket::SocketType [enumeration]
module.add_enum('SocketType', ['NS3_SOCK_STREAM', 'NS3_SOCK_SEQPACKET', 'NS3_SOCK_DGRAM', 'NS3_SOCK_RAW'], outer_class=root_module['ns3::Socket'], import_from_module='ns.network')
+ ## socket.h (module 'network'): ns3::Socket::Ipv6MulticastFilterMode [enumeration]
+ module.add_enum('Ipv6MulticastFilterMode', ['INCLUDE', 'EXCLUDE'], outer_class=root_module['ns3::Socket'], import_from_module='ns.network')
## socket.h (module 'network'): ns3::SocketAddressTag [class]
module.add_class('SocketAddressTag', import_from_module='ns.network', parent=root_module['ns3::Tag'])
## socket.h (module 'network'): ns3::SocketIpTosTag [class]
@@ -236,6 +256,8 @@
root_module['ns3::Time'].implicitly_converts_to(root_module['ns3::int64x64_t'])
## trace-source-accessor.h (module 'core'): ns3::TraceSourceAccessor [class]
module.add_class('TraceSourceAccessor', import_from_module='ns.core', parent=root_module['ns3::SimpleRefCount< ns3::TraceSourceAccessor, ns3::empty, ns3::DefaultDeleter >'])
+ ## traffic-control-layer.h (module 'traffic-control'): ns3::TrafficControlLayer [class]
+ module.add_class('TrafficControlLayer', import_from_module='ns.traffic_control', parent=root_module['ns3::Object'])
## trailer.h (module 'network'): ns3::Trailer [class]
module.add_class('Trailer', import_from_module='ns.network', parent=root_module['ns3::Chunk'])
## random-variable-stream.h (module 'core'): ns3::TriangularRandomVariable [class]
@@ -264,6 +286,10 @@
module.add_class('AttributeChecker', allow_subclassing=False, automatic_type_narrowing=True, import_from_module='ns.core', parent=root_module['ns3::SimpleRefCount< ns3::AttributeChecker, ns3::empty, ns3::DefaultDeleter >'])
## attribute.h (module 'core'): ns3::AttributeValue [class]
module.add_class('AttributeValue', allow_subclassing=False, automatic_type_narrowing=True, import_from_module='ns.core', parent=root_module['ns3::SimpleRefCount< ns3::AttributeValue, ns3::empty, ns3::DefaultDeleter >'])
+ ## boolean.h (module 'core'): ns3::BooleanChecker [class]
+ module.add_class('BooleanChecker', import_from_module='ns.core', parent=root_module['ns3::AttributeChecker'])
+ ## boolean.h (module 'core'): ns3::BooleanValue [class]
+ module.add_class('BooleanValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue'])
## callback.h (module 'core'): ns3::CallbackChecker [class]
module.add_class('CallbackChecker', import_from_module='ns.core', parent=root_module['ns3::AttributeChecker'])
## callback.h (module 'core'): ns3::CallbackImplBase [class]
@@ -274,6 +300,8 @@
module.add_class('ConstantRandomVariable', import_from_module='ns.core', parent=root_module['ns3::RandomVariableStream'])
## random-variable-stream.h (module 'core'): ns3::DeterministicRandomVariable [class]
module.add_class('DeterministicRandomVariable', import_from_module='ns.core', parent=root_module['ns3::RandomVariableStream'])
+ ## double.h (module 'core'): ns3::DoubleValue [class]
+ module.add_class('DoubleValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue'])
## random-variable-stream.h (module 'core'): ns3::EmpiricalRandomVariable [class]
module.add_class('EmpiricalRandomVariable', import_from_module='ns.core', parent=root_module['ns3::RandomVariableStream'])
## attribute.h (module 'core'): ns3::EmptyAttributeValue [class]
@@ -290,6 +318,8 @@
module.add_class('ExponentialRandomVariable', import_from_module='ns.core', parent=root_module['ns3::RandomVariableStream'])
## random-variable-stream.h (module 'core'): ns3::GammaRandomVariable [class]
module.add_class('GammaRandomVariable', import_from_module='ns.core', parent=root_module['ns3::RandomVariableStream'])
+ ## integer.h (module 'core'): ns3::IntegerValue [class]
+ module.add_class('IntegerValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue'])
## ipv4.h (module 'internet'): ns3::Ipv4 [class]
module.add_class('Ipv4', import_from_module='ns.internet', parent=root_module['ns3::Object'])
## ipv4-address.h (module 'network'): ns3::Ipv4AddressChecker [class]
@@ -330,6 +360,10 @@
module.add_class('NetDevice', import_from_module='ns.network', parent=root_module['ns3::Object'])
## net-device.h (module 'network'): ns3::NetDevice::PacketType [enumeration]
module.add_enum('PacketType', ['PACKET_HOST', 'NS3_PACKET_HOST', 'PACKET_BROADCAST', 'NS3_PACKET_BROADCAST', 'PACKET_MULTICAST', 'NS3_PACKET_MULTICAST', 'PACKET_OTHERHOST', 'NS3_PACKET_OTHERHOST'], outer_class=root_module['ns3::NetDevice'], import_from_module='ns.network')
+ ## net-device.h (module 'network'): ns3::NetDeviceQueue [class]
+ module.add_class('NetDeviceQueue', import_from_module='ns.network', parent=root_module['ns3::SimpleRefCount< ns3::NetDeviceQueue, ns3::empty, ns3::DefaultDeleter >'])
+ ## net-device.h (module 'network'): ns3::NetDeviceQueueInterface [class]
+ module.add_class('NetDeviceQueueInterface', import_from_module='ns.network', parent=root_module['ns3::Object'])
## nix-vector.h (module 'network'): ns3::NixVector [class]
module.add_class('NixVector', import_from_module='ns.network', parent=root_module['ns3::SimpleRefCount< ns3::NixVector, ns3::empty, ns3::DefaultDeleter >'])
## node.h (module 'network'): ns3::Node [class]
@@ -346,19 +380,27 @@
module.add_class('Packet', import_from_module='ns.network', parent=root_module['ns3::SimpleRefCount< ns3::Packet, ns3::empty, ns3::DefaultDeleter >'])
## random-variable-stream.h (module 'core'): ns3::ParetoRandomVariable [class]
module.add_class('ParetoRandomVariable', import_from_module='ns.core', parent=root_module['ns3::RandomVariableStream'])
+ ## net-device.h (module 'network'): ns3::QueueItem [class]
+ module.add_class('QueueItem', import_from_module='ns.network', parent=root_module['ns3::SimpleRefCount< ns3::QueueItem, ns3::empty, ns3::DefaultDeleter >'])
## nstime.h (module 'core'): ns3::TimeValue [class]
module.add_class('TimeValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue'])
## type-id.h (module 'core'): ns3::TypeIdChecker [class]
module.add_class('TypeIdChecker', import_from_module='ns.core', parent=root_module['ns3::AttributeChecker'])
## type-id.h (module 'core'): ns3::TypeIdValue [class]
module.add_class('TypeIdValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue'])
+ ## uinteger.h (module 'core'): ns3::UintegerValue [class]
+ module.add_class('UintegerValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue'])
## address.h (module 'network'): ns3::AddressChecker [class]
module.add_class('AddressChecker', import_from_module='ns.network', parent=root_module['ns3::AttributeChecker'])
## address.h (module 'network'): ns3::AddressValue [class]
module.add_class('AddressValue', import_from_module='ns.network', parent=root_module['ns3::AttributeValue'])
## ipv4-list-routing.h (module 'internet'): ns3::Ipv4ListRouting [class]
module.add_class('Ipv4ListRouting', import_from_module='ns.internet', parent=root_module['ns3::Ipv4RoutingProtocol'])
- module.add_container('std::list< ns3::Ptr< ns3::Packet > >', 'ns3::Ptr< ns3::Packet >', container_type=u'list')
+ ## queue-disc.h (module 'traffic-control'): ns3::QueueDiscItem [class]
+ module.add_class('QueueDiscItem', import_from_module='ns.traffic_control', parent=root_module['ns3::QueueItem'])
+ module.add_container('std::vector< ns3::Ipv6Address >', 'ns3::Ipv6Address', container_type=u'vector')
+ module.add_container('std::vector< ns3::Ptr< ns3::QueueDisc > >', 'ns3::Ptr< ns3::QueueDisc >', container_type=u'vector')
+ module.add_container('std::list< std::pair< ns3::Ptr< ns3::Packet >, ns3::Ipv4Header > >', 'std::pair< ns3::Ptr< ns3::Packet >, ns3::Ipv4Header >', container_type=u'list')
module.add_container('std::map< unsigned int, unsigned int >', ('unsigned int', 'unsigned int'), container_type=u'map')
## Register a nested module for the namespace FatalImpl
@@ -384,6 +426,12 @@
nested_module = module.add_cpp_namespace('aodv')
register_types_ns3_aodv(nested_module)
+
+ ## Register a nested module for the namespace internal
+
+ nested_module = module.add_cpp_namespace('internal')
+ register_types_ns3_internal(nested_module)
+
def register_types_ns3_FatalImpl(module):
root_module = module.get_root()
@@ -422,6 +470,30 @@
def register_types_ns3_TracedValueCallback(module):
root_module = module.get_root()
+ typehandlers.add_type_alias(u'void ( * ) ( double, double ) *', u'ns3::TracedValueCallback::Double')
+ typehandlers.add_type_alias(u'void ( * ) ( double, double ) **', u'ns3::TracedValueCallback::Double*')
+ typehandlers.add_type_alias(u'void ( * ) ( double, double ) *&', u'ns3::TracedValueCallback::Double&')
+ typehandlers.add_type_alias(u'void ( * ) ( int8_t, int8_t ) *', u'ns3::TracedValueCallback::Int8')
+ typehandlers.add_type_alias(u'void ( * ) ( int8_t, int8_t ) **', u'ns3::TracedValueCallback::Int8*')
+ typehandlers.add_type_alias(u'void ( * ) ( int8_t, int8_t ) *&', u'ns3::TracedValueCallback::Int8&')
+ typehandlers.add_type_alias(u'void ( * ) ( uint8_t, uint8_t ) *', u'ns3::TracedValueCallback::Uint8')
+ typehandlers.add_type_alias(u'void ( * ) ( uint8_t, uint8_t ) **', u'ns3::TracedValueCallback::Uint8*')
+ typehandlers.add_type_alias(u'void ( * ) ( uint8_t, uint8_t ) *&', u'ns3::TracedValueCallback::Uint8&')
+ typehandlers.add_type_alias(u'void ( * ) ( int32_t, int32_t ) *', u'ns3::TracedValueCallback::Int32')
+ typehandlers.add_type_alias(u'void ( * ) ( int32_t, int32_t ) **', u'ns3::TracedValueCallback::Int32*')
+ typehandlers.add_type_alias(u'void ( * ) ( int32_t, int32_t ) *&', u'ns3::TracedValueCallback::Int32&')
+ typehandlers.add_type_alias(u'void ( * ) ( bool, bool ) *', u'ns3::TracedValueCallback::Bool')
+ typehandlers.add_type_alias(u'void ( * ) ( bool, bool ) **', u'ns3::TracedValueCallback::Bool*')
+ typehandlers.add_type_alias(u'void ( * ) ( bool, bool ) *&', u'ns3::TracedValueCallback::Bool&')
+ typehandlers.add_type_alias(u'void ( * ) ( uint16_t, uint16_t ) *', u'ns3::TracedValueCallback::Uint16')
+ typehandlers.add_type_alias(u'void ( * ) ( uint16_t, uint16_t ) **', u'ns3::TracedValueCallback::Uint16*')
+ typehandlers.add_type_alias(u'void ( * ) ( uint16_t, uint16_t ) *&', u'ns3::TracedValueCallback::Uint16&')
+ typehandlers.add_type_alias(u'void ( * ) ( uint32_t, uint32_t ) *', u'ns3::TracedValueCallback::Uint32')
+ typehandlers.add_type_alias(u'void ( * ) ( uint32_t, uint32_t ) **', u'ns3::TracedValueCallback::Uint32*')
+ typehandlers.add_type_alias(u'void ( * ) ( uint32_t, uint32_t ) *&', u'ns3::TracedValueCallback::Uint32&')
+ typehandlers.add_type_alias(u'void ( * ) ( int16_t, int16_t ) *', u'ns3::TracedValueCallback::Int16')
+ typehandlers.add_type_alias(u'void ( * ) ( int16_t, int16_t ) **', u'ns3::TracedValueCallback::Int16*')
+ typehandlers.add_type_alias(u'void ( * ) ( int16_t, int16_t ) *&', u'ns3::TracedValueCallback::Int16&')
typehandlers.add_type_alias(u'void ( * ) ( ns3::Time, ns3::Time ) *', u'ns3::TracedValueCallback::Time')
typehandlers.add_type_alias(u'void ( * ) ( ns3::Time, ns3::Time ) **', u'ns3::TracedValueCallback::Time*')
typehandlers.add_type_alias(u'void ( * ) ( ns3::Time, ns3::Time ) *&', u'ns3::TracedValueCallback::Time&')
@@ -464,6 +536,10 @@
module.add_container('std::map< ns3::Ipv4Address, unsigned int >', ('ns3::Ipv4Address', 'unsigned int'), container_type=u'map')
module.add_container('std::vector< ns3::Ipv4Address >', 'ns3::Ipv4Address', container_type=u'vector')
+def register_types_ns3_internal(module):
+ root_module = module.get_root()
+
+
def register_methods(root_module):
register_Ns3Address_methods(root_module, root_module['ns3::Address'])
register_Ns3AttributeConstructionList_methods(root_module, root_module['ns3::AttributeConstructionList'])
@@ -512,6 +588,7 @@
register_Ns3TimeWithUnit_methods(root_module, root_module['ns3::TimeWithUnit'])
register_Ns3Timer_methods(root_module, root_module['ns3::Timer'])
register_Ns3TimerImpl_methods(root_module, root_module['ns3::TimerImpl'])
+ register_Ns3TracedValue__Unsigned_int_methods(root_module, root_module['ns3::TracedValue< unsigned int >'])
register_Ns3TypeId_methods(root_module, root_module['ns3::TypeId'])
register_Ns3TypeIdAttributeInformation_methods(root_module, root_module['ns3::TypeId::AttributeInformation'])
register_Ns3TypeIdTraceSourceInformation_methods(root_module, root_module['ns3::TypeId::TraceSourceInformation'])
@@ -523,6 +600,10 @@
register_Ns3Ipv4Header_methods(root_module, root_module['ns3::Ipv4Header'])
register_Ns3Object_methods(root_module, root_module['ns3::Object'])
register_Ns3ObjectAggregateIterator_methods(root_module, root_module['ns3::Object::AggregateIterator'])
+ register_Ns3PacketFilter_methods(root_module, root_module['ns3::PacketFilter'])
+ register_Ns3Queue_methods(root_module, root_module['ns3::Queue'])
+ register_Ns3QueueDisc_methods(root_module, root_module['ns3::QueueDisc'])
+ register_Ns3QueueDiscClass_methods(root_module, root_module['ns3::QueueDiscClass'])
register_Ns3RandomVariableStream_methods(root_module, root_module['ns3::RandomVariableStream'])
register_Ns3SequentialRandomVariable_methods(root_module, root_module['ns3::SequentialRandomVariable'])
register_Ns3SimpleRefCount__Ns3AttributeAccessor_Ns3Empty_Ns3DefaultDeleter__lt__ns3AttributeAccessor__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::AttributeAccessor, ns3::empty, ns3::DefaultDeleter >'])
@@ -533,9 +614,11 @@
register_Ns3SimpleRefCount__Ns3HashImplementation_Ns3Empty_Ns3DefaultDeleter__lt__ns3HashImplementation__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter >'])
register_Ns3SimpleRefCount__Ns3Ipv4MulticastRoute_Ns3Empty_Ns3DefaultDeleter__lt__ns3Ipv4MulticastRoute__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::Ipv4MulticastRoute, ns3::empty, ns3::DefaultDeleter >'])
register_Ns3SimpleRefCount__Ns3Ipv4Route_Ns3Empty_Ns3DefaultDeleter__lt__ns3Ipv4Route__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::Ipv4Route, ns3::empty, ns3::DefaultDeleter >'])
+ register_Ns3SimpleRefCount__Ns3NetDeviceQueue_Ns3Empty_Ns3DefaultDeleter__lt__ns3NetDeviceQueue__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::NetDeviceQueue, ns3::empty, ns3::DefaultDeleter >'])
register_Ns3SimpleRefCount__Ns3NixVector_Ns3Empty_Ns3DefaultDeleter__lt__ns3NixVector__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::NixVector, ns3::empty, ns3::DefaultDeleter >'])
register_Ns3SimpleRefCount__Ns3OutputStreamWrapper_Ns3Empty_Ns3DefaultDeleter__lt__ns3OutputStreamWrapper__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::OutputStreamWrapper, ns3::empty, ns3::DefaultDeleter >'])
register_Ns3SimpleRefCount__Ns3Packet_Ns3Empty_Ns3DefaultDeleter__lt__ns3Packet__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::Packet, ns3::empty, ns3::DefaultDeleter >'])
+ register_Ns3SimpleRefCount__Ns3QueueItem_Ns3Empty_Ns3DefaultDeleter__lt__ns3QueueItem__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::QueueItem, ns3::empty, ns3::DefaultDeleter >'])
register_Ns3SimpleRefCount__Ns3TraceSourceAccessor_Ns3Empty_Ns3DefaultDeleter__lt__ns3TraceSourceAccessor__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::TraceSourceAccessor, ns3::empty, ns3::DefaultDeleter >'])
register_Ns3Socket_methods(root_module, root_module['ns3::Socket'])
register_Ns3SocketAddressTag_methods(root_module, root_module['ns3::SocketAddressTag'])
@@ -546,6 +629,7 @@
register_Ns3SocketSetDontFragmentTag_methods(root_module, root_module['ns3::SocketSetDontFragmentTag'])
register_Ns3Time_methods(root_module, root_module['ns3::Time'])
register_Ns3TraceSourceAccessor_methods(root_module, root_module['ns3::TraceSourceAccessor'])
+ register_Ns3TrafficControlLayer_methods(root_module, root_module['ns3::TrafficControlLayer'])
register_Ns3Trailer_methods(root_module, root_module['ns3::Trailer'])
register_Ns3TriangularRandomVariable_methods(root_module, root_module['ns3::TriangularRandomVariable'])
register_Ns3UniformRandomVariable_methods(root_module, root_module['ns3::UniformRandomVariable'])
@@ -558,11 +642,14 @@
register_Ns3AttributeAccessor_methods(root_module, root_module['ns3::AttributeAccessor'])
register_Ns3AttributeChecker_methods(root_module, root_module['ns3::AttributeChecker'])
register_Ns3AttributeValue_methods(root_module, root_module['ns3::AttributeValue'])
+ register_Ns3BooleanChecker_methods(root_module, root_module['ns3::BooleanChecker'])
+ register_Ns3BooleanValue_methods(root_module, root_module['ns3::BooleanValue'])
register_Ns3CallbackChecker_methods(root_module, root_module['ns3::CallbackChecker'])
register_Ns3CallbackImplBase_methods(root_module, root_module['ns3::CallbackImplBase'])
register_Ns3CallbackValue_methods(root_module, root_module['ns3::CallbackValue'])
register_Ns3ConstantRandomVariable_methods(root_module, root_module['ns3::ConstantRandomVariable'])
register_Ns3DeterministicRandomVariable_methods(root_module, root_module['ns3::DeterministicRandomVariable'])
+ register_Ns3DoubleValue_methods(root_module, root_module['ns3::DoubleValue'])
register_Ns3EmpiricalRandomVariable_methods(root_module, root_module['ns3::EmpiricalRandomVariable'])
register_Ns3EmptyAttributeValue_methods(root_module, root_module['ns3::EmptyAttributeValue'])
register_Ns3EnumChecker_methods(root_module, root_module['ns3::EnumChecker'])
@@ -571,6 +658,7 @@
register_Ns3EventImpl_methods(root_module, root_module['ns3::EventImpl'])
register_Ns3ExponentialRandomVariable_methods(root_module, root_module['ns3::ExponentialRandomVariable'])
register_Ns3GammaRandomVariable_methods(root_module, root_module['ns3::GammaRandomVariable'])
+ register_Ns3IntegerValue_methods(root_module, root_module['ns3::IntegerValue'])
register_Ns3Ipv4_methods(root_module, root_module['ns3::Ipv4'])
register_Ns3Ipv4AddressChecker_methods(root_module, root_module['ns3::Ipv4AddressChecker'])
register_Ns3Ipv4AddressValue_methods(root_module, root_module['ns3::Ipv4AddressValue'])
@@ -589,6 +677,8 @@
register_Ns3Mac48AddressChecker_methods(root_module, root_module['ns3::Mac48AddressChecker'])
register_Ns3Mac48AddressValue_methods(root_module, root_module['ns3::Mac48AddressValue'])
register_Ns3NetDevice_methods(root_module, root_module['ns3::NetDevice'])
+ register_Ns3NetDeviceQueue_methods(root_module, root_module['ns3::NetDeviceQueue'])
+ register_Ns3NetDeviceQueueInterface_methods(root_module, root_module['ns3::NetDeviceQueueInterface'])
register_Ns3NixVector_methods(root_module, root_module['ns3::NixVector'])
register_Ns3Node_methods(root_module, root_module['ns3::Node'])
register_Ns3NormalRandomVariable_methods(root_module, root_module['ns3::NormalRandomVariable'])
@@ -597,12 +687,15 @@
register_Ns3OutputStreamWrapper_methods(root_module, root_module['ns3::OutputStreamWrapper'])
register_Ns3Packet_methods(root_module, root_module['ns3::Packet'])
register_Ns3ParetoRandomVariable_methods(root_module, root_module['ns3::ParetoRandomVariable'])
+ register_Ns3QueueItem_methods(root_module, root_module['ns3::QueueItem'])
register_Ns3TimeValue_methods(root_module, root_module['ns3::TimeValue'])
register_Ns3TypeIdChecker_methods(root_module, root_module['ns3::TypeIdChecker'])
register_Ns3TypeIdValue_methods(root_module, root_module['ns3::TypeIdValue'])
+ register_Ns3UintegerValue_methods(root_module, root_module['ns3::UintegerValue'])
register_Ns3AddressChecker_methods(root_module, root_module['ns3::AddressChecker'])
register_Ns3AddressValue_methods(root_module, root_module['ns3::AddressValue'])
register_Ns3Ipv4ListRouting_methods(root_module, root_module['ns3::Ipv4ListRouting'])
+ register_Ns3QueueDiscItem_methods(root_module, root_module['ns3::QueueDiscItem'])
register_Ns3HashImplementation_methods(root_module, root_module['ns3::Hash::Implementation'])
register_Ns3HashFunctionFnv1a_methods(root_module, root_module['ns3::Hash::Function::Fnv1a'])
register_Ns3HashFunctionHash32_methods(root_module, root_module['ns3::Hash::Function::Hash32'])
@@ -1361,6 +1454,11 @@
'ns3::Ipv4Address',
[],
is_static=True)
+ ## ipv4-address.h (module 'network'): bool ns3::Ipv4Address::IsAny() const [member function]
+ cls.add_method('IsAny',
+ 'bool',
+ [],
+ is_const=True)
## ipv4-address.h (module 'network'): bool ns3::Ipv4Address::IsBroadcast() const [member function]
cls.add_method('IsBroadcast',
'bool',
@@ -1376,6 +1474,11 @@
'bool',
[],
is_const=True)
+ ## ipv4-address.h (module 'network'): bool ns3::Ipv4Address::IsLocalhost() const [member function]
+ cls.add_method('IsLocalhost',
+ 'bool',
+ [],
+ is_const=True)
## ipv4-address.h (module 'network'): static bool ns3::Ipv4Address::IsMatchingType(ns3::Address const & address) [member function]
cls.add_method('IsMatchingType',
'bool',
@@ -1670,7 +1773,7 @@
cls.add_method('IsAllHostsMulticast',
'bool',
[],
- is_const=True)
+ deprecated=True, is_const=True)
## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsAllNodesMulticast() const [member function]
cls.add_method('IsAllNodesMulticast',
'bool',
@@ -2564,6 +2667,40 @@
is_pure_virtual=True, is_virtual=True)
return
+def register_Ns3TracedValue__Unsigned_int_methods(root_module, cls):
+ ## traced-value.h (module 'core'): ns3::TracedValue::TracedValue() [constructor]
+ cls.add_constructor([])
+ ## traced-value.h (module 'core'): ns3::TracedValue::TracedValue(ns3::TracedValue const & o) [copy constructor]
+ cls.add_constructor([param('ns3::TracedValue< unsigned int > const &', 'o')])
+ ## traced-value.h (module 'core'): ns3::TracedValue::TracedValue(unsigned int const & v) [constructor]
+ cls.add_constructor([param('unsigned int const &', 'v')])
+ ## traced-value.h (module 'core'): void ns3::TracedValue::Connect(ns3::CallbackBase const & cb, std::basic_string,std::allocator > path) [member function]
+ cls.add_method('Connect',
+ 'void',
+ [param('ns3::CallbackBase const &', 'cb'), param('std::string', 'path')])
+ ## traced-value.h (module 'core'): void ns3::TracedValue::ConnectWithoutContext(ns3::CallbackBase const & cb) [member function]
+ cls.add_method('ConnectWithoutContext',
+ 'void',
+ [param('ns3::CallbackBase const &', 'cb')])
+ ## traced-value.h (module 'core'): void ns3::TracedValue::Disconnect(ns3::CallbackBase const & cb, std::basic_string,std::allocator > path) [member function]
+ cls.add_method('Disconnect',
+ 'void',
+ [param('ns3::CallbackBase const &', 'cb'), param('std::string', 'path')])
+ ## traced-value.h (module 'core'): void ns3::TracedValue::DisconnectWithoutContext(ns3::CallbackBase const & cb) [member function]
+ cls.add_method('DisconnectWithoutContext',
+ 'void',
+ [param('ns3::CallbackBase const &', 'cb')])
+ ## traced-value.h (module 'core'): unsigned int ns3::TracedValue::Get() const [member function]
+ cls.add_method('Get',
+ 'unsigned int',
+ [],
+ is_const=True)
+ ## traced-value.h (module 'core'): void ns3::TracedValue::Set(unsigned int const & v) [member function]
+ cls.add_method('Set',
+ 'void',
+ [param('unsigned int const &', 'v')])
+ return
+
def register_Ns3TypeId_methods(root_module, cls):
cls.add_binary_comparison_operator('!=')
cls.add_binary_comparison_operator('<')
@@ -2780,6 +2917,7 @@
cls.add_binary_comparison_operator('<=')
cls.add_binary_comparison_operator('!=')
cls.add_inplace_numeric_operator('+=', param('ns3::int64x64_t const &', u'right'))
+ cls.add_inplace_numeric_operator('/=', param('ns3::int64x64_t const &', u'right'))
cls.add_binary_numeric_operator('*', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('ns3::int64x64_t const &', u'right'))
cls.add_binary_numeric_operator('+', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('ns3::int64x64_t const &', u'right'))
cls.add_binary_numeric_operator('-', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('ns3::int64x64_t const &', u'right'))
@@ -2789,7 +2927,6 @@
cls.add_binary_comparison_operator('>')
cls.add_inplace_numeric_operator('*=', param('ns3::int64x64_t const &', u'right'))
cls.add_inplace_numeric_operator('-=', param('ns3::int64x64_t const &', u'right'))
- cls.add_inplace_numeric_operator('/=', param('ns3::int64x64_t const &', u'right'))
cls.add_output_stream_operator()
cls.add_binary_comparison_operator('==')
cls.add_binary_comparison_operator('>=')
@@ -3161,6 +3298,354 @@
[])
return
+def register_Ns3PacketFilter_methods(root_module, cls):
+ ## packet-filter.h (module 'traffic-control'): ns3::PacketFilter::PacketFilter(ns3::PacketFilter const & arg0) [copy constructor]
+ cls.add_constructor([param('ns3::PacketFilter const &', 'arg0')])
+ ## packet-filter.h (module 'traffic-control'): ns3::PacketFilter::PacketFilter() [constructor]
+ cls.add_constructor([])
+ ## packet-filter.h (module 'traffic-control'): int32_t ns3::PacketFilter::Classify(ns3::Ptr item) const [member function]
+ cls.add_method('Classify',
+ 'int32_t',
+ [param('ns3::Ptr< ns3::QueueDiscItem >', 'item')],
+ is_const=True)
+ ## packet-filter.h (module 'traffic-control'): static ns3::TypeId ns3::PacketFilter::GetTypeId() [member function]
+ cls.add_method('GetTypeId',
+ 'ns3::TypeId',
+ [],
+ is_static=True)
+ ## packet-filter.h (module 'traffic-control'): ns3::PacketFilter::PF_NO_MATCH [variable]
+ cls.add_static_attribute('PF_NO_MATCH', 'int const', is_const=True)
+ ## packet-filter.h (module 'traffic-control'): bool ns3::PacketFilter::CheckProtocol(ns3::Ptr item) const [member function]
+ cls.add_method('CheckProtocol',
+ 'bool',
+ [param('ns3::Ptr< ns3::QueueDiscItem >', 'item')],
+ is_pure_virtual=True, is_const=True, visibility='private', is_virtual=True)
+ ## packet-filter.h (module 'traffic-control'): int32_t ns3::PacketFilter::DoClassify(ns3::Ptr item) const [member function]
+ cls.add_method('DoClassify',
+ 'int32_t',
+ [param('ns3::Ptr< ns3::QueueDiscItem >', 'item')],
+ is_pure_virtual=True, is_const=True, visibility='private', is_virtual=True)
+ return
+
+def register_Ns3Queue_methods(root_module, cls):
+ ## queue.h (module 'network'): ns3::Queue::Queue(ns3::Queue const & arg0) [copy constructor]
+ cls.add_constructor([param('ns3::Queue const &', 'arg0')])
+ ## queue.h (module 'network'): ns3::Queue::Queue() [constructor]
+ cls.add_constructor([])
+ ## queue.h (module 'network'): ns3::Ptr ns3::Queue::Dequeue() [member function]
+ cls.add_method('Dequeue',
+ 'ns3::Ptr< ns3::QueueItem >',
+ [])
+ ## queue.h (module 'network'): void ns3::Queue::DequeueAll() [member function]
+ cls.add_method('DequeueAll',
+ 'void',
+ [])
+ ## queue.h (module 'network'): bool ns3::Queue::Enqueue(ns3::Ptr item) [member function]
+ cls.add_method('Enqueue',
+ 'bool',
+ [param('ns3::Ptr< ns3::QueueItem >', 'item')])
+ ## queue.h (module 'network'): uint32_t ns3::Queue::GetMaxBytes() const [member function]
+ cls.add_method('GetMaxBytes',
+ 'uint32_t',
+ [],
+ is_const=True)
+ ## queue.h (module 'network'): uint32_t ns3::Queue::GetMaxPackets() const [member function]
+ cls.add_method('GetMaxPackets',
+ 'uint32_t',
+ [],
+ is_const=True)
+ ## queue.h (module 'network'): ns3::Queue::QueueMode ns3::Queue::GetMode() const [member function]
+ cls.add_method('GetMode',
+ 'ns3::Queue::QueueMode',
+ [],
+ is_const=True)
+ ## queue.h (module 'network'): uint32_t ns3::Queue::GetNBytes() const [member function]
+ cls.add_method('GetNBytes',
+ 'uint32_t',
+ [],
+ is_const=True)
+ ## queue.h (module 'network'): uint32_t ns3::Queue::GetNPackets() const [member function]
+ cls.add_method('GetNPackets',
+ 'uint32_t',
+ [],
+ is_const=True)
+ ## queue.h (module 'network'): uint32_t ns3::Queue::GetTotalDroppedBytes() const [member function]
+ cls.add_method('GetTotalDroppedBytes',
+ 'uint32_t',
+ [],
+ is_const=True)
+ ## queue.h (module 'network'): uint32_t ns3::Queue::GetTotalDroppedPackets() const [member function]
+ cls.add_method('GetTotalDroppedPackets',
+ 'uint32_t',
+ [],
+ is_const=True)
+ ## queue.h (module 'network'): uint32_t ns3::Queue::GetTotalReceivedBytes() const [member function]
+ cls.add_method('GetTotalReceivedBytes',
+ 'uint32_t',
+ [],
+ is_const=True)
+ ## queue.h (module 'network'): uint32_t ns3::Queue::GetTotalReceivedPackets() const [member function]
+ cls.add_method('GetTotalReceivedPackets',
+ 'uint32_t',
+ [],
+ is_const=True)
+ ## queue.h (module 'network'): static ns3::TypeId ns3::Queue::GetTypeId() [member function]
+ cls.add_method('GetTypeId',
+ 'ns3::TypeId',
+ [],
+ is_static=True)
+ ## queue.h (module 'network'): bool ns3::Queue::IsEmpty() const [member function]
+ cls.add_method('IsEmpty',
+ 'bool',
+ [],
+ is_const=True)
+ ## queue.h (module 'network'): ns3::Ptr ns3::Queue::Peek() const [member function]
+ cls.add_method('Peek',
+ 'ns3::Ptr< ns3::QueueItem const >',
+ [],
+ is_const=True)
+ ## queue.h (module 'network'): void ns3::Queue::ResetStatistics() [member function]
+ cls.add_method('ResetStatistics',
+ 'void',
+ [])
+ ## queue.h (module 'network'): void ns3::Queue::SetMaxBytes(uint32_t maxBytes) [member function]
+ cls.add_method('SetMaxBytes',
+ 'void',
+ [param('uint32_t', 'maxBytes')])
+ ## queue.h (module 'network'): void ns3::Queue::SetMaxPackets(uint32_t maxPackets) [member function]
+ cls.add_method('SetMaxPackets',
+ 'void',
+ [param('uint32_t', 'maxPackets')])
+ ## queue.h (module 'network'): void ns3::Queue::SetMode(ns3::Queue::QueueMode mode) [member function]
+ cls.add_method('SetMode',
+ 'void',
+ [param('ns3::Queue::QueueMode', 'mode')])
+ ## queue.h (module 'network'): void ns3::Queue::Drop(ns3::Ptr p) [member function]
+ cls.add_method('Drop',
+ 'void',
+ [param('ns3::Ptr< ns3::Packet >', 'p')],
+ visibility='protected')
+ ## queue.h (module 'network'): ns3::Ptr ns3::Queue::DoDequeue() [member function]
+ cls.add_method('DoDequeue',
+ 'ns3::Ptr< ns3::QueueItem >',
+ [],
+ is_pure_virtual=True, visibility='private', is_virtual=True)
+ ## queue.h (module 'network'): bool ns3::Queue::DoEnqueue(ns3::Ptr item) [member function]
+ cls.add_method('DoEnqueue',
+ 'bool',
+ [param('ns3::Ptr< ns3::QueueItem >', 'item')],
+ is_pure_virtual=True, visibility='private', is_virtual=True)
+ ## queue.h (module 'network'): ns3::Ptr ns3::Queue::DoPeek() const [member function]
+ cls.add_method('DoPeek',
+ 'ns3::Ptr< ns3::QueueItem const >',
+ [],
+ is_pure_virtual=True, is_const=True, visibility='private', is_virtual=True)
+ return
+
+def register_Ns3QueueDisc_methods(root_module, cls):
+ ## queue-disc.h (module 'traffic-control'): ns3::QueueDisc::QueueDisc(ns3::QueueDisc const & arg0) [copy constructor]
+ cls.add_constructor([param('ns3::QueueDisc const &', 'arg0')])
+ ## queue-disc.h (module 'traffic-control'): ns3::QueueDisc::QueueDisc() [constructor]
+ cls.add_constructor([])
+ ## queue-disc.h (module 'traffic-control'): void ns3::QueueDisc::AddInternalQueue(ns3::Ptr queue) [member function]
+ cls.add_method('AddInternalQueue',
+ 'void',
+ [param('ns3::Ptr< ns3::Queue >', 'queue')])
+ ## queue-disc.h (module 'traffic-control'): void ns3::QueueDisc::AddPacketFilter(ns3::Ptr filter) [member function]
+ cls.add_method('AddPacketFilter',
+ 'void',
+ [param('ns3::Ptr< ns3::PacketFilter >', 'filter')])
+ ## queue-disc.h (module 'traffic-control'): void ns3::QueueDisc::AddQueueDiscClass(ns3::Ptr qdClass) [member function]
+ cls.add_method('AddQueueDiscClass',
+ 'void',
+ [param('ns3::Ptr< ns3::QueueDiscClass >', 'qdClass')])
+ ## queue-disc.h (module 'traffic-control'): int32_t ns3::QueueDisc::Classify(ns3::Ptr item) [member function]
+ cls.add_method('Classify',
+ 'int32_t',
+ [param('ns3::Ptr< ns3::QueueDiscItem >', 'item')])
+ ## queue-disc.h (module 'traffic-control'): ns3::Ptr ns3::QueueDisc::Dequeue() [member function]
+ cls.add_method('Dequeue',
+ 'ns3::Ptr< ns3::QueueDiscItem >',
+ [])
+ ## queue-disc.h (module 'traffic-control'): bool ns3::QueueDisc::Enqueue(ns3::Ptr item) [member function]
+ cls.add_method('Enqueue',
+ 'bool',
+ [param('ns3::Ptr< ns3::QueueDiscItem >', 'item')])
+ ## queue-disc.h (module 'traffic-control'): ns3::Ptr ns3::QueueDisc::GetInternalQueue(uint32_t i) const [member function]
+ cls.add_method('GetInternalQueue',
+ 'ns3::Ptr< ns3::Queue >',
+ [param('uint32_t', 'i')],
+ is_const=True)
+ ## queue-disc.h (module 'traffic-control'): uint32_t ns3::QueueDisc::GetNBytes() const [member function]
+ cls.add_method('GetNBytes',
+ 'uint32_t',
+ [],
+ is_const=True)
+ ## queue-disc.h (module 'traffic-control'): uint32_t ns3::QueueDisc::GetNInternalQueues() const [member function]
+ cls.add_method('GetNInternalQueues',
+ 'uint32_t',
+ [],
+ is_const=True)
+ ## queue-disc.h (module 'traffic-control'): uint32_t ns3::QueueDisc::GetNPacketFilters() const [member function]
+ cls.add_method('GetNPacketFilters',
+ 'uint32_t',
+ [],
+ is_const=True)
+ ## queue-disc.h (module 'traffic-control'): uint32_t ns3::QueueDisc::GetNPackets() const [member function]
+ cls.add_method('GetNPackets',
+ 'uint32_t',
+ [],
+ is_const=True)
+ ## queue-disc.h (module 'traffic-control'): uint32_t ns3::QueueDisc::GetNQueueDiscClasses() const [member function]
+ cls.add_method('GetNQueueDiscClasses',
+ 'uint32_t',
+ [],
+ is_const=True)
+ ## queue-disc.h (module 'traffic-control'): ns3::Ptr ns3::QueueDisc::GetNetDevice() const [member function]
+ cls.add_method('GetNetDevice',
+ 'ns3::Ptr< ns3::NetDevice >',
+ [],
+ is_const=True)
+ ## queue-disc.h (module 'traffic-control'): ns3::Ptr ns3::QueueDisc::GetPacketFilter(uint32_t i) const [member function]
+ cls.add_method('GetPacketFilter',
+ 'ns3::Ptr< ns3::PacketFilter >',
+ [param('uint32_t', 'i')],
+ is_const=True)
+ ## queue-disc.h (module 'traffic-control'): ns3::Ptr ns3::QueueDisc::GetQueueDiscClass(uint32_t i) const [member function]
+ cls.add_method('GetQueueDiscClass',
+ 'ns3::Ptr< ns3::QueueDiscClass >',
+ [param('uint32_t', 'i')],
+ is_const=True)
+ ## queue-disc.h (module 'traffic-control'): uint32_t ns3::QueueDisc::GetQuota() const [member function]
+ cls.add_method('GetQuota',
+ 'uint32_t',
+ [],
+ is_const=True, is_virtual=True)
+ ## queue-disc.h (module 'traffic-control'): uint32_t ns3::QueueDisc::GetTotalDroppedBytes() const [member function]
+ cls.add_method('GetTotalDroppedBytes',
+ 'uint32_t',
+ [],
+ is_const=True)
+ ## queue-disc.h (module 'traffic-control'): uint32_t ns3::QueueDisc::GetTotalDroppedPackets() const [member function]
+ cls.add_method('GetTotalDroppedPackets',
+ 'uint32_t',
+ [],
+ is_const=True)
+ ## queue-disc.h (module 'traffic-control'): uint32_t ns3::QueueDisc::GetTotalReceivedBytes() const [member function]
+ cls.add_method('GetTotalReceivedBytes',
+ 'uint32_t',
+ [],
+ is_const=True)
+ ## queue-disc.h (module 'traffic-control'): uint32_t ns3::QueueDisc::GetTotalReceivedPackets() const [member function]
+ cls.add_method('GetTotalReceivedPackets',
+ 'uint32_t',
+ [],
+ is_const=True)
+ ## queue-disc.h (module 'traffic-control'): uint32_t ns3::QueueDisc::GetTotalRequeuedBytes() const [member function]
+ cls.add_method('GetTotalRequeuedBytes',
+ 'uint32_t',
+ [],
+ is_const=True)
+ ## queue-disc.h (module 'traffic-control'): uint32_t ns3::QueueDisc::GetTotalRequeuedPackets() const [member function]
+ cls.add_method('GetTotalRequeuedPackets',
+ 'uint32_t',
+ [],
+ is_const=True)
+ ## queue-disc.h (module 'traffic-control'): static ns3::TypeId ns3::QueueDisc::GetTypeId() [member function]
+ cls.add_method('GetTypeId',
+ 'ns3::TypeId',
+ [],
+ is_static=True)
+ ## queue-disc.h (module 'traffic-control'): ns3::QueueDisc::WakeMode ns3::QueueDisc::GetWakeMode() [member function]
+ cls.add_method('GetWakeMode',
+ 'ns3::QueueDisc::WakeMode',
+ [])
+ ## queue-disc.h (module 'traffic-control'): ns3::Ptr ns3::QueueDisc::Peek() const [member function]
+ cls.add_method('Peek',
+ 'ns3::Ptr< ns3::QueueDiscItem const >',
+ [],
+ is_const=True)
+ ## queue-disc.h (module 'traffic-control'): void ns3::QueueDisc::Run() [member function]
+ cls.add_method('Run',
+ 'void',
+ [])
+ ## queue-disc.h (module 'traffic-control'): void ns3::QueueDisc::SetNetDevice(ns3::Ptr device) [member function]
+ cls.add_method('SetNetDevice',
+ 'void',
+ [param('ns3::Ptr< ns3::NetDevice >', 'device')])
+ ## queue-disc.h (module 'traffic-control'): void ns3::QueueDisc::SetQuota(uint32_t const quota) [member function]
+ cls.add_method('SetQuota',
+ 'void',
+ [param('uint32_t const', 'quota')],
+ is_virtual=True)
+ ## queue-disc.h (module 'traffic-control'): void ns3::QueueDisc::DoDispose() [member function]
+ cls.add_method('DoDispose',
+ 'void',
+ [],
+ visibility='protected', is_virtual=True)
+ ## queue-disc.h (module 'traffic-control'): void ns3::QueueDisc::DoInitialize() [member function]
+ cls.add_method('DoInitialize',
+ 'void',
+ [],
+ visibility='protected', is_virtual=True)
+ ## queue-disc.h (module 'traffic-control'): void ns3::QueueDisc::Drop(ns3::Ptr item) [member function]
+ cls.add_method('Drop',
+ 'void',
+ [param('ns3::Ptr< ns3::QueueDiscItem >', 'item')],
+ visibility='protected')
+ ## queue-disc.h (module 'traffic-control'): bool ns3::QueueDisc::CheckConfig() [member function]
+ cls.add_method('CheckConfig',
+ 'bool',
+ [],
+ is_pure_virtual=True, visibility='private', is_virtual=True)
+ ## queue-disc.h (module 'traffic-control'): ns3::Ptr ns3::QueueDisc::DoDequeue() [member function]
+ cls.add_method('DoDequeue',
+ 'ns3::Ptr< ns3::QueueDiscItem >',
+ [],
+ is_pure_virtual=True, visibility='private', is_virtual=True)
+ ## queue-disc.h (module 'traffic-control'): bool ns3::QueueDisc::DoEnqueue(ns3::Ptr item) [member function]
+ cls.add_method('DoEnqueue',
+ 'bool',
+ [param('ns3::Ptr< ns3::QueueDiscItem >', 'item')],
+ is_pure_virtual=True, visibility='private', is_virtual=True)
+ ## queue-disc.h (module 'traffic-control'): ns3::Ptr ns3::QueueDisc::DoPeek() const [member function]
+ cls.add_method('DoPeek',
+ 'ns3::Ptr< ns3::QueueDiscItem const >',
+ [],
+ is_pure_virtual=True, is_const=True, visibility='private', is_virtual=True)
+ ## queue-disc.h (module 'traffic-control'): void ns3::QueueDisc::InitializeParams() [member function]
+ cls.add_method('InitializeParams',
+ 'void',
+ [],
+ is_pure_virtual=True, visibility='private', is_virtual=True)
+ return
+
+def register_Ns3QueueDiscClass_methods(root_module, cls):
+ ## queue-disc.h (module 'traffic-control'): ns3::QueueDiscClass::QueueDiscClass(ns3::QueueDiscClass const & arg0) [copy constructor]
+ cls.add_constructor([param('ns3::QueueDiscClass const &', 'arg0')])
+ ## queue-disc.h (module 'traffic-control'): ns3::QueueDiscClass::QueueDiscClass() [constructor]
+ cls.add_constructor([])
+ ## queue-disc.h (module 'traffic-control'): ns3::Ptr ns3::QueueDiscClass::GetQueueDisc() const [member function]
+ cls.add_method('GetQueueDisc',
+ 'ns3::Ptr< ns3::QueueDisc >',
+ [],
+ is_const=True)
+ ## queue-disc.h (module 'traffic-control'): static ns3::TypeId ns3::QueueDiscClass::GetTypeId() [member function]
+ cls.add_method('GetTypeId',
+ 'ns3::TypeId',
+ [],
+ is_static=True)
+ ## queue-disc.h (module 'traffic-control'): void ns3::QueueDiscClass::SetQueueDisc(ns3::Ptr qd) [member function]
+ cls.add_method('SetQueueDisc',
+ 'void',
+ [param('ns3::Ptr< ns3::QueueDisc >', 'qd')])
+ ## queue-disc.h (module 'traffic-control'): void ns3::QueueDiscClass::DoDispose() [member function]
+ cls.add_method('DoDispose',
+ 'void',
+ [],
+ visibility='protected', is_virtual=True)
+ return
+
def register_Ns3RandomVariableStream_methods(root_module, cls):
## random-variable-stream.h (module 'core'): static ns3::TypeId ns3::RandomVariableStream::GetTypeId() [member function]
cls.add_method('GetTypeId',
@@ -3340,6 +3825,18 @@
is_static=True)
return
+def register_Ns3SimpleRefCount__Ns3NetDeviceQueue_Ns3Empty_Ns3DefaultDeleter__lt__ns3NetDeviceQueue__gt___methods(root_module, cls):
+ ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount >::SimpleRefCount() [constructor]
+ cls.add_constructor([])
+ ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount >::SimpleRefCount(ns3::SimpleRefCount > const & o) [copy constructor]
+ cls.add_constructor([param('ns3::SimpleRefCount< ns3::NetDeviceQueue, ns3::empty, ns3::DefaultDeleter< ns3::NetDeviceQueue > > const &', 'o')])
+ ## simple-ref-count.h (module 'core'): static void ns3::SimpleRefCount >::Cleanup() [member function]
+ cls.add_method('Cleanup',
+ 'void',
+ [],
+ is_static=True)
+ return
+
def register_Ns3SimpleRefCount__Ns3NixVector_Ns3Empty_Ns3DefaultDeleter__lt__ns3NixVector__gt___methods(root_module, cls):
## simple-ref-count.h (module 'core'): ns3::SimpleRefCount >::SimpleRefCount() [constructor]
cls.add_constructor([])
@@ -3376,6 +3873,18 @@
is_static=True)
return
+def register_Ns3SimpleRefCount__Ns3QueueItem_Ns3Empty_Ns3DefaultDeleter__lt__ns3QueueItem__gt___methods(root_module, cls):
+ ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount >::SimpleRefCount() [constructor]
+ cls.add_constructor([])
+ ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount >::SimpleRefCount(ns3::SimpleRefCount > const & o) [copy constructor]
+ cls.add_constructor([param('ns3::SimpleRefCount< ns3::QueueItem, ns3::empty, ns3::DefaultDeleter< ns3::QueueItem > > const &', 'o')])
+ ## simple-ref-count.h (module 'core'): static void ns3::SimpleRefCount >::Cleanup() [member function]
+ cls.add_method('Cleanup',
+ 'void',
+ [],
+ is_static=True)
+ return
+
def register_Ns3SimpleRefCount__Ns3TraceSourceAccessor_Ns3Empty_Ns3DefaultDeleter__lt__ns3TraceSourceAccessor__gt___methods(root_module, cls):
## simple-ref-count.h (module 'core'): ns3::SimpleRefCount >::SimpleRefCount() [constructor]
cls.add_constructor([])
@@ -3467,6 +3976,11 @@
'ns3::Ptr< ns3::Node >',
[],
is_pure_virtual=True, is_const=True, is_virtual=True)
+ ## socket.h (module 'network'): int ns3::Socket::GetPeerName(ns3::Address & address) const [member function]
+ cls.add_method('GetPeerName',
+ 'int',
+ [param('ns3::Address &', 'address')],
+ is_pure_virtual=True, is_const=True, is_virtual=True)
## socket.h (module 'network'): uint32_t ns3::Socket::GetRxAvailable() const [member function]
cls.add_method('GetRxAvailable',
'uint32_t',
@@ -3492,6 +4006,21 @@
'ns3::TypeId',
[],
is_static=True)
+ ## socket.h (module 'network'): void ns3::Socket::Ipv6JoinGroup(ns3::Ipv6Address address, ns3::Socket::Ipv6MulticastFilterMode filterMode, std::vector > sourceAddresses) [member function]
+ cls.add_method('Ipv6JoinGroup',
+ 'void',
+ [param('ns3::Ipv6Address', 'address'), param('ns3::Socket::Ipv6MulticastFilterMode', 'filterMode'), param('std::vector< ns3::Ipv6Address >', 'sourceAddresses')],
+ is_virtual=True)
+ ## socket.h (module 'network'): void ns3::Socket::Ipv6JoinGroup(ns3::Ipv6Address address) [member function]
+ cls.add_method('Ipv6JoinGroup',
+ 'void',
+ [param('ns3::Ipv6Address', 'address')],
+ is_virtual=True)
+ ## socket.h (module 'network'): void ns3::Socket::Ipv6LeaveGroup() [member function]
+ cls.add_method('Ipv6LeaveGroup',
+ 'void',
+ [],
+ is_virtual=True)
## socket.h (module 'network'): bool ns3::Socket::IsIpRecvTos() const [member function]
cls.add_method('IsIpRecvTos',
'bool',
@@ -4224,6 +4753,74 @@
is_pure_virtual=True, is_const=True, is_virtual=True)
return
+def register_Ns3TrafficControlLayer_methods(root_module, cls):
+ ## traffic-control-layer.h (module 'traffic-control'): ns3::TrafficControlLayer::TrafficControlLayer() [constructor]
+ cls.add_constructor([])
+ ## traffic-control-layer.h (module 'traffic-control'): void ns3::TrafficControlLayer::DeleteRootQueueDiscOnDevice(ns3::Ptr device) [member function]
+ cls.add_method('DeleteRootQueueDiscOnDevice',
+ 'void',
+ [param('ns3::Ptr< ns3::NetDevice >', 'device')],
+ is_virtual=True)
+ ## traffic-control-layer.h (module 'traffic-control'): ns3::TypeId ns3::TrafficControlLayer::GetInstanceTypeId() const [member function]
+ cls.add_method('GetInstanceTypeId',
+ 'ns3::TypeId',
+ [],
+ is_const=True, is_virtual=True)
+ ## traffic-control-layer.h (module 'traffic-control'): ns3::Ptr ns3::TrafficControlLayer::GetRootQueueDiscOnDevice(ns3::Ptr device) [member function]
+ cls.add_method('GetRootQueueDiscOnDevice',
+ 'ns3::Ptr< ns3::QueueDisc >',
+ [param('ns3::Ptr< ns3::NetDevice >', 'device')],
+ is_virtual=True)
+ ## traffic-control-layer.h (module 'traffic-control'): static ns3::TypeId ns3::TrafficControlLayer::GetTypeId() [member function]
+ cls.add_method('GetTypeId',
+ 'ns3::TypeId',
+ [],
+ is_static=True)
+ ## traffic-control-layer.h (module 'traffic-control'): void ns3::TrafficControlLayer::Receive(ns3::Ptr device, ns3::Ptr