From 7531f592585a7e5c916de6933bb80c7d49f33d85 Mon Sep 17 00:00:00 2001
From: Kirill Andreev <andreev@iitp.ru>
Date: Tue, 27 Oct 2009 18:43:45 +0300
Subject: [PATCH] Mesh: fixed FLAME PATH_UPDATE procedure, fixed mesh.cc,
 valgrind errors in FLAME

---
 examples/mesh/mesh.cc                        | 11 ++++++-
 src/devices/mesh/flame/flame-protocol-mac.cc |  2 ++
 src/devices/mesh/flame/flame-protocol.cc     | 33 +++++++++++++-------
 3 files changed, 33 insertions(+), 13 deletions(-)

diff --git a/examples/mesh/mesh.cc b/examples/mesh/mesh.cc
index fa42ae62b..866b28a33 100644
--- a/examples/mesh/mesh.cc
+++ b/examples/mesh/mesh.cc
@@ -158,7 +158,16 @@ MeshTest::CreateNodes ()
    * mesh point device
    */
   mesh = MeshHelper::Default ();
-  mesh.SetStackInstaller (m_stack, "Root", Mac48AddressValue (Mac48Address (m_root.c_str ())));
+  if (!Mac48Address (m_root.c_str ()).IsBroadcast ())
+    {
+      mesh.SetStackInstaller (m_stack, "Root", Mac48AddressValue (Mac48Address (m_root.c_str ())));
+    }
+  else
+    {
+      //If root is not set, we do not use "Root" attribute, because it
+      //is specified only for 11s
+      mesh.SetStackInstaller (m_stack);
+    }
   if (m_chan)
     {
       mesh.SetSpreadInterfaceChannels (MeshHelper::SPREAD_CHANNELS);
diff --git a/src/devices/mesh/flame/flame-protocol-mac.cc b/src/devices/mesh/flame/flame-protocol-mac.cc
index f9b6650c5..d1a047a4a 100644
--- a/src/devices/mesh/flame/flame-protocol-mac.cc
+++ b/src/devices/mesh/flame/flame-protocol-mac.cc
@@ -31,6 +31,8 @@ FlameProtocolMac::FlameProtocolMac (uint32_t ifIndex, Ptr<FlameProtocol> protoco
 }
 FlameProtocolMac::~FlameProtocolMac ()
 {
+  m_protocol = 0;
+  m_parent = 0;
 }
 void
 FlameProtocolMac::SetParent (Ptr<MeshWifiInterfaceMac> parent)
diff --git a/src/devices/mesh/flame/flame-protocol.cc b/src/devices/mesh/flame/flame-protocol.cc
index d0bd251f0..8a0ebbdf2 100644
--- a/src/devices/mesh/flame/flame-protocol.cc
+++ b/src/devices/mesh/flame/flame-protocol.cc
@@ -127,7 +127,7 @@ FlameProtocol::GetTypeId ()
   return tid;
 }
 FlameProtocol::FlameProtocol () :
-  m_address (Mac48Address ()), m_broadcastInterval (Seconds (5)), m_lastBroadcast (Simulator::Now ()),
+  m_address (Mac48Address ()), m_broadcastInterval (Seconds (5)), m_lastBroadcast (Seconds (0)),
       m_maxCost (32), m_myLastSeqno (1), m_rtable (CreateObject<FlameRtable> ())
 {
 }
@@ -137,6 +137,9 @@ FlameProtocol::~FlameProtocol ()
 void
 FlameProtocol::DoDispose ()
 {
+  m_interfaces.clear ();
+  m_rtable = 0;
+  m_mp = 0;
 }
 bool
 FlameProtocol::RequestRoute (uint32_t sourceIface, const Mac48Address source, const Mac48Address destination,
@@ -224,8 +227,12 @@ FlameProtocol::RequestRoute (uint32_t sourceIface, const Mac48Address source, co
                   m_stats.totalDropped++;
                   return false;
                 }
+              tag.receiver = result.retransmitter;
+            }
+          else
+            {
+              tag.receiver = Mac48Address::GetBroadcast ();
             }
-          tag.receiver = result.retransmitter;
           if (result.retransmitter == Mac48Address::GetBroadcast ())
             {
               m_stats.txBroadcast++;
@@ -262,19 +269,21 @@ FlameProtocol::RemoveRoutingStuff (uint32_t fromIface, const Mac48Address source
     }
   FlameHeader flameHdr;
   packet->RemoveHeader (flameHdr);
-  if ((destination == GetAddress ()) && (m_lastBroadcast + m_broadcastInterval < Simulator::Now ()))
-      {
-        Ptr<Packet> packet = Create<Packet> ();
-        m_mp->Send(packet, Mac48Address::GetBroadcast (), 0);
-        m_lastBroadcast = Simulator::Now ();
-      }
-  NS_ASSERT (protocolType == FLAME_PROTOCOL);
-  protocolType = flameHdr.GetProtocol ();
-  if ((HandleDataFrame (flameHdr.GetSeqno (), source, flameHdr, tag.transmitter, fromIface))
-      || packet->GetSize () == 0)
+  if (HandleDataFrame (flameHdr.GetSeqno (), source, flameHdr, tag.transmitter, fromIface))
     {
       return false;
     }
+  // Start PATH_UPDATE procedure if destination is our own address and last broadcast was sent more
+  // than broadcast interval ago or was not sent at all
+  if ((destination == GetAddress ()) && ((m_lastBroadcast + m_broadcastInterval < Simulator::Now ())
+      || (m_lastBroadcast == Seconds (0))))
+    {
+      Ptr<Packet> packet = Create<Packet> ();
+      m_mp->Send (packet, Mac48Address::GetBroadcast (), 0);
+      m_lastBroadcast = Simulator::Now ();
+    }
+  NS_ASSERT (protocolType == FLAME_PROTOCOL);
+  protocolType = flameHdr.GetProtocol ();
   return true;
 }
 bool