Attachment #111 for bug #129

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

(-)a/src/internet-node/tcp-header.cc (-1 / +1 lines)

Lines 44-50 TcpHeader::TcpHeader ()	Link Here

    m_ackNumber (0),

    m_ackNumber (0),

    m_length (5),

    m_length (5),

    m_flags (0),

    m_flags (0),

    m_windowSize (Tcp::defaultAdvWin.GetValue ()),

    m_windowSize (0),

    m_checksum (0),

    m_checksum (0),

    m_urgentPointer (0)

    m_urgentPointer (0)




#include "ns3/log.h"
#include "ns3/ipv4.h"
#include "tcp-socket.h"
#include "tcp-impl.h"
#include "tcp-l4-protocol.h"
#include "ipv4-end-point.h"
#include "ipv4-l4-demux.h"

    m_lastRxAck (0),
    m_nextRxSequence (0),
    m_pendingData (0),
    m_segmentSize (0),
    m_rxWindowSize (0),
    m_advertisedWindowSize (0),
    m_cWnd (0),
    m_ssThresh (0),
    m_initialCWnd (0),
    m_rtt (RttEstimator::CreateDefault()),
    m_lastMeasuredRtt (Seconds(0.0)),
    m_cnTimeout (Seconds (0.0)),
    m_cnCount (0)
{
  NS_LOG_FUNCTION;
  NS_LOG_PARAMS (this<<node<<tcp);
  // Set default values from Tcp socket factory
  Ptr<TcpImpl> tcpimpl = node->GetObject<TcpImpl> ();
  m_segmentSize = tcpimpl->GetDefaultSegSize ();
  m_rxWindowSize = tcpimpl->GetDefaultAdvWin ();
  m_advertisedWindowSize = tcpimpl->GetDefaultAdvWin ();
  m_cWnd = tcpimpl->GetDefaultInitialCWnd () * m_segmentSize;
  m_ssThresh = tcpimpl->GetDefaultSSThresh ();
  m_initialCWnd = tcpimpl->GetDefaultInitialCWnd ();
  m_cnTimeout = Seconds (tcpimpl->GetDefaultConnTimeout ());
  m_cnCount = tcpimpl->GetDefaultConnCount ();
}

TcpSocket::~TcpSocket ()





namespace ns3 {

static NumericDefaultValue<uint32_t>       g_defaultSegSize
("TcpDefaultSegmentSize",
"Default TCP maximum segment size in bytes (may be adjusted based on MTU discovery)",
536);

static NumericDefaultValue<uint32_t>       g_defaultAdvWin
("TcpDefaultAdvertisedWindowSize",
"Default TCP advertised window size (bytes)",
0xffff);

static NumericDefaultValue<uint32_t>       g_defaultSSThresh
("TcpDefaultSlowStartThreshold",
"Default TCP slow start threshold (bytes)",
0xffff);

static NumericDefaultValue<uint32_t>       g_defaultTxBuffer
("TcpDefaultTxBufferSize",
"Default TCP maximum transmit buffer size (bytes)",
0xffffffffl);

static NumericDefaultValue<uint32_t>       g_defaultRxBuffer
("TcpDefaultRxBufferSize",
"Default TCP maximum receive buffer size (bytes)",
0xffffffffl);

static NumericDefaultValue<uint32_t>       g_defaultInitialCWnd
("TcpDefaultInitialCongestionWindowSize",
"Default TCP initial congestion window size (segments)",
1);

static NumericDefaultValue<uint32_t>       g_defaultConnTimeout
("TcpDefaultConnTimeout",
"Default TCP retransmission timeout when opening connection (seconds)",
6);

static NumericDefaultValue<uint32_t>       g_defaultConnCount
("TcpDefaultConnCount",
"Default number of connection attempts (SYN retransmissions) before returning failure",
3);

  return tid;
}

Tcp::Tcp (void) : 
  m_defaultSegSize (g_defaultSegSize.GetValue ()),
  m_defaultAdvWin (g_defaultAdvWin.GetValue ()),
  m_defaultSSThresh (g_defaultSSThresh.GetValue ()),
  m_defaultTxBuffer (g_defaultTxBuffer.GetValue ()), 
  m_defaultRxBuffer (g_defaultRxBuffer.GetValue()), 
  m_defaultInitialCWnd (g_defaultInitialCWnd.GetValue()),
  m_defaultConnTimeout (g_defaultConnTimeout.GetValue()),  
  m_defaultConnCount (g_defaultConnCount.GetValue())  
{}
    
void 
Tcp::SetDefaultSegSize (uint32_t segSize)
{
  m_defaultSegSize = segSize;
}
uint32_t 
Tcp::GetDefaultSegSize (void)
{
  return m_defaultSegSize;
}
void 
Tcp::SetDefaultAdvWin (uint32_t advWin)
{
  m_defaultAdvWin = advWin;
}
uint32_t 
Tcp::GetDefaultAdvWin (void)
{
  return m_defaultAdvWin;
}
void 
Tcp::SetDefaultSSThresh (uint32_t ssThresh)
{
  m_defaultSSThresh = ssThresh;
}
uint32_t 
Tcp::GetDefaultSSThresh (void)
{
  return m_defaultSSThresh;
}
void 
Tcp::SetDefaultTxBuffer (uint32_t txBuffer)
{
  m_defaultTxBuffer = txBuffer;
}
uint32_t 
Tcp::GetDefaultTxBuffer (void)
{
  return m_defaultTxBuffer;
}
void 
Tcp::SetDefaultRxBuffer (uint32_t rxBuffer)
{
  m_defaultRxBuffer = rxBuffer;
}
uint32_t 
Tcp::GetDefaultRxBuffer (void)
{
  return m_defaultRxBuffer;
}
void 
Tcp::SetDefaultInitialCWnd (uint32_t initialCWnd)
{
  m_defaultInitialCWnd = initialCWnd;
}
uint32_t 
Tcp::GetDefaultInitialCWnd (void)
{
  return m_defaultInitialCWnd;
}
void 
Tcp::SetDefaultConnTimeout (uint32_t connTimeout)
{
  m_defaultConnTimeout = connTimeout;
}
uint32_t 
Tcp::GetDefaultConnTimeout (void)
{
  return m_defaultConnTimeout;
}
void 
Tcp::SetDefaultConnCount (uint32_t connCount)
{
  m_defaultConnCount = connCount;
}
uint32_t 
Tcp::GetDefaultConnCount (void)
{
  return m_defaultConnCount;
}

} // namespace ns3




public:
  static TypeId GetTypeId (void);

  Tcp (void);

  virtual Ptr<Socket> CreateSocket (void) = 0;

public:
  // Default values for TCP sockets
  void SetDefaultSegSize (uint32_t segSize);
  uint32_t GetDefaultSegSize (void);
  void SetDefaultAdvWin (uint32_t advWin);
  uint32_t GetDefaultAdvWin (void);
  void SetDefaultSSThresh (uint32_t ssThresh);
  uint32_t GetDefaultSSThresh (void);
  void SetDefaultTxBuffer (uint32_t txBuffer);
  uint32_t GetDefaultTxBuffer (void);
  void SetDefaultRxBuffer (uint32_t rxBuffer);
  uint32_t GetDefaultRxBuffer (void);
  void SetDefaultInitialCWnd (uint32_t initialCWnd);
  uint32_t GetDefaultInitialCWnd (void);
  void SetDefaultConnTimeout (uint32_t connTimeout);
  uint32_t GetDefaultConnTimeout (void);
  void SetDefaultConnCount (uint32_t connCount);
  uint32_t GetDefaultConnCount (void);

private:
  uint32_t m_defaultSegSize;
  uint32_t m_defaultAdvWin;   
  uint32_t m_defaultSSThresh; 
  uint32_t m_defaultTxBuffer; 
  uint32_t m_defaultRxBuffer; 
  uint32_t m_defaultInitialCWnd; 
  uint32_t m_defaultConnTimeout;  
  uint32_t m_defaultConnCount;  

};


(-)a/examples/tcp-large-transfer-errors.cc (+3 lines)

Lines 142-147 int main (int argc, char *argv[])	Link Here

142

  // Bind()s at run-time, via command-line arguments

142

  // Bind()s at run-time, via command-line arguments

143

  CommandLine::Parse (argc, argv);

143

  CommandLine::Parse (argc, argv);

144

145

  // Force deterministic loss pattern on this example script

146

  RandomVariable::UseGlobalSeed(1,2,3,4,5,6);

147

145

  // Here, we will explicitly create three nodes.  In more sophisticated

148

  // Here, we will explicitly create three nodes.  In more sophisticated

146

  // topologies, we could configure a node factory.

149

  // topologies, we could configure a node factory.

147

  Ptr<Node> n0 = Create<InternetNode> ();

150

  Ptr<Node> n0 = Create<InternetNode> ();

(-)a/src/internet-node/tcp-socket.cc (+1 lines)

Lines 745-750 bool TcpSocket::SendPendingData (bool wi	Link Here

745

      header.SetAckNumber (m_nextRxSequence);

745

      header.SetAckNumber (m_nextRxSequence);

746

      header.SetSourcePort (m_endPoint->GetLocalPort());

746

      header.SetSourcePort (m_endPoint->GetLocalPort());

747

      header.SetDestinationPort (m_defaultPort);

747

      header.SetDestinationPort (m_defaultPort);

748

      header.SetWindowSize (m_advertisedWindowSize);

748

      if (m_shutdownSend)

749

      if (m_shutdownSend)

749

750

          m_errno = ERROR_SHUTDOWN;

751

          m_errno = ERROR_SHUTDOWN;

Return to bug 129