diff -r be0a0e796faf src/devices/bridge/bridge-net-device.cc --- a/src/devices/bridge/bridge-net-device.cc Mon Nov 03 11:38:23 2008 -0500 +++ b/src/devices/bridge/bridge-net-device.cc Tue Nov 04 16:42:58 2008 +0100 @@ -299,7 +299,7 @@ Address -BridgeNetDevice::MakeMulticastAddress (Ipv4Address multicastGroup) const +BridgeNetDevice::GetMulticast (Ipv4Address multicastGroup) const { NS_LOG_FUNCTION (this << multicastGroup); Mac48Address multicast = Mac48Address::GetMulticast (multicastGroup); diff -r be0a0e796faf src/devices/bridge/bridge-net-device.h --- a/src/devices/bridge/bridge-net-device.h Mon Nov 03 11:38:23 2008 -0500 +++ b/src/devices/bridge/bridge-net-device.h Tue Nov 04 16:42:58 2008 +0100 @@ -97,7 +97,7 @@ virtual Address GetBroadcast (void) const; virtual bool IsMulticast (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 Send (Ptr packet, const Address& dest, uint16_t protocolNumber); virtual bool SendFrom (Ptr packet, const Address& source, const Address& dest, uint16_t protocolNumber); diff -r be0a0e796faf src/devices/csma/csma-net-device.cc --- a/src/devices/csma/csma-net-device.cc Mon Nov 03 11:38:23 2008 -0500 +++ b/src/devices/csma/csma-net-device.cc Tue Nov 04 16:42:58 2008 +0100 @@ -803,7 +803,7 @@ } Address -CsmaNetDevice::MakeMulticastAddress (Ipv4Address multicastGroup) const +CsmaNetDevice::GetMulticast (Ipv4Address multicastGroup) const { NS_LOG_FUNCTION (multicastGroup); diff -r be0a0e796faf src/devices/csma/csma-net-device.h --- a/src/devices/csma/csma-net-device.h Mon Nov 03 11:38:23 2008 -0500 +++ b/src/devices/csma/csma-net-device.h Tue Nov 04 16:42:58 2008 +0100 @@ -343,7 +343,7 @@ * \see Mac48Address * \see Address */ - virtual Address MakeMulticastAddress (Ipv4Address multicastGroup) const; + virtual Address GetMulticast (Ipv4Address multicastGroup) const; /** * Is this a point to point link? diff -r be0a0e796faf src/devices/point-to-point/point-to-point-net-device.cc --- a/src/devices/point-to-point/point-to-point-net-device.cc Mon Nov 03 11:38:23 2008 -0500 +++ b/src/devices/point-to-point/point-to-point-net-device.cc Tue Nov 04 16:42:58 2008 +0100 @@ -385,7 +385,7 @@ } Address -PointToPointNetDevice::MakeMulticastAddress (Ipv4Address multicastGroup) const +PointToPointNetDevice::GetMulticast (Ipv4Address multicastGroup) const { return Mac48Address ("01:00:5e:00:00:00"); } diff -r be0a0e796faf src/devices/point-to-point/point-to-point-net-device.h --- a/src/devices/point-to-point/point-to-point-net-device.h Mon Nov 03 11:38:23 2008 -0500 +++ b/src/devices/point-to-point/point-to-point-net-device.h Tue Nov 04 16:42:58 2008 +0100 @@ -250,7 +250,7 @@ virtual bool IsMulticast (void) const; virtual Address GetMulticast (void) const; - virtual Address MakeMulticastAddress (Ipv4Address multicastGroup) const; + virtual Address GetMulticast (Ipv4Address multicastGroup) const; virtual bool IsPointToPoint (void) const; diff -r be0a0e796faf src/devices/wifi/wifi-net-device.cc --- a/src/devices/wifi/wifi-net-device.cc Mon Nov 03 11:38:23 2008 -0500 +++ b/src/devices/wifi/wifi-net-device.cc Tue Nov 04 16:42:58 2008 +0100 @@ -258,7 +258,7 @@ return Mac48Address::GetMulticastPrefix (); } Address -WifiNetDevice::MakeMulticastAddress (Ipv4Address multicastGroup) const +WifiNetDevice::GetMulticast (Ipv4Address multicastGroup) const { return Mac48Address::GetMulticast (multicastGroup); } diff -r be0a0e796faf src/devices/wifi/wifi-net-device.h --- a/src/devices/wifi/wifi-net-device.h Mon Nov 03 11:38:23 2008 -0500 +++ b/src/devices/wifi/wifi-net-device.h Tue Nov 04 16:42:58 2008 +0100 @@ -93,7 +93,7 @@ virtual Address GetBroadcast (void) const; virtual bool IsMulticast (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 Send(Ptr packet, const Address& dest, uint16_t protocolNumber); virtual Ptr GetNode (void) const; diff -r be0a0e796faf src/internet-stack/arp-ipv4-interface.cc --- a/src/internet-stack/arp-ipv4-interface.cc Mon Nov 03 11:38:23 2008 -0500 +++ b/src/internet-stack/arp-ipv4-interface.cc Tue Nov 04 16:42:58 2008 +0100 @@ -139,7 +139,7 @@ "ArpIpv4Interface::SendTo (): Sending multicast packet over " "non-multicast device"); - hardwareDestination = GetDevice ()->MakeMulticastAddress(dest); + hardwareDestination = GetDevice ()->GetMulticast(dest); found = true; } else diff -r be0a0e796faf src/node/net-device.h --- a/src/node/net-device.h Mon Nov 03 11:38:23 2008 -0500 +++ b/src/node/net-device.h Tue Nov 04 16:42:58 2008 +0100 @@ -155,14 +155,14 @@ * 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 + * 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::MakeMulticastAddress + * \see NetDevice::GetMulticast */ virtual Address GetMulticast (void) const = 0; @@ -179,7 +179,7 @@ * encapsulated in an abstract Address to avoid dependencies on the exact * MAC address format. * - * A default imlementation of MakeMulticastAddress is provided, but this + * 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 @@ -196,7 +196,7 @@ * \see Address * \see NetDevice::IsMulticast */ - virtual Address MakeMulticastAddress (Ipv4Address multicastGroup) const = 0; + virtual Address GetMulticast (Ipv4Address multicastGroup) const = 0; /** * \return value of m_isPointToPoint flag diff -r be0a0e796faf src/node/simple-net-device.cc --- a/src/node/simple-net-device.cc Mon Nov 03 11:38:23 2008 -0500 +++ b/src/node/simple-net-device.cc Tue Nov 04 16:42:58 2008 +0100 @@ -153,7 +153,7 @@ return Mac48Address::GetMulticastPrefix (); } Address -SimpleNetDevice::MakeMulticastAddress (Ipv4Address multicastGroup) const +SimpleNetDevice::GetMulticast (Ipv4Address multicastGroup) const { return Mac48Address::GetMulticast (multicastGroup); } diff -r be0a0e796faf src/node/simple-net-device.h --- a/src/node/simple-net-device.h Mon Nov 03 11:38:23 2008 -0500 +++ b/src/node/simple-net-device.h Tue Nov 04 16:42:58 2008 +0100 @@ -60,7 +60,7 @@ virtual Address GetBroadcast (void) const; virtual bool IsMulticast (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 Send(Ptr packet, const Address& dest, uint16_t protocolNumber); virtual bool SendFrom(Ptr packet, const Address& source, const Address& dest, uint16_t protocolNumber);