From d41925794b2c637cfecaf4d897784a5119c75e7e Mon Sep 17 00:00:00 2001
From: Kirill Andreev <andreev@iitp.ru>
Date: Mon, 27 Apr 2009 23:31:54 +0400
Subject: [PATCH 1/3] Intermediate reply bugfix

---
 src/devices/mesh/dot11s/hwmp-protocol.cc | 29 ++++++++++++------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/src/devices/mesh/dot11s/hwmp-protocol.cc b/src/devices/mesh/dot11s/hwmp-protocol.cc
index 53452fc86..ec48041a1 100644
--- a/src/devices/mesh/dot11s/hwmp-protocol.cc
+++ b/src/devices/mesh/dot11s/hwmp-protocol.cc
@@ -361,7 +361,6 @@ HwmpProtocol::ReceivePreq (IePreq preq, Mac48Address from, uint32_t interface, u
         }
       if ((*i)->GetDestinationAddress () == GetAddress ())
         {
-          preq.DelDestinationAddressElement ((*i)->GetDestinationAddress());
           SendPrep (
               GetAddress (),
               preq.GetOriginatorAddress (),
@@ -372,29 +371,31 @@ HwmpProtocol::ReceivePreq (IePreq preq, Mac48Address from, uint32_t interface, u
               preq.GetLifetime (),
               interface
           );
+          preq.DelDestinationAddressElement ((*i)->GetDestinationAddress());
           continue;
         }
       //check if can answer:
       HwmpRtable::LookupResult result = m_rtable->LookupReactive ((*i)->GetDestinationAddress());
+      NS_LOG_UNCOND("Lookup:"<<(*i)->GetDestinationAddress()<<"I am "<<GetAddress ()<<", RA = "<<result.retransmitter);
       if ((! ((*i)->IsDo())) && (result.retransmitter != Mac48Address::GetBroadcast()))
         {
-          //have a valid information and acn answer
+          //have a valid information and can answer
+          SendPrep (
+              (*i)->GetDestinationAddress (),
+              preq.GetOriginatorAddress (),
+              from,
+              result.metric,
+              preq.GetOriginatorSeqNumber (),
+              result.seqnum +1,
+              preq.GetLifetime (),
+              interface
+              );
+
           if ((*i)->IsRf ())
-            (*i)->SetFlags (true, false, (*i)->IsUsn ()); //DO = 1, RF = 0 (as it was)
+            (*i)->SetFlags (true, false, (*i)->IsUsn ()); //DO = 1, RF = 0
           else
             {
-              //send a PREP and delete destination
               preq.DelDestinationAddressElement ((*i)->GetDestinationAddress());
-              SendPrep (
-                  (*i)->GetDestinationAddress (),
-                  preq.GetOriginatorAddress (),
-                  from,
-                  result.metric,
-                  preq.GetOriginatorSeqNumber (),
-                  result.seqnum +1,
-                  preq.GetLifetime (),
-                  interface
-              );
               continue;
             }
         }

From 3a9591ee9194ac1aa7f12d52beea27d7b39b36ad Mon Sep 17 00:00:00 2001
From: Kirill Andreev <andreev@iitp.ru>
Date: Mon, 27 Apr 2009 23:35:36 +0400
Subject: [PATCH 2/3] Flags bugfix

---
 src/devices/mesh/dot11s/hwmp-mac-plugin.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/devices/mesh/dot11s/hwmp-mac-plugin.cc b/src/devices/mesh/dot11s/hwmp-mac-plugin.cc
index 5492fd826..520812f19 100644
--- a/src/devices/mesh/dot11s/hwmp-mac-plugin.cc
+++ b/src/devices/mesh/dot11s/hwmp-mac-plugin.cc
@@ -170,7 +170,7 @@ HwmpMacPlugin::RequestDestination (Mac48Address dst, uint32_t originator_seqno,
   preq.SetOriginatorAddress (m_protocol->GetAddress ());
   preq.SetOriginatorSeqNumber (originator_seqno);
   preq.SetLifetime (m_protocol->GetActivePathLifetime ());
-  preq.AddDestinationAddressElement (false, false, dst, dst_seqno);
+  preq.AddDestinationAddressElement (m_protocol->GetDoFlag (), m_protocol->GetRfFlag (), dst, dst_seqno);
   m_preqQueue.push_back (preq);
   //set iterator position to my preq:
   SendOnePreq ();

From 3e9e5fa18f4b62b9e564d4425e894f891ee86247 Mon Sep 17 00:00:00 2001
From: Kirill Andreev <andreev@iitp.ru>
Date: Tue, 28 Apr 2009 00:20:40 +0400
Subject: [PATCH 3/3] Fix

---
 src/devices/mesh/dot11s/hwmp-protocol.cc | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/devices/mesh/dot11s/hwmp-protocol.cc b/src/devices/mesh/dot11s/hwmp-protocol.cc
index ec48041a1..e9a1b5a8a 100644
--- a/src/devices/mesh/dot11s/hwmp-protocol.cc
+++ b/src/devices/mesh/dot11s/hwmp-protocol.cc
@@ -376,7 +376,6 @@ HwmpProtocol::ReceivePreq (IePreq preq, Mac48Address from, uint32_t interface, u
         }
       //check if can answer:
       HwmpRtable::LookupResult result = m_rtable->LookupReactive ((*i)->GetDestinationAddress());
-      NS_LOG_UNCOND("Lookup:"<<(*i)->GetDestinationAddress()<<"I am "<<GetAddress ()<<", RA = "<<result.retransmitter);
       if ((! ((*i)->IsDo())) && (result.retransmitter != Mac48Address::GetBroadcast()))
         {
           //have a valid information and can answer