Attachment #287 for bug #294

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

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

Lines 299-305	Link Here

299

300

301

Address

301

Address

302

BridgeNetDevice::MakeMulticastAddress (Ipv4Address multicastGroup) const

302

BridgeNetDevice::GetMulticast (Ipv4Address multicastGroup) const

303

304

 NS_LOG_FUNCTION (this << multicastGroup);

304

 NS_LOG_FUNCTION (this << multicastGroup);

305

 Mac48Address multicast = Mac48Address::GetMulticast (multicastGroup);

305

 Mac48Address multicast = Mac48Address::GetMulticast (multicastGroup);

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

Lines 97-103	Link Here

  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 (void) const;

100

  virtual Address MakeMulticastAddress (Ipv4Address multicastGroup) const;

100

  virtual Address GetMulticast (Ipv4Address multicastGroup) const;

101

  virtual bool IsPointToPoint (void) const;

101

  virtual bool IsPointToPoint (void) const;

102

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

102

  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);

103

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

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

Lines 803-809	Link Here

803

804

805

  Address

805

  Address

806

CsmaNetDevice::MakeMulticastAddress (Ipv4Address multicastGroup) const

806

CsmaNetDevice::GetMulticast (Ipv4Address multicastGroup) const

807

808

  NS_LOG_FUNCTION (multicastGroup);

808

  NS_LOG_FUNCTION (multicastGroup);

809

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

Lines 343-349	Link Here

343

   * \see Mac48Address

343

   * \see Mac48Address

344

   * \see Address

344

   * \see Address

345

*/

345

*/

346

  virtual Address MakeMulticastAddress (Ipv4Address multicastGroup) const;

346

  virtual Address GetMulticast (Ipv4Address multicastGroup) const;

347

348

/**

348

/**

349

   * Is this a point to point link?

349

   * Is this a point to point link?

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

Lines 385-391	Link Here

385

386

387

  Address

387

  Address

388

PointToPointNetDevice::MakeMulticastAddress (Ipv4Address multicastGroup) const

388

PointToPointNetDevice::GetMulticast (Ipv4Address multicastGroup) const

389

390

  return Mac48Address ("01:00:5e:00:00:00");

390

  return Mac48Address ("01:00:5e:00:00:00");

391

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

Lines 250-256	Link Here

250

251

  virtual bool IsMulticast (void) const;

251

  virtual bool IsMulticast (void) const;

252

  virtual Address GetMulticast (void) const;

252

  virtual Address GetMulticast (void) const;

253

  virtual Address MakeMulticastAddress (Ipv4Address multicastGroup) const;

253

  virtual Address GetMulticast (Ipv4Address multicastGroup) const;

254

255

  virtual bool IsPointToPoint (void) const;

255

  virtual bool IsPointToPoint (void) const;

256

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

Lines 258-264	Link Here

258

  return Mac48Address::GetMulticastPrefix ();

258

  return Mac48Address::GetMulticastPrefix ();

259

260

Address

260

Address

261

WifiNetDevice::MakeMulticastAddress (Ipv4Address multicastGroup) const

261

WifiNetDevice::GetMulticast (Ipv4Address multicastGroup) const

262

263

  return Mac48Address::GetMulticast (multicastGroup);

263

  return Mac48Address::GetMulticast (multicastGroup);

264

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

Lines 93-99	Link Here

  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 (void) const;

  virtual Address MakeMulticastAddress (Ipv4Address multicastGroup) const;

  virtual Address GetMulticast (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




   * 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::GetMulticast 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::GetMulticast
   */
  virtual Address GetMulticast (void) const = 0;
  

   * 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

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

Lines 153-159	Link Here

153

  return Mac48Address::GetMulticastPrefix ();

153

  return Mac48Address::GetMulticastPrefix ();

154

155

Address

155

Address

156

SimpleNetDevice::MakeMulticastAddress (Ipv4Address multicastGroup) const

156

SimpleNetDevice::GetMulticast (Ipv4Address multicastGroup) const

157

158

  return Mac48Address::GetMulticast (multicastGroup);

158

  return Mac48Address::GetMulticast (multicastGroup);

159

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

Lines 60-66	Link Here

  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 (void) const;

  virtual Address MakeMulticastAddress (Ipv4Address multicastGroup) const;

  virtual Address GetMulticast (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