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 
46
#include <sstream>
46
#include <sstream>
47
47
48
/// Set to true to rewrite reference traces, leave false to run regression tests
48
/// Set to true to rewrite reference traces, leave false to run regression tests
49
const bool WRITE_VECTORS = false;
49
const bool WRITE_VECTORS = true;
50
50
51
namespace ns3 {
51
namespace ns3 {
52
namespace aodv {
52
namespace aodv {
(-)a/src/internet/model/rtt-estimator.cc (-1 / +1 lines)
 Lines 53-59    Link Here 
53
                   MakeTimeChecker ())
53
                   MakeTimeChecker ())
54
    .AddAttribute ("MinRTO", 
54
    .AddAttribute ("MinRTO", 
55
                   "Minimum retransmit timeout value",
55
                   "Minimum retransmit timeout value",
56
                   TimeValue (Seconds (0.2)),
56
                   TimeValue (Seconds (1)),
57
                   MakeTimeAccessor (&RttEstimator::minrto),
57
                   MakeTimeAccessor (&RttEstimator::minrto),
58
                   MakeTimeChecker ())
58
                   MakeTimeChecker ())
59
    ;
59
    ;
(-)a/src/internet/model/tcp-socket-base.cc (+10 lines)
 Lines 1296-1301    Link Here 
1296
        {
1296
        {
1297
          break; // No more
1297
          break; // No more
1298
        }
1298
        }
1299
1300
      // Nagle's algorithm. Hold off sending if there is unacked data in the 
1301
      // buffer and the amount of data to send is less than a segment size
1302
      if (UnAckDataCount () > 0 && 
1303
          m_txBuffer.SizeFromSequence (m_nextTxSequence) < m_segmentSize)
1304
        {
1305
          NS_LOG_LOGIC ("Invoking Nagle's algorithm. Wait to send.");
1306
          break;
1307
        }
1308
1299
      uint32_t s = std::min (w, m_segmentSize);  // Send no more than window
1309
      uint32_t s = std::min (w, m_segmentSize);  // Send no more than window
1300
      Ptr<Packet> p = m_txBuffer.CopyFromSequence (s, m_nextTxSequence);
1310
      Ptr<Packet> p = m_txBuffer.CopyFromSequence (s, m_nextTxSequence);
1301
      NS_LOG_LOGIC ("TcpSocketBase " << this << " SendPendingData" <<
1311
      NS_LOG_LOGIC ("TcpSocketBase " << this << " SendPendingData" <<

Return to bug 1039