1.1 --- a/src/internet-stack/tcp-test.cc	Wed Sep 30 18:44:51 2009 +0200
     1.2 +++ b/src/internet-stack/tcp-test.cc	Thu Oct 01 10:20:59 2009 +0200
     1.3 @@ -33,6 +33,7 @@
     1.4  #include "ns3/node.h"
     1.5  #include "ns3/inet-socket-address.h"
     1.6  #include "ns3/uinteger.h"
     1.7 +#include "ns3/log.h"
     1.8  
     1.9  #include "ipv4-end-point.h"
    1.10  #include "arp-l3-protocol.h"
    1.11 @@ -43,6 +44,8 @@
    1.12  
    1.13  #include <string>
    1.14  
    1.15 +NS_LOG_COMPONENT_DEFINE("TcpTestSuite");
    1.16 +
    1.17  namespace ns3 {
    1.18  
    1.19  class TcpTestCase : public TestCase
    1.20 @@ -93,6 +96,13 @@
    1.21    return oss.str ();
    1.22  }
    1.23  
    1.24 +static std::string GetString (Ptr<Packet> p)
    1.25 +{
    1.26 +  std::ostringstream oss;
    1.27 +  p->CopyData (&oss, p->GetSize ());
    1.28 +  return oss.str ();
    1.29 +}
    1.30 +
    1.31  TcpTestCase::TcpTestCase (uint32_t totalStreamSize,
    1.32                            uint32_t sourceWriteSize,
    1.33                            uint32_t sourceReadSize,
    1.34 @@ -172,6 +182,7 @@
    1.35          }
    1.36        NS_TEST_EXPECT_MSG_EQ ((m_currentServerRxBytes + p->GetSize () <= m_totalBytes), true, 
    1.37                               "Server received too many bytes");
    1.38 +      NS_LOG_DEBUG ("Server recv data=\"" << GetString (p) << "\"");
    1.39        p->CopyData (&m_serverRxPayload[m_currentServerRxBytes], p->GetSize ());
    1.40        m_currentServerRxBytes += p->GetSize ();
    1.41        ServerHandleSend (sock, sock->GetTxAvailable ());
    1.42 @@ -187,6 +198,7 @@
    1.43        uint32_t toSend = std::min (left, sock->GetTxAvailable ());
    1.44        toSend = std::min (toSend, m_serverWriteSize);
    1.45        Ptr<Packet> p = Create<Packet> (&m_serverRxPayload[m_currentServerTxBytes], toSend);
    1.46 +      NS_LOG_DEBUG ("Server send data=\"" << GetString (p) << "\"");
    1.47        int sent = sock->Send (p);
    1.48        NS_TEST_EXPECT_MSG_EQ ((sent != -1), true, "Server error during send ?");
    1.49        m_currentServerTxBytes += sent;
    1.50 @@ -206,6 +218,7 @@
    1.51        uint32_t toSend = std::min (left, sock->GetTxAvailable ());
    1.52        toSend = std::min (toSend, m_sourceWriteSize);
    1.53        Ptr<Packet> p = Create<Packet> (&m_sourceTxPayload[m_currentSourceTxBytes], toSend);
    1.54 +      NS_LOG_DEBUG ("Source send data=\"" << GetString (p) << "\"");
    1.55        int sent = sock->Send (p);
    1.56        NS_TEST_EXPECT_MSG_EQ ((sent != -1), true, "Error during send ?");
    1.57        m_currentSourceTxBytes += sent;
    1.58 @@ -225,6 +238,7 @@
    1.59          }
    1.60        NS_TEST_EXPECT_MSG_EQ ((m_currentSourceRxBytes + p->GetSize () <= m_totalBytes), true, 
    1.61                               "Source received too many bytes");
    1.62 +      NS_LOG_DEBUG ("Source recv data=\"" << GetString (p) << "\"");
    1.63        p->CopyData (&m_sourceRxPayload[m_currentSourceRxBytes], p->GetSize ());
    1.64        m_currentSourceRxBytes += p->GetSize ();
    1.65      }
    1.66 @@ -319,7 +333,7 @@
    1.67      {
    1.68        AddTestCase (new TcpTestCase (13, 200, 200, 200, 200));
    1.69        AddTestCase (new TcpTestCase (13, 1, 1, 1, 1));
    1.70 -      //AddTestCase (new TcpTestCase (100000, 100, 50, 100, 20));
    1.71 +      AddTestCase (new TcpTestCase (100000, 100, 50, 100, 20));
    1.72      }
    1.73    
    1.74  } g_tcpTestSuite;