handle NAV correctly

2007-11-14 14:11:11 +01:00
parent 3128aadfe0
commit d20ccf186e
1 changed files with 7 additions and 3 deletions
--- a/src/devices/wifi/dcf-manager.cc
+++ b/src/devices/wifi/dcf-manager.cc
@@ -435,9 +435,13 @@ DcfManager::NotifyNavStartNow (Time duration)
  NS_ASSERT (m_lastNavStart < Simulator::Now ());
  MY_DEBUG ("nav start for="<<duration);
  UpdateBackoff ();
-  // XXX handle 
-  m_lastNavStart = Simulator::Now ();
-  m_lastNavDuration = duration;
+  Time newNavEnd = Simulator::Now () + duration;
+  Time lastNavEnd = m_lastNavStart + m_lastNavDuration;
+  if (newNavEnd > lastNavEnd)
+    {
+      m_lastNavStart = Simulator::Now ();
+      m_lastNavDuration = duration;
+    }
 }

 } // namespace ns3