From b1d413cb3a6f7cc8e9b86da58fe271dac6d54d87 Mon Sep 17 00:00:00 2001 From: Saswat Mishra Date: Sun, 6 Sep 2015 22:58:26 -0700 Subject: [PATCH] Update AODV and DSR for static ARP support --- src/aodv/model/aodv-neighbor.cc | 2 +- src/dsr/model/dsr-rcache.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/aodv/model/aodv-neighbor.cc b/src/aodv/model/aodv-neighbor.cc index 4599a0cfb..090d59647 100644 --- a/src/aodv/model/aodv-neighbor.cc +++ b/src/aodv/model/aodv-neighbor.cc @@ -149,7 +149,7 @@ Neighbors::LookupMacAddress (Ipv4Address addr) i != m_arp.end (); ++i) { ArpCache::Entry * entry = (*i)->Lookup (addr); - if (entry != 0 && entry->IsAlive () && !entry->IsExpired ()) + if (entry != 0 && (entry->IsAlive () || entry->IsPermanent ()) && !entry->IsExpired ()) { hwaddr = Mac48Address::ConvertFrom (entry->GetMacAddress ()); break; diff --git a/src/dsr/model/dsr-rcache.cc b/src/dsr/model/dsr-rcache.cc index f9e26afd9..979a28879 100644 --- a/src/dsr/model/dsr-rcache.cc +++ b/src/dsr/model/dsr-rcache.cc @@ -1222,7 +1222,7 @@ RouteCache::LookupMacAddress (Ipv4Address addr) i != m_arp.end (); ++i) { ArpCache::Entry * entry = (*i)->Lookup (addr); - if (entry != 0 && entry->IsAlive () && !entry->IsExpired ()) + if (entry != 0 && (entry->IsAlive () || entry->IsPermanent ()) && !entry->IsExpired ()) { hwaddr = Mac48Address::ConvertFrom (entry->GetMacAddress ()); break;