RecvReply changed to respond properly to receive RREP with origin address != receiver address, but == local address of another interface

This commit is contained in:
Borovkova Elena committed 2009-07-30 11:14:47 +04:00
1 parent cc4a5ac145
commit bfec349d77
6 files changed
+31 -31

No files matched your search

+10 -8
View File
@@ -178,7 +178,7 @@ Ipv4Interface::SetForwarding (bool val)
void
Ipv4Interface::Send (Ptr<Packet> p, Ipv4Address dest)
{
NS_LOG_FUNCTION (dest << *p);
NS_LOG_UNCOND (dest << *p);
if (!IsUp())
{
return;
@@ -188,6 +188,7 @@ Ipv4Interface::Send (Ptr<Packet> p, Ipv4Address dest)
{
// XXX additional checks needed here (such as whether multicast
// goes to loopback)?
NS_LOG_UNCOND ("Ipv4Interface::Send loopback");
m_device->Send (p, m_device->GetBroadcast (),
Ipv4L3Protocol::PROT_NUMBER);
return;
@@ -197,6 +198,7 @@ Ipv4Interface::Send (Ptr<Packet> p, Ipv4Address dest)
{
if (dest == (*i).GetLocal ())
{
NS_LOG_UNCOND ("to local");
Ptr<Ipv4L3Protocol> ipv4 = m_node->GetObject<Ipv4L3Protocol> ();
ipv4->Receive (m_device, p, Ipv4L3Protocol::PROT_NUMBER,
@@ -209,19 +211,19 @@ Ipv4Interface::Send (Ptr<Packet> p, Ipv4Address dest)
}
if (m_device->NeedsArp ())
{
NS_LOG_LOGIC ("Needs ARP" << " " << dest);
NS_LOG_UNCOND ("Needs ARP" << " " << dest);
Ptr<ArpL3Protocol> arp = m_node->GetObject<ArpL3Protocol> ();
Address hardwareDestination;
bool found = false;
if (dest.IsBroadcast ())
{
NS_LOG_LOGIC ("All-network Broadcast");
NS_LOG_UNCOND ("All-network Broadcast");
hardwareDestination = m_device->GetBroadcast ();
found = true;
}
else if (dest.IsMulticast ())
{
NS_LOG_LOGIC ("IsMulticast");
NS_LOG_UNCOND ("IsMulticast");
NS_ASSERT_MSG(m_device->IsMulticast (),
"ArpIpv4Interface::SendTo (): Sending multicast packet over "
"non-multicast device");
@@ -235,7 +237,7 @@ Ipv4Interface::Send (Ptr<Packet> p, Ipv4Address dest)
{
if (dest.IsSubnetDirectedBroadcast ((*i).GetMask ()))
{
NS_LOG_LOGIC ("Subnetwork Broadcast");
NS_LOG_UNCOND ("Subnetwork Broadcast hardwareDestination " << hardwareDestination);
hardwareDestination = m_device->GetBroadcast ();
found = true;
break;
@@ -243,21 +245,21 @@ Ipv4Interface::Send (Ptr<Packet> p, Ipv4Address dest)
}
if (!found)
{
NS_LOG_LOGIC ("ARP Lookup");
NS_LOG_UNCOND ("ARP Lookup");
found = arp->Lookup (p, dest, m_device, m_cache, &hardwareDestination);
}
}
if (found)
{
NS_LOG_LOGIC ("Address Resolved. Send.");
NS_LOG_UNCOND ("Address Resolved. Send.");
m_device ->Send (p, hardwareDestination,
Ipv4L3Protocol::PROT_NUMBER);
}
}
else
{
NS_LOG_LOGIC ("Doesn't need ARP");
NS_LOG_UNCOND ("Doesn't need ARP");
m_device->Send (p, m_device->GetBroadcast (),
Ipv4L3Protocol::PROT_NUMBER);
}