Attachment #3230 for bug #3021

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

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

Lines 358-363 WifiPhy::GetTypeId (void)	Link Here

358

                     "in monitor mode to sniff all frames being transmitted",

358

                     "in monitor mode to sniff all frames being transmitted",

359

                     MakeTraceSourceAccessor (&WifiPhy::m_phyMonitorSniffTxTrace),

359

                     MakeTraceSourceAccessor (&WifiPhy::m_phyMonitorSniffTxTrace),

360

                     "ns3::WifiPhy::MonitorSnifferTxTracedCallback")

360

                     "ns3::WifiPhy::MonitorSnifferTxTracedCallback")

361

    .AddTraceSource ("EndOfHeSig",

362

                     "Trace source indicating the end of the 802.11ax HE-SIG",

363

                     MakeTraceSourceAccessor (&WifiPhy::m_phyEndOfHeSigTrace),

364

                     "ns3::WifiPhy::EndOfHeSigTracedCallback")

361

365

362

  return tid;

366

  return tid;

363

367

Lines 2357-2362 WifiPhy::NotifyMonitorSniffTx (Ptr<const Packet> packet, uint16_t channelFreqMhz	Link Here

2357

2361

2358

2362

2359

void

2363

void

2364

WifiPhy::NotifyEndOfHeSig (HeSigParameters params)

2365

2366

  m_phyEndOfHeSigTrace (params);

2367

2368

2369

void

2360

WifiPhy::SendPacket (Ptr<const Packet> packet, WifiTxVector txVector, MpduType mpdutype)

2370

WifiPhy::SendPacket (Ptr<const Packet> packet, WifiTxVector txVector, MpduType mpdutype)

2361

2371

2362

  NS_LOG_FUNCTION (this << packet << txVector.GetMode ()

2372

  NS_LOG_FUNCTION (this << packet << txVector.GetMode ()

Lines 2627-2632 WifiPhy::StartReceivePacket (Ptr<Packet> packet,	Link Here

2627

2637

2628

          NS_LOG_DEBUG ("receiving plcp payload"); //endReceive is already scheduled

2638

          NS_LOG_DEBUG ("receiving plcp payload"); //endReceive is already scheduled

2629

          m_plcpSuccess = true;

2639

          m_plcpSuccess = true;

2640

          if (txVector.GetMode ().GetModulationClass () == WIFI_MOD_CLASS_HE)

2641

2642

              HeSigParameters params;

2643

              params.rssiW = event->GetRxPowerW ();

2644

              params.bssColor = txVector.GetBssColor ();

2645

              NotifyEndOfHeSig (params);

2646

2630

2647

2631

      else //mode is not allowed

2648

      else //mode is not allowed

2632

2649

(-)a/src/wifi/model/wifi-phy.h (+29 lines)

Lines 58-63 struct MpduInfo	Link Here

  uint32_t mpduRefNumber; ///< MPDU ref number

  uint32_t mpduRefNumber; ///< MPDU ref number

};

};

// Parameters for receive HE-SIG

struct HeSigParameters

  double rssiW; ///< RSSI in W

  uint8_t bssColor; ///< BSS color

}; //replace by passing PHY headers?

/**

/**

 * \brief 802.11 PHY layer model

 * \brief 802.11 PHY layer model

 * \ingroup wifi

 * \ingroup wifi

Lines 1196-1201 public:	Link Here

1196

                                            MpduInfo aMpdu);

1203

                                            MpduInfo aMpdu);

1197

1204

1198

/**

1205

/**

1206

   * Public method used to fire a EndOfHeSig trace once a HE-SIG header is being received.

1207

1208

   * \param params the HE-SIG parameters

1209

*/

1210

  void NotifyEndOfHeSig (HeSigParameters params);

1211

1212

/**

1213

   * TracedCallback signature for end of HE-SIG-A events.

1214

1215

1216

   * \param params the HE-SIG parameters

1217

*/

1218

  typedef void (* EndOfHePreambleCallback)(HeSigParameters params);

1219

1220

/**

1199

   * Assign a fixed random variable stream number to the random variables

1221

   * Assign a fixed random variable stream number to the random variables

1200

   * used by this model. Return the number of streams (possibly zero) that

1222

   * used by this model. Return the number of streams (possibly zero) that

1201

   * have been assigned.

1223

   * have been assigned.

Lines 1736-1741 private:	Link Here

1736

  TracedCallback<Ptr<const Packet>, uint16_t, WifiTxVector, MpduInfo> m_phyMonitorSniffTxTrace;

1758

  TracedCallback<Ptr<const Packet>, uint16_t, WifiTxVector, MpduInfo> m_phyMonitorSniffTxTrace;

1737

1759

1738

/**

1760

/**

1761

   * A trace source that indiates end of HE-SIG-A for received 802.11ax packets

1762

1763

   * \see class CallBackTraceSource

1764

*/

1765

  TracedCallback<HeSigParameters> m_phyEndOfHeSigTrace;

1766

1767

/**

1739

   * This vector holds the set of transmission modes that this

1768

   * This vector holds the set of transmission modes that this

1740

   * WifiPhy(-derived class) can support. In conversation we call this

1769

   * WifiPhy(-derived class) can support. In conversation we call this

1741

   * the DeviceRateSet (not a term you'll find in the standard), and

1770

   * the DeviceRateSet (not a term you'll find in the standard), and

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

Lines 588-593 WifiRemoteStationManager::GetDataTxVector (Mac48Address address, const WifiMacHe	Link Here

588

      txVector.SetChannelWidth (GetChannelWidthForTransmission (mgtMode, m_wifiPhy->GetChannelWidth ()));

588

      txVector.SetChannelWidth (GetChannelWidthForTransmission (mgtMode, m_wifiPhy->GetChannelWidth ()));

589

      txVector.SetGuardInterval (ConvertGuardIntervalToNanoSeconds (mgtMode, DynamicCast<WifiNetDevice> (m_wifiPhy->GetDevice ())));

589

      txVector.SetGuardInterval (ConvertGuardIntervalToNanoSeconds (mgtMode, DynamicCast<WifiNetDevice> (m_wifiPhy->GetDevice ())));

590

591

  Ptr<WifiNetDevice> device = DynamicCast<WifiNetDevice> (m_wifiPhy->GetDevice ());

592

  Ptr<HeConfiguration> heConfiguration = device->GetHeConfiguration ();

593

  if (heConfiguration)

594

595

      UintegerValue bssColor;

596

      heConfiguration->GetAttribute ("BssColor", bssColor);

597

      txVector.SetBssColor (bssColor.Get ());

598

591

  return txVector;

599

  return txVector;

592

600

593

601




    m_ness (0),
    m_aggregation (false),
    m_stbc (false),
    m_bssColor (0),
    m_modeInitialized (false),
    m_txPowerLevelInitialized (false)
{

                            uint8_t ness,
                            uint16_t channelWidth,
                            bool aggregation,
                            bool stbc,
                            uint8_t bssColor)
  : m_mode (mode),
    m_txPowerLevel (powerLevel),
    m_preamble (preamble),

    m_ness (ness),
    m_aggregation (aggregation),
    m_stbc (stbc),
    m_bssColor (bssColor),
    m_modeInitialized (true),
    m_txPowerLevelInitialized (true)
{

  m_stbc = stbc;
}

void
WifiTxVector::SetBssColor (uint8_t color)
{
  m_bssColor = color;
}

uint8_t
WifiTxVector::GetBssColor (void) const
{
  return m_bssColor;
}

bool
WifiTxVector::IsValid (void) const
{




   * \param channelWidth the channel width in MHz
   * \param aggregation enable or disable MPDU aggregation
   * \param stbc enable or disable STBC
   * \param bssColor the BSS color
   */
  WifiTxVector (WifiMode mode,
                uint8_t powerLevel,

                uint8_t ness,
                uint16_t channelWidth,
                bool aggregation,
                bool stbc,
                uint8_t bssColor = 0);
  /**
   * \returns the selected payload transmission mode
   */

   */
  void SetStbc (bool stbc);
  /**
   * Set the BSS color
   * \param color the BSS color
   */
  void SetBssColor (uint8_t color);
  /**
   * Get the BSS color
   * \return the BSS color
   */
  uint8_t GetBssColor (void) const;
  /**
   * The standard disallows certain combinations of WifiMode, number of
   * spatial streams, and channel widths.  This method can be used to
   * check whether this WifiTxVector contains an invalid combination.

  uint8_t  m_ness;               /**< number of spatial streams in beamforming */
  bool     m_aggregation;        /**< Flag whether the PSDU contains A-MPDU. */
  bool     m_stbc;               /**< STBC used or not */
  uint8_t  m_bssColor;           /**< BSS color */

  bool     m_modeInitialized;         /**< Internal initialization flag */
  bool     m_txPowerLevelInitialized; /**< Internal initialization flag */

Return to bug 3021