Updating Master

doc/doxygen.conf

@@ -434,7 +434,7 @@ LOOKUP_CACHE_SIZE      = 1
 # normally produced when WARNINGS is set to YES.
 # The default value is: NO.
 
-EXTRACT_ALL            = no
+EXTRACT_ALL            = YES
 
 # If the EXTRACT_PRIVATE tag is set to YES, all private members of a class will
 # be included in the documentation.
@@ -732,7 +732,7 @@ QUIET                  = NO
 # Tip: Turn warnings on while writing the documentation.
 # The default value is: YES.
 
-WARNINGS               = no
+WARNINGS               = YES
 
 # If the WARN_IF_UNDOCUMENTED tag is set to YES then doxygen will generate
 # warnings for undocumented members. If EXTRACT_ALL is set to YES then this flag
@@ -2205,7 +2205,7 @@ HIDE_UNDOC_RELATIONS   = YES
 # set to NO
 # The default value is: NO.
 
-HAVE_DOT               = no
+HAVE_DOT               = yes
 
 # The DOT_NUM_THREADS specifies the number of dot invocations doxygen is allowed
 # to run in parallel. When set to 0 doxygen will base this on the number of

doc/models/Makefile

@@ -171,6 +171,13 @@ SOURCEFIGS = \
 	$(SRC)/lte/doc/source/figures/lte-rlc-data-txon-ul.dia \
 	$(SRC)/lte/doc/source/figures/lte-rlc-data-retx-ul.dia \
 	$(SRC)/lte/doc/source/figures/lte-epc-x2-entity-saps.dia \
+	$(SRC)/lte/doc/source/figures/ca-rrc-reconf.dia \
+	$(SRC)/lte/doc/source/figures/ca-lte-enb-net-device-changes.dia \
+	$(SRC)/lte/doc/source/figures/ca-lte-ue-net-device-changes.dia \
+	$(SRC)/lte/doc/source/figures/ca-enb-data-plane.dia \
+	$(SRC)/lte/doc/source/figures/ca-enb-ctrl-plane.dia \
+	$(SRC)/lte/doc/source/figures/ca-ue-data-plane.dia \
+	$(SRC)/lte/doc/source/figures/ca-ue-ctrl-plane.dia \
 	$(SRC)/lte/doc/source/figures/lte-strongest-cell-handover-algorithm.eps \
 	$(SRC)/lte/doc/source/figures/lte-phy-interference.pdf \
 	$(SRC)/lte/doc/source/figures/lte-phy-interference.png \
@@ -188,6 +195,10 @@ SOURCEFIGS = \
 	$(SRC)/lte/doc/source/figures/rrc-connection-reconfiguration-handover.png \
 	$(SRC)/lte/doc/source/figures/nas-attach.pdf \
 	$(SRC)/lte/doc/source/figures/nas-attach.png \
+	$(SRC)/lte/doc/source/figures/ca-downlink-bsr.pdf \
+	$(SRC)/lte/doc/source/figures/ca-downlink-bsr.png \
+	$(SRC)/lte/doc/source/figures/ca-setup-radio-bearer.pdf \
+	$(SRC)/lte/doc/source/figures/ca-setup-radio-bearer.png \
 	$(SRC)/lte/doc/source/figures/lte-enb-rrc-states.pdf \
 	$(SRC)/lte/doc/source/figures/lte-enb-rrc-states.png \
 	$(SRC)/lte/doc/source/figures/lte-ue-rrc-states.pdf \
@@ -240,6 +251,16 @@ SOURCEFIGS = \
 	$(SRC)/lte/doc/source/figures/MCS_16_test.pdf \
 	$(SRC)/lte/doc/source/figures/miesm_scheme.pdf \
 	$(SRC)/lte/doc/source/figures/miesm_scheme.png \
+	$(SRC)/lte/doc/source/figures/carrier-aggregation-impact.pdf \
+	$(SRC)/lte/doc/source/figures/carrier-aggregation-impact.png \
+	$(SRC)/lte/doc/source/figures/carrier-aggregation-mac-impact.pdf \
+	$(SRC)/lte/doc/source/figures/carrier-aggregation-mac-impact.png \
+	$(SRC)/lte/doc/source/figures/ca-uplink-bsr.pdf \
+	$(SRC)/lte/doc/source/figures/ca-uplink-bsr.png \
+	$(SRC)/lte/doc/source/figures/ca-test-example-ul.pdf \
+	$(SRC)/lte/doc/source/figures/ca-test-example-ul.png \
+	$(SRC)/lte/doc/source/figures/ca-test-example-dl.pdf \
+	$(SRC)/lte/doc/source/figures/ca-test-example-dl.png \
 	$(SRC)/lte/doc/source/figures/lte-dl-power-control.dia \
 	$(SRC)/lte/doc/source/figures/lte-ffr-scheduling.dia \
 	$(SRC)/lte/doc/source/figures/lte-handover-campaign-rem.pdf \
@@ -377,6 +398,13 @@ IMAGES_EPS = \
 	$(FIGURES)/nist-frame-success-rate-n.eps \
 	$(FIGURES)/nist-frame-success-rate-ac.eps \
 	$(FIGURES)/nist-frame-success-rate-ax.eps \
+	$(FIGURES)/ca-rrc-reconf.eps \
+	$(FIGURES)/ca-lte-enb-net-device-changes.eps \
+	$(FIGURES)/ca-lte-ue-net-device-changes.eps \
+	$(FIGURES)/ca-enb-data-plane.eps \
+	$(FIGURES)/ca-enb-ctrl-plane.eps \
+	$(FIGURES)/ca-ue-data-plane.eps \
+	$(FIGURES)/ca-ue-ctrl-plane.eps \
 
 # rescale pdf figures as necessary
 $(FIGURES)/testbed.pdf_width = 5in

doc/tutorial/source/building-topologies.rst

@@ -959,14 +959,14 @@ wireless medium and can communication and interfere:
   phy.SetChannel (channel.Create ());
 
 Once the PHY helper is configured, we can focus on the MAC layer. Here we choose to
-work with non-Qos MACs so we use a NqosWifiMacHelper object to set MAC parameters. 
+work with non-Qos MACs. WifiMacHelper object is used to set MAC parameters. 
 
 ::
 
-  WifiHelper wifi = WifiHelper::Default ();
+  WifiHelper wifi;
   wifi.SetRemoteStationManager ("ns3::AarfWifiManager");
 
-  NqosWifiMacHelper mac = NqosWifiMacHelper::Default ();
+  WifiMacHelper mac;
 
 The ``SetRemoteStationManager`` method tells the helper the type of 
 rate control algorithm to use.  Here, it is asking the helper to use the AARF
@@ -986,9 +986,8 @@ This code first creates an 802.11 service set identifier (SSID) object
 that will be used to set the value of the "Ssid" ``Attribute`` of
 the MAC layer implementation.  The particular kind of MAC layer that
 will be created by the helper is specified by ``Attribute`` as
-being of the "ns3::StaWifiMac" type.  The use of
-``NqosWifiMacHelper`` will ensure that the "QosSupported"
-``Attribute`` for created MAC objects is set false. The combination
+being of the "ns3::StaWifiMac" type.  "QosSupported" ``Attribute`` is
+set to false by default for ``WifiMacHelper`` objects. The combination
 of these two configurations means that the MAC instance next created
 will be a non-QoS non-AP station (STA) in an infrastructure BSS (i.e.,
 a BSS with an AP).  Finally, the "ActiveProbing" ``Attribute`` is
@@ -1006,18 +1005,18 @@ create the wifi devices of these stations:
 
 We have configured Wifi for all of our STA nodes, and now we need to 
 configure the AP (access point) node.  We begin this process by changing
-the default ``Attributes`` of the ``NqosWifiMacHelper`` to reflect the 
+the default ``Attributes`` of the ``WifiMacHelper`` to reflect the 
 requirements of the AP.
 
 ::
 
   mac.SetType ("ns3::ApWifiMac",
                "Ssid", SsidValue (ssid));
 
-In this case, the ``NqosWifiMacHelper`` is going to create MAC
+In this case, the ``WifiMacHelper`` is going to create MAC
 layers of the "ns3::ApWifiMac", the latter specifying that a MAC
-instance configured as an AP should be created, with the helper type
-implying that the "QosSupported" ``Attribute`` should be set to
+instance configured as an AP should be created. We do not change
+the default setting of "QosSupported" ``Attribute``, so it remains
 false - disabling 802.11e/WMM-style QoS support at created APs.  
 
 The next lines create the single AP which shares the same set of PHY-level

src/core/model/command-line.cc

@@ -116,8 +116,7 @@ CommandLine::Parse (int argc, char *argv[])
 
   m_name = SystemPath::Split (argv[0]).back ();
 
-  int iargc = argc;
-  for (iargc--; iargc > 0; iargc--)
+  for (int iargc = 1; iargc < argc; iargc++)
     {
       // remove "--" or "-" heading.
       std::string param = argv[iargc];

src/core/test/command-line-test-suite.cc

@@ -255,6 +255,70 @@ CommandLineStringTestCase::DoRun (void)
   NS_TEST_ASSERT_MSG_EQ (myStr, "XX", "Command parser did not correctly set an string value to \"XX\"");
 }
 
+/*************************************************************************//**
+ * Test order of argument parsing
+ ****************************************************************************/
+class CommandLineOrderTestCase : public CommandLineTestCaseBase
+{
+public:
+  CommandLineOrderTestCase ();              /**< Constructor */
+  virtual ~CommandLineOrderTestCase () {}   /**< Destructor */
+
+private:
+  virtual void DoRun (void);                 /**< Run the test */
+
+};
+
+CommandLineOrderTestCase::CommandLineOrderTestCase ()
+  : CommandLineTestCaseBase ("order")
+{
+}
+
+void
+CommandLineOrderTestCase::DoRun (void)
+{
+  CommandLine cmd;
+  uint32_t myUint32 = 0;
+
+  cmd.AddValue ("my-uint32", "help", myUint32);
+
+  Parse (cmd, 2, "--my-uint32=1", "--my-uint32=2");
+
+  NS_TEST_ASSERT_MSG_EQ (myUint32, 2, "Command parser did not correctly set an unsigned integer value to 2");
+}
+
+/*************************************************************************//**
+ * Test ignoring invalid arguments
+ ****************************************************************************/
+class CommandLineInvalidTestCase : public CommandLineTestCaseBase
+{
+public:
+  CommandLineInvalidTestCase ();              /**< Constructor */
+  virtual ~CommandLineInvalidTestCase () {}   /**< Destructor */
+
+private:
+  virtual void DoRun (void);                 /**< Run the test */
+
+};
+
+CommandLineInvalidTestCase::CommandLineInvalidTestCase ()
+  : CommandLineTestCaseBase ("invalid")
+{
+}
+
+void
+CommandLineInvalidTestCase::DoRun (void)
+{
+  CommandLine cmd;
+  uint32_t myUint32 = 0;
+
+  cmd.AddValue ("my-uint32", "help", myUint32);
+
+  Parse (cmd, 2, "quack", "--my-uint32=5");
+
+  NS_TEST_ASSERT_MSG_EQ (myUint32, 5, "Command parser did not correctly set an unsigned integer value to 5");
+}
+
 /*************************************************************************//**
  * The Test Suite that glues all of the Test Cases together.
  ****************************************************************************/
@@ -271,6 +335,8 @@ CommandLineTestSuite::CommandLineTestSuite ()
   AddTestCase (new CommandLineIntTestCase, TestCase::QUICK);
   AddTestCase (new CommandLineUnsignedIntTestCase, TestCase::QUICK);
   AddTestCase (new CommandLineStringTestCase, TestCase::QUICK);
+  AddTestCase (new CommandLineOrderTestCase, TestCase::QUICK);
+  AddTestCase (new CommandLineInvalidTestCase, TestCase::QUICK);
 }
 
 static CommandLineTestSuite CommandLineTestSuite; /**< Test instance */

src/internet/doc/tcp.rst

@@ -728,8 +728,7 @@ In comparison to RFC 6817, the scope and limitations of the current LEDBAT
 implementation are:
 
 * It assumes that the clocks on the sender side and receiver side are synchronised
-* In line with Linux implementation, the one-way delay is calculated at the sender
-side by using the timestamps option in TCP header
+* In line with Linux implementation, the one-way delay is calculated at the sender side by using the timestamps option in TCP header
 * Only the MIN function is used for noise filtering 
 
 More information about LEDBAT is available in RFC 6817: https://tools.ietf.org/html/rfc6817

src/mesh/doc/source/mesh-references.rst

@@ -18,6 +18,6 @@ References
 
 .. [Hep15] \C. Hepner and \A. Witt and \R. Muenzner, `Validation of the ns-3 802.11s model and proposed changes compliant to IEEE 802.11-2012 <https://www.nsnam.org/wp-content/uploads/2015/05/WNS3_2015_submission_33.pdf>`_, Poster at 2015 Workshop on ns-3, May 2015.
 
-.. [Hep16] \C. Hepner and \S. Moll and \R. Muenzner, `Influence of Processing Delays on the VoIP Performance for IEEE 802.11s Multihop Wireless Mesh Networks:  Comparison of ns-3 Network Simulations with Hardware Measurements <http://dl.acm.org/citation.cfm?id=3021439>`_, Proceedings of SIMUTOOLS `16, August, 2016.
+.. [Hep16] \C. Hepner and \S. Moll and \R. Muenzner, `Influence of Processing Delays on the VoIP Performance for IEEE 802.11s Multihop Wireless Mesh Networks:  Comparison of ns-3 Network Simulations with Hardware Measurements <http://dl.acm.org/citation.cfm?id=3021439>`_, Proceedings of SIMUTOOLS 16, August, 2016.
 
 .. [ieee80211s] IEEE Standard for Information Technology, Telecommunications and information exchange between systems, Local and metropolitan area networks, Specific requirements,  Part 11: Wireless LAN Medium Access Control (MAC) and Physical Layer (PHY) specifications, Amendment 10: Mesh Networking, 10 September 2011.

src/wifi/examples/wifi-manager-example.cc

@@ -237,7 +237,7 @@ int main (int argc, char *argv[])
       dataName += oss.str ();
       plotName += "-client=";
       dataName += "-client=";
-      oss.flush ();
+      oss.str("");
       if (clientShortGuardInterval)
         {
           gi = "SGI";