doc: (fixes #817) various fixes highlighted by doxygen 1.9.6

doc/modules

@@ -1,17 +1,14 @@
 /**
  * @file
  * @ingroup utils
- * @brief Definition of support modules Constants, Utils, Example programs and
+ * @brief Definition of support modules Utils, Example programs and
  * Test suites.
  */
 /**
  * @anchor modules_anchor
  *
- * @defgroup constants Constants
- * @brief Constants you can change
- *
  * @defgroup utils Utils
- * @brief The utils directory is for various programs and scripts related 
+ * @brief The utils directory is for various programs and scripts related
  * to code coverage, test suites, style checking, and benchmarking.
  *
  * @defgroup examples Example programs

examples/ipv6/CMakeLists.txt

@@ -35,8 +35,8 @@ build_example(
 )
 
 build_example(
-  NAME ping6
-  SOURCE_FILES ping6.cc
+  NAME ping6-example
+  SOURCE_FILES ping6-example.cc
   LIBRARIES_TO_LINK
     ${libcsma}
     ${libinternet}
@@ -44,8 +44,8 @@ build_example(
 )
 
 build_example(
-  NAME radvd
-  SOURCE_FILES radvd.cc
+  NAME radvd-one-prefix
+  SOURCE_FILES radvd-one-prefix.cc
   LIBRARIES_TO_LINK
     ${libcsma}
     ${libinternet}

examples/ipv6/radvd-one-prefix.cc

@@ -30,14 +30,13 @@
 // //
 // // - Tracing of queues and packet receptions to file "radvd.tr"
 
-#include "ns3/radvd.h"
-
 #include "ns3/core-module.h"
 #include "ns3/csma-module.h"
 #include "ns3/internet-apps-module.h"
 #include "ns3/internet-module.h"
 #include "ns3/radvd-interface.h"
 #include "ns3/radvd-prefix.h"
+#include "ns3/radvd.h"
 
 #include <fstream>
 

src/aodv/model/aodv-packet.h

@@ -108,6 +108,7 @@ class TypeHeader : public Header
 /**
  * \brief Stream output operator
  * \param os output stream
+ * \param h the TypeHeader
  * \return updated stream
  */
 std::ostream& operator<<(std::ostream& os, const TypeHeader& h);

src/aodv/model/aodv-routing-protocol.h

@@ -260,7 +260,6 @@ class RoutingProtocol : public Ipv4RoutingProtocol
                              ///< originated route discovery.
     bool m_enableHello;      ///< Indicates whether a hello messages enable
     bool m_enableBroadcast;  ///< Indicates whether a a broadcast data packets forwarding enable
-    //\}
 
     /// IP protocol
     Ptr<Ipv4> m_ipv4;
@@ -377,8 +376,10 @@ class RoutingProtocol : public Ipv4RoutingProtocol
      */
     Ptr<Ipv4Route> LoopbackRoute(const Ipv4Header& header, Ptr<NetDevice> oif) const;
 
-    ///\name Receive control packets
-    //\{
+    /**
+     * \name Receive control packets
+     * @{
+     */
     /**
      * Receive and process control packet
      * \param socket input socket
@@ -410,10 +411,12 @@ class RoutingProtocol : public Ipv4RoutingProtocol
      */
     /// Receive  from node with address src
     void RecvError(Ptr<Packet> p, Ipv4Address src);
-    //\}
+    /** @} */
 
-    ///\name Send
-    //\{
+    /**
+     * \name Send
+     * @{
+     */
     /** Forward packet from route request queue
      * \param dst destination address
      * \param route route to use
@@ -459,7 +462,7 @@ class RoutingProtocol : public Ipv4RoutingProtocol
      * \param origin originating node IP address
      */
     void SendRerrWhenNoRouteToForward(Ipv4Address dst, uint32_t dstSeqNo, Ipv4Address origin);
-    /// @}
+    /** @} */
 
     /**
      * Send packet to destination socket

src/aodv/test/aodv-id-cache-test-suite.cc

@@ -33,13 +33,13 @@ namespace aodv
 {
 
 /**
- * \ingroup aodv
  * \defgroup aodv-test AODV module tests
+ * \ingroup aodv
+ * \ingroup tests
  */
 
 /**
  * \ingroup aodv-test
- * \ingroup tests
  *
  * \brief Unit test for id cache
  */
@@ -111,7 +111,6 @@ IdCacheTest::CheckTimeout3()
 
 /**
  * \ingroup aodv-test
- * \ingroup tests
  *
  * \brief Id Cache Test Suite
  */

src/aodv/test/aodv-regression.cc

@@ -45,7 +45,6 @@ using namespace ns3;
 
 /**
  * \ingroup aodv-test
- * \ingroup tests
  *
  * \brief AODV regression test suite
  */
@@ -69,7 +68,6 @@ class AodvRegressionTestSuite : public TestSuite
 
 /**
  * \ingroup aodv-test
- * \ingroup tests
  *
  * \brief Chain Regression Test
  */

src/aodv/test/aodv-test-suite.cc

@@ -30,7 +30,6 @@ namespace aodv
 
 /**
  * \ingroup aodv-test
- * \ingroup tests
  *
  * \brief Unit test for neighbors
  */
@@ -136,7 +135,6 @@ NeighborTest::DoRun()
 
 /**
  * \ingroup aodv-test
- * \ingroup tests
  *
  * \brief Type header test case
  */
@@ -164,7 +162,6 @@ struct TypeHeaderTest : public TestCase
 
 /**
  * \ingroup aodv-test
- * \ingroup tests
  *
  * \brief Unit test for RREQ
  */
@@ -224,7 +221,6 @@ struct RreqHeaderTest : public TestCase
 
 /**
  * \ingroup aodv-test
- * \ingroup tests
  *
  * \brief Unit test for RREP
  */
@@ -282,7 +278,6 @@ struct RrepHeaderTest : public TestCase
 
 /**
  * \ingroup aodv-test
- * \ingroup tests
  *
  * \brief Unit test for RREP-ACK
  */
@@ -307,7 +302,6 @@ struct RrepAckHeaderTest : public TestCase
 
 /**
  * \ingroup aodv-test
- * \ingroup tests
  *
  * \brief Unit test for RERR
  */
@@ -342,7 +336,6 @@ struct RerrHeaderTest : public TestCase
 
 /**
  * \ingroup aodv-test
- * \ingroup tests
  *
  * \brief Unit test for AODV routing table entry
  */
@@ -559,7 +552,6 @@ AodvRqueueTest::CheckTimeout()
 
 /**
  * \ingroup aodv-test
- * \ingroup tests
  *
  * \brief Unit test for AODV routing table entry
  */
@@ -653,7 +645,6 @@ struct AodvRtableEntryTest : public TestCase
 
 /**
  * \ingroup aodv-test
- * \ingroup tests
  *
  * \brief Unit test for AODV routing table
  */
@@ -741,7 +732,6 @@ struct AodvRtableTest : public TestCase
 
 /**
  * \ingroup aodv-test
- * \ingroup tests
  *
  * \brief AODV test suite
  */

src/aodv/test/loopback.cc

@@ -191,7 +191,6 @@ LoopbackTestCase::DoRun()
 
 /**
  * \ingroup aodv-test
- * \ingroup tests
  *
  * \brief AODV Loopback test suite
  */

src/config-store/model/model-node-creator.h

@@ -36,9 +36,7 @@ enum
 struct ModelNode
 {
     /**
-     * \enum node type
      * \brief node type structure
-     *
      */
     enum
     {

src/config-store/model/model-typeid-creator.h

@@ -38,7 +38,6 @@ enum
 struct ModelTypeid
 {
     /**
-     * \enum node type
      * \brief Whether the node represents an attribute or TypeId
      */
     enum

src/core/examples/length-example.cc

@@ -23,17 +23,21 @@
 #include <iostream>
 
 /**
- * \file
+ * \defgroup length-examples Demonstrates usage of the ns3::Length class
  * \ingroup core-examples
  * \ingroup length
+ */
+
+/**
+ * \file
+ * \ingroup length-examples
  * Demonstrates usage of the ns3::Length class
  */
 
 using namespace ns3;
 
 /**
- * \ingroup core-examples
- * \ingroup length
+ * \ingroup length-examples
  * \brief Demonstrates the use of ns3::Length constructors.
  */
 void
@@ -55,8 +59,7 @@ Constructors()
 }
 
 /**
- * \ingroup core-examples
- * \ingroup length
+ * \ingroup length-examples
  * \brief Demonstrates the use of ns3::Length conversions.
  */
 void
@@ -75,8 +78,7 @@ Conversions()
 }
 
 /**
- * \ingroup core-examples
- * \ingroup length
+ * \ingroup length-examples
  * \brief Demonstrates the use of ns3::Length arithmetic operators.
  */
 void
@@ -103,8 +105,7 @@ ArithmeticOperators()
 }
 
 /**
- * \ingroup core-examples
- * \ingroup length
+ * \ingroup length-examples
  * \brief Demonstrates the use of ns3::Length equality operators.
  */
 void
@@ -141,8 +142,7 @@ EqualityOperators()
 }
 
 /**
- * \ingroup core-examples
- * \ingroup length
+ * \ingroup length-examples
  * \brief Demonstrates the use of ns3::Length multiplications and divisions.
  */
 void

src/core/examples/test-string-value-formatting.cc

@@ -18,7 +18,7 @@
 #include "ns3/core-module.h"
 
 /**
- * \defgroup string-value-formatting
+ * \defgroup string-value-formatting StringValue parsing tests
  * Check that StringValue parses complex values correctly.
  */
 

src/core/model/attribute-helper.h

@@ -111,7 +111,12 @@ MakeSimpleAttributeChecker(std::string name, std::string underlying)
 
         std::string GetValueTypeName() const override
         {
-            return m_type;
+            if (m_type.rfind("ns3::", 0) == 0)
+            {
+                // m_type already starts with "ns3::"
+                return m_type;
+            }
+            return "ns3::" + m_type;
         }
 
         bool HasUnderlyingTypeInformation() const override

src/core/model/int64x64-double.h

@@ -314,7 +314,7 @@ class int64x64_t
      * \name Arithmetic Operators
      * Arithmetic operators for int64x64_t.
      */
-    /*
+    /**
      * @{
      * Arithmetic operator.
      * \param [in] lhs Left hand argument
@@ -367,7 +367,7 @@ class int64x64_t
      * \name Unary Operators
      * Unary operators for int64x64_t.
      */
-    /*
+    /**
      * @{
      * Unary operator.
      * \param [in] lhs Left hand argument

src/core/model/length.cc

@@ -849,6 +849,4 @@ Miles(double value)
     return Length(value, Length::Unit::Mile);
 }
 
-/**@}*/
-
 } // namespace ns3

src/dsdv/test/dsdv-testcase.cc

@@ -46,13 +46,13 @@
 using namespace ns3;
 
 /**
- * \ingroup dsdv-test
+ * \ingroup dsdv
+ * \ingroup tests
  * \defgroup dsdv-test DSDV module tests
  */
 
 /**
  * \ingroup dsdv-test
- * \ingroup tests
  *
  * \brief DSDV test case to verify the DSDV header
  *
@@ -111,7 +111,6 @@ DsdvHeaderTestCase::DoRun()
 
 /**
  * \ingroup dsdv-test
- * \ingroup tests
  *
  * \brief DSDV routing table tests (adding and looking up routes)
  */
@@ -213,7 +212,6 @@ DsdvTableTestCase::DoRun()
 
 /**
  * \ingroup dsdv-test
- * \ingroup tests
  *
  * \brief DSDV test suite
  */

src/energy/examples/CMakeLists.txt

@@ -1,6 +1,6 @@
 build_lib_example(
-  NAME li-ion-energy-source
-  SOURCE_FILES li-ion-energy-source.cc
+  NAME li-ion-energy-source-example
+  SOURCE_FILES li-ion-energy-source-example.cc
   LIBRARIES_TO_LINK ${libcore}
                     ${libenergy}
 )

src/energy/examples/li-ion-energy-source-example.cc

@@ -17,10 +17,9 @@
  * Author: Andrea Sacco <andrea.sacco85@gmail.com>
  */
 
-#include "ns3/li-ion-energy-source.h"
-
 #include "ns3/command-line.h"
 #include "ns3/energy-source-container.h"
+#include "ns3/li-ion-energy-source.h"
 #include "ns3/log.h"
 #include "ns3/simple-device-energy-model.h"
 #include "ns3/simulator.h"

src/flow-monitor/examples/flowmon-parse-results.py

@@ -45,10 +45,6 @@ class Histogram(object):
     ## class variables
     ## @var bins
     #  histogram bins
-    ## @var nbins
-    #  number of bins
-    ## @var number_of_flows
-    #  number of flows
     ## @var __slots_
     #  class variable list
     __slots_ = 'bins', 'nbins', 'number_of_flows'
@@ -76,8 +72,6 @@ class Flow(object):
     #  receive bit rate
     ## @var txBitrate
     #  transmit bit rate
-    ## @var fiveTuple
-    #  five tuple
     ## @var packetSizeMean
     #  packet size mean
     ## @var probe_stats_unsorted
@@ -140,14 +134,10 @@ class Flow(object):
 ## ProbeFlowStats
 class ProbeFlowStats(object):
     ## class variables
-    ## @var probeId
-    #  probe ID
     ## @var packets
     #  network packets
     ## @var bytes
     #  bytes
-    ## @var delayFromFirstProbe
-    #  delay from first probe
     ## @var __slots_
     #  class variable list
     __slots_ = ['probeId', 'packets', 'bytes', 'delayFromFirstProbe']

src/internet/helper/ipv4-routing-helper.h

@@ -284,15 +284,6 @@ class Ipv4RoutingHelper
                                    Time::Unit unit = Time::S);
 };
 
-/**
- * \brief Request a specified routing protocol <T> from Ipv4RoutingProtocol protocol
- *
- * If protocol is Ipv4ListRouting, then protocol will be searched in the list,
- * otherwise a simple DynamicCast will be performed
- *
- * \param protocol Smart pointer to Ipv4RoutingProtocol object
- * \return a Smart Pointer to the requested protocol (zero if the protocol can't be found)
- */
 template <class T>
 Ptr<T>
 Ipv4RoutingHelper::GetRouting(Ptr<Ipv4RoutingProtocol> protocol)

src/internet/helper/ipv6-routing-helper.h

@@ -284,15 +284,6 @@ class Ipv6RoutingHelper
                                      Time::Unit unit = Time::S);
 };
 
-/**
- * \brief Request a specified routing protocol <T> from Ipv6RoutingProtocol protocol
- *
- * If protocol is Ipv6ListRouting, then protocol will be searched in the list,
- * otherwise a simple DynamicCast will be performed
- *
- * \param protocol Smart pointer to Ipv6RoutingProtocol object
- * \return a Smart Pointer to the requested protocol (zero if the protocol can't be found)
- */
 template <class T>
 Ptr<T>
 Ipv6RoutingHelper::GetRouting(Ptr<Ipv6RoutingProtocol> protocol)

src/internet/model/tcp-rate-ops.cc

@@ -238,7 +238,7 @@ TcpRateLinux::SkbSent(TcpTxItem* skb, bool isStartOfTransmission)
 }
 
 std::ostream&
-operator<<(std::ostream& os, const TcpRateLinux::TcpRateConnection& rate)
+operator<<(std::ostream& os, const TcpRateOps::TcpRateConnection& rate)
 {
     os << "m_delivered      = " << rate.m_delivered << std::endl;
     os << "m_deliveredTime  = " << rate.m_deliveredTime << std::endl;
@@ -252,7 +252,7 @@ operator<<(std::ostream& os, const TcpRateLinux::TcpRateConnection& rate)
 }
 
 std::ostream&
-operator<<(std::ostream& os, const TcpRateLinux::TcpRateSample& sample)
+operator<<(std::ostream& os, const TcpRateOps::TcpRateSample& sample)
 {
     os << "m_deliveryRate  = " << sample.m_deliveryRate << std::endl;
     os << " m_isAppLimited = " << sample.m_isAppLimited << std::endl;

src/internet/model/tcp-rate-ops.h

@@ -259,7 +259,7 @@ class TcpRateLinux : public TcpRateOps
  * \param sample the TcpRateLinux::TcpRateSample to print.
  * \returns The output stream.
  */
-std::ostream& operator<<(std::ostream& os, const TcpRateLinux::TcpRateSample& sample);
+std::ostream& operator<<(std::ostream& os, const TcpRateOps::TcpRateSample& sample);
 
 /**
  * \brief Output operator.
@@ -267,7 +267,7 @@ std::ostream& operator<<(std::ostream& os, const TcpRateLinux::TcpRateSample& sa
  * \param rate the TcpRateLinux::TcpRateConnection to print.
  * \returns The output stream.
  */
-std::ostream& operator<<(std::ostream& os, const TcpRateLinux::TcpRateConnection& rate);
+std::ostream& operator<<(std::ostream& os, const TcpRateOps::TcpRateConnection& rate);
 
 /**
  * Comparison operator

src/internet/test/global-route-manager-impl-test-suite.cc

@@ -32,12 +32,12 @@ using namespace ns3;
 
 /**
  * \ingroup internet
+ * \ingroup tests
  * \defgroup internet-test internet module tests
  */
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief Global Route Manager Test
  */
@@ -224,7 +224,6 @@ GlobalRouteManagerImplTestCase::DoRun()
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief Global Route Manager TestSuite
  */

src/internet/test/ipv4-address-generator-test-suite.cc

@@ -23,7 +23,6 @@ using namespace ns3;
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief IPv4 network number Test
  */
@@ -84,7 +83,6 @@ NetworkNumberAllocatorTestCase::DoRun()
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief IPv4 address allocator Test
  */
@@ -142,7 +140,6 @@ AddressAllocatorTestCase::DoTeardown()
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief IPv4 network and address allocator Test
  */
@@ -214,7 +211,6 @@ NetworkAndAddressTestCase::DoRun()
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief IPv4 AddressGenerator example (sort of) Test
  */
@@ -273,7 +269,6 @@ ExampleAddressGeneratorTestCase::DoRun()
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief IPv4 address collision Test
  */
@@ -346,7 +341,6 @@ AddressCollisionTestCase::DoRun()
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief IPv4 Address Generator TestSuite
  */

src/internet/test/ipv4-address-helper-test-suite.cc

@@ -24,7 +24,6 @@ using namespace ns3;
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief IPv4 network allocator helper Test
  */
@@ -78,7 +77,6 @@ NetworkAllocatorHelperTestCase::DoRun()
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief IPv4 address allocator helper Test
  */
@@ -132,7 +130,6 @@ AddressAllocatorHelperTestCase::DoRun()
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief IPv4 reset allocator helper Test
  */
@@ -201,7 +198,6 @@ ResetAllocatorHelperTestCase::DoTeardown()
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief IPv4 address helper Test
  */
@@ -281,7 +277,6 @@ IpAddressHelperTestCasev4::DoTeardown()
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief IPv4 Address Helper TestSuite
  */

src/internet/test/ipv4-deduplication-test.cc

@@ -57,7 +57,6 @@ using namespace ns3;
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief IPv4 Deduplication Test
  *
@@ -546,7 +545,6 @@ Ipv4DeduplicationTest::CheckDrops(const std::string& name)
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief IPv4 Deduplication TestSuite
  */
@@ -572,7 +570,6 @@ static Ipv4DeduplicationTestSuite
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief IPv4 Deduplication Performance Test
  *
@@ -730,7 +727,6 @@ Ipv4DeduplicationPerformanceTest::DoSendData(Ptr<Socket> socket, Address to, uin
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief IPv4 Deduplication Performance TestSuite
  */

src/internet/test/ipv4-forwarding-test.cc

@@ -44,7 +44,6 @@ using namespace ns3;
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief IPv4 Forwarding Test
  */
@@ -227,7 +226,6 @@ Ipv4ForwardingTest::DoRun()
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief IPv4 Forwarding TestSuite
  */

src/internet/test/ipv4-fragmentation-test.cc

@@ -59,7 +59,6 @@ class UdpSocketImpl;
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief Tag used in IPv4 Fragmentation Test
  */
@@ -125,7 +124,6 @@ class IPv4TestTag : public Tag
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief IPv4 Fragmentation Test
  */
@@ -579,7 +577,6 @@ Ipv4FragmentationTest::DoRun()
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief IPv4 Fragmentation TestSuite
  */

src/internet/test/ipv4-global-routing-test-suite.cc

@@ -118,7 +118,6 @@ NS_LOG_COMPONENT_DEFINE("Ipv4GlobalRoutingTestSuite");
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief IPv4 GlobalRouting Link test
  */
@@ -203,7 +202,6 @@ LinkTest::DoRun()
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief IPv4 GlobalRouting LAN test
  */
@@ -285,7 +283,6 @@ LanTest::DoRun()
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief IPv4 GlobalRouting Two Link test
  */
@@ -405,7 +402,6 @@ TwoLinkTest::DoRun()
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief IPv4 GlobalRouting Two LAN test
  */
@@ -506,7 +502,6 @@ TwoLanTest::DoRun()
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief IPv4 GlobalRouting Bridge test
  */
@@ -690,7 +685,6 @@ BridgeTest::DoRun()
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief IPv4 GlobalRouting Two bridges test
  */
@@ -848,7 +842,6 @@ TwoBridgeTest::DoRun()
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief IPv4 Dynamic GlobalRouting test
  */
@@ -1159,7 +1152,6 @@ Ipv4DynamicGlobalRoutingTestCase::DoRun()
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief IPv4 Dynamic GlobalRouting /32 test
  */
@@ -1323,7 +1315,6 @@ Ipv4GlobalRoutingSlash32TestCase::DoRun()
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief IPv4 GlobalRouting TestSuite
  */

src/internet/test/ipv4-header-test.cc

@@ -53,7 +53,6 @@ using namespace ns3;
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief IPv4 Header Test
  */
@@ -293,7 +292,6 @@ Ipv4HeaderTest::DoRun()
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief IPv4 Header TestSuite
  */

src/internet/test/ipv4-list-routing-test-suite.cc

@@ -24,7 +24,6 @@ using namespace ns3;
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief IPv4 dummy routing class (A)
  */
@@ -77,7 +76,6 @@ class Ipv4ARouting : public Ipv4RoutingProtocol
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief IPv4 dummy routing class (B)
  */
@@ -130,7 +128,6 @@ class Ipv4BRouting : public Ipv4RoutingProtocol
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief IPv4 ListRouting negative test.
  */
@@ -165,7 +162,6 @@ Ipv4ListRoutingNegativeTestCase::DoRun()
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief IPv4 ListRouting positive test.
  */
@@ -205,7 +201,6 @@ Ipv4ListRoutingPositiveTestCase::DoRun()
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief IPv4 ListRouting TestSuite
  */

src/internet/test/ipv4-packet-info-tag-test-suite.cc

@@ -54,7 +54,6 @@ using namespace ns3;
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief IPv4 PacketInfoTag Test
  */
@@ -209,7 +208,6 @@ Ipv4PacketInfoTagTest::DoRun()
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief IPv4 PacketInfoTag TestSuite
  */

src/internet/test/ipv4-raw-test.cc

@@ -54,7 +54,6 @@ using namespace ns3;
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief IPv4 RAW Socket Test
  */
@@ -372,7 +371,6 @@ Ipv4RawSocketImplTest::DoRun()
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief IPv4 RAW Socket TestSuite
  */

src/internet/test/ipv4-rip-test.cc

@@ -46,7 +46,6 @@ using namespace ns3;
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief IPv4 RIP Test
  */
@@ -276,7 +275,6 @@ Ipv4RipTest::DoRun()
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief IPv4 RIP count to infinity Test
  */
@@ -510,7 +508,6 @@ Ipv4RipCountToInfinityTest::DoRun()
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief IPv4 RIP SplitHorizon strategy Test
  */
@@ -699,7 +696,6 @@ Ipv4RipSplitHorizonStrategyTest::DoRun()
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief IPv4 RIP TestSuite
  */

src/internet/test/ipv4-static-routing-test-suite.cc

@@ -39,7 +39,6 @@ using namespace ns3;
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief IPv4 StaticRouting /32 Test
  */
@@ -210,7 +209,6 @@ Ipv4StaticRoutingSlash32TestCase::DoRun()
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief IPv4 StaticRouting /32 TestSuite
  */

src/internet/test/ipv4-test.cc

@@ -32,7 +32,6 @@ using namespace ns3;
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief IPv4 Test
  */
@@ -123,7 +122,6 @@ Ipv4L3ProtocolTestCase::DoRun()
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief IPv4 TestSuite
  */

src/internet/test/ipv6-address-duplication-test.cc

@@ -44,7 +44,6 @@ using namespace ns3;
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief IPv6 Duplicate Address Detection Test
  */
@@ -118,7 +117,6 @@ Ipv6DadTest::DoRun()
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief IPv6 Duplicate Address Detection TestSuite
  */

src/internet/test/ipv6-address-generator-test-suite.cc

@@ -24,7 +24,6 @@ using namespace ns3;
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief IPv6 network number allocator Test
  */
@@ -83,7 +82,6 @@ NetworkNumber6AllocatorTestCase::DoRun()
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief IPv6 address allocator Test
  */
@@ -148,7 +146,6 @@ AddressAllocator6TestCase::DoTeardown()
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief IPv6 network number and address allocator Test
  */
@@ -200,7 +197,6 @@ NetworkAndAddress6TestCase::DoRun()
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief IPv6 example of an address generator Test
  */
@@ -265,7 +261,6 @@ ExampleAddress6GeneratorTestCase::DoRun()
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief IPv6 address collision Test
  */
@@ -338,7 +333,6 @@ AddressCollision6TestCase::DoRun()
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief IPv6 address generator TestSuite
  */

src/internet/test/ipv6-address-helper-test-suite.cc

@@ -29,7 +29,6 @@ using namespace ns3;
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief IPv6 AddressHelper Test
  */
@@ -170,7 +169,6 @@ IpAddressHelperTestCasev6::DoTeardown()
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief IPv6 AddressHelper TestSuite
  */

src/internet/test/ipv6-dual-stack-test-suite.cc

@@ -52,7 +52,6 @@ NS_LOG_COMPONENT_DEFINE("Ipv6DualStackTestSuite");
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief IPv6 dual stack Test
  */
@@ -354,7 +353,6 @@ DualStackTestCase::DoTeardown()
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief IPv6 dual stack TestSuite
  */

src/internet/test/ipv6-extension-header-test-suite.cc

@@ -35,7 +35,6 @@ using namespace ns3;
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief IPv6 extensions Test: Empty option field.
  */
@@ -76,7 +75,6 @@ class TestEmptyOptionField : public TestCase
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief IPv6 extensions Test: Option without alignment.
  */
@@ -100,7 +98,6 @@ class OptionWithoutAlignmentHeader : public Ipv6OptionHeader
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief IPv6 extensions Test: Test the option without alignment.
  */
@@ -151,7 +148,6 @@ class TestOptionWithoutAlignment : public TestCase
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief IPv6 extensions Test: Option with alignment.
  */
@@ -180,7 +176,6 @@ class OptionWithAlignmentHeader : public Ipv6OptionHeader
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief IPv6 extensions Test: Test the option with alignment.
  */
@@ -238,7 +233,6 @@ class TestOptionWithAlignment : public TestCase
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief IPv6 extensions Test: Test an option already aligned.
  */
@@ -278,7 +272,6 @@ class TestFulfilledAlignment : public TestCase
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief IPv6 extensions TestSuite.
  */

src/internet/test/ipv6-forwarding-test.cc

@@ -44,7 +44,6 @@ using namespace ns3;
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief IPv6 Forwarding Test
  */
@@ -212,7 +211,6 @@ Ipv6ForwardingTest::DoRun()
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief IPv6 Forwarding TestSuite
  */

src/internet/test/ipv6-fragmentation-test.cc

@@ -67,7 +67,6 @@ class UdpSocketImpl;
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief Tag used in IPv6 Fragmentation Test
  */
@@ -133,7 +132,6 @@ class IPv6TestTag : public Tag
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief IPv6 Fragmentation Test
  */
@@ -618,7 +616,6 @@ Ipv6FragmentationTest::DoRun()
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief IPv6 Fragmentation TestSuite
  */

src/internet/test/ipv6-list-routing-test-suite.cc

@@ -25,7 +25,6 @@ using namespace ns3;
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief IPv6 dummy routing class (A)
  */
@@ -92,7 +91,6 @@ class Ipv6ARouting : public Ipv6RoutingProtocol
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief IPv6 dummy routing class (B)
  */
@@ -159,7 +157,6 @@ class Ipv6BRouting : public Ipv6RoutingProtocol
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief IPv6 ListRouting negative test.
  */
@@ -194,7 +191,6 @@ Ipv6ListRoutingNegativeTestCase::DoRun()
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief IPv6 ListRouting positive test.
  */
@@ -234,7 +230,6 @@ Ipv6ListRoutingPositiveTestCase::DoRun()
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief IPv6 ListRouting TestSuite
  */

src/internet/test/ipv6-packet-info-tag-test-suite.cc

@@ -76,7 +76,6 @@ using namespace ns3;
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief IPv6 PacketInfoTag Test
  */
@@ -245,7 +244,6 @@ Ipv6PacketInfoTagTest::DoRun()
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief IPv6 PacketInfoTag TestSuite
  */

src/internet/test/ipv6-raw-test.cc

@@ -56,7 +56,6 @@ using namespace ns3;
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief IPv6 RAW Socket Test
  */
@@ -324,7 +323,6 @@ Ipv6RawSocketImplTest::DoRun()
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief IPv6 RAW Socket TestSuite
  */

src/internet/test/ipv6-ripng-test.cc

@@ -45,7 +45,6 @@ using namespace ns3;
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief IPv6 RIPng Test
  */
@@ -276,7 +275,6 @@ Ipv6RipngTest::DoRun()
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief IPv6 RIPng count to infinity Test
  */
@@ -509,7 +507,6 @@ Ipv6RipngCountToInfinityTest::DoRun()
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief IPv6 RIPng SplitHorizon strategy Test
  */
@@ -698,7 +695,6 @@ Ipv6RipngSplitHorizonStrategyTest::DoRun()
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief IPv6 RIPng TestSuite
  */

src/internet/test/ipv6-test.cc

@@ -32,7 +32,6 @@ using namespace ns3;
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief IPv6 Test
  */
@@ -180,7 +179,6 @@ Ipv6L3ProtocolTestCase::DoRun()
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief IPv6 TestSuite
  */

src/internet/test/neighbor-cache-test.cc

@@ -41,7 +41,6 @@ using namespace ns3;
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief Dynamic Neighbor Cache Test
  */
@@ -542,7 +541,6 @@ DynamicNeighborCacheTest::DoRun()
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief Neighbor cache on Channel Test
  */
@@ -632,7 +630,6 @@ ChannelTest::DoRun()
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief Neighbor Cache on NetDeviceContainer Test
  */
@@ -723,7 +720,6 @@ NetDeviceContainerTest::DoRun()
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief Neighbor Cache on InterfaceContainer Test
  */
@@ -814,7 +810,6 @@ InterfaceContainerTest::DoRun()
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief Neighbor Cache Flush Test
  */
@@ -922,7 +917,6 @@ FlushTest::DoRun()
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief Neighbor Cache on Overlapped Scope Test
  */
@@ -1022,7 +1016,6 @@ DuplicateTest::DoRun()
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief Dynamic Neighbor Cache on Reduced Scope Test
  */
@@ -1230,7 +1223,6 @@ DynamicPartialTest::DoRun()
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief NeighborCache TestSuite
  */

src/internet/test/rtt-test.cc

@@ -28,7 +28,6 @@ NS_LOG_COMPONENT_DEFINE("RttEstimatorTestSuite");
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief RTT estimator Test
  */
@@ -181,7 +180,6 @@ RttEstimatorTestCase::DoTeardown()
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief RTT estimator TestSuite
  */

src/internet/test/tcp-bbr-test.cc

@@ -182,7 +182,6 @@ TcpBbrCheckGainValuesTest::ExecuteTest()
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief TCP BBR TestSuite
  */

src/internet/test/tcp-bic-test.cc

@@ -28,7 +28,6 @@ NS_LOG_COMPONENT_DEFINE("TcpBicTestSuite");
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief Testing the congestion avoidance increment on TcpBic
  */
@@ -191,7 +190,6 @@ TcpBicIncrementTest::Update(Ptr<TcpSocketState> tcb)
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief Testing the congestion avoidance decrement on TcpBic
  */
@@ -305,7 +303,6 @@ TcpBicDecrementTest::ExecuteTest()
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief TCP Bic TestSuite
  */

src/internet/test/tcp-bytes-in-flight-test.cc

@@ -29,7 +29,6 @@ NS_LOG_COMPONENT_DEFINE("TcpBytesInFlightTestSuite");
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief Check the value of BytesInFlight against a home-made guess
  *
@@ -283,7 +282,6 @@ TcpBytesInFlightTest::FinalChecks()
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief TestSuite: Check the value of BytesInFlight against a home-made guess
  */

src/internet/test/tcp-classic-recovery-test.cc

@@ -118,7 +118,6 @@ ClassicRecoveryTest::DoRun()
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief Classic Recovery TestSuite
  */

src/internet/test/tcp-cong-avoid-test.cc

@@ -28,7 +28,6 @@ NS_LOG_COMPONENT_DEFINE("TcpNewRenoCongAvoidTest");
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief Test the behavior of RFC congestion avoidance
  *
@@ -181,7 +180,6 @@ TcpNewRenoCongAvoidNormalTest::NormalClose(SocketWho who)
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief TestSuite for the behavior of RFC congestion avoidance
  */

src/internet/test/tcp-datasentcb-test.cc

@@ -28,7 +28,6 @@ NS_LOG_COMPONENT_DEFINE("TcpDatSentCbTest");
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief Socket that the 50% of the times saves the entire packet in the buffer,
  * while in the other 50% saves only half the packet.
@@ -90,7 +89,6 @@ TcpSocketHalfAck::ReceivedData(Ptr<Packet> packet, const TcpHeader& tcpHeader)
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief Data Sent callback test
  *
@@ -164,7 +162,6 @@ TcpDataSentCbTestCase::CreateReceiverSocket(Ptr<Node> node)
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief TestSuite: Data Sent callback
  */

src/internet/test/tcp-dctcp-test.cc

@@ -39,7 +39,6 @@ NS_LOG_COMPONENT_DEFINE("TcpDctcpTestSuite");
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief Validates the setting of ECT and ECE codepoints for DCTCP enabled traffic
  */
@@ -209,7 +208,6 @@ TcpDctcpCodePointsTest::ConfigureEnvironment()
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief A TCP socket which sends a data packet with CE flags set for test 3.
  *
@@ -554,7 +552,6 @@ TcpDctcpCodePointsTest::CreateReceiverSocket(Ptr<Node> node)
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief DCTCP should be same as Linux during slow start
  */
@@ -655,7 +652,6 @@ TcpDctcpToLinuxReno::ExecuteTest()
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief TCP DCTCP TestSuite
  */

src/internet/test/tcp-ecn-test.cc

@@ -42,7 +42,6 @@ NS_LOG_COMPONENT_DEFINE("TcpEcnTestSuite");
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief checks if ECT, CWR and ECE bits are set correctly in different scenarios
  *
@@ -81,7 +80,6 @@ class TcpEcnTest : public TcpGeneralTest
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief A TCP socket which sends certain data packets with CE flags set for tests 5 and 6.
  *
@@ -580,7 +578,6 @@ TcpEcnTest::CreateSenderSocket(Ptr<Node> node)
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief TCP ECN TestSuite
  */

src/internet/test/tcp-endpoint-bug2211.cc

@@ -27,7 +27,6 @@ using namespace ns3;
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief Test for bug 2211.
  *
@@ -151,7 +150,6 @@ TcpEndPointBug2211Test::DoRun()
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief TestSuite for bug 2211 - It must be used with valgrind.
  */

src/internet/test/tcp-error-model.h

@@ -27,7 +27,6 @@ namespace ns3
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief A general (TCP-aware) error model.
  *
@@ -74,7 +73,6 @@ class TcpGeneralErrorModel : public ErrorModel
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief An error model TCP aware: it drops the sequence number declared.
  *
@@ -121,7 +119,6 @@ class TcpSeqErrorModel : public TcpGeneralErrorModel
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief Error model which drop packets with specified TCP flags.
  *

src/internet/test/tcp-fast-retr-test.cc

@@ -29,7 +29,6 @@ NS_LOG_COMPONENT_DEFINE("TcpFastRetrTest");
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief Test the fast retransmission
  *
@@ -431,7 +430,6 @@ TcpFastRetrTest::FinalChecks()
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief Testsuite for the fast retransmission
  */

src/internet/test/tcp-general-test.h

@@ -31,7 +31,6 @@ namespace ns3
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief Class for inserting callbacks special points of the flow of TCP sockets
  *
@@ -151,7 +150,6 @@ class TcpSocketMsgBase : public ns3::TcpSocketBase
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief A TCP socket which sends ACKs smaller than the segment received.
  *
@@ -215,7 +213,6 @@ class TcpSocketSmallAcks : public TcpSocketMsgBase
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief General infrastructure for TCP testing
  *
@@ -1162,7 +1159,6 @@ class TcpGeneralTest : public TestCase
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief Convenience function to retrieve the ACK state from a TCB
  *

src/internet/test/tcp-header-test.cc

@@ -41,7 +41,6 @@ using namespace ns3;
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief TCP header Get/Set test.
  */
@@ -159,7 +158,6 @@ TcpHeaderGetSetTestCase::DoTeardown()
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief TCP header with RFC793 Options test.
  */
@@ -386,7 +384,6 @@ TcpHeaderWithRFC793OptionTestCase::DoTeardown()
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief TCP header Flags to Striing test.
  */
@@ -456,7 +453,6 @@ TcpHeaderFlagsToString::DoRun()
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief TCP header TestSuite
  */

src/internet/test/tcp-highspeed-test.cc

@@ -28,7 +28,6 @@ NS_LOG_COMPONENT_DEFINE("TcpHighSpeedTestSuite");
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief Testing the congestion avoidance increment on TcpHighSpeed
  */
@@ -83,7 +82,6 @@ TcpHighSpeedIncrementTest::DoRun()
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief Testing the congestion avoidance decrement on TcpHighSpeed
  */
@@ -137,7 +135,6 @@ TcpHighSpeedDecrementTest::DoRun()
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief TcpHighSpeed Congestion window values to test.
  */
@@ -179,7 +176,6 @@ static const HighSpeedImportantValues highSpeedImportantValues[]{
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief TCP HighSpeed TestSuite
  */

src/internet/test/tcp-htcp-test.cc

@@ -36,7 +36,6 @@ NS_LOG_COMPONENT_DEFINE("TcpHtcpTestSuite");
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief Testing the congestion avoidance increment on TcpHtcp
  */
@@ -148,7 +147,6 @@ TcpHtcpIncrementTest::DoRun()
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief TCP Htcp TestSuite.
  *

src/internet/test/tcp-hybla-test.cc

@@ -28,7 +28,6 @@ NS_LOG_COMPONENT_DEFINE("TcpHyblaTestSuite");
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief Testing the congestion avoidance increment on TcpHybla
  */
@@ -149,7 +148,6 @@ TcpHyblaIncrementTest::DoRun()
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief TCP Hybla TestSuite
  */

src/internet/test/tcp-illinois-test.cc

@@ -35,7 +35,6 @@ NS_LOG_COMPONENT_DEFINE("TcpIllinoisTestSuite");
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief TcpIllinois C-AIMD algorithm tests.
  */
@@ -346,7 +345,6 @@ TcpIllinoisTest::GetSsThresh()
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief TCP Illinois TestSuite
  */

src/internet/test/tcp-ledbat-test.cc

@@ -31,7 +31,6 @@ NS_LOG_COMPONENT_DEFINE("TcpLedbatTestSuite");
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief LEDBAT should be same as NewReno during slow start, and when timestamps are disabled
  */
@@ -132,7 +131,6 @@ TcpLedbatToNewReno::ExecuteTest()
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief Test to validate cWnd increment in LEDBAT
  */
@@ -234,7 +232,6 @@ TcpLedbatIncrementTest::ExecuteTest()
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief Test to validate cWnd decrement in LEDBAT
  */
@@ -339,7 +336,6 @@ TcpLedbatDecrementTest::ExecuteTest()
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief TCP Ledbat TestSuite
  */

src/internet/test/tcp-linux-reno-test.cc

@@ -31,7 +31,6 @@ NS_LOG_COMPONENT_DEFINE("TcpLinuxRenoTest");
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * This unit test checks that the slow start and congestion avoidance
  * behavior matches Linux behavior as follows:
@@ -195,7 +194,6 @@ TcpLinuxRenoSSTest::DoTeardown()
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * This unit test checks that the slow start and congestion avoidance
  * behavior matches Linux behavior as follows:
@@ -372,7 +370,6 @@ TcpLinuxRenoCongAvoidTest::DoTeardown()
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief TestSuite for the behavior of Linux Reno
  */

src/internet/test/tcp-loss-test.cc

@@ -28,7 +28,6 @@ NS_LOG_COMPONENT_DEFINE("TcpLossTestSuite");
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief Check rollover of sequence number and how that affects loss recovery
  *
@@ -176,7 +175,6 @@ TcpLargeTransferLossTest::FinalChecks()
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * Test various packet losses
  */

src/internet/test/tcp-lp-test.cc

@@ -33,7 +33,6 @@ NS_LOG_COMPONENT_DEFINE("TcpLpTestSuite");
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief Testing the behaviour common to New Reno
  */
@@ -114,7 +113,6 @@ TcpLpToNewReno::DoRun()
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief Testing TcpLp when cwd exceeds threshold
  */
@@ -184,7 +182,6 @@ TcpLpInferenceTest1::DoRun()
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief Testing TcpLp when it is inference phase
  */
@@ -258,7 +255,6 @@ TcpLpInferenceTest2::DoRun()
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * Test the behaviour common to New Reno
  */

src/internet/test/tcp-option-test.cc

@@ -28,7 +28,6 @@ using namespace ns3;
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief TCP Window Scaling option Test
  */
@@ -107,7 +106,6 @@ TcpOptionWSTestCase::DoTeardown()
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief TCP TimeStamp option Test
  */
@@ -198,7 +196,6 @@ TcpOptionTSTestCase::DoTeardown()
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief TCP options TestSuite
  */

src/internet/test/tcp-pacing-test.cc

@@ -30,7 +30,6 @@ NS_LOG_COMPONENT_DEFINE("TcpPacingTestSuite");
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief Test the behavior of TCP pacing
  *
@@ -373,7 +372,6 @@ TcpPacingTest::NormalClose(SocketWho who)
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief TestSuite for the behavior of TCP pacing
  */

src/internet/test/tcp-pkts-acked-test.cc

@@ -30,7 +30,6 @@ class DummyCongControl;
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief Check the number of times that PktsAcked is called
  *
@@ -76,7 +75,6 @@ class TcpPktsAckedOpenTest : public TcpGeneralTest
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief Behaves as NewReno, except that each time PktsAcked is called,
  * a notification is sent to TcpPktsAckedOpenTest.
@@ -173,7 +171,6 @@ TcpPktsAckedOpenTest::FinalChecks()
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief PktsAcked is calls TestSuite.
  */

src/internet/test/tcp-prr-recovery-test.cc

@@ -145,7 +145,6 @@ PrrRecoveryTest::DoRun()
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief PRR Recovery TestSuite
  */

src/internet/test/tcp-rate-ops-test.cc

@@ -184,7 +184,6 @@ TcpRateLinuxBasicTest::SkbDelivered(TcpTxItem* skb)
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief Behaves as NewReno except HasCongControl returns true
  */
@@ -595,7 +594,6 @@ TcpRateLinuxWithBufferTest::DoTeardown()
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief the TestSuite for the TcpRateLinux test case
  */

src/internet/test/tcp-rto-test.cc

@@ -30,7 +30,6 @@ using namespace ns3;
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief Testing the moments after an RTO expiration
  *
@@ -167,7 +166,6 @@ TcpRtoTest::FinalChecks()
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief Testing the ssthresh behavior after the RTO expires
  *
@@ -314,7 +312,6 @@ TcpSsThreshRtoTest::AfterRTOExpired(const Ptr<const TcpSocketState> tcb, SocketW
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief Testing the timing of RTO
  *
@@ -510,7 +507,6 @@ TcpTimeRtoTest::FinalChecks()
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief TCP RTO TestSuite
  */

src/internet/test/tcp-rtt-estimation.cc

@@ -29,7 +29,6 @@ NS_LOG_COMPONENT_DEFINE("TcpRttEstimationTestSuite");
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief Check Rtt calculations
  *
@@ -192,7 +191,6 @@ TcpRttEstimationTest::FinalChecks()
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief Check Rtt calculations with packet losses.
  *
@@ -246,7 +244,6 @@ TcpRttEstimationWithLossTest::CreateReceiverErrorModel()
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief TCP RTT estimation TestSuite
  */

src/internet/test/tcp-rx-buffer-test.cc

@@ -296,7 +296,6 @@ TcpRxBufferTestCase::DoTeardown()
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief the TestSuite for the TcpRxBuffer test case
  */

src/internet/test/tcp-sack-permitted-test.cc

@@ -29,7 +29,6 @@ NS_LOG_COMPONENT_DEFINE("SackPermittedTestSuite");
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief Test case for checking the SACK-PERMITTED option.
  *

src/internet/test/tcp-scalable-test.cc

@@ -36,7 +36,6 @@ NS_LOG_COMPONENT_DEFINE("TcpScalableTestSuite");
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief Testing the congestion avoidance increment on TcpScalable
  */
@@ -106,7 +105,6 @@ TcpScalableIncrementTest::DoRun()
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief Testing the multiplicative decrease on TcpScalable
  */
@@ -165,7 +163,6 @@ TcpScalableDecrementTest::DoRun()
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief TcpScalable TestSuite.
  */

src/internet/test/tcp-slow-start-test.cc

@@ -30,7 +30,6 @@ NS_LOG_COMPONENT_DEFINE("TcpSlowStartTest");
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief Test the normal behavior for slow start
  *
@@ -208,7 +207,6 @@ TcpSlowStartNormalTest::Rx(const Ptr<const Packet> p, const TcpHeader& h, Socket
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief A slow start test using a socket which sends smaller ACKs
  *
@@ -262,7 +260,6 @@ TcpSlowStartAttackerTest::CreateReceiverSocket(Ptr<Node> node)
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief TCP Slow Start TestSuite.
  */

src/internet/test/tcp-syn-connection-failed-test.cc

@@ -27,7 +27,6 @@ using namespace ns3;
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief Test that connection failed callback is called when
  * SYN retransmission number is exceeded.
@@ -96,7 +95,6 @@ TcpSynConnectionFailedTest::DoRun()
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief TestSuite
  */

src/internet/test/tcp-test.cc

@@ -52,7 +52,6 @@ NS_LOG_COMPONENT_DEFINE("TcpTestSuite");
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief TCP Test - send string data from client to server and back.
  */
@@ -537,7 +536,6 @@ TcpTestCase::AddSimpleNetDevice6(Ptr<Node> node, Ipv6Address ipaddr, Ipv6Prefix
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief TCP TestSuite - send string data from client to server and back.
  */

src/internet/test/tcp-timestamp-test.cc

@@ -29,7 +29,6 @@ NS_LOG_COMPONENT_DEFINE("TimestampTestSuite");
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief TCP TimeStamp enabling Test.
  */
@@ -210,7 +209,6 @@ TimestampTestCase::Rx(const Ptr<const Packet> p, const TcpHeader& h, SocketWho w
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief TCP TimeStamp values Test.
  */
@@ -291,7 +289,6 @@ TimestampValueTestCase::Check()
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief TCP TimeStamp TestSuite.
  */

src/internet/test/tcp-tx-buffer-test.cc

@@ -432,7 +432,6 @@ TcpTxBufferTestCase::DoTeardown()
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief the TestSuite for the TcpTxBuffer test case
  */

src/internet/test/tcp-vegas-test.cc

@@ -202,7 +202,6 @@ TcpVegasTest::GetSsThresh(Ptr<TcpVegas> cong)
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief TCP Vegas TestSuite
  */

src/internet/test/tcp-veno-test.cc

@@ -35,7 +35,6 @@ NS_LOG_COMPONENT_DEFINE("TcpVenoTestSuite");
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief Testing the additive increase and multiplicative decrease of TcpVeno
  */
@@ -300,7 +299,6 @@ TcpVenoTest::NewReno_CongestionAvoidance(Ptr<TcpSocketState> state, uint32_t seg
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief TCP Veno TestSuite
  */

src/internet/test/tcp-wscaling-test.cc

@@ -32,7 +32,6 @@ NS_LOG_COMPONENT_DEFINE("WScalingTestSuite");
 // TODO: Check the buffer size and scaling option value
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief TCP Window Scaling enabling Test.
  */
@@ -226,7 +225,6 @@ WScalingTestCase::Tx(const Ptr<const Packet> p, const TcpHeader& h, SocketWho wh
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief TCP Window Scaling TestSuite.
  */

src/internet/test/tcp-yeah-test.cc

@@ -35,7 +35,6 @@ NS_LOG_COMPONENT_DEFINE("TcpYeahTestSuite");
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief Testing TcpYeah additive increase algorithm.
  */
@@ -216,7 +215,6 @@ TcpYeahIncrementTest::IncreaseWindow(Ptr<TcpYeah> cong)
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief Testing TcpYeah multiplicative decrease algorithm
  */
@@ -359,7 +357,6 @@ TcpYeahDecrementTest::CalculateSsThresh(Ptr<TcpYeah> cong)
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief TCP Yeah TestSuite
  */

src/internet/test/tcp-zero-window-test.cc

@@ -28,7 +28,6 @@ NS_LOG_COMPONENT_DEFINE("TcpZeroWindowTestSuite");
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief Testing the congestion avoidance increment on TCP ZeroWindow
  */
@@ -249,7 +248,6 @@ TcpZeroWindowTest::ProcessedAck(const Ptr<const TcpSocketState> tcb,
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief TCP ZeroWindow TestSuite
  */

src/internet/test/udp-test.cc

@@ -57,7 +57,6 @@ using namespace ns3;
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief UDP Socket Loopback over IPv4 Test
  */
@@ -115,7 +114,6 @@ UdpSocketLoopbackTest::DoRun()
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief UDP Socket Loopback over IPv6 Test
  */
@@ -172,7 +170,6 @@ Udp6SocketLoopbackTest::DoRun()
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief UDP Socket over IPv4 Test
  */
@@ -524,7 +521,6 @@ UdpSocketImplTest::DoRun()
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief UDP Socket over IPv6 Test
  */
@@ -768,7 +764,6 @@ Udp6SocketImplTest::DoRun()
 
 /**
  * \ingroup internet-test
- * \ingroup tests
  *
  * \brief UDP TestSuite
  */

src/lte/model/epc-s11-sap.h

@@ -271,11 +271,6 @@ class MemberEpcS11SapMme : public EpcS11SapMme
     C* m_owner; ///< owner class
 };
 
-/**
- * Constructor
- *
- * \param owner the owner class
- */
 template <class C>
 MemberEpcS11SapMme<C>::MemberEpcS11SapMme(C* owner)
     : m_owner(owner)
@@ -331,11 +326,6 @@ class MemberEpcS11SapSgw : public EpcS11SapSgw
     C* m_owner; ///< owner class
 };
 
-/**
- * Constructor
- *
- * \param owner the owner class
- */
 template <class C>
 MemberEpcS11SapSgw<C>::MemberEpcS11SapSgw(C* owner)
     : m_owner(owner)

src/lte/test/epc-test-gtpu.h

@@ -27,12 +27,12 @@ using namespace ns3;
 
 /**
  * \ingroup lte
+ * \ingroup tests
  * \defgroup lte-test lte module tests
  */
 
 /**
  * \ingroup lte-test
- * \ingroup tests
  *
  * \brief Test suite for testing GPRS tunnelling protocol header coding and decoding.
  */

src/lte/test/epc-test-s1u-downlink.cc

@@ -45,7 +45,6 @@ NS_LOG_COMPONENT_DEFINE("EpcTestS1uDownlink");
 
 /**
  * \ingroup lte-test
- * \ingroup tests
  *
  * \brief Custom structure for testing UE downlink data
  */
@@ -74,7 +73,6 @@ UeDlTestData::UeDlTestData(uint32_t n, uint32_t s)
 
 /**
  * \ingroup lte-test
- * \ingroup tests
  *
  * \brief Custom structure for testing eNodeB downlink data, contains
  * the list of data structures for UEs
@@ -86,7 +84,6 @@ struct EnbDlTestData
 
 /**
  * \ingroup lte-test
- * \ingroup tests
  *
  * \brief EpcS1uDlTestCase class
  */

src/lte/test/epc-test-s1u-uplink.cc

@@ -52,7 +52,6 @@ NS_LOG_COMPONENT_DEFINE("EpcTestS1uUplink");
 
 /**
  * \ingroup lte-test
- * \ingroup tests
  *
  * A Udp client. Sends UDP packet carrying sequence number and time
  * stamp but also including the EpsBearerTag. This tag is normally
@@ -250,7 +249,6 @@ EpsBearerTagUdpClient::Send()
 
 /**
  * \ingroup lte-test
- * \ingroup tests
  *
  * \brief Custom test structure to hold information of data transmitted in the uplink per UE
  */
@@ -285,7 +283,6 @@ UeUlTestData::UeUlTestData(uint32_t n, uint32_t s, uint16_t r, uint8_t l)
 
 /**
  * \ingroup lte-test
- * \ingroup tests
  *
  * \brief Custom structure containing information about data sent in the uplink
  * of eNodeB. Includes the information of the data sent in the uplink per UE.
@@ -297,7 +294,6 @@ struct EnbUlTestData
 
 /**
  * \ingroup lte-test
- * \ingroup tests
  *
  * \brief EpcS1uUlTestCase class
  */

src/lte/test/lte-ffr-simple.h

@@ -34,7 +34,6 @@ namespace ns3
 
 /**
  * \ingroup lte-test
- * \ingroup tests
  *
  * \brief Simple Frequency Reuse algorithm implementation which uses only 1 sub-band.
  *                Used to test Downlink Power Allocation. When Simple FR receives UE measurements