From 6012bba067da2f23991ff22d161c45efb5703dc0 Mon Sep 17 00:00:00 2001 From: Tommaso Pecorella Date: Tue, 24 Oct 2017 02:29:22 +0200 Subject: [PATCH] doxy: suppress internet module warnings --- src/internet/model/global-router-interface.cc | 7 ++++--- src/internet/test/tcp-rto-test.cc | 8 +++++--- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/internet/model/global-router-interface.cc b/src/internet/model/global-router-interface.cc index b34bac161..f93a301a4 100644 --- a/src/internet/model/global-router-interface.cc +++ b/src/internet/model/global-router-interface.cc @@ -838,7 +838,8 @@ GlobalRouter::ProcessSingleBroadcastLink (Ptr nd, GlobalRoutingLSA *p // case. // ClearBridgesVisited (); - Ipv4Address desigRtr = FindDesignatedRouterForLink (nd); + Ipv4Address desigRtr; + desigRtr = FindDesignatedRouterForLink (nd); // // Let's double-check that any designated router we find out on our @@ -848,10 +849,10 @@ GlobalRouter::ProcessSingleBroadcastLink (Ptr nd, GlobalRoutingLSA *p { Ipv4Address networkHere = addrLocal.CombineMask (maskLocal); Ipv4Address networkThere = desigRtr.CombineMask (maskLocal); - NS_ABORT_MSG_UNLESS (networkHere == networkThere, + NS_ABORT_MSG_UNLESS (networkHere == networkThere, "GlobalRouter::ProcessSingleBroadcastLink(): Network number confusion"); } - if (desigRtr == addrLocal) + if (desigRtr == addrLocal) { c.Add (nd); NS_LOG_LOGIC ("Node " << node->GetId () << " elected a designated router"); diff --git a/src/internet/test/tcp-rto-test.cc b/src/internet/test/tcp-rto-test.cc index 700c0e88b..93012e6d1 100644 --- a/src/internet/test/tcp-rto-test.cc +++ b/src/internet/test/tcp-rto-test.cc @@ -184,6 +184,8 @@ public: /** * \brief Constructor. * \param congControl Congestion control type. + * \param seqToDrop sequence number to drop + * \param minRto minimum RTO * \param msg Test description. */ TcpSsThreshRtoTest (TypeId &congControl, uint32_t seqToDrop, Time minRto, const std::string &msg); @@ -210,9 +212,9 @@ protected: private: uint32_t m_bytesInFlight; //!< Store the number of bytes in flight uint32_t m_bytesInFlightBeforeRto; //!< Store the number of bytes in flight before the RTO expiration - uint32_t m_ssThreshSocket; //