Attachment #2723 for bug #2528

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

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

Lines 68-73	Link Here

                   BooleanValue (true),

                   BooleanValue (true),

                   MakeBooleanAccessor (&ApWifiMac::m_enableNonErpProtection),

                   MakeBooleanAccessor (&ApWifiMac::m_enableNonErpProtection),

                   MakeBooleanChecker ())

                   MakeBooleanChecker ())

    .AddAttribute ("RifsMode", "If non-HT STAs are detected, whether to force RIFS to be disabled within the BSS."

                   "This parameter is only used when HT is supported by the AP.",

                   BooleanValue (true),

                   MakeBooleanAccessor (&ApWifiMac::m_disableRifs),

                   MakeBooleanChecker ())

  return tid;

  return tid;

Lines 507-512	Link Here

507

  if (m_htSupported)

512

  if (m_htSupported)

508

513

509

      operation.SetHtSupported (1);

514

      operation.SetHtSupported (1);

515

      operation.SetRifsMode (GetRifsMode ());

510

      operation.SetNonGfHtStasPresent (IsNonGfHtStasPresent ());

516

      operation.SetNonGfHtStasPresent (IsNonGfHtStasPresent ());

511

      if (m_nonHtStations.empty ())

517

      if (m_nonHtStations.empty ())

512

518

Lines 1088-1091	Link Here

1088

  return useProtection;

1094

  return useProtection;

1089

1095

1090

1096

1097

bool

1098

ApWifiMac::GetRifsMode (void) const

1099

1100

  bool rifsMode = false;

1101

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

1102

1103

      if (m_nonHtStations.empty () || !m_disableRifs)

1104

1105

          rifsMode = true;

1106

1107

1108

  if (GetRifsSupported () && rifsMode)

1109

1110

      m_stationManager->SetRifsPermitted (true);

1111

1112

  else

1113

1114

      m_stationManager->SetRifsPermitted (false);

1115

1116

  return rifsMode;

1117

1118

1091

} //namespace ns3

1119

} //namespace ns3

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

Lines 265-270	Link Here

265

   *         false otherwise

265

   *         false otherwise

266

*/

266

*/

267

  bool GetUseNonErpProtection (void) const;

267

  bool GetUseNonErpProtection (void) const;

268

/**

269

   * Return whether RIFS is allowed in the BSS.

270

271

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

272

   *         false otherwise

273

*/

274

  bool GetRifsMode (void) const;

268

275

269

  virtual void DoDispose (void);

276

  virtual void DoDispose (void);

270

  virtual void DoInitialize (void);

277

  virtual void DoInitialize (void);

Lines 279-284	Link Here

279

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

286

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

280

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

287

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

281

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

288

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

289

  bool m_disableRifs;                        //!< Flag whether to force RIFS to be disabled within the BSS If non-HT STAs are detected

282

};

290

};

283

291

284

} //namespace ns3

292

} //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 && m_listener->HasTxop ())
        {
          if (m_stationManager->GetRifsPermitted ())
            {
              m_waitIfsEvent = Simulator::Schedule (GetRifs (),
                                                    &MacLow::WaitIfsAfterEndTxPacketInTxop, this);
            }
          else
            {
              m_waitIfsEvent = Simulator::Schedule (GetSifs (),
                                                    &MacLow::WaitIfsAfterEndTxPacketInTxop, this);
            }
        }
      m_ampdu = false;
      if (m_currentHdr.IsQosData ())

    }
  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_currentHdr.IsQosData () && m_currentHdr.IsQosBlockAck ())
    {
      Time delay = txDuration;
      if (m_stationManager->GetRifsPermitted ())
        {
          delay += GetRifs ();
        }
      else
        {
          delay += GetSifs ();
        }
      NS_ASSERT (m_waitIfsEvent.IsExpired ());
      m_waitIfsEvent = Simulator::Schedule (delay, &MacLow::WaitIfsAfterEndTxPacketInBA, this);
    }
  else
    {

    }
  if (m_txParams.HasNextPacket ())
    {
      if (m_stationManager->GetRifsPermitted ())
        {
          newDuration += GetRifs ();
        }
      else
        {
          newDuration += GetSifs ();
        }      newDuration += m_phy->CalculateTxDuration (m_txParams.GetNextPacketSize (), m_currentTxVector, m_phy->GetFrequency ());
      if (m_txParams.MustWaitCompressedBlockAck ())
        {
          newDuration += GetSifs ();

}

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

void
MacLow::WaitIfsAfterEndTxPacketInBA (void)
{
  m_listener->StartNextPacketInBA ();
}

void
MacLow::WaitIfsAfterEndTxPacketInTxop (void)
{
  m_listener->StartNextPacketInTxop ();
}




   * Event handler that is usually scheduled to fired at the appropriate time
   * after completing transmissions.
   */
  void WaitIfsAfterEndTxFragment (void);
  void WaitIfsAfterEndTxPacketInBA (void);
  void WaitIfsAfterEndTxPacketInTxop (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/regular-wifi-mac.cc (-2 / +21 lines)

Lines 731-736	Link Here

731

732

733

void

733

void

734

RegularWifiMac::SetRifsSupported (bool enable)

735

736

  NS_LOG_FUNCTION (this << enable);

737

  m_rifsSupported = enable;

738

739

740

bool

741

RegularWifiMac::GetRifsSupported (void) const

742

743

  return m_rifsSupported;

744

745

746

void

734

RegularWifiMac::Enqueue (Ptr<const Packet> packet,

747

RegularWifiMac::Enqueue (Ptr<const Packet> packet,

735

                         Mac48Address to, Mac48Address from)

748

                         Mac48Address to, Mac48Address from)

736

749

Lines 1067-1074	Link Here

1067

    .AddAttribute ("ShortSlotTimeSupported",

1080

    .AddAttribute ("ShortSlotTimeSupported",

1068

                   "Whether or not short slot time is supported (only used by ERP APs or STAs).",

1081

                   "Whether or not short slot time is supported (only used by ERP APs or STAs).",

1069

                   BooleanValue (true),

1082

                   BooleanValue (true),

1070

                   MakeBooleanAccessor (&WifiMac::GetShortSlotTimeSupported,

1083

                   MakeBooleanAccessor (&RegularWifiMac::GetShortSlotTimeSupported,

1071

                                        &WifiMac::SetShortSlotTimeSupported),

1084

                                        &RegularWifiMac::SetShortSlotTimeSupported),

1085

                   MakeBooleanChecker ())

1086

    .AddAttribute ("RifsSupported",

1087

                   "Whether or not RIFS is supported (only used by HT APs or STAs).",

1088

                   BooleanValue (false),

1089

                   MakeBooleanAccessor (&RegularWifiMac::GetRifsSupported,

1090

                                        &RegularWifiMac::SetRifsSupported),

1072

                   MakeBooleanChecker ())

1091

                   MakeBooleanChecker ())

1073

    .AddAttribute ("DcaTxop",

1092

    .AddAttribute ("DcaTxop",

1074

                   "The DcaTxop object.",

1093

                   "The DcaTxop object.",




   *         false otherwise.
   */
  virtual bool GetShortSlotTimeSupported (void) const;
  /**
   * Enable or disable RIFS feature.
   *
   * \param enable true if RIFS is to be supported,
   *               false otherwise
   */
  virtual void SetRifsSupported (bool enable);
  /**
   * \return whether the device supports RIFS capability.
   *
   * \return true if short RIFS is supported,
   *         false otherwise.
   */
  virtual bool GetRifsSupported (void) const;

  /**
   * \return the MAC address associated to this MAC layer.

  TracedCallback<const WifiMacHeader &> m_txErrCallback;
  
  bool m_shortSlotTimeSupported;
  bool m_rifsSupported;
};

} //namespace ns3

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

Lines 546-551	Link Here

546

547

              HtCapabilities htcapabilities = beacon.GetHtCapabilities ();

547

              HtCapabilities htcapabilities = beacon.GetHtCapabilities ();

548

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

548

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

549

              HtOperation htOperation = beacon.GetHtOperation ();

550

              if (!m_vhtSupported && GetRifsSupported () && htOperation.GetRifsMode ())

551

552

                  m_stationManager->SetRifsPermitted (true);

553

554

              else

555

556

                  m_stationManager->SetRifsPermitted (false);

557

549

558

550

          if (m_vhtSupported)

559

          if (m_vhtSupported)

551

560

Lines 714-719	Link Here

714

                  HtCapabilities htcapabilities = assocResp.GetHtCapabilities ();

723

                  HtCapabilities htcapabilities = assocResp.GetHtCapabilities ();

715

                  HtOperation htOperation = assocResp.GetHtOperation ();

724

                  HtOperation htOperation = assocResp.GetHtOperation ();

716

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

725

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

726

                  if (!m_vhtSupported && GetRifsSupported () && htOperation.GetRifsMode ())

727

728

                      m_stationManager->SetRifsPermitted (true);

729

730

                  else

731

732

                      m_stationManager->SetRifsPermitted (false);

733

717

734

718

              if (m_vhtSupported)

735

              if (m_vhtSupported)

719

736

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

Lines 190-196	Link Here

190

                   MakeTimeAccessor (&WifiMac::SetPifs,

190

                   MakeTimeAccessor (&WifiMac::SetPifs,

191

                                     &WifiMac::GetPifs),

191

                                     &WifiMac::GetPifs),

192

                   MakeTimeChecker ())

192

                   MakeTimeChecker ())

193

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

193

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

194

                   TimeValue (GetDefaultRifs ()),

194

                   TimeValue (GetDefaultRifs ()),

195

                   MakeTimeAccessor (&WifiMac::SetRifs,

195

                   MakeTimeAccessor (&WifiMac::SetRifs,

196

                                     &WifiMac::GetRifs),

196

                                     &WifiMac::GetRifs),

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

Lines 159-164	Link Here

159

   * \return whether the device supports short slot time capability.

159

   * \return whether the device supports short slot time capability.

160

*/

160

*/

161

  virtual bool GetShortSlotTimeSupported (void) const = 0;

161

  virtual bool GetShortSlotTimeSupported (void) const = 0;

162

/**

163

   * \return whether the device supports RIFS capability.

164

*/

165

  virtual bool GetRifsSupported (void) const = 0;

162

166

163

/**

167

/**

164

   * \param packet the packet to send.

168

   * \param packet the packet to send.

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

Lines 356-362	Link Here

356

    m_vhtSupported (false),

356

    m_vhtSupported (false),

357

    m_useNonErpProtection (false),

357

    m_useNonErpProtection (false),

358

    m_shortPreambleEnabled (false),

358

    m_shortPreambleEnabled (false),

359

    m_shortSlotTimeEnabled (false)

359

    m_shortSlotTimeEnabled (false),

360

    m_rifsPermitted (false)

360

361

362

363

Lines 453-458	Link Here

453

  m_shortSlotTimeEnabled = enable;

454

  m_shortSlotTimeEnabled = enable;

454

455

456

457

void

458

WifiRemoteStationManager::SetRifsPermitted (bool allow)

459

460

  m_rifsPermitted = allow;

461

462

456

bool

463

bool

457

WifiRemoteStationManager::GetShortSlotTimeEnabled (void) const

464

WifiRemoteStationManager::GetShortSlotTimeEnabled (void) const

458

465

Lines 465-470	Link Here

465

  return m_shortPreambleEnabled;

472

  return m_shortPreambleEnabled;

466

473

467

474

475

bool

476

WifiRemoteStationManager::GetRifsPermitted (void) const

477

478

  return m_rifsPermitted;

479

480

468

WifiRemoteStationManager::ProtectionMode

481

WifiRemoteStationManager::ProtectionMode

469

WifiRemoteStationManager::GetProtectionMode (void) const

482

WifiRemoteStationManager::GetProtectionMode (void) const

470

483




   *         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