Attachment #2632 for bug #2528

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

(-)a/src/wifi/model/ap-wifi-mac.cc (+12 lines)

Lines 77-82	Link Here

                   BooleanValue (true),

                   BooleanValue (true),

                   MakeBooleanAccessor (&ApWifiMac::m_enableNonErpProtection),

                   MakeBooleanAccessor (&ApWifiMac::m_enableNonErpProtection),

                   MakeBooleanChecker ())

                   MakeBooleanChecker ())

    .AddAttribute ("RifsMode", "Whether or not RIFS is permitted within the BSS.",

                   BooleanValue (false),

                   MakeBooleanAccessor (&ApWifiMac::m_enableRifs),

                   MakeBooleanChecker ())

  return tid;

  return tid;

Lines 496-501	Link Here

496

  operations.SetHtSupported (1);

500

  operations.SetHtSupported (1);

497

  if (m_htSupported)

501

  if (m_htSupported)

498

502

503

      operations.SetRifsMode (GetUseRifs ());

499

      if (!m_nonHtStations.empty ())

504

      if (!m_nonHtStations.empty ())

500

505

501

          operations.SetHtProtection (MIXED_MODE_PROTECTION);

506

          operations.SetHtProtection (MIXED_MODE_PROTECTION);

Lines 1037-1040	Link Here

1037

  return useProtection;

1042

  return useProtection;

1038

1043

1039

1044

1045

bool

1046

ApWifiMac::GetUseRifs (void) const

1047

1048

  m_stationManager->SetRifsPermitted (m_enableRifs);

1049

  return m_enableRifs;

1050

1051

1040

} //namespace ns3

1052

} //namespace ns3

(-)a/src/wifi/model/ap-wifi-mac.h (+8 lines)

Lines 259-264	Link Here

259

   *         false otherwise

259

   *         false otherwise

260

*/

260

*/

261

  bool GetUseNonErpProtection (void) const;

261

  bool GetUseNonErpProtection (void) const;

262

/**

263

   * Return whether RIFS is used in the BSS.

264

265

   * \return true if RIFS is used in the BSS,

266

   *         false otherwise

267

*/

268

  bool GetUseRifs (void) const;

262

269

263

  virtual void DoDispose (void);

270

  virtual void DoDispose (void);

264

  virtual void DoInitialize (void);

271

  virtual void DoInitialize (void);

Lines 273-278	Link Here

273

  std::list<Mac48Address> m_nonErpStations;  //!< List of all non-ERP stations currently associated to the AP

280

  std::list<Mac48Address> m_nonErpStations;  //!< List of all non-ERP stations currently associated to the AP

274

  std::list<Mac48Address> m_nonHtStations;   //!< List of all non-HT stations currently associated to the AP

281

  std::list<Mac48Address> m_nonHtStations;   //!< List of all non-HT stations currently associated to the AP

275

  bool m_enableNonErpProtection;             //!< Flag whether protection mechanism is used or not when non-ERP STAs are present within the BSS

282

  bool m_enableNonErpProtection;             //!< Flag whether protection mechanism is used or not when non-ERP STAs are present within the BSS

283

  bool m_enableRifs;                         //!< Flag whether RIFS is used within the BSS

276

};

284

};

277

285

278

} //namespace ns3

286

} //namespace ns3




    m_sendCtsEvent (),
    m_sendAckEvent (),
    m_sendDataEvent (),
    m_waitIfsEvent (),
    m_endTxNoAckEvent (),
    m_currentPacket (0),
    m_listener (0),

  m_sendCtsEvent.Cancel ();
  m_sendAckEvent.Cancel ();
  m_sendDataEvent.Cancel ();
  m_waitIfsEvent.Cancel ();
  m_endTxNoAckEvent.Cancel ();
  m_waitRifsEvent.Cancel ();
  m_phy = 0;
  m_stationManager = 0;
  if (m_phyMacLowListener != 0)

      m_sendDataEvent.Cancel ();
      oneRunning = true;
    }
  if (m_waitIfsEvent.IsRunning ())
    {
      m_waitIfsEvent.Cancel ();
      oneRunning = true;
    }
  if (m_waitRifsEvent.IsRunning ())
    {
      m_waitRifsEvent.Cancel ();
      oneRunning = true;
    }
  if (m_endTxNoAckEvent.IsRunning ())

        }
      if (m_txParams.HasNextPacket ())
        {
          if (txVector.GetMode ().GetModulationClass () == WIFI_MOD_CLASS_HT && m_stationManager->GetRifsPermitted ())
            {
              m_waitIfsEvent = Simulator::Schedule (GetRifs (),
                                                    &MacLow::WaitIfsAfterEndTxFragment, this);
            }
          else
            {
              m_waitIfsEvent = Simulator::Schedule (GetSifs (),
                                                 &MacLow::WaitIfsAfterEndTxFragment, this);
            }
        }
      else if (m_currentHdr.IsQosData () && !m_ampdu)
        {
          if (txVector.GetMode ().GetModulationClass () == WIFI_MOD_CLASS_HT && m_stationManager->GetRifsPermitted ())
            {
              m_waitIfsEvent = Simulator::Schedule (GetRifs (),
                                                 &MacLow::WaitIfsAfterEndTx, this);
            }
          else
            {
              m_waitIfsEvent = Simulator::Schedule (GetSifs (),
                                                 &MacLow::WaitIfsAfterEndTx, this);
            }
        }

      FlushAggregateQueue ();

              if ((*it).second.first.IsImmediateBlockAck ())
                {
                  NS_LOG_DEBUG ("rx blockAckRequest/sendImmediateBlockAck from=" << hdr.GetAddr2 ());
                  Time delay;
                  if (txVector.GetMode ().GetModulationClass () == WIFI_MOD_CLASS_HT && m_stationManager->GetRifsPermitted ())
                   {
                     delay = GetRifs ();
                   }
                  else
                   {
                     delay = GetSifs ();
                   }
                  m_sendAckEvent = Simulator::Schedule (delay,
                                                        &MacLow::SendBlockAckAfterBlockAckRequest, this,
                                                        blockAckReq,
                                                        hdr.GetAddr2 (),

    }
  else if (m_txParams.HasNextPacket ())
    {
      if (dataTxVector.GetMode ().GetModulationClass () == WIFI_MOD_CLASS_HT && m_stationManager->GetRifsPermitted ())

        {
          Time delay = txDuration + GetRifs ();
          NS_ASSERT (m_waitIfsEvent.IsExpired ());
          m_waitIfsEvent = Simulator::Schedule (delay, &MacLow::WaitIfsAfterEndTxFragment, this);
        }
      else
        {
          Time delay = txDuration + GetSifs ();
          NS_ASSERT (m_waitIfsEvent.IsExpired ());
          m_waitIfsEvent = Simulator::Schedule (delay, &MacLow::WaitIfsAfterEndTxFragment, this);
        }
    }
  else

  Time newDuration = Seconds (0);
  if (m_txParams.MustWaitBasicBlockAck ())
    {
      if (m_currentTxVector.GetMode ().GetModulationClass () == WIFI_MOD_CLASS_HT && m_stationManager->GetRifsPermitted ())
        {
          newDuration += GetRifs ();
        }
      else
        {
          newDuration += GetSifs ();
        }
      WifiTxVector blockAckReqTxVector = GetBlockAckTxVector (m_currentHdr.GetAddr2 (), m_currentTxVector.GetMode ());
      newDuration += GetBlockAckDuration (m_currentHdr.GetAddr1 (), blockAckReqTxVector, BASIC_BLOCK_ACK);
    }
  else if (m_txParams.MustWaitCompressedBlockAck ())
    {
      if (m_currentTxVector.GetMode ().GetModulationClass () == WIFI_MOD_CLASS_HT && m_stationManager->GetRifsPermitted ())
        {
          newDuration += GetRifs ();
        }
      else
        {
          newDuration += GetSifs ();
        }
      WifiTxVector blockAckReqTxVector = GetBlockAckTxVector (m_currentHdr.GetAddr2 (), m_currentTxVector.GetMode ());
      newDuration += GetBlockAckDuration (m_currentHdr.GetAddr1 (), blockAckReqTxVector, COMPRESSED_BLOCK_ACK);
    }
  else if (m_txParams.MustWaitAck ())
    {
      if (m_txParams.HasNextPacket () && m_currentTxVector.GetMode ().GetModulationClass () == WIFI_MOD_CLASS_HT && m_stationManager->GetRifsPermitted ())
        {
          newDuration += GetRifs ();
        }
      else
        {
          newDuration += GetSifs ();
        }
      newDuration += GetAckDuration (m_currentHdr.GetAddr1 (), m_currentTxVector);
    }
  if (m_txParams.HasNextPacket ())
    {
      if (m_currentTxVector.GetMode ().GetModulationClass () == WIFI_MOD_CLASS_HT && m_stationManager->GetRifsPermitted ())
        {
          newDuration += GetRifs ();
        }
      else
        {
          newDuration += GetSifs ();
        }
      newDuration += m_phy->CalculateTxDuration (m_txParams.GetNextPacketSize (), m_currentTxVector, preamble, m_phy->GetFrequency ());
      if (m_txParams.MustWaitCompressedBlockAck ())
        {
          if (m_currentTxVector.GetMode ().GetModulationClass () == WIFI_MOD_CLASS_HT && m_stationManager->GetRifsPermitted ())
            {
              newDuration += GetRifs ();
            }
          else
            {
              newDuration += GetSifs ();
            }
          WifiTxVector blockAckReqTxVector = GetBlockAckTxVector (m_currentHdr.GetAddr2 (), m_currentTxVector.GetMode ());
          newDuration += GetBlockAckDuration (m_currentHdr.GetAddr1 (), blockAckReqTxVector, COMPRESSED_BLOCK_ACK);
        }
      else if (m_txParams.MustWaitAck ())
        {
          if (m_currentTxVector.GetMode ().GetModulationClass () == WIFI_MOD_CLASS_HT && m_stationManager->GetRifsPermitted ())
            {
              newDuration += GetRifs ();
            }
          else
            {
              newDuration += GetSifs ();
            }
          newDuration += GetAckDuration (m_currentHdr.GetAddr1 (), m_currentTxVector);
        }
    }

}

void
MacLow::WaitIfsAfterEndTxFragment (void)
{
  m_listener->StartNextFragment ();
}

void
MacLow::WaitIfsAfterEndTx (void)
{
  m_listener->StartNext ();
}

  if (immediate)
    {
      m_txParams.DisableAck ();
      if (blockAckReqTxVector.GetMode ().GetModulationClass () == WIFI_MOD_CLASS_HT && m_stationManager->GetRifsPermitted ())
        {
          duration -= GetRifs ();
        }
      else
        {
          duration -= GetSifs ();
        }
      if (blockAck->IsBasic ())
        {
          duration -= GetBlockAckDuration (originator, blockAckReqTxVector, BASIC_BLOCK_ACK);

            }
          else if (preamble != WIFI_PREAMBLE_NONE || !m_sendAckEvent.IsRunning ())
            {
              Time delay = ampdu.GetRemainingAmpduDuration ();
              if (txVector.GetMode ().GetModulationClass () == WIFI_MOD_CLASS_HT && m_stationManager->GetRifsPermitted ())
                {
                  delay += GetRifs ();
                }
              else
                {
                  delay += GetSifs ();
                }
              m_sendAckEvent = Simulator::Schedule (delay,
                                                    &MacLow::SendBlockAckAfterAmpdu, this,
                                                    firsthdr.GetQosTid (),
                                                    firsthdr.GetAddr2 (),




   * Event handler that is usually scheduled to fired at the appropriate time
   * after completing transmissions.
   */
  void WaitIfsAfterEndTxFragment (void);
  void WaitIfsAfterEndTx (void);

  /**
   * A transmission that does not require an ACK has completed.

  EventId m_sendCtsEvent;               //!< Event to send CTS
  EventId m_sendAckEvent;               //!< Event to send ACK
  EventId m_sendDataEvent;              //!< Event to send DATA
  EventId m_waitIfsEvent;               //!< Wait for IFS event
  EventId m_endTxNoAckEvent;            //!< Event for finishing transmission that does not require ACK
  EventId m_navCounterResetCtsMissed;   //!< Event to reset NAV when CTS is not received
  EventId m_waitRifsEvent;              //!< Wait for RIFS event

  Ptr<Packet> m_currentPacket;              //!< Current packet transmitted/to be transmitted
  WifiMacHeader m_currentHdr;               //!< Header of the current transmitted packet

(-)a/src/wifi/model/sta-wifi-mac.cc (+1 lines)

Lines 719-724	Link Here

719

                  HtCapabilities htcapabilities = assocResp.GetHtCapabilities ();

719

                  HtCapabilities htcapabilities = assocResp.GetHtCapabilities ();

720

                  HtOperations htOperations = assocResp.GetHtOperations ();

720

                  HtOperations htOperations = assocResp.GetHtOperations ();

721

                  m_stationManager->AddStationHtCapabilities (hdr->GetAddr2 (), htcapabilities);

721

                  m_stationManager->AddStationHtCapabilities (hdr->GetAddr2 (), htcapabilities);

722

                  m_stationManager->SetRifsPermitted (htOperations.GetRifsMode ());

722

723

              if (m_vhtSupported)

724

              if (m_vhtSupported)

724

725

(-)a/src/wifi/model/wifi-mac.cc (-1 / +1 lines)

Lines 191-197	Link Here

191

                   MakeTimeAccessor (&WifiMac::SetPifs,

191

                   MakeTimeAccessor (&WifiMac::SetPifs,

192

                                     &WifiMac::GetPifs),

192

                                     &WifiMac::GetPifs),

193

                   MakeTimeChecker ())

193

                   MakeTimeChecker ())

194

    .AddAttribute ("Rifs", "The value of the RIFS constant (not supported yet!).",

194

    .AddAttribute ("Rifs", "The value of the RIFS constant.",

195

                   TimeValue (GetDefaultRifs ()),

195

                   TimeValue (GetDefaultRifs ()),

196

                   MakeTimeAccessor (&WifiMac::SetRifs,

196

                   MakeTimeAccessor (&WifiMac::SetRifs,

197

                                     &WifiMac::GetRifs),

197

                                     &WifiMac::GetRifs),

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

Lines 362-368	Link Here

362

    m_vhtSupported (false),

362

    m_vhtSupported (false),

363

    m_useNonErpProtection (false),

363

    m_useNonErpProtection (false),

364

    m_shortPreambleEnabled (false),

364

    m_shortPreambleEnabled (false),

365

    m_shortSlotTimeEnabled (false)

365

    m_shortSlotTimeEnabled (false),

366

    m_rifsPermitted (false)

366

367

368

369

Lines 459-464	Link Here

459

  m_shortSlotTimeEnabled = enable;

460

  m_shortSlotTimeEnabled = enable;

460

461

462

463

void

464

WifiRemoteStationManager::SetRifsPermitted (bool allow)

465

466

  m_rifsPermitted = allow;

467

468

462

bool

469

bool

463

WifiRemoteStationManager::GetShortSlotTimeEnabled (void) const

470

WifiRemoteStationManager::GetShortSlotTimeEnabled (void) const

464

471

Lines 471-476	Link Here

471

  return m_shortPreambleEnabled;

478

  return m_shortPreambleEnabled;

472

479

473

480

481

bool

482

WifiRemoteStationManager::GetRifsPermitted (void) const

483

484

  return m_rifsPermitted;

485

486

474

WifiRemoteStationManager::ProtectionMode

487

WifiRemoteStationManager::ProtectionMode

475

WifiRemoteStationManager::GetProtectionMode (void) const

488

WifiRemoteStationManager::GetProtectionMode (void) const

476

489




   *         false otherwise
   */
  bool GetShortSlotTimeEnabled (void) const;
  /**
   * Permit or prohibit RIFS.
   *
   * \param allow permit or prohibit RIFS
   */
  void SetRifsPermitted (bool allow);
  /**
   * Return whether the device can use RIFS.
   *
   * \return true if RIFS is permitted,
   *         false otherwise
   */
  bool GetRifsPermitted (void) const;

  /**
   * Reset the station, invoked in a STA upon dis-association or in an AP upon reboot.

  bool m_useNonErpProtection; //!< flag if protection for non-ERP stations against ERP transmissions is enabled
  bool m_shortPreambleEnabled; //!< flag if short PLCP preamble is enabled
  bool m_shortSlotTimeEnabled; //!< flag if short slot time is enabled
  bool m_rifsPermitted;        //!< flag if RIFS is enabled
  ProtectionMode m_protectionMode; //!< Protection mode for ERP stations when non-ERP stations are detected

  /**

Return to bug 2528