Attachment #2441 for bug #1797

View | Details | Raw Unified | Return to bug 1797
Collapse All | Expand All




  return true;
}

bool
AarfWifiManager::IsHtSupported (void) const
{
  NS_LOG_FUNCTION (this);
  return false;
}

bool
AarfWifiManager::IsVhtSupported (void) const
{
  NS_LOG_FUNCTION (this);
  return false;
}

} //namespace ns3

(-)a/src/wifi/model/aarf-wifi-manager.h (+2 lines)

Lines 56-61 private:	Link Here

  virtual WifiTxVector DoGetDataTxVector (WifiRemoteStation *station);

  virtual WifiTxVector DoGetDataTxVector (WifiRemoteStation *station);

  virtual WifiTxVector DoGetRtsTxVector (WifiRemoteStation *station);

  virtual WifiTxVector DoGetRtsTxVector (WifiRemoteStation *station);

  virtual bool IsLowLatency (void) const;

  virtual bool IsLowLatency (void) const;

  virtual bool IsHtSupported (void) const;

  virtual bool IsVhtSupported (void) const;

  uint32_t m_minTimerThreshold;

  uint32_t m_minTimerThreshold;

  uint32_t m_minSuccessThreshold;

  uint32_t m_minSuccessThreshold;




  return true;
}

bool
AarfcdWifiManager::IsHtSupported (void) const
{
  NS_LOG_FUNCTION (this);
  return false;
}

bool
AarfcdWifiManager::IsVhtSupported (void) const
{
  NS_LOG_FUNCTION (this);
  return false;
}

void
AarfcdWifiManager::CheckRts (AarfcdWifiRemoteStation *station)
{

(-)a/src/wifi/model/aarfcd-wifi-manager.h (+2 lines)

Lines 73-78 private:	Link Here

  virtual bool DoNeedRts (WifiRemoteStation *station,

  virtual bool DoNeedRts (WifiRemoteStation *station,

                          Ptr<const Packet> packet, bool normally);

                          Ptr<const Packet> packet, bool normally);

  virtual bool IsLowLatency (void) const;

  virtual bool IsLowLatency (void) const;

  virtual bool IsHtSupported (void) const;

  virtual bool IsVhtSupported (void) const;

/**

/**

   * Check if the use of RTS for the given station can be turned off.

   * Check if the use of RTS for the given station can be turned off.




  return true;
}

bool
AmrrWifiManager::IsHtSupported (void) const
{
  NS_LOG_FUNCTION (this);
  return false;
}

bool
AmrrWifiManager::IsVhtSupported (void) const
{
  NS_LOG_FUNCTION (this);
  return false;
}

} //namespace ns3

(-)a/src/wifi/model/amrr-wifi-manager.h (+2 lines)

Lines 61-66 private:	Link Here

  virtual WifiTxVector DoGetDataTxVector (WifiRemoteStation *station);

  virtual WifiTxVector DoGetDataTxVector (WifiRemoteStation *station);

  virtual WifiTxVector DoGetRtsTxVector (WifiRemoteStation *station);

  virtual WifiTxVector DoGetRtsTxVector (WifiRemoteStation *station);

  virtual bool IsLowLatency (void) const;

  virtual bool IsLowLatency (void) const;

  virtual bool IsHtSupported (void) const;

  virtual bool IsVhtSupported (void) const;

  //void UpdateRetry (AmrrWifiRemoteStation *station);

  //void UpdateRetry (AmrrWifiRemoteStation *station);

/**

/**




  return true;
}

bool
AparfWifiManager::IsHtSupported (void) const
{
  NS_LOG_FUNCTION (this);
  return false;
}

bool
AparfWifiManager::IsVhtSupported (void) const
{
  NS_LOG_FUNCTION (this);
  return false;
}

} //namespace ns3

(-)a/src/wifi/model/aparf-wifi-manager.h (+2 lines)

Lines 78-83 private:	Link Here

  virtual WifiTxVector DoGetDataTxVector (WifiRemoteStation *station);

  virtual WifiTxVector DoGetDataTxVector (WifiRemoteStation *station);

  virtual WifiTxVector DoGetRtsTxVector (WifiRemoteStation *station);

  virtual WifiTxVector DoGetRtsTxVector (WifiRemoteStation *station);

  virtual bool IsLowLatency (void) const;

  virtual bool IsLowLatency (void) const;

  virtual bool IsHtSupported (void) const;

  virtual bool IsVhtSupported (void) const;

  /** Check for initializations.

  /** Check for initializations.




  return true;
}

bool
ArfWifiManager::IsHtSupported (void) const
{
  NS_LOG_FUNCTION (this);
  return false;
}

bool
ArfWifiManager::IsVhtSupported (void) const
{
  NS_LOG_FUNCTION (this);
  return false;
}

} //namespace ns3

(-)a/src/wifi/model/arf-wifi-manager.h (+2 lines)

Lines 64-69 private:	Link Here

  virtual WifiTxVector DoGetDataTxVector (WifiRemoteStation *station);

  virtual WifiTxVector DoGetDataTxVector (WifiRemoteStation *station);

  virtual WifiTxVector DoGetRtsTxVector (WifiRemoteStation *station);

  virtual WifiTxVector DoGetRtsTxVector (WifiRemoteStation *station);

  virtual bool IsLowLatency (void) const;

  virtual bool IsLowLatency (void) const;

  virtual bool IsHtSupported (void) const;

  virtual bool IsVhtSupported (void) const;

  uint32_t m_timerThreshold;

  uint32_t m_timerThreshold;

  uint32_t m_successThreshold;

  uint32_t m_successThreshold;




  return true;
}

bool
CaraWifiManager::IsHtSupported (void) const
{
  NS_LOG_FUNCTION (this);
  return false;
}

bool
CaraWifiManager::IsVhtSupported (void) const
{
  NS_LOG_FUNCTION (this);
  return false;
}

} //namespace ns3

(-)a/src/wifi/model/cara-wifi-manager.h (+2 lines)

Lines 62-67 private:	Link Here

  virtual bool DoNeedRts (WifiRemoteStation *station,

  virtual bool DoNeedRts (WifiRemoteStation *station,

                          Ptr<const Packet> packet, bool normally);

                          Ptr<const Packet> packet, bool normally);

  virtual bool IsLowLatency (void) const;

  virtual bool IsLowLatency (void) const;

  virtual bool IsHtSupported (void) const;

  virtual bool IsVhtSupported (void) const;

  uint32_t m_timerTimeout;

  uint32_t m_timerTimeout;

  uint32_t m_successThreshold;

  uint32_t m_successThreshold;




  return true;
}

bool
ConstantRateWifiManager::IsHtSupported (void) const
{
  NS_LOG_FUNCTION (this);
  return true;
}

bool
ConstantRateWifiManager::IsVhtSupported (void) const
{
  NS_LOG_FUNCTION (this);
  return true;
}

} //namespace ns3

(-)a/src/wifi/model/constant-rate-wifi-manager.h (+2 lines)

Lines 57-62 private:	Link Here

  virtual WifiTxVector DoGetDataTxVector (WifiRemoteStation *station);

  virtual WifiTxVector DoGetDataTxVector (WifiRemoteStation *station);

  virtual WifiTxVector DoGetRtsTxVector (WifiRemoteStation *station);

  virtual WifiTxVector DoGetRtsTxVector (WifiRemoteStation *station);

  virtual bool IsLowLatency (void) const;

  virtual bool IsLowLatency (void) const;

  virtual bool IsHtSupported (void) const;

  virtual bool IsVhtSupported (void) const;

  WifiMode m_dataMode; //!< Wifi mode for unicast DATA frames

  WifiMode m_dataMode; //!< Wifi mode for unicast DATA frames

  WifiMode m_ctlMode;  //!< Wifi mode for RTS frames

  WifiMode m_ctlMode;  //!< Wifi mode for RTS frames




  return true;
}

bool
IdealWifiManager::IsHtSupported (void) const
{
  NS_LOG_FUNCTION (this);
  return true;
}

bool
IdealWifiManager::IsVhtSupported (void) const
{
  NS_LOG_FUNCTION (this);
  return true;
}

} //namespace ns3

(-)a/src/wifi/model/ideal-wifi-manager.h (+2 lines)

Lines 72-77 private:	Link Here

  virtual WifiTxVector DoGetDataTxVector (WifiRemoteStation *station);

  virtual WifiTxVector DoGetDataTxVector (WifiRemoteStation *station);

  virtual WifiTxVector DoGetRtsTxVector (WifiRemoteStation *station);

  virtual WifiTxVector DoGetRtsTxVector (WifiRemoteStation *station);

  virtual bool IsLowLatency (void) const;

  virtual bool IsLowLatency (void) const;

  virtual bool IsHtSupported (void) const;

  virtual bool IsVhtSupported (void) const;

/**

/**

   * Return the minimum SNR needed to successfully transmit

   * Return the minimum SNR needed to successfully transmit




  return true;
}

bool
MinstrelHtWifiManager::IsHtSupported (void) const
{
  NS_LOG_FUNCTION (this);
  return true;
}

bool
MinstrelHtWifiManager::IsVhtSupported (void) const
{
  NS_LOG_FUNCTION (this);
  return true;
}

uint32_t
MinstrelHtWifiManager::GetNextSample (MinstrelHtWifiRemoteStation *station)
{

(-)a/src/wifi/model/minstrel-ht-wifi-manager.h (+2 lines)

Lines 252-257 private:	Link Here

252

  virtual WifiTxVector DoGetRtsTxVector (WifiRemoteStation *station);

252

  virtual WifiTxVector DoGetRtsTxVector (WifiRemoteStation *station);

253

  virtual void DoReportAmpduTxStatus (WifiRemoteStation *station, uint32_t nSuccessfulMpdus, uint32_t nFailedMpdus, double rxSnr, double dataSnr);

253

  virtual void DoReportAmpduTxStatus (WifiRemoteStation *station, uint32_t nSuccessfulMpdus, uint32_t nFailedMpdus, double rxSnr, double dataSnr);

254

  virtual bool IsLowLatency (void) const;

254

  virtual bool IsLowLatency (void) const;

255

  virtual bool IsHtSupported (void) const;

256

  virtual bool IsVhtSupported (void) const;

255

  virtual bool DoNeedDataRetransmission (WifiRemoteStation *st, Ptr<const Packet> packet, bool normally);

257

  virtual bool DoNeedDataRetransmission (WifiRemoteStation *st, Ptr<const Packet> packet, bool normally);

256

  virtual void DoDisposeStation (WifiRemoteStation *station);

258

  virtual void DoDisposeStation (WifiRemoteStation *station);

257

259




  return true;
}

bool
MinstrelWifiManager::IsHtSupported (void) const
{
  NS_LOG_FUNCTION (this);
  return false;
}

bool
MinstrelWifiManager::IsVhtSupported (void) const
{
  NS_LOG_FUNCTION (this);
  return false;
}

uint32_t
MinstrelWifiManager::GetNextSample (MinstrelWifiRemoteStation *station)
{

(-)a/src/wifi/model/minstrel-wifi-manager.h (+2 lines)

Lines 216-221 private:	Link Here

216

  virtual bool DoNeedDataRetransmission (WifiRemoteStation *st, Ptr<const Packet> packet, bool normally);

216

  virtual bool DoNeedDataRetransmission (WifiRemoteStation *st, Ptr<const Packet> packet, bool normally);

217

218

  virtual bool IsLowLatency (void) const;

218

  virtual bool IsLowLatency (void) const;

219

  virtual bool IsHtSupported (void) const;

220

  virtual bool IsVhtSupported (void) const;

219

221

220

  //for estimating the TxTime of a packet with a given mode

222

  //for estimating the TxTime of a packet with a given mode

221

  Time GetCalcTxTime (WifiMode mode) const;

223

  Time GetCalcTxTime (WifiMode mode) const;




  return false;
}

bool
OnoeWifiManager::IsHtSupported (void) const
{
  NS_LOG_FUNCTION (this);
  return false;
}

bool
OnoeWifiManager::IsVhtSupported (void) const
{
  NS_LOG_FUNCTION (this);
  return false;
}

} //namespace ns3

(-)a/src/wifi/model/onoe-wifi-manager.h (+2 lines)

Lines 63-68 private:	Link Here

  virtual WifiTxVector DoGetDataTxVector (WifiRemoteStation *station);

  virtual WifiTxVector DoGetDataTxVector (WifiRemoteStation *station);

  virtual WifiTxVector DoGetRtsTxVector (WifiRemoteStation *station);

  virtual WifiTxVector DoGetRtsTxVector (WifiRemoteStation *station);

  virtual bool IsLowLatency (void) const;

  virtual bool IsLowLatency (void) const;

  virtual bool IsHtSupported (void) const;

  virtual bool IsVhtSupported (void) const;

/**

/**

   * Update the number of retry (both short and long).

   * Update the number of retry (both short and long).




  return true;
}

bool
ParfWifiManager::IsHtSupported (void) const
{
  NS_LOG_FUNCTION (this);
  return false;
}

bool
ParfWifiManager::IsVhtSupported (void) const
{
  NS_LOG_FUNCTION (this);
  return false;
}

} //namespace ns3

(-)a/src/wifi/model/parf-wifi-manager.h (+2 lines)

Lines 67-72 private:	Link Here

  virtual WifiTxVector DoGetDataTxVector (WifiRemoteStation *station);

  virtual WifiTxVector DoGetDataTxVector (WifiRemoteStation *station);

  virtual WifiTxVector DoGetRtsTxVector (WifiRemoteStation *station);

  virtual WifiTxVector DoGetRtsTxVector (WifiRemoteStation *station);

  virtual bool IsLowLatency (void) const;

  virtual bool IsLowLatency (void) const;

  virtual bool IsHtSupported (void) const;

  virtual bool IsVhtSupported (void) const;

  /** Check for initializations.

  /** Check for initializations.




  return true;
}

bool
RraaWifiManager::IsHtSupported (void) const
{
  NS_LOG_FUNCTION (this);
  return false;
}

bool
RraaWifiManager::IsVhtSupported (void) const
{
  NS_LOG_FUNCTION (this);
  return false;
}

} //namespace ns3

(-)a/src/wifi/model/rraa-wifi-manager.h (+2 lines)

Lines 72-77 private:	Link Here

  virtual bool DoNeedRts (WifiRemoteStation *st,

  virtual bool DoNeedRts (WifiRemoteStation *st,

                          Ptr<const Packet> packet, bool normally);

                          Ptr<const Packet> packet, bool normally);

  virtual bool IsLowLatency (void) const;

  virtual bool IsLowLatency (void) const;

  virtual bool IsHtSupported (void) const;

  virtual bool IsVhtSupported (void) const;

/**

/**

   * Return the index for the maximum transmission rate for

   * Return the index for the maximum transmission rate for

(-)a/src/wifi/model/wifi-remote-station-manager.cc (+8 lines)

Lines 414-419 WifiRemoteStationManager::SetupMac (Ptr<WifiMac> mac)	Link Here

414

void

414

void

415

WifiRemoteStationManager::SetHtSupported (bool enable)

415

WifiRemoteStationManager::SetHtSupported (bool enable)

416

417

  if (enable && !IsHtSupported())

418

419

      NS_FATAL_ERROR ("WifiRemoteStationManager selected does not support HT rates");

420

417

  m_htSupported = enable;

421

  m_htSupported = enable;

418

422

419

423

Lines 486-491 WifiRemoteStationManager::HasHtSupported (void) const	Link Here

486

void

490

void

487

WifiRemoteStationManager::SetVhtSupported (bool enable)

491

WifiRemoteStationManager::SetVhtSupported (bool enable)

488

492

493

  if (enable && !IsVhtSupported())

494

495

      NS_FATAL_ERROR ("WifiRemoteStationManager selected does not support VHT rates");

496

489

  m_vhtSupported = enable;

497

  m_vhtSupported = enable;

490

498

491

499

(-)a/src/wifi/model/wifi-remote-station-manager.h (+8 lines)

Lines 978-983 private:	Link Here

978

*/

978

*/

979

  virtual bool IsLowLatency (void) const = 0;

979

  virtual bool IsLowLatency (void) const = 0;

980

/**

980

/**

981

   * \return whether this manager is a manager designed to work with HTstandards.

982

*/

983

  virtual bool IsHtSupported (void) const = 0;

984

/**

985

   * \return whether this manager is a manager designed to work with VHT standards.

986

*/

987

  virtual bool IsVhtSupported (void) const = 0;

988

/**

981

   * \return a new station data structure

989

   * \return a new station data structure

982

*/

990

*/

983

  virtual WifiRemoteStation* DoCreateStation (void) const = 0;

991

  virtual WifiRemoteStation* DoCreateStation (void) const = 0;

Return to bug 1797