Attachment #2750 for bug #2622

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




/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/*
 * Copyright (c) 2011 Universita' di Firenze, Italy
 *
 * 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
 *
 * Author: Tommaso Pecorella <tommaso.pecorella@unifi.it>
 */
#include "error-channel.h"
#include "ns3/simple-net-device.h"
#include "ns3/simulator.h"
#include "ns3/packet.h"
#include "ns3/node.h"
#include "ns3/log.h"

namespace ns3 {

NS_LOG_COMPONENT_DEFINE ("ErrorChannel");

NS_OBJECT_ENSURE_REGISTERED (ErrorChannel);

TypeId 
ErrorChannel::GetTypeId (void)
{
  static TypeId tid = TypeId ("ns3::ErrorChannel")
    .SetParent<Channel> ()
    .AddConstructor<ErrorChannel> ()
    ;
  return tid;
}

ErrorChannel::ErrorChannel ()
{
  jumping = false;
  jumpingState = 0;
}

void
ErrorChannel::SetJumpingTime(Time delay)
{
  jumpingTime = delay;
}

void
ErrorChannel::SetJumpingMode(bool mode)
{
  jumping = mode;
  jumpingState = 0;
}

void
ErrorChannel::Send (Ptr<Packet> p, uint16_t protocol,
                    Mac48Address to, Mac48Address from,
                    Ptr<SimpleNetDevice> sender)
{
  NS_LOG_FUNCTION (p << protocol << to << from << sender);
  for (std::vector<Ptr<SimpleNetDevice> >::const_iterator i = m_devices.begin (); i != m_devices.end (); ++i)
    {
      Ptr<SimpleNetDevice> tmp = *i;
      if (tmp == sender)
        {
          continue;
        }
      if( !jumping || jumpingState%2 )
        {
          Simulator::ScheduleWithContext (tmp->GetNode ()->GetId (), Seconds (0),
                                      &SimpleNetDevice::Receive, tmp, p->Copy (), protocol, to, from);
          jumpingState++;
        }
      else
        {
          Simulator::ScheduleWithContext (tmp->GetNode ()->GetId (), jumpingTime,
                                      &SimpleNetDevice::Receive, tmp, p->Copy (), protocol, to, from);
          jumpingState++;
        }
    }
}

void 
ErrorChannel::Add (Ptr<SimpleNetDevice> device)
{
  m_devices.push_back (device);
}

uint32_t 
ErrorChannel::GetNDevices (void) const
{
  return m_devices.size ();
}
Ptr<NetDevice> 
ErrorChannel::GetDevice (uint32_t i) const
{
  return m_devices[i];
}

NS_OBJECT_ENSURE_REGISTERED (BinaryErrorModel);

TypeId BinaryErrorModel::GetTypeId (void)
{
  static TypeId tid = TypeId ("ns3::BinaryErrorModel")
    .SetParent<ErrorModel> ()
    .AddConstructor<BinaryErrorModel> ()
    ;
  return tid;
}

BinaryErrorModel::BinaryErrorModel ()
{
  counter = 0;
}

BinaryErrorModel::~BinaryErrorModel ()
{
}


bool
BinaryErrorModel::DoCorrupt (Ptr<Packet> p)
{
  if (!IsEnabled ())
    {
      return false;
    }
  bool ret = counter%2;
  counter++;
  return ret;
}

void
BinaryErrorModel::Reset (void)
{
  DoReset();
}

void
BinaryErrorModel::DoReset (void)
{
  counter = 0;
}


} // namespace ns3




/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/*
 * Copyright (c) 2011 Universita' di Firenze, Italy
 *
 * 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
 *
 * Author: Tommaso Pecorella <tommaso.pecorella@unifi.it>
 */
#ifndef ERROR_CHANNEL_H
#define ERROR_CHANNEL_H

#include "ns3/simple-channel.h"
#include "ns3/error-model.h"
#include "ns3/mac48-address.h"
#include "ns3/nstime.h"
#include <vector>

namespace ns3 {

class SimpleNetDevice;
class Packet;

/**
 * \ingroup channel
 * \brief A Error channel, introducing deterministic delays on even/odd packets. Used for testing
 */
class ErrorChannel : public SimpleChannel
{
public:
  static TypeId GetTypeId (void);
  ErrorChannel ();

  virtual void Send (Ptr<Packet> p, uint16_t protocol, Mac48Address to, Mac48Address from,
                     Ptr<SimpleNetDevice> sender);

  virtual void Add (Ptr<SimpleNetDevice> device);

  // inherited from ns3::Channel
  virtual uint32_t GetNDevices (void) const;
  virtual Ptr<NetDevice> GetDevice (uint32_t i) const;

  /**
   * \brief Set the delay for the odd packets (even ones are not delayed)
   * \param delay Delay for the odd packets.
   */
  void SetJumpingTime(Time delay);

  /**
   * \brief Set if the odd packets are delayed (even ones are not delayed ever)
   * \param mode true if the odd packets should be delayed.
   */
void SetJumpingMode(bool mode);

private:
  std::vector<Ptr<SimpleNetDevice> > m_devices;
  Time jumpingTime;
  uint8_t jumpingState;
  bool jumping;

};

class BinaryErrorModel : public ErrorModel
{
public:
  static TypeId GetTypeId (void);

  BinaryErrorModel ();
  virtual ~BinaryErrorModel ();
  void Reset (void);

private:
  virtual bool DoCorrupt (Ptr<Packet> p);
  virtual void DoReset (void);

  uint8_t counter;

};

} // namespace ns3

#endif /* ERROR_CHANNEL_H */

(-)a/src/internet/test/ipv4-fragmentation-test.cc (-1 / +1 lines)

Lines 28-34	Link Here

#include "ns3/ipv4-raw-socket-factory.h"

#include "ns3/ipv4-raw-socket-factory.h"

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

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

#include "ns3/simulator.h"

#include "ns3/simulator.h"

#include "error-channel.h"

#include "ns3/simple-net-device.h"

#include "ns3/simple-net-device.h"

#include "ns3/simple-net-device-helper.h"

#include "ns3/simple-net-device-helper.h"

#include "ns3/socket.h"

#include "ns3/socket.h"

Lines 46-51	Link Here

#include "ns3/ipv4-static-routing.h"

#include "ns3/ipv4-static-routing.h"

#include "ns3/udp-l4-protocol.h"

#include "ns3/udp-l4-protocol.h"

#include "ns3/internet-stack-helper.h"

#include "ns3/internet-stack-helper.h"

#include "ns3/error-channel.h"

#include <string>

#include <string>

#include <limits>

#include <limits>

(-)a/src/internet/test/ipv6-fragmentation-test.cc (-1 / +1 lines)

Lines 31-37	Link Here

#include "ns3/ipv6-raw-socket-factory.h"

#include "ns3/ipv6-raw-socket-factory.h"

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

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

#include "ns3/simulator.h"

#include "ns3/simulator.h"

#include "error-channel.h"

#include "ns3/simple-net-device.h"

#include "ns3/simple-net-device.h"

#include "ns3/socket.h"

#include "ns3/socket.h"

#include "ns3/udp-socket.h"

#include "ns3/udp-socket.h"

Lines 55-60	Link Here

#include "ns3/ipv6-l3-protocol.h"

#include "ns3/ipv6-l3-protocol.h"

#include "ns3/icmpv6-l4-protocol.h"

#include "ns3/icmpv6-l4-protocol.h"

#include "ns3/traffic-control-layer.h"

#include "ns3/traffic-control-layer.h"

#include "ns3/error-channel.h"

#include <string>

#include <string>

#include <limits>

#include <limits>

(-)a/src/internet/wscript (-1 lines)

Lines 232-238	Link Here

232

        'test/ipv4-header-test.cc',

232

        'test/ipv4-header-test.cc',

233

        'test/ipv4-fragmentation-test.cc',

233

        'test/ipv4-fragmentation-test.cc',

234

        'test/ipv4-forwarding-test.cc',

234

        'test/ipv4-forwarding-test.cc',

235

        'test/error-channel.cc',

236

        'test/ipv4-test.cc',

235

        'test/ipv4-test.cc',

237

        'test/ipv4-static-routing-test-suite.cc',

236

        'test/ipv4-static-routing-test-suite.cc',

238

        'test/ipv4-global-routing-test-suite.cc',

237

        'test/ipv4-global-routing-test-suite.cc',




 *
 * Author: Tommaso Pecorella <tommaso.pecorella@unifi.it>
 */

#include "ns3/simple-net-device.h"
#include "ns3/simulator.h"
#include "ns3/packet.h"
#include "ns3/node.h"
#include "ns3/log.h"
#include "error-channel.h"

namespace ns3 {

NS_LOG_COMPONENT_DEFINE ("ErrorChannel");

NS_OBJECT_ENSURE_REGISTERED (ErrorChannel);

TypeId
ErrorChannel::GetTypeId (void)
{
  static TypeId tid = TypeId ("ns3::ErrorChannel")
    .SetParent<SimpleChannel> ()
    .SetGroupName ("Network")
    .AddConstructor<ErrorChannel> ()
  ;
  return tid;
}

ErrorChannel::ErrorChannel ()
{
  m_jumpingTime = Seconds (0.5);
  m_jumping = false;
  m_jumpingState = 0;
  m_duplicateTime = Seconds (0.1);
  m_duplicate = false;
  m_duplicateState = 0;
}

void
ErrorChannel::SetJumpingTime (Time delay)
{
  m_jumpingTime = delay;
}

void
ErrorChannel::SetJumpingMode (bool mode)
{
  m_jumping = mode;
  m_jumpingState = 0;
}

void
ErrorChannel::SetDuplicateTime (Time delay)
{
  m_duplicateTime = delay;
}

void
ErrorChannel::SetDuplicateMode (bool mode)
{
  m_duplicate = mode;
  m_duplicateState = 0;
}


void
ErrorChannel::Send (Ptr<Packet> p, uint16_t protocol,
                          Mac48Address to, Mac48Address from,
                          Ptr<SimpleNetDevice> sender)
{

}

void
ErrorChannel::Add (Ptr<SimpleNetDevice> device)
{
  m_devices.push_back (device);
}

uint32_t
ErrorChannel::GetNDevices (void) const
{
  return m_devices.size ();
}

Ptr<NetDevice>
ErrorChannel::GetDevice (uint32_t i) const
{
  return m_devices[i];
}

NS_OBJECT_ENSURE_REGISTERED (BinaryErrorSixlowModel);

TypeId BinaryErrorSixlowModel::GetTypeId (void)
{
  static TypeId tid = TypeId ("ns3::BinaryErrorSixlowModel")
    .SetParent<ErrorModel> ()
    .SetGroupName ("SixLowPan")
    .AddConstructor<BinaryErrorSixlowModel> ()
  ;
  return tid;
}

BinaryErrorSixlowModel::BinaryErrorSixlowModel ()
{
  m_counter = 0;
}

BinaryErrorSixlowModel::~BinaryErrorSixlowModel ()
{
}


bool
BinaryErrorSixlowModel::DoCorrupt (Ptr<Packet> p)
{
  if (!IsEnabled ())
    {
      return false;
    }
  bool ret = m_counter % 2;
  m_counter++;
  return ret;
}

void
BinaryErrorSixlowModel::Reset (void)
{
  DoReset ();
}

void
BinaryErrorSixlowModel::DoReset (void)
{
  m_counter = 0;
}


} // namespace ns3




 *
 * Author: Tommaso Pecorella <tommaso.pecorella@unifi.it>
 */
#ifndef ERROR_CHANNEL_H
#define ERROR_CHANNEL_H

#include "ns3/channel.h"
#include "ns3/simple-channel.h"

 * \ingroup channel
 * \brief A Error channel, introducing deterministic delays on even/odd packets. Used for testing
 */
class ErrorChannel : public SimpleChannel
{
public:
  /**
   * \brief Get the type ID.
   * \return the object TypeId
   */
  static TypeId GetTypeId (void);
  ErrorChannel ();

  // inherited from ns3::SimpleChannel
  virtual void Send (Ptr<Packet> p, uint16_t protocol, Mac48Address to, Mac48Address from,
                     Ptr<SimpleNetDevice> sender);


  void SetDuplicateMode (bool mode);

private:
  std::vector<Ptr<SimpleNetDevice> > m_devices; //!< devices connected by the channel
  Time m_jumpingTime;       //!< Delay time in Jumping mode.
  uint8_t m_jumpingState;   //!< Counter for even/odd packets in Jumping mode.
  bool m_jumping;           //!< Flag for Jumping mode.
  Time m_duplicateTime;     //!< Duplicate time in Duplicate mode.
  bool m_duplicate;         //!< Flag for Duplicate mode.
  uint8_t m_duplicateState; //!< Counter for even/odd packets in Duplicate mode.
};

class BinaryErrorSixlowModel : public ErrorModel
{
public:
  static TypeId GetTypeId (void);

  BinaryErrorSixlowModel ();
  virtual ~BinaryErrorSixlowModel ();
  void Reset (void);

private:
  virtual bool DoCorrupt (Ptr<Packet> p);
  virtual void DoReset (void);

  uint8_t m_counter;

};

} // namespace ns3

#endif /* ERROR_CHANNEL_H */




}


NS_OBJECT_ENSURE_REGISTERED (BinaryErrorModel);

TypeId BinaryErrorModel::GetTypeId (void)
{
  static TypeId tid = TypeId ("ns3::BinaryErrorModel")
    .SetParent<ErrorModel> ()
    .AddConstructor<BinaryErrorModel> ()
    ;
  return tid;
}

BinaryErrorModel::BinaryErrorModel ()
{
  NS_LOG_FUNCTION (this);
  m_counter = 0;
}

BinaryErrorModel::~BinaryErrorModel ()
{
  NS_LOG_FUNCTION (this);
}

bool
BinaryErrorModel::DoCorrupt (Ptr<Packet> p)
{
  NS_LOG_FUNCTION (this);
  if (!IsEnabled ())
    {
      return false;
    }
  bool ret = m_counter%2;
  m_counter++;
  return ret;
}

void
BinaryErrorModel::DoReset (void)
{
  NS_LOG_FUNCTION (this);
  m_counter = 0;
}




} // namespace ns3






};

/**
 * \brief The simplest error model, corrupts even packets and does not corrupt odd ones.
 */
class BinaryErrorModel : public ErrorModel
{
public:
  static TypeId GetTypeId (void);

  BinaryErrorModel ();
  virtual ~BinaryErrorModel ();

private:
  virtual bool DoCorrupt (Ptr<Packet> p);
  virtual void DoReset (void);

  uint8_t m_counter; //!< internal state counter.

};

} // namespace ns3
#endif

(-)a/src/network/wscript (+2 lines)

Lines 29-34	Link Here

        'utils/data-rate.cc',

        'utils/data-rate.cc',

        'utils/drop-tail-queue.cc',

        'utils/drop-tail-queue.cc',

        'utils/dynamic-queue-limits.cc',

        'utils/dynamic-queue-limits.cc',

        'utils/error-channel.cc',

        'utils/error-model.cc',

        'utils/error-model.cc',

        'utils/ethernet-header.cc',

        'utils/ethernet-header.cc',

        'utils/ethernet-trailer.cc',

        'utils/ethernet-trailer.cc',

Lines 112-117	Link Here

112

        'utils/data-rate.h',

113

        'utils/data-rate.h',

113

        'utils/drop-tail-queue.h',

114

        'utils/drop-tail-queue.h',

114

        'utils/dynamic-queue-limits.h',

115

        'utils/dynamic-queue-limits.h',

116

        'utils/error-channel.h',

115

        'utils/error-model.h',

117

        'utils/error-model.h',

116

        'utils/ethernet-header.h',

118

        'utils/ethernet-header.h',

117

        'utils/ethernet-trailer.h',

119

        'utils/ethernet-trailer.h',




#include "ns3/ipv6-raw-socket-factory.h"
#include "ns3/udp-socket-factory.h"
#include "ns3/simulator.h"
#include "error-channel-sixlow.h"
#include "ns3/simple-net-device.h"
#include "ns3/socket.h"
#include "ns3/udp-socket.h"

#include "ns3/sixlowpan-net-device.h"
#include "ns3/internet-stack-helper.h"
#include "ns3/icmpv6-l4-protocol.h"
#include "ns3/error-channel.h"

#include <string>
#include <limits>

  Ptr<Node> serverNode = CreateObject<Node> ();
  internet.Install (serverNode);
  Ptr<SimpleNetDevice> serverDev;
  Ptr<BinaryErrorModel> serverDevErrorModel = CreateObject<BinaryErrorModel> ();
  {
    Ptr<Icmpv6L4Protocol> icmpv6l4 = serverNode->GetObject<Icmpv6L4Protocol> ();
    icmpv6l4->SetAttribute ("DAD", BooleanValue (false));

  Ptr<Node> clientNode = CreateObject<Node> ();
  internet.Install (clientNode);
  Ptr<SimpleNetDevice> clientDev;
  Ptr<BinaryErrorModel> clientDevErrorModel = CreateObject<BinaryErrorModel> ();
  {
    Ptr<Icmpv6L4Protocol> icmpv6l4 = clientNode->GetObject<Icmpv6L4Protocol> ();
    icmpv6l4->SetAttribute ("DAD", BooleanValue (false));

  StartClient (clientNode);

  // link the two nodes
  Ptr<ErrorChannel> channel = CreateObject<ErrorChannel> ();
  serverDev->SetChannel (channel);
  clientDev->SetChannel (channel);


(-)a/src/sixlowpan/wscript (-1 lines)

Lines 13-19	Link Here

    module_test.source = [

    module_test.source = [

        'test/sixlowpan-hc1-test.cc',

        'test/sixlowpan-hc1-test.cc',

        'test/sixlowpan-iphc-test.cc',

        'test/sixlowpan-iphc-test.cc',

        'test/error-channel-sixlow.cc',

        'test/sixlowpan-fragmentation-test.cc',

        'test/sixlowpan-fragmentation-test.cc',

Return to bug 2622