Attachment #1045 for bug #1039

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




}

NscTcpSocketImpl::NscTcpSocketImpl ()
  : m_nagle (false),
    m_endPoint (0),
    m_node (0),
    m_tcp (0),
    m_localAddress (Ipv4Address::GetZero ()),

  : TcpSocket(sock), //copy the base class callbacks
    m_delAckMaxCount (sock.m_delAckMaxCount),
    m_delAckTimeout (sock.m_delAckTimeout),
    m_nagle (sock.m_nagle),
    m_endPoint (0),
    m_node (sock.m_node),
    m_tcp (sock.m_tcp),

  return m_delAckMaxCount;
}

void
NscTcpSocketImpl::SetNagle (bool enable)
{
  m_nagle = enable;
}

bool
NscTcpSocketImpl::GetNagle (void) const
{
  return m_nagle;
}

void 
NscTcpSocketImpl::SetPersistTimeout (Time timeout)
{

(-)a/src/internet/model/nsc-tcp-socket-impl.h (+3 lines)

Lines 124-129	Link Here

124

  virtual void SetDelAckTimeout (Time timeout);

124

  virtual void SetDelAckTimeout (Time timeout);

125

  virtual Time GetDelAckTimeout (void) const;

125

  virtual Time GetDelAckTimeout (void) const;

126

  virtual void SetDelAckMaxCount (uint32_t count);

126

  virtual void SetDelAckMaxCount (uint32_t count);

127

  virtual bool GetNagle (void) const;

128

  virtual void SetNagle (bool enable);

127

  virtual uint32_t GetDelAckMaxCount (void) const;

129

  virtual uint32_t GetDelAckMaxCount (void) const;

128

  virtual void SetPersistTimeout (Time timeout);

130

  virtual void SetPersistTimeout (Time timeout);

129

  virtual Time GetPersistTimeout (void) const;

131

  virtual Time GetPersistTimeout (void) const;

Lines 131-136	Link Here

131

  enum Socket::SocketErrno GetNativeNs3Errno(int err) const;

133

  enum Socket::SocketErrno GetNativeNs3Errno(int err) const;

132

  uint32_t m_delAckMaxCount;

134

  uint32_t m_delAckMaxCount;

133

  Time m_delAckTimeout;

135

  Time m_delAckTimeout;

136

  bool m_nagle;

134

137

135

  Ipv4EndPoint *m_endPoint;

138

  Ipv4EndPoint *m_endPoint;

136

  Ptr<Node> m_node;

139

  Ptr<Node> m_node;

(-)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 ())




TcpSocketBase::TcpSocketBase (void)
  : m_dupAckCount (0),
    m_delAckCount (0),
    m_nagle (true),
    m_endPoint (0),
    m_node (0),
    m_tcp (0),

    m_dupAckCount (sock.m_dupAckCount),
    m_delAckCount (0),
    m_delAckMaxCount (sock.m_delAckMaxCount),
    m_nagle (sock.m_nagle),
    m_cnCount (sock.m_cnCount),
    m_delAckTimeout (sock.m_delAckTimeout),
    m_persistTimeout (sock.m_persistTimeout),

        {
          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" <<

}

void
TcpSocketBase::SetNagle (bool enable)
{
  m_nagle = enable;
}

bool
TcpSocketBase::GetNagle (void) const
{
  return m_nagle;
}

void
TcpSocketBase::SetPersistTimeout (Time timeout)
{
  m_persistTimeout = timeout;

(-)a/src/internet/model/tcp-socket-base.h (+3 lines)

Lines 115-120	Link Here

115

  virtual Time     GetDelAckTimeout (void) const;

115

  virtual Time     GetDelAckTimeout (void) const;

116

  virtual void     SetDelAckMaxCount (uint32_t count);

116

  virtual void     SetDelAckMaxCount (uint32_t count);

117

  virtual uint32_t GetDelAckMaxCount (void) const;

117

  virtual uint32_t GetDelAckMaxCount (void) const;

118

  virtual void     SetNagle (bool enable);

119

  virtual bool     GetNagle (void) const;

118

  virtual void     SetPersistTimeout (Time timeout);

120

  virtual void     SetPersistTimeout (Time timeout);

119

  virtual Time     GetPersistTimeout (void) const;

121

  virtual Time     GetPersistTimeout (void) const;

120

  virtual bool     SetAllowBroadcast (bool allowBroadcast);

122

  virtual bool     SetAllowBroadcast (bool allowBroadcast);

Lines 182-187	Link Here

182

  uint32_t          m_dupAckCount;     //< Dupack counter

184

  uint32_t          m_dupAckCount;     //< Dupack counter

183

  uint32_t          m_delAckCount;     //< Delayed ACK counter

185

  uint32_t          m_delAckCount;     //< Delayed ACK counter

184

  uint32_t          m_delAckMaxCount;  //< Number of packet to fire an ACK before delay timeout

186

  uint32_t          m_delAckMaxCount;  //< Number of packet to fire an ACK before delay timeout

187

  bool              m_nagle;           //< Enable or disable Nagle's algorithm

185

  uint32_t          m_cnCount;         //< Count of remaining connection retries

188

  uint32_t          m_cnCount;         //< Count of remaining connection retries

186

  TracedValue<Time> m_rto;             //< Retransmit timeout

189

  TracedValue<Time> m_rto;             //< Retransmit timeout

187

  TracedValue<Time> m_lastRtt;         //< Last RTT sample collected

190

  TracedValue<Time> m_lastRtt;         //< Last RTT sample collected

(-)a/src/internet/model/tcp-socket.cc (+6 lines)

Lines 22-27	Link Here

#include "ns3/log.h"

#include "ns3/log.h"

#include "ns3/uinteger.h"

#include "ns3/uinteger.h"

#include "ns3/double.h"

#include "ns3/double.h"

#include "ns3/boolean.h"

#include "ns3/trace-source-accessor.h"

#include "ns3/trace-source-accessor.h"

#include "ns3/nstime.h"

#include "ns3/nstime.h"

#include "tcp-socket.h"

#include "tcp-socket.h"

Lines 93-98	Link Here

                   MakeUintegerAccessor (&TcpSocket::GetDelAckMaxCount,

                   MakeUintegerAccessor (&TcpSocket::GetDelAckMaxCount,

                                         &TcpSocket::SetDelAckMaxCount),

                                         &TcpSocket::SetDelAckMaxCount),

                   MakeUintegerChecker<uint32_t> ())

                   MakeUintegerChecker<uint32_t> ())

    .AddAttribute ("Nagle", "Whether or not Nagle's algorithm is enabled",

                   BooleanValue (true),

                   MakeBooleanAccessor (&TcpSocket::SetNagle,

100

                                        &TcpSocket::GetNagle),

101

                   MakeBooleanChecker ())

    .AddAttribute ("PersistTimeout",

102

    .AddAttribute ("PersistTimeout",

                   "Persist timeout to probe for rx window",

103

                   "Persist timeout to probe for rx window",

                   TimeValue (Seconds (6)),

104

                   TimeValue (Seconds (6)),

(-)a/src/internet/model/tcp-socket.h (+2 lines)

Lines 89-94	Link Here

  virtual Time GetDelAckTimeout (void) const = 0;

  virtual Time GetDelAckTimeout (void) const = 0;

  virtual void SetDelAckMaxCount (uint32_t count) = 0;

  virtual void SetDelAckMaxCount (uint32_t count) = 0;

  virtual uint32_t GetDelAckMaxCount (void) const = 0;

  virtual uint32_t GetDelAckMaxCount (void) const = 0;

  virtual void SetNagle (bool enable) = 0;

  virtual bool GetNagle (void) const = 0;

  virtual void SetPersistTimeout (Time timeout) = 0;

  virtual void SetPersistTimeout (Time timeout) = 0;

  virtual Time GetPersistTimeout (void) const = 0;

  virtual Time GetPersistTimeout (void) const = 0;

Return to bug 1039