Attachment #839 for bug #888

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




  pointToPoint.SetChannelAttribute ("Delay", StringValue ("2ms"));

  //
  // The idea here is that someone will look very closely at the all of the
  // communications between the reference TCP and the TCP under test in this
  // simulation and determine that all of the responses are correct.  We expect
  // that this means generating a pcap trace file from the point-to-point link
  // and examining the packets closely using tcpdump, wireshark or some such
  // program.  So we provide the ability to generate a pcap trace of the 
  // test execution for your perusal.
  //
  // Once the validation test is determined to be running exactly as exptected,
  // the set of congestion window changes is collected and hard coded into the 
  // test results which will then be checked during the actual execution of the
  // test.
  //

  if (m_writeResults)
    {
      pointToPoint.EnablePcapAll ("tcp-cwnd");
    }

  //
  // Install the point-to-point devices on both nodes and connec them up.
  //
  NetDeviceContainer devices;

  app->SetStartTime (Seconds (1.));
  app->SetStopTime (Seconds (1.1));

  //
  // The idea here is that someone will look very closely at the all of the
  // communications between the reference TCP and the TCP under test in this
  // simulation and determine that all of the responses are correct.  We expect
  // that this means generating a pcap trace file from the point-to-point link
  // and examining the packets closely using tcpdump, wireshark or some such
  // program.  So we provide the ability to generate a pcap trace of the 
  // test execution for your perusal.
  //
  // Once the validation test is determined to be running exactly as exptected,
  // the set of congestion window changes is collected and hard coded into the 
  // test results which will then be checked during the actual execution of the
  // test.
  //

  if (m_writeResults)
    {
      pointToPoint.EnablePcapAll ("tcp-cwnd");
    }

  Simulator::Stop (Seconds(2));
  Simulator::Run ();
  Simulator::Destroy ();

  p2p2.SetDeviceAttribute ("DataRate", DataRateValue (DataRate(100000)));
  p2p2.SetChannelAttribute ("Delay", TimeValue (MilliSeconds(10)));

  if (m_writeResults)
    {
      // Write a pcap for tcp cwnd testcase with out-of-order delivery
      PointToPointHelper pointToPoint;
      pointToPoint.EnablePcapAll ("tcp-cwnd-ood");
    }

  // And then install devices and channels connecting our topology.
  NetDeviceContainer dev0 = p2p1.Install (n0n1);
  NetDeviceContainer dev1 = p2p2.Install (n1n2);

  app->SetStartTime (Seconds (1.0));
  app->SetStopTime (Seconds (5.4));

  if (m_writeResults)
    {
      // Write a pcap for tcp cwnd testcase with out-of-order delivery
      PointToPointHelper pointToPoint;
      pointToPoint.EnablePcapAll ("tcp-cwnd-ood");
    }

  // Finally, set up the simulator to run.
  Simulator::Stop (Seconds(5.4));
  Simulator::Run ();

(-)a/src/test/ns3tcp/ns3tcp-loss-test-suite.cc (-12 / +12 lines)

Lines 94-99	Link Here

  pointToPoint.SetDeviceAttribute ("DataRate", StringValue ("5Mbps"));

  pointToPoint.SetDeviceAttribute ("DataRate", StringValue ("5Mbps"));

  pointToPoint.SetChannelAttribute ("Delay", StringValue ("200ms"));

  pointToPoint.SetChannelAttribute ("Delay", StringValue ("200ms"));

  if (m_writeResults)

      pointToPoint.EnablePcapAll ("tcp-loss-test-case-1");

100

      pointToPoint.EnableAsciiAll ("tcp-loss-test-case-1");

101

102

  NetDeviceContainer devices;

103

  NetDeviceContainer devices;

  devices = pointToPoint.Install (n0, n1);

104

  devices = pointToPoint.Install (n0, n1);

105

Lines 135-146	Link Here

135

  pem->SetList (sampleList);

141

  pem->SetList (sampleList);

136

  devices.Get (1)->SetAttribute ("ReceiveErrorModel", PointerValue (pem));

142

  devices.Get (1)->SetAttribute ("ReceiveErrorModel", PointerValue (pem));

137

143

138

  if (m_writeResults)

139

140

      pointToPoint.EnablePcapAll ("tcp-loss-test-case-1");

141

      pointToPoint.EnableAsciiAll ("tcp-loss-test-case-1");

142

143

144

  Simulator::Stop (simStopTimeObj);

144

  Simulator::Stop (simStopTimeObj);

145

  Simulator::Run ();

145

  Simulator::Run ();

146

  Simulator::Destroy ();

146

  Simulator::Destroy ();

Lines 203-208	Link Here

203

  pointToPoint.SetDeviceAttribute ("DataRate", StringValue ("5Mbps"));

203

  pointToPoint.SetDeviceAttribute ("DataRate", StringValue ("5Mbps"));

204

  pointToPoint.SetChannelAttribute ("Delay", StringValue ("200ms"));

204

  pointToPoint.SetChannelAttribute ("Delay", StringValue ("200ms"));

205

206

  if (m_writeResults)

207

208

      pointToPoint.EnablePcapAll ("tcp-loss-test-case-2");

209

      pointToPoint.EnableAsciiAll ("tcp-loss-test-case-2");

210

211

206

  NetDeviceContainer devices;

212

  NetDeviceContainer devices;

207

  devices = pointToPoint.Install (n0, n1);

213

  devices = pointToPoint.Install (n0, n1);

208

214

Lines 243-254	Link Here

243

  pem->SetList (sampleList);

249

  pem->SetList (sampleList);

244

  devices.Get (1)->SetAttribute ("ReceiveErrorModel", PointerValue (pem));

250

  devices.Get (1)->SetAttribute ("ReceiveErrorModel", PointerValue (pem));

245

251

246

  if (m_writeResults)

247

248

      pointToPoint.EnablePcapAll ("tcp-loss-test-case-2");

249

      pointToPoint.EnableAsciiAll ("tcp-loss-test-case-2");

250

251

252

  Simulator::Stop (simStopTimeObj);

252

  Simulator::Stop (simStopTimeObj);

253

  Simulator::Run ();

253

  Simulator::Run ();

254

  Simulator::Destroy ();

254

  Simulator::Destroy ();

(-)a/src/test/ns3tcp/ns3tcp-socket-test-suite.cc (-9 / +10 lines)

Lines 91-96	Link Here

  pointToPoint.SetDeviceAttribute ("DataRate", StringValue ("5Mbps"));

  pointToPoint.SetDeviceAttribute ("DataRate", StringValue ("5Mbps"));

  pointToPoint.SetChannelAttribute ("Delay", StringValue ("2ms"));

  pointToPoint.SetChannelAttribute ("Delay", StringValue ("2ms"));

  if (m_writeResults)

      pointToPoint.EnablePcapAll ("tcp-socket-test-case-1");

  NetDeviceContainer devices;

  NetDeviceContainer devices;

  devices = pointToPoint.Install (n0, n1);

100

  devices = pointToPoint.Install (n0, n1);

101

Lines 131-141	Link Here

131

  m_inputs.Add (464);  // ns-3 TCP default segment size of 536

136

  m_inputs.Add (464);  // ns-3 TCP default segment size of 536

132

  Simulator::Schedule(writerStopTimeObj, &SocketWriter::Close, socketWriter);

137

  Simulator::Schedule(writerStopTimeObj, &SocketWriter::Close, socketWriter);

133

138

134

  if (m_writeResults)

135

136

      pointToPoint.EnablePcapAll ("tcp-socket-test-case-1");

137

138

139

  Simulator::Stop (simStopTimeObj);

139

  Simulator::Stop (simStopTimeObj);

140

  Simulator::Run ();

140

  Simulator::Run ();

141

  Simulator::Destroy ();

141

  Simulator::Destroy ();

Lines 202-207	Link Here

202

  csma.SetChannelAttribute ("DataRate", StringValue ("5Mbps"));

202

  csma.SetChannelAttribute ("DataRate", StringValue ("5Mbps"));

203

  csma.SetChannelAttribute ("Delay", StringValue ("2ms"));

203

  csma.SetChannelAttribute ("Delay", StringValue ("2ms"));

204

205

  if (m_writeResults)

206

207

      csma.EnablePcapAll ("tcp-socket-test-case-2", false);

208

209

205

  NetDeviceContainer devices;

210

  NetDeviceContainer devices;

206

  devices = csma.Install (nodes);

211

  devices = csma.Install (nodes);

207

212

Lines 246-255	Link Here

246

  m_inputs.Add (1);

251

  m_inputs.Add (1);

247

  Simulator::Schedule(writerStopTimeObj, &SocketWriter::Close, socketWriter);

252

  Simulator::Schedule(writerStopTimeObj, &SocketWriter::Close, socketWriter);

248

253

249

  if (m_writeResults)

250

251

      csma.EnablePcapAll ("tcp-socket-test-case-2", false);

252

253

  Simulator::Stop (simStopTimeObj);

254

  Simulator::Stop (simStopTimeObj);

254

  Simulator::Run ();

255

  Simulator::Run ();

255

  Simulator::Destroy ();

256

  Simulator::Destroy ();

Return to bug 888