Attachment #1028 for bug #1047

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




{
  NS_LOG_FUNCTION (this << mrtentry << p << header);
  NS_LOG_LOGIC ("Multicast forwarding logic for node: " << m_node->GetId ());

  std::map<uint32_t, uint32_t> ttlMap = mrtentry->GetOutputTtlMap();
  std::map<uint32_t, uint32_t>::iterator mapIter;

  for (mapIter = ttlMap.begin(); mapIter != ttlMap.end(); mapIter++)
    {
      uint32_t interfaceId = mapIter->first;
      //uint32_t outputTtl = mapIter->second;  // We never use this, do we?

      Ptr<Packet> packet = p->Copy ();
      Ipv4Header h = header;
      h.SetTtl (header.GetTtl () - 1);
      if (h.GetTtl () == 0)
        {
          NS_LOG_WARN ("TTL exceeded.  Drop.");
          m_dropTrace (header, packet, DROP_TTL_EXPIRED, m_node->GetObject<Ipv4> (), interfaceId);
          return;
          if (h.GetTtl () == 0)
            {
              NS_LOG_WARN ("TTL exceeded.  Drop.");
              m_dropTrace (header, packet, DROP_TTL_EXPIRED, m_node->GetObject<Ipv4> (), i);
              return;
            }
          NS_LOG_LOGIC ("Forward multicast via interface " << i);
          Ptr<Ipv4Route> rtentry = Create<Ipv4Route> ();
          rtentry->SetSource (h.GetSource ());
          rtentry->SetDestination (h.GetDestination ());
          rtentry->SetGateway (Ipv4Address::GetAny ());
          rtentry->SetOutputDevice (GetNetDevice (i));
          SendRealOut (rtentry, packet, h);
          continue; 
        }
      NS_LOG_LOGIC ("Forward multicast via interface " << interfaceId);
      Ptr<Ipv4Route> rtentry = Create<Ipv4Route> ();
      rtentry->SetSource (h.GetSource ());
      rtentry->SetDestination (h.GetDestination ());
      rtentry->SetGateway (Ipv4Address::GetAny ());
      rtentry->SetOutputDevice (GetNetDevice (interfaceId));
      SendRealOut (rtentry, packet, h);
      continue;
    }
}





  NS_LOG_FUNCTION (this << mrtentry << p << header);
  NS_LOG_LOGIC ("Multicast forwarding logic for node: " << m_node->GetId ());

  std::map<uint32_t, uint32_t> ttlMap = mrtentry->GetOutputTtlMap();
  std::map<uint32_t, uint32_t>::iterator mapIter;

  for (mapIter = ttlMap.begin(); mapIter != ttlMap.end(); mapIter++)
    {
      uint32_t interfaceId = mapIter->first;
      //uint32_t outputTtl = mapIter->second;  // We never use this, do we?
          Ptr<Packet> packet = p->Copy ();
          Ipv6Header h = header;
          h.SetHopLimit (header.GetHopLimit () - 1);
          if (h.GetHopLimit () == 0)
            {
              NS_LOG_WARN ("TTL exceeded.  Drop.");
              m_dropTrace (header, packet, DROP_TTL_EXPIRED, i);
              return;
            }

      Ptr<Packet> packet = p->Copy ();
      Ipv6Header h = header;
      h.SetHopLimit (header.GetHopLimit () - 1);
      if (h.GetHopLimit () == 0)
        {
          NS_LOG_WARN ("TTL exceeded.  Drop.");
          m_dropTrace (header, packet, DROP_TTL_EXPIRED, interfaceId);
          return;
        }
      NS_LOG_LOGIC ("Forward multicast via interface " << interfaceId);
      Ptr<Ipv6Route> rtentry = Create<Ipv6Route> ();
      rtentry->SetSource (h.GetSourceAddress ());
      rtentry->SetDestination (h.GetDestinationAddress ());
      rtentry->SetGateway (Ipv6Address::GetAny ());
      rtentry->SetOutputDevice (GetNetDevice (interfaceId));
      SendRealOut (rtentry, packet, h);
      continue;
    }
}






Ipv4MulticastRoute::Ipv4MulticastRoute ()
{
  m_ttls.clear();
  // Initialize array to MAX_TTL, which means that all interfaces are "off"
  for (uint32_t i = 0; i < MAX_INTERFACES; i++)
    {
      m_ttls.push_back(initial_ttl);
    }
}

void 

void 
Ipv4MulticastRoute::SetOutputTtl (uint32_t oif, uint32_t ttl)
{
  if (ttl >= MAX_TTL)
  {
    // This TTL value effectively disables the interface
    std::map<uint32_t, uint32_t>::iterator iter;
    iter = m_ttls.find(oif);
    if (iter != m_ttls.end())
    {
      m_ttls.erase(iter);
    }
  }
  else
  {
    m_ttls[oif] = ttl;
  }
}

uint32_t
Ipv4MulticastRoute::GetOutputTtl (uint32_t oif) const
{
  // We keep this interface around for compatibility (for now?)
  std::map<uint32_t, uint32_t>::const_iterator iter = m_ttls.find(oif);
  if (iter == m_ttls.end())
    return((uint32_t)MAX_TTL);
  return(iter->second);
}

std::map<uint32_t, uint32_t>
Ipv4MulticastRoute::GetOutputTtlMap() const
{
    return(m_ttls);
}

}//namespace ns3

(-)a/ns-3.10/src/node/ipv4-route.h (-2 / +7 lines)

Lines 20-26	Link Here

#define IPV4_ROUTE_H

#define IPV4_ROUTE_H

#include <list>

#include <list>

#include <vector>

#include <map>

#include <ostream>

#include <ostream>

#include "ns3/simple-ref-count.h"

#include "ns3/simple-ref-count.h"

Lines 146-151 public:	Link Here

146

   * \return TTL for this route

146

   * \return TTL for this route

147

*/

147

*/

148

  uint32_t GetOutputTtl (uint32_t oif) const;

148

  uint32_t GetOutputTtl (uint32_t oif) const;

149

150

/**

151

   * \return map of output interface Ids and TTLs for this route

152

*/

153

  std::map<uint32_t, uint32_t> GetOutputTtlMap() const;

149

154

150

  static const uint32_t MAX_INTERFACES = 16;  // Maximum number of multicast interfaces on a router

155

  static const uint32_t MAX_INTERFACES = 16;  // Maximum number of multicast interfaces on a router

151

  static const uint32_t MAX_TTL = 255;  // Maximum time-to-live (TTL)

156

  static const uint32_t MAX_TTL = 255;  // Maximum time-to-live (TTL)

Lines 154-160 private:	Link Here

154

  Ipv4Address m_group;      // Group

159

  Ipv4Address m_group;      // Group

155

  Ipv4Address m_origin;     // Source of packet

160

  Ipv4Address m_origin;     // Source of packet

156

  uint32_t m_parent;        // Source interface

161

  uint32_t m_parent;        // Source interface

157

  std::vector<uint32_t> m_ttls;

162

  std::map<uint32_t, uint32_t> m_ttls;

158

};

163

};

159

164

160

}//namespace ns3

165

}//namespace ns3





Ipv6MulticastRoute::Ipv6MulticastRoute ()
{
  m_ttls.clear();

  /* Initialize array to MAX_TTL, which means that all interfaces are "off" */
  for (uint32_t i = 0; i < MAX_INTERFACES; i++)
    {
      m_ttls.push_back (initial_ttl);
    }
}

Ipv6MulticastRoute::~Ipv6MulticastRoute ()


void Ipv6MulticastRoute::SetOutputTtl (uint32_t oif, uint32_t ttl)
{
  if (ttl >= MAX_TTL)
    {
      // This TTL value effectively disables the interface
      std::map<uint32_t, uint32_t>::iterator iter;
      iter = m_ttls.find(oif);
      if (iter != m_ttls.end())
        {
          m_ttls.erase(iter);
        }
    }
  else
    {
      m_ttls[oif] = ttl;
    }
}

uint32_t Ipv6MulticastRoute::GetOutputTtl (uint32_t oif) const
{
  // We keep this interface around for compatibility (for now?)
  std::map<uint32_t, uint32_t>::const_iterator iter = m_ttls.find(oif);
  if (iter == m_ttls.end())
    return((uint32_t)MAX_TTL);
  return(iter->second);
}

std::map<uint32_t, uint32_t> Ipv6MulticastRoute::GetOutputTtlMap() const
{
    return(m_ttls);
}

std::ostream& operator<< (std::ostream& os, Ipv6MulticastRoute const& route)

(-)a/ns-3.10/src/node/ipv6-route.h (-2 / +7 lines)

Lines 22-28	Link Here

#define IPV6_ROUTE_H

#define IPV6_ROUTE_H

#include <list>

#include <list>

#include <vector>

#include <map>

#include <ostream>

#include <ostream>

#include "ns3/simple-ref-count.h"

#include "ns3/simple-ref-count.h"

Lines 202-207 public:	Link Here

202

*/

202

*/

203

  uint32_t GetOutputTtl (uint32_t oif) const;

203

  uint32_t GetOutputTtl (uint32_t oif) const;

204

205

/**

206

   * \return map of output interface Ids and TTLs for this route

207

*/

208

  std::map<uint32_t, uint32_t> GetOutputTtlMap() const;

209

205

private:

210

private:

206

/**

211

/**

207

   * \brief IPv6 group.

212

   * \brief IPv6 group.

Lines 221-227 private:	Link Here

221

/**

226

/**

222

   * \brief TTLs.

227

   * \brief TTLs.

223

*/

228

*/

224

  std::vector<uint32_t> m_ttls;

229

  std::map<uint32_t, uint32_t> m_ttls;

225

};

230

};

226

231

227

std::ostream& operator<< (std::ostream& os, Ipv6MulticastRoute const& route);

232

std::ostream& operator<< (std::ostream& os, Ipv6MulticastRoute const& route);

Return to bug 1047