Attachment #1760 for bug #1834

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




      tos = ipTosTag.GetTos ();
    }

  if (destination.IsMulticast ())
    {
      SocketIpMulticastLoopTag ipMulticastLoopTag;
      found = packet->RemovePacketTag (ipMulticastLoopTag);
      if (found && ipMulticastLoopTag.IsEnabled ())
        {
          Ptr<Ipv4Route> rtentry = Create<Ipv4Route> ();
          rtentry->SetSource (source);
          rtentry->SetDestination (destination);
          rtentry->SetGateway (Ipv4Address::GetAny ());
          rtentry->SetOutputDevice (m_node->GetLoopbackDevice ());

          SendRealOut (rtentry, packet->Copy (), BuildHeader (source, destination, protocol, packet->GetSize (), ttl, tos, mayFragment));
        }
    }

  // Handle a few cases:
  // 1) packet is destined to limited broadcast address
  // 2) packet is destined to a subnet-directed broadcast address




      tclass = tclassTag.GetTclass ();
    }

  if (destination.IsMulticast ())
    {
      SocketIpMulticastLoopTag ipMulticastLoopTag;
      found = packet->RemovePacketTag (ipMulticastLoopTag);
      if (found && ipMulticastLoopTag.IsEnabled ())
        {
          Ptr<Ipv6Route> rtentry = Create<Ipv6Route> ();
          rtentry->SetSource (source);
          rtentry->SetDestination (destination);
          rtentry->SetGateway (Ipv6Address::GetAny ());
          rtentry->SetOutputDevice (m_node->GetLoopbackDevice ());

          SendRealOut (rtentry, packet->Copy (), BuildHeader (source, destination, protocol, packet->GetSize (), ttl, tclass));
        }
    }

  /* Handle 3 cases:
   * 1) Packet is passed in with a route entry
   * 2) Packet is passed in with a route entry but route->GetGateway is not set (e.g., same network)

(-)a/src/internet/model/udp-socket-impl.cc (+16 lines)

Lines 519-524	Link Here

519

        p->AddPacketTag (tag);

519

        p->AddPacketTag (tag);

520

521

522

523

  if (dest.IsMulticast () && m_ipMulticastLoop)

524

525

      SocketIpMulticastLoopTag tag;

526

      tag.Enable ();

527

      p->AddPacketTag (tag);

528

529

522

//

530

//

523

  // If dest is set to the limited broadcast address (all ones),

531

  // If dest is set to the limited broadcast address (all ones),

524

  // convert it to send a copy of the packet out of every

532

  // convert it to send a copy of the packet out of every

Lines 698-703	Link Here

698

      tag.SetHopLimit (GetIpv6HopLimit ());

706

      tag.SetHopLimit (GetIpv6HopLimit ());

699

      p->AddPacketTag (tag);

707

      p->AddPacketTag (tag);

700

708

709

710

  if (dest.IsMulticast () && m_ipMulticastLoop)

711

712

      SocketIpMulticastLoopTag tag;

713

      tag.Enable ();

714

      p->AddPacketTag (tag);

715

716

701

  // There is no analgous to an IPv4 broadcast address in IPv6.

717

  // There is no analgous to an IPv4 broadcast address in IPv6.

702

  // Instead, we use a set of link-local, site-local, and global

718

  // Instead, we use a set of link-local, site-local, and global

703

  // multicast addresses.  The Ipv6 routing layers should all

719

  // multicast addresses.  The Ipv6 routing layers should all




  os << "IPV6_TCLASS = " << m_ipv6Tclass;
}

SocketIpMulticastLoopTag::SocketIpMulticastLoopTag () :
  m_multicastLoop (false)
{
  NS_LOG_FUNCTION (this);
}
void
SocketIpMulticastLoopTag::Enable (void)
{
  NS_LOG_FUNCTION (this);
  m_multicastLoop = true;
}
void
SocketIpMulticastLoopTag::Disable (void)
{
  NS_LOG_FUNCTION (this);
  m_multicastLoop = false;
}
bool
SocketIpMulticastLoopTag::IsEnabled (void) const
{
  NS_LOG_FUNCTION (this);
  return m_multicastLoop;
}

NS_OBJECT_ENSURE_REGISTERED (SocketIpMulticastLoopTag);

TypeId
SocketIpMulticastLoopTag::GetTypeId (void)
{
  static TypeId tid = TypeId ("ns3::SocketIpMulticastLoopTag")
    .SetParent<Tag> ()
    .AddConstructor<SocketIpMulticastLoopTag> ();
  return tid;
}
TypeId
SocketIpMulticastLoopTag::GetInstanceTypeId (void) const
{
  return GetTypeId ();
}
uint32_t
SocketIpMulticastLoopTag::GetSerializedSize (void) const
{
  NS_LOG_FUNCTION (this);
  return 1;
}
void
SocketIpMulticastLoopTag::Serialize (TagBuffer i) const
{
  NS_LOG_FUNCTION (this << &i);
  i.WriteU8 (m_multicastLoop ? 1 : 0);
}
void
SocketIpMulticastLoopTag::Deserialize (TagBuffer i)
{
  NS_LOG_FUNCTION (this << &i);
  m_multicastLoop = (i.ReadU8 () == 1) ? true : false;
}
void
SocketIpMulticastLoopTag::Print (std::ostream &os) const
{
  NS_LOG_FUNCTION (this << &os);
  os << (m_multicastLoop ? "true" : "false");
}

} // namespace ns3




  uint8_t m_ipv6Tclass; //!< the Tclass carried by the tag
};

/**
 * \brief indicated whether multicast packets should be looped back to
 * local sockets.
 */
class SocketIpMulticastLoopTag : public Tag
{
public:
  SocketIpMulticastLoopTag ();
  void Enable (void);
  void Disable (void);
  bool IsEnabled (void) const;

  static TypeId GetTypeId (void);
  virtual TypeId GetInstanceTypeId (void) const;
  virtual uint32_t GetSerializedSize (void) const;
  virtual void Serialize (TagBuffer i) const;
  virtual void Deserialize (TagBuffer i);
  virtual void Print (std::ostream &os) const;
private:
  bool m_multicastLoop;
};

} // namespace ns3

#endif /* NS3_SOCKET_H */

(-)a/src/internet/model/ipv4-interface.cc (-1 / +1 lines)

Lines 19-25	Link Here

*/

*/

#include "ipv4-interface.h"

#include "ipv4-interface.h"

#include "loopback-net-device.h"

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

#include "ns3/ipv4-address.h"

#include "ns3/ipv4-address.h"

#include "ipv4-l3-protocol.h"

#include "ipv4-l3-protocol.h"

#include "arp-l3-protocol.h"

#include "arp-l3-protocol.h"




#include "ns3/boolean.h"
#include "ns3/ipv4-routing-table-entry.h"

#include "loopback-net-device.h"
#include "arp-l3-protocol.h"
#include "ipv4-l3-protocol.h"
#include "icmpv4-l4-protocol.h"

  NS_LOG_FUNCTION (this);

  Ptr<Ipv4Interface> interface = CreateObject<Ipv4Interface> ();
  Ptr<NetDevice> device = m_node->GetLoopbackDevice ();
  // First check whether an existing LoopbackNetDevice exists on the node
  for (uint32_t i = 0; i < m_node->GetNDevices (); i++)
    {
      if ((device = DynamicCast<LoopbackNetDevice> (m_node->GetDevice (i))))
        {
          break;
        }
    }
  if (device == 0)
    {
      device = CreateObject<LoopbackNetDevice> (); 
      m_node->AddDevice (device);
    }
  interface->SetDevice (device);
  interface->SetNode (m_node);
  Ipv4InterfaceAddress ifaceAddr = Ipv4InterfaceAddress (Ipv4Address::GetLoopback (), Ipv4Mask::GetLoopback ());

(-)a/src/internet/model/ipv6-interface.cc (-1 / +1 lines)

Lines 24-30	Link Here

#include "ipv6-interface.h"

#include "ipv6-interface.h"

#include "ns3/net-device.h"

#include "ns3/net-device.h"

#include "loopback-net-device.h"

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

#include "ns3/mac16-address.h"

#include "ns3/mac16-address.h"

#include "ns3/mac64-address.h"

#include "ns3/mac64-address.h"

#include "ipv6-l3-protocol.h"

#include "ipv6-l3-protocol.h"




#include "ns3/ipv6-route.h"
#include "ns3/mac16-address.h"
#include "ns3/mac64-address.h"
#include "ns3/mac48-address.h"

#include "loopback-net-device.h"
#include "ipv6-l3-protocol.h"
#include "ipv6-interface.h"
#include "ipv6-raw-socket-impl.h"

{
  NS_LOG_FUNCTION_NOARGS ();
  Ptr<Ipv6Interface> interface = CreateObject<Ipv6Interface> ();
  Ptr<NetDevice> device = m_node->GetLoopbackDevice ();
  uint32_t i = 0;

  /* see if we have already an loopback NetDevice */
  for (i = 0; i < m_node->GetNDevices (); i++)
    {
      if ((device = DynamicCast<LoopbackNetDevice> (m_node->GetDevice (i))))
        {
          break;
        }
    }

  if (device == 0)
    {
      device = CreateObject<LoopbackNetDevice> ();
      m_node->AddDevice (device);
    }

  interface->SetDevice (device);
  interface->SetNode (m_node);

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

Lines 120-126	Link Here

120

        'model/ipv4-raw-socket-impl.cc',

120

        'model/ipv4-raw-socket-impl.cc',

121

        'model/icmpv4.cc',

121

        'model/icmpv4.cc',

122

        'model/icmpv4-l4-protocol.cc',

122

        'model/icmpv4-l4-protocol.cc',

123

        'model/loopback-net-device.cc',

124

        'model/ndisc-cache.cc',

123

        'model/ndisc-cache.cc',

125

        'model/ipv6-interface.cc',

124

        'model/ipv6-interface.cc',

126

        'model/icmpv6-header.cc',

125

        'model/icmpv6-header.cc',

Lines 247-253	Link Here

247

        'model/icmpv6-l4-protocol.h',

246

        'model/icmpv6-l4-protocol.h',

248

        'model/ipv6-interface.h',

247

        'model/ipv6-interface.h',

249

        'model/ndisc-cache.h',

248

        'model/ndisc-cache.h',

250

        'model/loopback-net-device.h',

251

        'model/ipv4-packet-info-tag.h',

249

        'model/ipv4-packet-info-tag.h',

252

        'model/ipv6-packet-info-tag.h',

250

        'model/ipv6-packet-info-tag.h',

253

        'model/ipv4-interface-address.h',

251

        'model/ipv4-interface-address.h',




#include "node.h"
#include "node-list.h"
#include "net-device.h"
#include "loopback-net-device.h"
#include "application.h"
#include "ns3/packet.h"
#include "ns3/simulator.h"

  NS_LOG_FUNCTION (this);
  return m_devices.size ();
}
Ptr<NetDevice>
Node::GetLoopbackDevice ()
{
  NS_LOG_FUNCTION (this);
  if (!m_loopbackDevice)
    {
      Ptr<LoopbackNetDevice> device = CreateObject<LoopbackNetDevice> ();
      AddDevice (device);
      m_loopbackDevice = device;
    }
  return m_loopbackDevice;
}

uint32_t 
Node::AddApplication (Ptr<Application> application)

(-)a/src/network/model/node.h (+5 lines)

Lines 100-105	Link Here

100

   *          to this Node.

100

   *          to this Node.

101

*/

101

*/

102

  uint32_t GetNDevices (void) const;

102

  uint32_t GetNDevices (void) const;

103

/**

104

   * \returns the LoopbackNetDevice associated with this Node.

105

*/

106

  Ptr<NetDevice> GetLoopbackDevice ();

103

107

104

/**

108

/**

105

   * \param application Application to associate to this node.

109

   * \param application Application to associate to this node.

Lines 224-229	Link Here

224

228

225

  uint32_t    m_id;         // Node id for this node

229

  uint32_t    m_id;         // Node id for this node

226

  uint32_t    m_sid;        // System id for this node

230

  uint32_t    m_sid;        // System id for this node

231

  Ptr<NetDevice> m_loopbackDevice;

227

  std::vector<Ptr<NetDevice> > m_devices;

232

  std::vector<Ptr<NetDevice> > m_devices;

228

  std::vector<Ptr<Application> > m_applications;

233

  std::vector<Ptr<Application> > m_applications;

229

  ProtocolHandlerList m_handlers;

234

  ProtocolHandlerList m_handlers;

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

Lines 15-20	Link Here

        'model/node.cc',

        'model/node.cc',

        'model/node-list.cc',

        'model/node-list.cc',

        'model/net-device.cc',

        'model/net-device.cc',

        'model/loopback-net-device.cc',

        'model/packet.cc',

        'model/packet.cc',

        'model/packet-metadata.cc',

        'model/packet-metadata.cc',

        'model/packet-tag-list.cc',

        'model/packet-tag-list.cc',

Lines 89-94	Link Here

        'model/chunk.h',

        'model/chunk.h',

        'model/header.h',

        'model/header.h',

        'model/net-device.h',

        'model/net-device.h',

        'model/loopback-net-device.h',

        'model/nix-vector.h',

        'model/nix-vector.h',

        'model/node.h',

        'model/node.h',

        'model/node-list.h',

        'model/node-list.h',

Return to bug 1834