Attachment #2997 for bug #2848

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




    }
  if (m_erpSupported == true && GetShortSlotTimeSupported () == true)
    {
      for (std::map<uint16_t, Mac48Address>::const_iterator i = m_staList.begin (); i != m_staList.end (); i++)
        {
          if (m_stationManager->GetShortSlotTimeSupported (i->second) == false)
            {
              return false;
            }

ApWifiMac::IsNonGfHtStasPresent (void) const
{
  bool isNonGfHtStasPresent = false;
  for (std::map<uint16_t, Mac48Address>::const_iterator i = m_staList.begin (); i != m_staList.end (); i++)
    {
      if (m_stationManager->GetGreenfieldSupported (i->second) == false)
        {
          isNonGfHtStasPresent = true;
          break;

ApWifiMac::GetVhtOperationalChannelWidth (void) const
{
  uint8_t channelWidth = m_phy->GetChannelWidth ();
  for (std::map<uint16_t, Mac48Address>::const_iterator i = m_staList.begin (); i != m_staList.end (); i++)
    {
      if (m_stationManager->GetVhtSupported (i->second))
        {
          if (m_stationManager->GetChannelWidthSupported (i->second) < channelWidth)
            {
              channelWidth = m_stationManager->GetChannelWidthSupported (i->second);
            }
        }
    }

        }
      uint8_t maxSpatialStream = m_phy->GetMaxSupportedTxSpatialStreams ();
      uint8_t nMcs = m_phy->GetNMcs ();
      for (std::map<uint16_t, Mac48Address>::const_iterator i = m_staList.begin (); i != m_staList.end (); i++)
        {
          if (m_stationManager->GetHtSupported (i->second))
            {
              uint64_t maxSupportedRateByHtSta = 0; //in bit/s
              for (uint8_t j = 0; j < (std::min (nMcs, m_stationManager->GetNMcsSupported (i->second))); j++)
                {
                  WifiMode mcs = m_phy->GetMcs (j);
                  if (mcs.GetModulationClass () != WIFI_MOD_CLASS_HT)

                    }
                  uint8_t nss = (mcs.GetMcsValue () / 8) + 1;
                  NS_ASSERT (nss > 0 && nss < 5);
                  uint64_t dataRate = mcs.GetDataRate (m_stationManager->GetChannelWidthSupported (i->second), m_stationManager->GetShortGuardInterval (i->second) ? 400 : 800, nss);
                  if (dataRate > maxSupportedRateByHtSta)
                    {
                      maxSupportedRateByHtSta = dataRate;

                {
                  maxSupportedRate = maxSupportedRateByHtSta;
                }
              if (m_stationManager->GetNMcsSupported (i->second) < nMcs)
                {
                  nMcs = m_stationManager->GetNMcsSupported (i->second);
                }
              if (m_stationManager->GetNumberOfSupportedStreams (i->second) < maxSpatialStream)
                {
                  maxSpatialStream = m_stationManager->GetNumberOfSupportedStreams (i->second);
                }
            }
        }

  if (success)
    {
      code.SetSuccess ();
      uint16_t aid = GetNextAssociationId ();
      m_staList.insert (std::make_pair (aid, to));
      assoc.SetAssociationId (aid);
    }
  else
    {

          else if (hdr->IsDisassociation ())
            {
              m_stationManager->RecordDisassociated (from);
              for (std::map<uint16_t, Mac48Address>::const_iterator j = m_staList.begin (); j != m_staList.end (); j++)
                {
                  if (j->second == from)
                    {
                      m_staList.erase (j);
                      break;
                    }
                }

  return rifsMode;
}

uint16_t
ApWifiMac::GetNextAssociationId (void)
{
  //Return the first free AID value between 1 and 2007
  for (uint16_t nextAid = 1; nextAid <= 2007; nextAid++)
    {
      if (m_staList.find (nextAid) == m_staList.end ())
        {
          return nextAid;
        }
    }
  NS_ASSERT_MSG (false, "No free association ID available!");
  return 0;
}

} //namespace ns3




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

  /**
   * \return the next Association ID to be allocated by the AP
   */
  uint16_t GetNextAssociationId (void);

  Ptr<DcaTxop> m_beaconDca;                  //!< Dedicated DcaTxop for beacons
  Time m_beaconInterval;                     //!< Interval between beacons
  bool m_enableBeaconGeneration;             //!< Flag whether beacons are being generated
  EventId m_beaconEvent;                     //!< Event to generate one beacon
  Ptr<UniformRandomVariable> m_beaconJitter; //!< UniformRandomVariable used to randomize the time of the first beacon
  bool m_enableBeaconJitter;                 //!< Flag whether the first beacon should be generated at random time
  std::map<uint16_t, Mac48Address> m_staList;//!< Map of all stations currently associated to the AP with their association ID
  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

(-)a/src/wifi/model/mgt-headers.cc (+7 lines)

Lines 48-53	Link Here

void

void

MgtAssocResponseHeader::SetAssociationId (uint16_t aid)

  m_aid = aid;

void

MgtProbeRequestHeader::SetSupportedRates (SupportedRates rates)

MgtProbeRequestHeader::SetSupportedRates (SupportedRates rates)

  m_rates = rates;

  m_rates = rates;

Lines 880-885	Link Here

880

MgtAssocResponseHeader::Print (std::ostream &os) const

886

MgtAssocResponseHeader::Print (std::ostream &os) const

881

887

882

  os << "status code=" << m_code << ", "

888

  os << "status code=" << m_code << ", "

889

     << "aid=" << m_aid << ", "

883

     << "rates=" << m_rates << ", "

890

     << "rates=" << m_rates << ", "

884

     << "ERP information=" << m_erpInformation << ", "

891

     << "ERP information=" << m_erpInformation << ", "

885

     << "HT Capabilities=" << m_htCapability << " , "

892

     << "HT Capabilities=" << m_htCapability << " , "

(-)a/src/wifi/model/mgt-headers.h (+6 lines)

Lines 302-307	Link Here

302

*/

302

*/

303

  void SetStatusCode (StatusCode code);

303

  void SetStatusCode (StatusCode code);

304

/**

304

/**

305

   * Set the association ID.

306

307

   * \param aid the association ID

308

*/

309

  void SetAssociationId (uint16_t aid);

310

/**

305

   * Set the ERP information.

311

   * Set the ERP information.

306

312

307

   * \param erpInformation the ERP information

313

   * \param erpInformation the ERP information

Return to bug 2848