From 2c1ff505a7dcba19f696152836de7413378cc0d4 Mon Sep 17 00:00:00 2001
From: John Abraham <john.abraham@gatech.edu>
Date: Thu, 30 Jun 2011 11:52:11 -0400
Subject: [PATCH] Bug 1194 - Incorrect RERR processing

---
 src/aodv/model/aodv-routing-protocol.cc | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/src/aodv/model/aodv-routing-protocol.cc b/src/aodv/model/aodv-routing-protocol.cc
index bcb0df7c9..c6f362216 100644
--- a/src/aodv/model/aodv-routing-protocol.cc
+++ b/src/aodv/model/aodv-routing-protocol.cc
@@ -1418,19 +1418,14 @@ RoutingProtocol::RecvError (Ptr<Packet> p, Ipv4Address src )
   std::pair<Ipv4Address, uint32_t> un;
   while (rerrHeader.RemoveUnDestination (un))
     {
-      if (m_nb.IsNeighbor (un.first))
-        SendRerrWhenBreaksLinkToNextHop (un.first);
-      else
-        {
-          for (std::map<Ipv4Address, uint32_t>::const_iterator i =
-                 dstWithNextHopSrc.begin (); i != dstWithNextHopSrc.end (); ++i)
-            {
-              if (i->first == un.first)
-                {
-                  unreachable.insert (un);
-                }
-            }
-        }
+      for (std::map<Ipv4Address, uint32_t>::const_iterator i =
+           dstWithNextHopSrc.begin (); i != dstWithNextHopSrc.end (); ++i)
+      {
+        if (i->first == un.first)
+          {
+            unreachable.insert (un);
+          }
+      }
     }
 
   std::vector<Ipv4Address> precursors;