Attachment #288 for bug #294

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




  return true;
}


Address
BridgeNetDevice::GetMulticast (Ipv4Address multicastGroup) const
{
  return Mac48Address ("01:00:5e:00:00:00");
}


Address
BridgeNetDevice::MakeMulticastAddress (Ipv4Address multicastGroup) const
{
 NS_LOG_FUNCTION (this << multicastGroup);
 Mac48Address multicast = Mac48Address::GetMulticast (multicastGroup);

(-)a/src/devices/bridge/bridge-net-device.h (-2 / +1 lines)

Lines 96-103	Link Here

  virtual bool IsBroadcast (void) const;

  virtual bool IsBroadcast (void) const;

  virtual Address GetBroadcast (void) const;

  virtual Address GetBroadcast (void) const;

  virtual bool IsMulticast (void) const;

  virtual bool IsMulticast (void) const;

  virtual Address GetMulticast (void) const;

  virtual Address GetMulticast (Ipv4Address multicastGroup) const;

100

  virtual Address MakeMulticastAddress (Ipv4Address multicastGroup) const;

101

  virtual bool IsPointToPoint (void) const;

100

  virtual bool IsPointToPoint (void) const;

102

  virtual bool Send (Ptr<Packet> packet, const Address& dest, uint16_t protocolNumber);

101

  virtual bool Send (Ptr<Packet> packet, const Address& dest, uint16_t protocolNumber);

103

  virtual bool SendFrom (Ptr<Packet> packet, const Address& source, const Address& dest, uint16_t protocolNumber);

102

  virtual bool SendFrom (Ptr<Packet> packet, const Address& source, const Address& dest, uint16_t protocolNumber);




}

  Address 
CsmaNetDevice::GetMulticast (Ipv4Address multicastGroup) const
{
  NS_LOG_FUNCTION_NOARGS ();
  return Mac48Address::GetMulticastPrefix ();
}

  Address 
CsmaNetDevice::MakeMulticastAddress (Ipv4Address multicastGroup) const
{
  NS_LOG_FUNCTION (multicastGroup);


(-)a/src/devices/csma/csma-net-device.h (-2 / +1 lines)

Lines 319-325	Link Here

319

  virtual bool IsBroadcast (void) const;

319

  virtual bool IsBroadcast (void) const;

320

  virtual Address GetBroadcast (void) const;

320

  virtual Address GetBroadcast (void) const;

321

  virtual bool IsMulticast (void) const;

321

  virtual bool IsMulticast (void) const;

322

  virtual Address GetMulticast (void) const;

323

322

324

/**

323

/**

325

   * \brief Make and return a MAC multicast address using the provided

324

   * \brief Make and return a MAC multicast address using the provided

Lines 343-349	Link Here

343

   * \see Mac48Address

342

   * \see Mac48Address

344

   * \see Address

343

   * \see Address

345

*/

344

*/

346

  virtual Address MakeMulticastAddress (Ipv4Address multicastGroup) const;

345

  virtual Address GetMulticast (Ipv4Address multicastGroup) const;

347

346

348

/**

347

/**

349

   * Is this a point to point link?

348

   * Is this a point to point link?




  return false;
}

//
// Since we return false in the IsMulticast call, calls to other multicast
// related methods returns are undefined according to the base class.  So we
// can freely make something up, which is the base of the MAC multicast
// address space.
//
  Address 
PointToPointNetDevice::GetMulticast (Ipv4Address multicastGroup) const
{
  return Mac48Address ("01:00:5e:00:00:00");
}

  Address 
PointToPointNetDevice::MakeMulticastAddress (Ipv4Address multicastGroup) const
{
  return Mac48Address ("01:00:5e:00:00:00");
}

(-)a/src/devices/point-to-point/point-to-point-net-device.h (-2 / +1 lines)

Lines 249-256	Link Here

249

  virtual Address GetBroadcast (void) const;

249

  virtual Address GetBroadcast (void) const;

250

251

  virtual bool IsMulticast (void) const;

251

  virtual bool IsMulticast (void) const;

252

  virtual Address GetMulticast (void) const;

252

  virtual Address GetMulticast (Ipv4Address multicastGroup) const;

253

  virtual Address MakeMulticastAddress (Ipv4Address multicastGroup) const;

254

253

255

  virtual bool IsPointToPoint (void) const;

254

  virtual bool IsPointToPoint (void) const;

256

255




  return false;
}
Address 
WifiNetDevice::GetMulticast (Ipv4Address multicastGroup) const
{
  return Mac48Address::GetMulticastPrefix ();
}
Address 
WifiNetDevice::MakeMulticastAddress (Ipv4Address multicastGroup) const
{
  return Mac48Address::GetMulticast (multicastGroup);
}

(-)a/src/devices/wifi/wifi-net-device.h (-2 / +1 lines)

Lines 92-99	Link Here

  virtual bool IsBroadcast (void) const;

  virtual bool IsBroadcast (void) const;

  virtual Address GetBroadcast (void) const;

  virtual Address GetBroadcast (void) const;

  virtual bool IsMulticast (void) const;

  virtual bool IsMulticast (void) const;

  virtual Address GetMulticast (void) const;

  virtual Address GetMulticast (Ipv4Address multicastGroup) const;

  virtual Address MakeMulticastAddress (Ipv4Address multicastGroup) const;

  virtual bool IsPointToPoint (void) const;

  virtual bool IsPointToPoint (void) const;

  virtual bool Send(Ptr<Packet> packet, const Address& dest, uint16_t protocolNumber);

  virtual bool Send(Ptr<Packet> packet, const Address& dest, uint16_t protocolNumber);

  virtual Ptr<Node> GetNode (void) const;

  virtual Ptr<Node> GetNode (void) const;

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

Lines 139-145	Link Here

139

            "ArpIpv4Interface::SendTo (): Sending multicast packet over "

139

            "ArpIpv4Interface::SendTo (): Sending multicast packet over "

140

            "non-multicast device");

140

            "non-multicast device");

141

142

          hardwareDestination = GetDevice ()->MakeMulticastAddress(dest);

142

          hardwareDestination = GetDevice ()->GetMulticast(dest);

143

          found = true;

143

          found = true;

144

145

      else

145

      else




  virtual bool IsMulticast (void) const = 0;

  /**
   * \brief Return the MAC multicast base address used when mapping multicast
   * groups to MAC multicast addresses.
   *
   * Typically when one constructs a multicast MAC addresses, some bits from
   * the IP multicast group are copied into a corresponding MAC multicast 
   * group.  In EUI-48, for example, the low order 23 bits of the multicast
   * group are copied to the MAC multicast group base address.
   *
   * This method allows access to the underlying MAC multicast group base 
   * address.  It is expected that in most cases, a net device client will
   * allow the net device to perform the actual construction of the multicast
   * address.  Use of this method is discouraged unless you have a good reason
   * to perform a custom mapping.  You should prefer 
   * NetDevice::MakeMulticastAddress which will do the RFC-specified mapping
   * for the net device in question.
   *
   * \return The multicast address supported by this net device.
   *
   * \warning Calling this method is invalid if IsMulticast returns not true.
   * The method NS_ASSERTs if the device is not a multicast device.
   * \see NetDevice::MakeMulticastAddress
   */
  virtual Address GetMulticast (void) const = 0;
  
  /**
   * \brief Make and return a MAC multicast address using the provided
   *        multicast group
   *

   * encapsulated in an abstract Address to avoid dependencies on the exact
   * MAC address format.
   *
   * A default imlementation of GetMulticast is provided, but this
   * method simply NS_ASSERTS.  In the case of net devices that do not support
   * multicast, clients are expected to test NetDevice::IsMulticast and avoid
   * attempting to map multicast packets.  Subclasses of NetDevice that do

   * \see Address
   * \see NetDevice::IsMulticast
   */
  virtual Address GetMulticast (Ipv4Address multicastGroup) const = 0;
  
  /**
   * \return value of m_isPointToPoint flag




  return false;
}
Address 
SimpleNetDevice::GetMulticast (Ipv4Address multicastGroup) const
{
  return Mac48Address::GetMulticastPrefix ();
}
Address 
SimpleNetDevice::MakeMulticastAddress (Ipv4Address multicastGroup) const
{
  return Mac48Address::GetMulticast (multicastGroup);
}

(-)a/src/node/simple-net-device.h (-2 / +1 lines)

Lines 59-66	Link Here

  virtual bool IsBroadcast (void) const;

  virtual bool IsBroadcast (void) const;

  virtual Address GetBroadcast (void) const;

  virtual Address GetBroadcast (void) const;

  virtual bool IsMulticast (void) const;

  virtual bool IsMulticast (void) const;

  virtual Address GetMulticast (void) const;

  virtual Address GetMulticast (Ipv4Address multicastGroup) const;

  virtual Address MakeMulticastAddress (Ipv4Address multicastGroup) const;

  virtual bool IsPointToPoint (void) const;

  virtual bool IsPointToPoint (void) const;

  virtual bool Send(Ptr<Packet> packet, const Address& dest, uint16_t protocolNumber);

  virtual bool Send(Ptr<Packet> packet, const Address& dest, uint16_t protocolNumber);

  virtual bool SendFrom(Ptr<Packet> packet, const Address& source, const Address& dest, uint16_t protocolNumber);

  virtual bool SendFrom(Ptr<Packet> packet, const Address& source, const Address& dest, uint16_t protocolNumber);

Return to bug 294