Attachment #2648 for bug #2528

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

(-)a/src/wifi/model/ap-wifi-mac.cc (+23 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."

                   "This parameter only applies to HT APs and is rejected by VHT APs.",

                   BooleanValue (false),

                   MakeBooleanAccessor (&ApWifiMac::SetRifsMode,

                                        &ApWifiMac::GetRifsMode),

                   MakeBooleanChecker ())

  return tid;

  return tid;

Lines 496-501	Link Here

496

  operations.SetHtSupported (1);

502

  operations.SetHtSupported (1);

497

  if (m_htSupported)

503

  if (m_htSupported)

498

504

505

      operations.SetRifsMode (GetRifsMode ());

499

      if (!m_nonHtStations.empty ())

506

      if (!m_nonHtStations.empty ())

500

507

501

          operations.SetHtProtection (MIXED_MODE_PROTECTION);

508

          operations.SetHtProtection (MIXED_MODE_PROTECTION);

Lines 1037-1040	Link Here

1037

  return useProtection;

1044

  return useProtection;

1038

1045

1039

1046

1047

void

1048

ApWifiMac::SetRifsMode (bool enable)

1049

1050

  if (m_htSupported && !m_vhtSupported) //RIFS mode is forbidden for VHT

1051

1052

      m_enableRifs = enable;

1053

      m_stationManager->SetRifsPermitted (enable);

1054

1055

1056

1057

bool

1058

ApWifiMac::GetRifsMode (void) const

1059

1060

  return m_enableRifs;

1061

1062

1040

} //namespace ns3

1063

} //namespace ns3




   *         false otherwise
   */
  bool GetUseNonErpProtection (void) const;
  /**
   * Enable or disable RIFS in the BSS.
   *
   * \param enable enable or disable RIFS in the BSS
   */
  void SetRifsMode (bool enable);
  /**
   * Return whether RIFS is used in the BSS.
   *
   * \return true if RIFS is used in the BSS,
   *         false otherwise
   */
  bool GetRifsMode (void) const;

  virtual void DoDispose (void);
  virtual void DoInitialize (void);

  std::list<Mac48Address> m_nonErpStations;  //!< List of all non-ERP stations currently associated to the AP
  std::list<Mac48Address> m_nonHtStations;   //!< List of all non-HT stations currently associated to the AP
  bool m_enableNonErpProtection;             //!< Flag whether protection mechanism is used or not when non-ERP STAs are present within the BSS
  bool m_enableRifs;                         //!< Flag whether RIFS is used within the BSS
};

} //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 (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 (m_stationManager->GetRifsPermitted ())
            {
              m_waitIfsEvent = Simulator::Schedule (GetRifs (),
                                                    &MacLow::WaitIfsAfterEndTx, this);
            }
          else
            {
              m_waitIfsEvent = Simulator::Schedule (GetSifs (),
                                                    &MacLow::WaitIfsAfterEndTx, this);
            }
        }

      FlushAggregateQueue ();

    }
  else if (m_txParams.HasNextPacket ())
    {
      if (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

    }
  if (m_txParams.HasNextPacket ())
    {
      if (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 ())
        {

}

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

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




   * 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 729-734	Link Here

729

                  HtCapabilities htcapabilities = assocResp.GetHtCapabilities ();

729

                  HtCapabilities htcapabilities = assocResp.GetHtCapabilities ();

730

                  HtOperations htOperations = assocResp.GetHtOperations ();

730

                  HtOperations htOperations = assocResp.GetHtOperations ();

731

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

731

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

732

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

732

733

              if (m_vhtSupported)

734

              if (m_vhtSupported)

734

735

(-)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 / +17 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

  if (m_htSupported && !m_vhtSupported) //RIFS mode is forbidden for VHT

467

468

      m_rifsPermitted = allow;

469

470

471

462

bool

472

bool

463

WifiRemoteStationManager::GetShortSlotTimeEnabled (void) const

473

WifiRemoteStationManager::GetShortSlotTimeEnabled (void) const

464

474

Lines 471-476	Link Here

471

  return m_shortPreambleEnabled;

481

  return m_shortPreambleEnabled;

472

482

473

483

484

bool

485

WifiRemoteStationManager::GetRifsPermitted (void) const

486

487

  return m_rifsPermitted;

488

489

474

WifiRemoteStationManager::ProtectionMode

490

WifiRemoteStationManager::ProtectionMode

475

WifiRemoteStationManager::GetProtectionMode (void) const

491

WifiRemoteStationManager::GetProtectionMode (void) const

476

492




   *         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