Attachment #1043 for bug #1039

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

(-)a/src/aodv/test/bug-772.cc (-1 / +1 lines)

Lines 46-52	Link Here

#include <sstream>

#include <sstream>

/// Set to true to rewrite reference traces, leave false to run regression tests

/// Set to true to rewrite reference traces, leave false to run regression tests

const bool WRITE_VECTORS = false;

const bool WRITE_VECTORS = true;

namespace ns3 {

namespace ns3 {

namespace aodv {

namespace aodv {

(-)a/src/internet/model/rtt-estimator.cc (-1 / +1 lines)

Lines 53-59	Link Here

                   MakeTimeChecker ())

                   MakeTimeChecker ())

    .AddAttribute ("MinRTO",

    .AddAttribute ("MinRTO",

                   "Minimum retransmit timeout value",

                   "Minimum retransmit timeout value",

                   TimeValue (Seconds (0.2)),

                   TimeValue (Seconds (1)),

                   MakeTimeAccessor (&RttEstimator::minrto),

                   MakeTimeAccessor (&RttEstimator::minrto),

                   MakeTimeChecker ())

                   MakeTimeChecker ())




        {
          break; // No more
        }

      // Nagle's algorithm. Hold off sending if there is unacked data in the 
      // buffer and the amount of data to send is less than a segment size
      if (UnAckDataCount () > 0 && 
          m_txBuffer.SizeFromSequence (m_nextTxSequence) < m_segmentSize)
        {
          NS_LOG_LOGIC ("Invoking Nagle's algorithm. Wait to send.");
          break;
        }

      uint32_t s = std::min (w, m_segmentSize);  // Send no more than window
      Ptr<Packet> p = m_txBuffer.CopyFromSequence (s, m_nextTxSequence);
      NS_LOG_LOGIC ("TcpSocketBase " << this << " SendPendingData" <<

Return to bug 1039