--- a/src/wifi/model/monitor-wifi-mac.h Sat Jul 16 13:52:11 2011 -0400
+++ b/src/wifi/model/monitor-wifi-mac.h Sat Jul 16 13:57:50 2011 -0400
@@ -78,81 +78,31 @@
virtual ~MonitorWifiMac ();
/**
- * \param slotTime the slot duration
- */
- void SetSlot (Time slotTime);
- /**
- * \param sifs the sifs duration
- */
- void SetSifs (Time sifs);
- /**
- * \param eifsNoDifs the duration of an EIFS minus DIFS.
+ * The following functions have been inherited from RegularWifiMac.
*
- * This value is used to calculate the EIFS depending
- * on AIFSN.
- */
- void SetEifsNoDifs (Time eifsNoDifs);
- /**
- * \param pifs the pifs duration.
*/
+
+ void SetSlot (Time slotTime);
+ void SetSifs (Time sifs);
+ void SetEifsNoDifs (Time eifsNoDifs);
void SetPifs (Time pifs);
- /**
- * \param ctsTimeout the duration of a CTS timeout.
- */
void SetCtsTimeout (Time ctsTimeout);
- /**
- * \param ackTimeout the duration of an ACK timeout.
- */
void SetAckTimeout (Time ackTimeout);
- /**
- * \returns the current PIFS duration.
- */
Time GetPifs (void) const;
- /**
- * \returns the current SIFS duration.
- */
Time GetSifs (void) const;
- /**
- * \returns the current slot duration.
- */
Time GetSlot (void) const;
- /**
- * \returns the current EIFS minus DIFS duration
- */
Time GetEifsNoDifs (void) const;
- /**
- * \returns the current CTS timeout duration.
- */
Time GetCtsTimeout (void) const;
- /**
- * \returns the current ACK timeout duration.
- */
Time GetAckTimeout (void) const;
- /**
- * \returns the MAC address associated to this MAC layer.
- */
virtual Mac48Address GetAddress (void) const;
- /**
- * Not applicable in Monitor Mode node
- */
- virtual Ssid GetSsid (void) const;
- /**
- * \param address the current address of this MAC layer.
- */
virtual void SetAddress (Mac48Address address);
- /**
- * \brief Sets the interface in promiscuous mode.
- *
- * Enables promiscuous mode on the interface. Note that any further
- * filtering on the incoming frame path may affect the overall
- * behavior.
- */
virtual void SetPromisc (void);
/**
* The following functions have been inherited from RegularMacWifi
- * but are not applicable in Monitor Mode
+ * but are not applicable in Monitor Mode.
*/
+ virtual Ssid GetSsid (void) const;
virtual void SetSsid (Ssid ssid);
virtual void SetBssid (Mac48Address bssid);
virtual Mac48Address GetBssid (void) const;
@@ -167,41 +117,13 @@
void SetQosSupported (bool enable);
bool GetQosSupported () const;
- /**
- * \param phy the physical layer attached to this MAC.
- */
virtual void SetWifiPhy (Ptr<WifiPhy> phy);
- /**
- * \param stationManager the station manager attached to this MAC.
- */
virtual void SetWifiRemoteStationManager (Ptr<WifiRemoteStationManager> stationManager);
- /**
- * This type defines the callback of a higher layer that a
- * WifiMac(-derived) object invokes to pass a packet up the stack.
- *
- * \param packet the packet that has been received.
- * \param from the MAC address of the device that sent the packet.
- * \param to the MAC address ot the device that the packet is
- * destined for.
- */
typedef Callback<void, Ptr<Packet>, Mac48Address, Mac48Address> ForwardUpCallback;
- /**
- * \param upCallback the callback to invoke when a packet must be
- * forwarded up the stack.
- */
virtual void SetForwardUpCallback (ForwardUpCallback upCallback);
- /**
- * \param linkUp the callback to invoke when the link becomes up.
- */
virtual void SetLinkUpCallback (Callback<void> linkUp);
- /**
- * \param linkDown the callback to invoke when the link becomes down.
- */
virtual void SetLinkDownCallback (Callback<void> linkDown);
- /* Next functions are not pure virtual so non Qos WifiMacs are not
- * forced to implement them.
- */
virtual void SetBasicBlockAckTimeout (Time blockAckTimeout);
virtual Time GetBasicBlockAckTimeout (void) const;
virtual void SetCompressedBlockAckTimeout (Time blockAckTimeout);
@@ -225,22 +147,8 @@
Ssid m_ssid;
- /** This holds a pointer to the DCF instance for this WifiMac - used
- for transmission of frames to non-QoS peers. */
Ptr<DcaTxop> m_dca;
- /**
- * \param standard the phy standard to be used
- *
- * This method is called by ns3::WifiMac::ConfigureStandard to
- * complete the configuration process for a requested phy standard.
- *
- * This method may be overriden by a derived class (e.g., in order
- * to apply DCF parameters specific to the usage model it is
- * dealing with), in which case the reimplementation may choose to
- * deal with certain values in the WifiPhyStandard enumeration, and
- * chain up to this implementation to deal with the remainder.
- */
virtual void FinishConfigureStandard (enum WifiPhyStandard standard);
/**