handle rts somewhat better
authorMathieu Lacage <mathieu.lacage@sophia.inria.fr>
Fri, 17 Apr 2009 11:43:14 +0200
changeset 4345 528d4150d2ac
parent 4344 968b98374cf6
child 4346 939a6ec84bf1
handle rts somewhat better
src/devices/wifi/aarfcd-wifi-manager.cc
src/devices/wifi/aarfcd-wifi-manager.h
src/devices/wifi/cara-wifi-manager.cc
src/devices/wifi/cara-wifi-manager.h
--- a/src/devices/wifi/aarfcd-wifi-manager.cc	Fri Apr 17 11:06:26 2009 +0200
+++ b/src/devices/wifi/aarfcd-wifi-manager.cc	Fri Apr 17 11:43:14 2009 +0200
@@ -327,7 +327,7 @@
 }
 
 bool
-AarfcdWifiRemoteStation::DoNeedRts (Ptr<const Packet> packet)
+AarfcdWifiRemoteStation::NeedRts (Ptr<const Packet> packet)
 {
   //printf ("%.9f %p NeedRts %d %d\n",Simulator::Now ().GetSeconds (),this,m_rate,(m_rtsOn?1:0));
   NS_LOG_INFO ("" << this << " rate=" << m_rate << " rts=" << (m_rtsOn?"RTS":"BASIC") << " rtsCounter=" << m_rtsCounter);
--- a/src/devices/wifi/aarfcd-wifi-manager.h	Fri Apr 17 11:06:26 2009 +0200
+++ b/src/devices/wifi/aarfcd-wifi-manager.h	Fri Apr 17 11:43:14 2009 +0200
@@ -70,10 +70,10 @@
   virtual void DoReportDataOk (double ackSnr, WifiMode ackMode, double dataSnr);
   virtual void DoReportFinalRtsFailed (void);
   virtual void DoReportFinalDataFailed (void);
-  virtual bool DoNeedRts (Ptr<const Packet> packet);
   virtual Ptr<WifiRemoteStationManager> GetManager (void) const;
   virtual WifiMode DoGetDataMode (uint32_t size);
   virtual WifiMode DoGetRtsMode (void);
+  virtual bool NeedRts (Ptr<const Packet> packet);
 
   void ReportRecoveryFailure (void);
   void ReportFailure (void);
--- a/src/devices/wifi/cara-wifi-manager.cc	Fri Apr 17 11:06:26 2009 +0200
+++ b/src/devices/wifi/cara-wifi-manager.cc	Fri Apr 17 11:43:14 2009 +0200
@@ -133,7 +133,7 @@
 }
 
 bool
-CaraWifiRemoteStation::DoNeedRts (Ptr<const Packet> packet)
+CaraWifiRemoteStation::NeedRts (Ptr<const Packet> packet)
 {
   bool rts = WifiRemoteStation::NeedRts (packet);
   if (rts || m_failed >= m_manager->m_probeThreshold)
--- a/src/devices/wifi/cara-wifi-manager.h	Fri Apr 17 11:06:26 2009 +0200
+++ b/src/devices/wifi/cara-wifi-manager.h	Fri Apr 17 11:43:14 2009 +0200
@@ -66,10 +66,11 @@
   virtual void DoReportFinalRtsFailed (void);
   virtual void DoReportFinalDataFailed (void);
   virtual void DoReportRxOk (double rxSnr, WifiMode txMode);
-  virtual bool DoNeedRts (Ptr<const Packet> packet);
   virtual WifiMode DoGetDataMode (uint32_t size);
   virtual WifiMode DoGetRtsMode (void);
 
+  virtual bool NeedRts (Ptr<const Packet> packet);
+
   uint32_t m_timer;
   uint32_t m_success;
   uint32_t m_failed;