Attachment #2107 for bug #2150

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




    m_initialSsThresh (sock.m_initialSsThresh),
    m_lastMeasuredRtt (Seconds (0.0)),
    m_cnTimeout (sock.m_cnTimeout),
    m_synRetries (sock.m_synRetries),
    m_rxAvailable (0),
    m_nscTcpSocket (0),
    m_sndBufSize (sock.m_sndBufSize)

}

void 
NscTcpSocketImpl::SetSynRetries (uint32_t count)
{
  m_synRetries = count;
}

uint32_t 
NscTcpSocketImpl::GetSynRetries (void) const
{
  return m_synRetries;
}

void 

  m_delAckTimeout = timeout;
}

void
NscTcpSocketImpl::SetDataRetries (uint32_t retries)
{
  NS_LOG_FUNCTION (this << retries);
  m_dataRetries = retries;
}

uint32_t
NscTcpSocketImpl::GetDataRetries (void) const
{
  NS_LOG_FUNCTION (this);
  return m_dataRetries;
}

Time
NscTcpSocketImpl::GetDelAckTimeout (void) const
{

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

Lines 193-200 private:	Link Here

193

  virtual uint32_t GetInitialCwnd (void) const;

193

  virtual uint32_t GetInitialCwnd (void) const;

194

  virtual void SetConnTimeout (Time timeout);

194

  virtual void SetConnTimeout (Time timeout);

195

  virtual Time GetConnTimeout (void) const;

195

  virtual Time GetConnTimeout (void) const;

196

  virtual void SetConnCount (uint32_t count);

196

  virtual uint32_t GetSynRetries (void) const;

197

  virtual uint32_t GetConnCount (void) const;

197

  virtual void SetSynRetries (uint32_t count);

198

  virtual void SetDataRetries (uint32_t retries);

199

  virtual uint32_t GetDataRetries (void) const;

198

  virtual void SetDelAckTimeout (Time timeout);

200

  virtual void SetDelAckTimeout (Time timeout);

199

  virtual Time GetDelAckTimeout (void) const;

201

  virtual Time GetDelAckTimeout (void) const;

200

  virtual void SetDelAckMaxCount (uint32_t count);

202

  virtual void SetDelAckMaxCount (uint32_t count);

Lines 250-256 private:	Link Here

250

252

251

  // Timer-related members

253

  // Timer-related members

252

  Time              m_cnTimeout;       //!< Timeout for connection retry

254

  Time              m_cnTimeout;       //!< Timeout for connection retry

253

  uint32_t          m_cnCount;         //!< Count of remaining connection retries

255

  uint32_t          m_synRetries;      //!< Count of remaining connection retries

256

  uint32_t          m_dataRetries;     //!< Count of remaining data retransmission attempts

254

  Time              m_persistTimeout;  //!< Time between sending 1-byte probes

257

  Time              m_persistTimeout;  //!< Time between sending 1-byte probes

255

258

256

  // Temporary queue for delivering data to application

259

  // Temporary queue for delivering data to application




    m_delAckCount (0),
    m_delAckMaxCount (sock.m_delAckMaxCount),
    m_noDelay (sock.m_noDelay),
    m_synRetries (sock.m_synRetries),
    m_delAckTimeout (sock.m_delAckTimeout),
    m_persistTimeout (sock.m_persistTimeout),
    m_cnTimeout (sock.m_cnTimeout),


  // Re-initialize parameters in case this socket is being reused after CLOSE
  m_rtt->Reset ();
  m_synCount = m_synRetries;
  m_dataRetrCount = m_dataRetries;

  // DoConnect() will do state-checking and send a SYN packet
  return DoConnect ();

    { // Received SYN, move to SYN_RCVD state and respond with SYN+ACK
      NS_LOG_DEBUG ("SYN_SENT -> SYN_RCVD");
      m_state = SYN_RCVD;
      m_synCount = m_synRetries;
      m_dataRetrCount = m_dataRetries;
      m_rxBuffer->SetNextRxSequence (tcpHeader.GetSequenceNumber () + SequenceNumber32 (1));
      SendEmptyPacket (TcpHeader::SYN | TcpHeader::ACK);
    }

  bool isAck = flags == TcpHeader::ACK;
  if (hasSyn)
    {
      if (m_synCount == 0)
        { // No more connection retries, give up
          NS_LOG_LOGIC ("Connection failed.");
          m_rtt->Reset (); //According to recommendation -> RFC 6298

        }
      else
        { // Exponential backoff of connection time out
          int backoffCount = 0x1 << (m_synRetries - m_synCount);
          m_rto = m_cnTimeout * backoffCount;
          m_synCount--;
        }
    }
  if (m_endPoint != 0)

  // Change the cloned socket from LISTEN state to SYN_RCVD
  NS_LOG_DEBUG ("LISTEN -> SYN_RCVD");
  m_state = SYN_RCVD;
  m_synCount = m_synRetries;
  m_dataRetrCount = m_dataRetries;
  SetupCallback ();
  // Set the sequence number and send SYN+ACK
  m_rxBuffer->SetNextRxSequence (h.GetSequenceNumber () + SequenceNumber32 (1));

  // Retransmit SYN packet
  if (m_state == SYN_SENT)
    {
      if (m_synCount > 0)
        {
          SendEmptyPacket (TcpHeader::SYN);
        }

        }
      return;
    }

  if (m_dataRetrCount == 0)
    {
      NotifyErrorClose ();
      DeallocateEndPoint ();
      return;
    }
  else
    {
      --m_dataRetrCount;
    }

  // Retransmit non-data packet: Only if in FIN_WAIT_1 or CLOSING state
  if (m_txBuffer->Size () == 0)
    {

}

void
TcpSocketBase::SetSynRetries (uint32_t count)
{
  NS_LOG_FUNCTION (this << count);
  m_synRetries = count;
}

uint32_t
TcpSocketBase::GetSynRetries (void) const
{
  return m_synRetries;
}

void
TcpSocketBase::SetDataRetries (uint32_t retries)
{
  NS_LOG_FUNCTION (this << retries);
  m_dataRetries = retries;
}

uint32_t
TcpSocketBase::GetDataRetries (void) const
{
  NS_LOG_FUNCTION (this);
  return m_dataRetries;
}

void

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

Lines 430-437 protected:	Link Here

430

  virtual uint32_t GetInitialCwnd (void) const;

430

  virtual uint32_t GetInitialCwnd (void) const;

431

  virtual void     SetConnTimeout (Time timeout);

431

  virtual void     SetConnTimeout (Time timeout);

432

  virtual Time     GetConnTimeout (void) const;

432

  virtual Time     GetConnTimeout (void) const;

433

  virtual void     SetConnCount (uint32_t count);

433

  virtual void     SetSynRetries (uint32_t count);

434

  virtual uint32_t GetConnCount (void) const;

434

  virtual uint32_t GetSynRetries (void) const;

435

  virtual void     SetDataRetries (uint32_t retries);

436

  virtual uint32_t GetDataRetries (void) const;

435

  virtual void     SetDelAckTimeout (Time timeout);

437

  virtual void     SetDelAckTimeout (Time timeout);

436

  virtual Time     GetDelAckTimeout (void) const;

438

  virtual Time     GetDelAckTimeout (void) const;

437

  virtual void     SetDelAckMaxCount (uint32_t count);

439

  virtual void     SetDelAckMaxCount (uint32_t count);

Lines 934-941 protected:	Link Here

934

  uint32_t          m_delAckCount;     //!< Delayed ACK counter

936

  uint32_t          m_delAckCount;     //!< Delayed ACK counter

935

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

937

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

936

  bool              m_noDelay;         //!< Set to true to disable Nagle's algorithm

938

  bool              m_noDelay;         //!< Set to true to disable Nagle's algorithm

937

  uint32_t          m_cnCount;         //!< Count of remaining connection retries

939

  uint32_t          m_synCount;        //!< Count of remaining connection retries

938

  uint32_t          m_cnRetries;       //!< Number of connection retries before giving up

940

  uint32_t          m_synRetries;      //!< Number of connection attempts

941

  uint32_t          m_dataRetrCount;   //!< Count of remaining data retransmission attempts

942

  uint32_t          m_dataRetries;     //!< Number of data retransmission attempts

939

  TracedValue<Time> m_rto;             //!< Retransmit timeout

943

  TracedValue<Time> m_rto;             //!< Retransmit timeout

940

  Time              m_minRto;          //!< minimum value of the Retransmit timeout

944

  Time              m_minRto;          //!< minimum value of the Retransmit timeout

941

  Time              m_clockGranularity; //!< Clock Granularity used in RTO calcs

945

  Time              m_clockGranularity; //!< Clock Granularity used in RTO calcs




                                     &TcpSocket::SetConnTimeout),
                   MakeTimeChecker ())
    .AddAttribute ("ConnCount",
                   "Number of connection attempts (SYN retransmissions) before "
                   "returning failure",
                   UintegerValue (6),
                   MakeUintegerAccessor (&TcpSocket::GetSynRetries,
                                         &TcpSocket::SetSynRetries),
                   MakeUintegerChecker<uint32_t> ())
    .AddAttribute ("DataRetries",
                   "Number of data retransmission attempts",
                   UintegerValue (6),
                   MakeUintegerAccessor (&TcpSocket::GetDataRetries,
                                         &TcpSocket::SetDataRetries),
                   MakeUintegerChecker<uint32_t> ())
    .AddAttribute ("DelAckTimeout",
                   "Timeout value for TCP delayed acks, in seconds",




   * \brief Set the number of connection retries before giving up.
   * \param count the number of connection retries
   */
  virtual void SetSynRetries (uint32_t count) = 0;

  /**
   * \brief Get the number of connection retries before giving up.
   * \returns the number of connection retries
   */
  virtual uint32_t GetSynRetries (void) const = 0;

  /**
   * \brief Set the number of data transmission retries before giving up.
   * \param count the number of data transmission retries
   */
  virtual void SetDataRetries (uint32_t retries) = 0;

  /**
   * \brief Get the number of data transmission retries before giving up.
   * \returns the number of data transmission retries
   */
  virtual uint32_t GetDataRetries (void) const = 0;

  /**
   * \brief Set the time to delay an ACK.

Return to bug 2150