Attachment #2044 for bug #1941

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

(-)a/src/aodv/test/aodv-id-cache-test-suite.cc (-2 / +5 lines)

Lines 37-47	Link Here

// Tests

// Tests

//-----------------------------------------------------------------------------

//-----------------------------------------------------------------------------

/// Unit test for id cache

/// Unit test for id cache

struct IdCacheTest : public TestCase

class IdCacheTest : public TestCase

public:

  IdCacheTest () : TestCase ("Id Cache"), cache (Seconds (10))

  IdCacheTest () : TestCase ("Id Cache"), cache (Seconds (10))

{}

{}

  virtual void DoRun ();

  virtual void DoRun ();

private:

  void CheckTimeout1 ();

  void CheckTimeout1 ();

  void CheckTimeout2 ();

  void CheckTimeout2 ();

  void CheckTimeout3 ();

  void CheckTimeout3 ();

Lines 93-99	Link Here

class IdCacheTestSuite : public TestSuite

class IdCacheTestSuite : public TestSuite

public:

public:

  IdCacheTestSuite () : TestSuite ("routing-id-cache", UNIT)

  IdCacheTestSuite () : TestSuite ("aodv-routing-id-cache", UNIT)

100

    AddTestCase (new IdCacheTest, TestCase::QUICK);

101

    AddTestCase (new IdCacheTest, TestCase::QUICK);

102





#include "aodv-regression.h"
#include "bug-772.h"
#include "loopback.h"

#include "ns3/simulator.h"
#include "ns3/mobility-helper.h"

#include "ns3/internet-stack-helper.h"
#include "ns3/ipv4-address-helper.h"
#include "ns3/abort.h"
#include "ns3/udp-echo-helper.h"
#include "ns3/mobility-model.h"
#include "ns3/pcap-file.h"
#include "ns3/aodv-helper.h"
#include "ns3/v4ping-helper.h"
#include "ns3/nqos-wifi-mac-helper.h"
#include "ns3/config.h"
#include "ns3/pcap-test.h"
#include "ns3/rng-seed-manager.h"
#include "ns3/icmpv4.h"
#include <sstream>

using namespace ns3;
// using namespace aodv;
//-----------------------------------------------------------------------------
// Test suite
//-----------------------------------------------------------------------------

    SetDataDir (NS_TEST_SOURCEDIR);
    // General RREQ-RREP-RRER test case
    AddTestCase (new ChainRegressionTest ("aodv-chain-regression-test"), TestCase::QUICK);
    // \bugid{606} test case, should crash if bug is not fixed
    /// \bugid{606} test case, should crash if bug is not fixed
    AddTestCase (new ChainRegressionTest ("bug-606-test", Seconds (10), 3, Seconds (1)), TestCase::QUICK);
    // \bugid{772} UDP test case
    /// \bugid{772} UDP test case
    AddTestCase (new Bug772ChainTest ("udp-chain-test", "ns3::UdpSocketFactory", Seconds (3), 10), TestCase::QUICK);
    // \bugid{772} TCP test case
    /// \bugid{772} TCP test case
    AddTestCase (new Bug772ChainTest ("tcp-chain-test", "ns3::TcpSocketFactory", Seconds (3), 10), TestCase::QUICK);
    // Ping loopback test case
    AddTestCase (new LoopbackTestCase (), TestCase::QUICK);
  }
} g_aodvRegressionTestSuite;
 

  m_time (t),
  m_size (size),
  m_step (120),
  m_arpAliveTimeout (arpAliveTimeout),
  m_seq (0)
{
}


}

void
ChainRegressionTest::SendPing ()
{
  if (Simulator::Now () >= m_time)
    {
      return;
    }

  Ptr<Packet> p = Create<Packet> ();
  Icmpv4Echo echo;
  echo.SetSequenceNumber (m_seq);
  m_seq++;
  echo.SetIdentifier (0);

  Ptr<Packet> dataPacket = Create<Packet> (56);
  echo.SetData (dataPacket);
  p->AddHeader (echo);
  Icmpv4Header header;
  header.SetType (Icmpv4Header::ECHO);
  header.SetCode (0);
  if (Node::ChecksumEnabled ())
    {
      header.EnableChecksum ();
    }
  p->AddHeader (header);
  m_socket->Send (p, 0);
  Simulator::Schedule (Seconds (1), &ChainRegressionTest::SendPing, this);
}

void
ChainRegressionTest::DoRun ()
{
  RngSeedManager::SetSeed (12345);

  Ipv4InterfaceContainer interfaces = address.Assign (devices);

  // 3. Setup ping
  m_socket = Socket::CreateSocket (m_nodes->Get (0), TypeId::LookupByName ("ns3::Ipv4RawSocketFactory"));
  m_socket->SetAttribute ("Protocol", UintegerValue (1)); // icmp
  // m_socket->SetRecvCallback (MakeCallback (&V4Ping::Receive, this));
  InetSocketAddress src = InetSocketAddress (Ipv4Address::GetAny (), 0);
  m_socket->Bind (src);
  InetSocketAddress dst = InetSocketAddress (interfaces.GetAddress (m_size - 1), 0);
  m_socket->Connect (dst);

  SendPing ();

  // 4. write PCAP
  wifiPhy.EnablePcapAll (CreateTempDirFilename (m_prefix));

(-)a/src/aodv/test/aodv-regression.h (+7 lines)

Lines 23-28	Link Here

#include "ns3/test.h"

#include "ns3/test.h"

#include "ns3/nstime.h"

#include "ns3/nstime.h"

#include "ns3/socket.h"

#include "ns3/node-container.h"

#include "ns3/node-container.h"

using namespace ns3;

using namespace ns3;

Lines 177-182	Link Here

177

  const double m_step;

178

  const double m_step;

178

  /// ARP alive timeout

179

  /// ARP alive timeout

179

  const Time m_arpAliveTimeout;

180

  const Time m_arpAliveTimeout;

181

  /// Socket

182

  Ptr<Socket> m_socket;

183

  /// Sequence number

184

  uint16_t m_seq;

180

185

181

  /// Create test topology

186

  /// Create test topology

182

  void CreateNodes ();

187

  void CreateNodes ();

Lines 186-191	Link Here

186

  void CheckResults ();

191

  void CheckResults ();

187

  /// Go

192

  /// Go

188

  void DoRun ();

193

  void DoRun ();

194

  /// Send one ping

195

  void SendPing ();

189

};

196

};

190

197

191

#endif /* AODV_REGRESSION_H */

198

#endif /* AODV_REGRESSION_H */




#include "ns3/internet-stack-helper.h"
#include "ns3/ipv4-address-helper.h"
#include "ns3/abort.h"
#include "ns3/udp-echo-helper.h"
#include "ns3/mobility-model.h"
#include "ns3/pcap-file.h"
#include "ns3/aodv-helper.h"

#include "ns3/on-off-helper.h"
#include "ns3/inet-socket-address.h"
#include "ns3/data-rate.h"
#include "ns3/packet-sink-helper.h"
#include "ns3/pcap-test.h"
#include <sstream>


  m_proto (proto),
  m_time (t),
  m_size (size),
  m_step (120),
  m_port (9){
}

Bug772ChainTest::~Bug772ChainTest ()

}

void
Bug772ChainTest::SendData (Ptr<Socket> socket)
{
  if (Simulator::Now () < m_time)
    {
      socket->Send (Create<Packet> (1000));
      Simulator::ScheduleWithContext (socket->GetNode ()->GetId (), Seconds (0.125),
                                      &Bug772ChainTest::SendData, this, socket);
    }
}

void
Bug772ChainTest::DoRun ()
{
  RngSeedManager::SetSeed (12345);

  Ipv4InterfaceContainer interfaces = address.Assign (devices);

  // 3. Setup UDP source and sink
  m_sendSocket = Socket::CreateSocket (m_nodes->Get (0), TypeId::LookupByName (m_proto));
  m_sendSocket->Bind ();
  m_sendSocket->Connect (InetSocketAddress (interfaces.GetAddress (m_size-1), m_port));
  m_sendSocket->SetAllowBroadcast (true);
  Simulator::ScheduleWithContext (m_sendSocket->GetNode ()->GetId (), Seconds (1.0),
                                  &Bug772ChainTest::SendData, this, m_sendSocket);

//
//  OnOffHelper onoff (m_proto, Address (InetSocketAddress (interfaces.GetAddress (m_size-1), m_port)));
//  onoff.SetConstantRate (DataRate (64000));
//  // 1000 * 8 / 64000 = 0.125 s
//  onoff.SetAttribute ("PacketSize", UintegerValue (1000));
//  ApplicationContainer app = onoff.Install (m_nodes->Get (0));
//  app.Start (Seconds (1.0));
//  app.Stop (m_time);

  m_recvSocket = Socket::CreateSocket (m_nodes->Get (m_size - 1), TypeId::LookupByName (m_proto));
  m_recvSocket->Bind (InetSocketAddress (Ipv4Address::GetAny (), m_port));
  m_recvSocket->Listen ();
  m_recvSocket->ShutdownSend ();

  // 4. write PCAP on the first and last nodes only
  wifiPhy.EnablePcap (CreateTempDirFilename (m_prefix), devices.Get (0));

(-)a/src/aodv/test/bug-772.h (+14 lines)

Lines 24-29	Link Here

#include "ns3/test.h"

#include "ns3/test.h"

#include "ns3/nstime.h"

#include "ns3/nstime.h"

#include "ns3/node-container.h"

#include "ns3/node-container.h"

#include "ns3/socket.h"

using namespace ns3;

using namespace ns3;

Lines 62-67	Link Here

  const uint32_t m_size;

  const uint32_t m_size;

  /// Chain step, meters

  /// Chain step, meters

  const double m_step;

  const double m_step;

  /// port number

  const uint16_t m_port;

  /// Create test topology

  /// Create test topology

  void CreateNodes ();

  void CreateNodes ();

Lines 71-76	Link Here

  void CheckResults ();

  void CheckResults ();

  /// Go

  /// Go

  void DoRun ();

  void DoRun ();

  /// Receiving socket

  Ptr<Socket> m_recvSocket;

  /// Transmitting socket

  Ptr<Socket> m_sendSocket;

/**

   * Send data

   * \param socket the sending socket

*/

  void SendData (Ptr<Socket> socket);

};

};

#endif /* BUG_772_H */

#endif /* BUG_772_H */

(-)a/src/aodv/test/loopback.cc (-14 / +96 lines)

Lines 18-25	Link Here

 * Authors: Pavel Boyko <boyko@iitp.ru>

 * Authors: Pavel Boyko <boyko@iitp.ru>

*/

*/

#include "loopback.h"

#include "ns3/test.h"

#include "ns3/simulator.h"

#include "ns3/simulator.h"

#include "ns3/socket-factory.h"

#include "ns3/udp-socket-factory.h"

#include "ns3/mobility-helper.h"

#include "ns3/mobility-helper.h"

#include "ns3/double.h"

#include "ns3/double.h"

#include "ns3/uinteger.h"

#include "ns3/uinteger.h"

Lines 45-56	Link Here

namespace aodv

namespace aodv

static uint32_t g_count (0);

/**

 * \ingroup aodv

 * \brief AODV loopback UDP echo test case

*/

class LoopbackTestCase : public TestCase

  uint32_t m_count; //!< number of packet received;

  Ptr<Socket> m_txSocket;

  Ptr<Socket> m_echoSocket;

  Ptr<Socket> m_rxSocket;

  uint16_t m_echoSendPort;

  uint16_t m_echoReplyPort;

static void

  void SendData (Ptr<Socket> socket);

PingRtt (std::string context, Time rtt)

  void ReceivePkt (Ptr<Socket> socket);

  void EchoData (Ptr<Socket> socket);

public:

  LoopbackTestCase ();

  void DoRun ();

};

LoopbackTestCase::LoopbackTestCase () :

    TestCase ("UDP Echo 127.0.0.1 test"), m_count (0)

  g_count++;

  m_echoSendPort = 1233;

  m_echoReplyPort = 1234;

void LoopbackTestCase::ReceivePkt (Ptr<Socket> socket)

  Ptr<Packet> receivedPacket = socket->Recv (std::numeric_limits<uint32_t>::max (), 0);

  m_count ++;

void

LoopbackTestCase::EchoData (Ptr<Socket> socket)

  Address from;

  Ptr<Packet> receivedPacket = socket->RecvFrom (std::numeric_limits<uint32_t>::max (), 0, from);

  Ipv4Address src = InetSocketAddress::ConvertFrom (from).GetIpv4 ();

  Address to = InetSocketAddress (src, m_echoReplyPort);

  receivedPacket->RemoveAllPacketTags ();

  receivedPacket->RemoveAllByteTags ();

  socket->SendTo (receivedPacket, 0, to);

100

101

102

void

103

LoopbackTestCase::SendData (Ptr<Socket> socket)

104

105

  Address realTo = InetSocketAddress (Ipv4Address::GetLoopback (), m_echoSendPort);

106

  socket->SendTo (Create<Packet> (123), 0, realTo);

107

108

  Simulator::ScheduleWithContext (socket->GetNode ()->GetId (), Seconds (1.0),

109

                                  &LoopbackTestCase::SendData, this, socket);

110

111

void

112

void

Lines 80-102	Link Here

  address.SetBase ("10.1.1.0", "255.255.255.0");

136

  address.SetBase ("10.1.1.0", "255.255.255.0");

  Ipv4InterfaceContainer interfaces = address.Assign (devices);

137

  Ipv4InterfaceContainer interfaces = address.Assign (devices);

138

  // Setup ping

139

  // Setup echos

  Ptr<V4Ping> ping = CreateObject<V4Ping> ();

140

  Ptr<SocketFactory> socketFactory = nodes.Get (0)->GetObject<UdpSocketFactory> ();

  ping->SetAttribute ("Remote", Ipv4AddressValue (Ipv4Address::GetLoopback ()));

141

  m_rxSocket = socketFactory->CreateSocket ();

  nodes.Get (0)->AddApplication (ping);

142

  m_rxSocket->Bind (InetSocketAddress (Ipv4Address::GetLoopback (), m_echoReplyPort));

  ping->SetStartTime (Seconds (0));

143

  m_rxSocket->SetRecvCallback (MakeCallback (&LoopbackTestCase::ReceivePkt, this));

  ping->SetStopTime (Seconds (4));

144

  Names::Add ("ping", ping);

145

  m_echoSocket = socketFactory->CreateSocket ();

  Config::Connect ("/Names/ping/Rtt", MakeCallback (&PingRtt));

146

  m_echoSocket->Bind (InetSocketAddress (Ipv4Address::GetLoopback (), m_echoSendPort));

147

  m_echoSocket->SetRecvCallback (MakeCallback (&LoopbackTestCase::EchoData, this));

148

149

  m_txSocket = socketFactory->CreateSocket ();

150

151

  Simulator::ScheduleWithContext (m_txSocket->GetNode ()->GetId (), Seconds (1.0),

152

                                  &LoopbackTestCase::SendData, this, m_txSocket);

153

  // Run

154

  // Run

  Simulator::Stop (Seconds (5));

155

  Simulator::Stop (Seconds (5));

  Simulator::Run ();

156

  Simulator::Run ();

157

158

  m_txSocket->Close ();

159

  m_echoSocket->Close ();

160

  m_rxSocket->Close ();

161

  Simulator::Destroy ();

162

  Simulator::Destroy ();

163

  // Check that 4 packets delivered

164

  // Check that 4 packets delivered

  NS_TEST_ASSERT_MSG_EQ (g_count, 4, "Exactly 4 ping replies must be delivered.");

165

  NS_TEST_ASSERT_MSG_EQ (m_count, 4, "Exactly 4 echo replies must be delivered.");

166

100

167

168

//-----------------------------------------------------------------------------

169

// Test suite

170

//-----------------------------------------------------------------------------

171

class AodvLoopbackTestSuite : public TestSuite

172

173

public:

174

  AodvLoopbackTestSuite () : TestSuite ("routing-aodv-loopback", SYSTEM)

175

176

    SetDataDir (NS_TEST_SOURCEDIR);

177

    // UDP Echo loopback test case

178

    AddTestCase (new LoopbackTestCase (), TestCase::QUICK);

179

180

} g_aodvLoopbackTestSuite;

181

182

101

183

102

184




/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/*
 * Copyright (c) 2010 IITP RAS
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License version 2 as
 * published by the Free Software Foundation;
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 *
 * Authors: Pavel Boyko <boyko@iitp.ru>
 */

#ifndef AODV_LOOPBACK_H
#define AODV_LOOPBACK_H
#include "ns3/test.h"
#include <string>

namespace ns3
{
namespace aodv
{
/**
 * \ingroup aodv
 * 
 * \brief AODV ping 127.0.0.1 test case
 */
struct LoopbackTestCase : public TestCase
{
  LoopbackTestCase () : TestCase ("Ping 127.0.0.1 test") {}
  /// Run test
  void DoRun ();
};

}
}

#endif /* AODV_LOOPBACK_H */

(-)a/src/aodv/wscript (-1 / +1 lines)

Lines 1-7	Link Here

## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-

## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-

def build(bld):

def build(bld):

    module = bld.create_ns3_module('aodv', ['internet', 'wifi', 'applications'])

    module = bld.create_ns3_module('aodv', ['internet', 'wifi'])

    module.includes = '.'

    module.includes = '.'

    module.source = [

    module.source = [

        'model/aodv-id-cache.cc',

        'model/aodv-id-cache.cc',

Return to bug 1941