Attachment #2071 for bug #2096

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

(-)original/src/network/utils/radiotap-header.cc (-4 / +99 lines)

Lines 16-21	Link Here

 * Foundation, Include., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

 * Foundation, Include., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

 * Author: Nicola Baldo <nbaldo@cttc.es>

 * Author: Nicola Baldo <nbaldo@cttc.es>

 * Author: Hany Assasa <hany.assasa@imdea.org>

*/

*/

#include <iomanip>

#include <iomanip>

Lines 38-44 RadiotapHeader::RadiotapHeader()	Link Here

    m_channelFreq (0),

    m_channelFreq (0),

    m_channelFlags (CHANNEL_FLAG_NONE),

    m_channelFlags (CHANNEL_FLAG_NONE),

    m_antennaSignal (0),

    m_antennaSignal (0),

    m_antennaNoise (0)

    m_antennaNoise (0),

    m_ampduStatusRef (0),

    m_ampduStatusFlags (0),

    m_ampduStatusCRC (0),

    m_ampduStatusReserved (0)

  NS_LOG_FUNCTION (this);

  NS_LOG_FUNCTION (this);

Lines 107-112 RadiotapHeader::Serialize (Buffer::Itera	Link Here

107

//

112

//

108

  if (m_present & RADIOTAP_CHANNEL) // bit 3

113

  if (m_present & RADIOTAP_CHANNEL) // bit 3

109

114

115

      start.WriteU8(0, m_channelPad);

110

      start.WriteU16 (m_channelFreq);

116

      start.WriteU16 (m_channelFreq);

111

      start.WriteU16 (m_channelFlags);

117

      start.WriteU16 (m_channelFlags);

112

118

Lines 128-133 RadiotapHeader::Serialize (Buffer::Itera	Link Here

128

134

129

      start.WriteU8 (m_antennaNoise);

135

      start.WriteU8 (m_antennaNoise);

130

136

137

138

//

139

  // A-MPDU Status, information about the received A-MPDU.

140

//

141

  if (m_present & RADIOTAP_MCS) // bit 19

142

143

      start.WriteU8 (0);

144

      start.WriteU8 (0);

145

      start.WriteU8 (0);

146

147

148

//

149

  // A-MPDU Status, information about the received A-MPDU.

150

//

151

  if (m_present & RADIOTAP_AMPDU_STATUS) // bit 20

152

153

      start.WriteU8(0, m_ampduStatusPad);

154

      start.WriteU32 (m_ampduStatusRef);

155

      start.WriteU16 (m_ampduStatusFlags);

156

      start.WriteU8 (m_ampduStatusCRC);

157

      start.WriteU8 (m_ampduStatusReserved);

158

131

159

132

160

133

uint32_t

161

uint32_t

Lines 176-184 RadiotapHeader::Deserialize (Buffer::Ite	Link Here

176

//

204

//

177

  if (m_present & RADIOTAP_CHANNEL) // bit 3

205

  if (m_present & RADIOTAP_CHANNEL) // bit 3

178

206

207

      m_channelPad = (2 - bytesRead % 2) % 2;

208

      start.Next(m_channelPad);

179

      m_channelFreq = start.ReadU16 ();

209

      m_channelFreq = start.ReadU16 ();

180

      m_channelFlags = start.ReadU16 ();

210

      m_channelFlags = start.ReadU16 ();

181

      bytesRead += 4;

211

      bytesRead += 4 + m_channelPad;

182

212

183

213

184

//

214

//

Lines 211-216 RadiotapHeader::Deserialize (Buffer::Ite	Link Here

211

      ++bytesRead;

241

      ++bytesRead;

212

242

213

243

244

//

245

  // A-MPDU Status, information about the received A-MPDU.

246

//

247

  if (m_present & RADIOTAP_MCS) // bit 19

248

249

      m_antennaNoise = start.ReadU8 ();

250

      m_antennaNoise = start.ReadU8 ();

251

      m_antennaNoise = start.ReadU8 ();

252

      bytesRead += 3;

253

254

255

//

256

  // A-MPDU Status, information about the received A-MPDU.

257

//

258

  if (m_present & RADIOTAP_AMPDU_STATUS) // bit 20

259

260

      m_ampduStatusPad = (4 - bytesRead % 4) % 4;

261

      start.Next(m_ampduStatusPad);

262

      m_ampduStatusRef = start.ReadU32 ();

263

      m_ampduStatusFlags = start.ReadU16 ();

264

      m_ampduStatusCRC = start.ReadU8 ();

265

      m_ampduStatusReserved = start.ReadU8 ();

266

      bytesRead += 8 + m_ampduStatusPad;

267

268

214

  NS_ASSERT_MSG (m_length == bytesRead, "RadiotapHeader::Deserialize(): expected and actual lengths inconsistent");

269

  NS_ASSERT_MSG (m_length == bytesRead, "RadiotapHeader::Deserialize(): expected and actual lengths inconsistent");

215

  return bytesRead;

270

  return bytesRead;

216

271

Lines 225-231 RadiotapHeader::Print (std::ostream &os)	Link Here

225

     << " freq=" << m_channelFreq

280

     << " freq=" << m_channelFreq

226

     << " chflags=" << std::hex << (uint32_t)m_channelFlags << std::dec

281

     << " chflags=" << std::hex << (uint32_t)m_channelFlags << std::dec

227

     << " signal=" << (int16_t) m_antennaSignal

282

     << " signal=" << (int16_t) m_antennaSignal

228

     << " noise=" << (int16_t) m_antennaNoise;

283

     << " noise=" << (int16_t) m_antennaNoise

284

     << " ampduStatusFlags=" << (int16_t) m_ampduStatusFlags;

229

285

230

286

231

void

287

void

Lines 294-299 RadiotapHeader::GetRate (void) const	Link Here

294

  return m_rate;

350

  return m_rate;

295

351

296

352

353

void

354

RadiotapHeader::SetAmpduStatus (uint32_t referenceNumber, uint16_t flags, uint8_t crc)

355

356

  NS_LOG_FUNCTION (this << referenceNumber << flags);

357

  m_ampduStatusRef = referenceNumber;

358

  m_ampduStatusFlags = flags;

359

  m_ampduStatusCRC = crc;

360

  if (!(m_present & RADIOTAP_AMPDU_STATUS))

361

362

      m_ampduStatusPad = (4 - m_length % 4) % 4;;

363

      m_present |= RADIOTAP_AMPDU_STATUS;

364

      m_length += 8 + m_ampduStatusPad;

365

366

367

  NS_LOG_LOGIC (this << " m_length=" << m_length << " m_present=0x" << std::hex << m_present << std::dec);

368

369

370

uint16_t

371

RadiotapHeader::GetAmpduStatusFlags () const

372

373

  NS_LOG_FUNCTION (this);

374

  return m_ampduStatusFlags;

375

376

377

void

378

RadiotapHeader::SetMCS (uint32_t value)

379

380

  NS_LOG_FUNCTION (this << value);

381

382

  if (!(m_present & RADIOTAP_MCS))

383

384

      m_present |= RADIOTAP_MCS;

385

      m_length += 3;

386

387

388

  NS_LOG_LOGIC (this << " m_length=" << m_length << " m_present=0x" << std::hex << m_present << std::dec);

389

390

297

void

391

void

298

RadiotapHeader::SetChannelFrequencyAndFlags (uint16_t frequency, uint16_t flags)

392

RadiotapHeader::SetChannelFrequencyAndFlags (uint16_t frequency, uint16_t flags)

299

393

Lines 303-310 RadiotapHeader::SetChannelFrequencyAndFl	Link Here

303

397

304

  if (!(m_present & RADIOTAP_CHANNEL))

398

  if (!(m_present & RADIOTAP_CHANNEL))

305

399

400

      m_channelPad = (2 - m_length % 2) % 2;

306

      m_present |= RADIOTAP_CHANNEL;

401

      m_present |= RADIOTAP_CHANNEL;

307

      m_length += 4;

402

      m_length += 4 + m_channelPad;

308

403

309

404

310

  NS_LOG_LOGIC (this << " m_length=" << m_length << " m_present=0x" << std::hex << m_present << std::dec);

405

  NS_LOG_LOGIC (this << " m_length=" << m_length << " m_present=0x" << std::hex << m_present << std::dec);




 * Foundation, Include., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 *
 * Author: Nicola Baldo <nbaldo@cttc.es>
 * Author: Hany Assasa <hany.assasa@imdea.org>
 */

#ifndef RADIOTAP_HEADER_H

  uint8_t GetRate (void) const;

  enum {
    A_MPDU_STATUS_NONE                = 0x0000, /**< No flags set */
    A_MPDU_STATUS_REPORT_ZERO_LENGTH  = 0x0001, /**< Driver reports 0-length subframes */
    A_MPDU_STATUS_IS_ZERO_LENGTH      = 0x0002, /**< Frame is 0-length subframe (valid only if 0x0001 is set) */
    A_MPDU_STATUS_LAST_KNOWN          = 0x0004, /**< Last subframe is known (should be set for all subframes in an A-MPDU) */
    A_MPDU_STATUS_LAST                = 0x0008, /**< This frame is the last subframe */
    A_MPDU_STATUS_DELIMITER_CRC_ERROR = 0x0010, /**< Delimiter CRC error */
    A_MPDU_STATUS_DELIMITER_CRC_KNOWN = 0x0020  /**< Delimiter CRC value known: the delimiter CRC value field is valid */
  };

  /**
   * @brief Set A-MPDU status.
   * @param status The status of the frame which is part of an A-MPDU.
   */
  void SetAmpduStatus (uint32_t referenceNumber, uint16_t falgs, uint8_t crc);

  /**
   * @brief Get A-MPDU status.
   * @returns The status of the frame which is part of an A-MPDU.
   */
  uint16_t GetAmpduStatusFlags (void) const;

  enum {
    CHANNEL_FLAG_NONE          = 0x0000, /**< No flags set */
    CHANNEL_FLAG_TURBO         = 0x0010, /**< Turbo Channel */
    CHANNEL_FLAG_CCK           = 0x0020, /**< CCK channel */

   */
  uint8_t GetAntennaNoisePower (void) const;

  void SetMCS (uint32_t value);

private:
  enum {
    RADIOTAP_TSFT              = 0x00000001,

    RADIOTAP_LOCK_QUALITY      = 0x00000080,
    RADIOTAP_TX_ATTENUATION    = 0x00000100,
    RADIOTAP_DB_TX_ATTENUATION = 0x00000200,
    RADIOTAP_DBM_TX_POWER      = 0x00000400,
    RADIOTAP_ANTENNA           = 0x00000800,
    RADIOTAP_DB_ANTSIGNAL      = 0x00001000,
    RADIOTAP_DB_ANTNOISE       = 0x00002000,
    RADIOTAP_RX_FLAGS          = 0x00004000,
    RADIOTAP_MCS               = 0x00080000,
    RADIOTAP_AMPDU_STATUS      = 0x00100000, // The presence of this field indicates the frame was received as part of an A-MPDU.
    RADIOTAP_VHT               = 0x00200000,
    RADIOTAP_EXT               = 0x10000000
  };
 
  uint16_t m_length;        //!< Entire length of radiotap data + header
  uint32_t m_present;       //!< Bits describing which fields follow header

  uint64_t m_tsft;          //!< Time Synchronization Function Timer (when the first bit of the MPDU arrived at the MAC)
  uint8_t m_flags;          //!< Properties of transmitted and received frames.
  uint8_t m_rate;           //!< TX/RX data rate in units of 500 kbps
  uint8_t m_channelPad;     //!< Tx/Rx channel Padding.
  uint16_t m_channelFreq;   //!< Tx/Rx frequency in MHz.
  uint16_t m_channelFlags;  //!< Tx/Rx channel flags.
  int8_t m_antennaSignal;   //!< RF signal power at the antenna, dB difference from an arbitrary, fixed reference.
  int8_t m_antennaNoise;    //!< RF noise power at the antenna, dB difference from an arbitrary, fixed reference.

  uint8_t m_ampduStatusPad;       //!< A-MPDU Status Flags, Padding before A-MPDU Status Field.
  uint32_t m_ampduStatusRef;      //!< A-MPDU Status Flags, reference number.
  uint16_t m_ampduStatusFlags;    //!< A-MPDU Status Flags, information about the received A-MPDU.
  uint8_t m_ampduStatusCRC;       //!< A-MPDU Status Flags, delimiter CRC value.
  uint8_t m_ampduStatusReserved;  //!< A-MPDU Status Flags, reserved.

};

} // namespace ns3




 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 *
 * Author: Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
 * Author: Hany Assasa <hany.assasa@imdea.org>
 */

#include "ns3/trace-helper.h"

#include "ns3/names.h"
#include "ns3/abort.h"
#include "ns3/log.h"
#include "ns3/ampdu-subframe-header.h"

namespace ns3 {


static void
PcapSniffTxEvent (
  Ptr<PcapFileWrapper> file,
  Ptr<const Packet>   packet,
  uint16_t            channelFreqMhz,
  uint16_t            channelNumber,
  uint32_t            rate,
  bool                isShortPreamble,
  WifiTxVector        txvector,
  uint8_t             packetType)
{
  uint32_t dlt = file->GetDataLinkType ();


          {
            frameFlags |= RadiotapHeader::FRAME_FLAG_SHORT_PREAMBLE;
          }

        if (txvector.IsShortGuardInterval ())
          {
            frameFlags |= RadiotapHeader::FRAME_FLAG_SHORT_GUARD;


        header.SetChannelFrequencyAndFlags (channelFreqMhz, channelFlags);

        if (txvector.IsAggregated())
          {
            uint16_t ampduStatus_Flags = 0;
            ampduStatus_Flags |= RadiotapHeader::A_MPDU_STATUS_DELIMITER_CRC_KNOWN;
            ampduStatus_Flags |= RadiotapHeader::A_MPDU_STATUS_LAST_KNOWN;
            if (packetType == 2)
              ampduStatus_Flags |= RadiotapHeader::A_MPDU_STATUS_LAST;

            /* For PCAP file, MPDU Delimiter and Padding should be removed by the MAC Driver */
            AmpduSubframeHeader hdr;
            uint32_t extractedLength;

            p->RemoveHeader (hdr);
            extractedLength = hdr.GetLength ();
            p = p->CreateFragment (0, static_cast<uint32_t> (extractedLength));
            header.SetAmpduStatus (10, ampduStatus_Flags, hdr.GetCrc());
          }

        p->AddHeader (header);
        file->Write (Simulator::Now (), p);
        return;


static void
PcapSniffRxEvent (
  Ptr<PcapFileWrapper> 	file,
  Ptr<const Packet>    	packet,
  uint16_t             	channelFreqMhz,
  uint16_t             	channelNumber,
  uint32_t             	rate,
  bool                 	isShortPreamble,
  WifiTxVector         	txvector,
  struct snrDbm         snr,
  uint8_t               packetType)
{
  uint32_t dlt = file->GetDataLinkType ();


          {
            frameFlags |= RadiotapHeader::FRAME_FLAG_SHORT_PREAMBLE;
          }

        if (txvector.IsShortGuardInterval ())
          {
            frameFlags |= RadiotapHeader::FRAME_FLAG_SHORT_GUARD;


        header.SetChannelFrequencyAndFlags (channelFreqMhz, channelFlags);

        header.SetAntennaSignalPower (snr.signal);
        header.SetAntennaNoisePower (snr.noise);

        if (txvector.IsAggregated())
          {
            uint16_t ampduStatus_Flags = 0;
            ampduStatus_Flags |= RadiotapHeader::A_MPDU_STATUS_DELIMITER_CRC_KNOWN;
            ampduStatus_Flags |= RadiotapHeader::A_MPDU_STATUS_LAST_KNOWN;
            if (packetType == 2)
              ampduStatus_Flags |= RadiotapHeader::A_MPDU_STATUS_LAST;

            /* For PCAP file, MPDU Delimiter and Padding should be removed by the MAC Driver */
            AmpduSubframeHeader hdr;
            uint32_t extractedLength;

            p->RemoveHeader (hdr);
            extractedLength = hdr.GetLength ();
            p = p->CreateFragment (0, static_cast<uint32_t> (extractedLength));
            header.SetAmpduStatus (10, ampduStatus_Flags, hdr.GetCrc());
          }

        p->AddHeader (header);
        file->Write (Simulator::Now (), p);

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

Lines 1545-1550 MacLow::ForwardDown (Ptr<const Packet> p	Link Here

1545

      AmpduTag ampdutag;

1545

      AmpduTag ampdutag;

1546

      ampdutag.SetAmpdu (true);

1546

      ampdutag.SetAmpdu (true);

1547

      Time delay = Seconds (0);

1547

      Time delay = Seconds (0);

1548

      txVector.SetAggregated (queueSize > 1);

1548

      for ( ; queueSize > 0; queueSize--)

1549

      for ( ; queueSize > 0; queueSize--)

1549

1550

          dequeuedPacket = m_aggregateQueue->Dequeue (&newHdr);

1551

          dequeuedPacket = m_aggregateQueue->Dequeue (&newHdr);




}

void
WifiPhy::NotifyMonitorSniffRx (Ptr<const Packet> packet, uint16_t channelFreqMhz, uint16_t channelNumber, uint32_t rate, bool isShortPreamble, WifiTxVector txvector, struct snrDbm snr, uint8_t packetType)
{
  m_phyMonitorSniffRxTrace (packet, channelFreqMhz, channelNumber, rate, isShortPreamble, txvector, snr, packetType);
}

void
WifiPhy::NotifyMonitorSniffTx (Ptr<const Packet> packet, uint16_t channelFreqMhz, uint16_t channelNumber, uint32_t rate, bool isShortPreamble, WifiTxVector txvector, uint8_t packetType)
{
  m_phyMonitorSniffTxTrace (packet, channelFreqMhz, channelNumber, rate, isShortPreamble, txvector, packetType);
}



// Clause 15 rates (DSSS)

WifiMode




class WifiChannel;
class NetDevice;

struct snrDbm
{
  double signal;
  double noise;
};

/**
 * \brief receive notifications about phy events.
 */

   *        units used both for the radiotap and for the prism header)
   * \param isShortPreamble true if short preamble is used, false otherwise
   * \param txVector the txvector that holds rx parameters
   * \param signalDbm signal power and noise power in dBm
   * \param packetType
   */
  void NotifyMonitorSniffRx (Ptr<const Packet> packet, uint16_t channelFreqMhz,
                             uint16_t channelNumber, uint32_t rate,
                             bool isShortPreamble, WifiTxVector txvector,
                             struct snrDbm snr, uint8_t packetType);

  /**
   * TracedCallback signature for monitor mode receive events.

   *        units used both for the radiotap and for the prism header)
   * \param isShortPreamble true if short preamble is used, false otherwise
   * \param txVector the txvector that holds rx parameters
   * \param signalDbm signal power and noise power in dBm
   * \param packetType
   */
  typedef void (* MonitorSnifferRxCallback)
    (Ptr<const Packet> packet, uint16_t channelFreqMhz,
     uint16_t channelNumber, uint32_t rate,
     bool isShortPreamble, WifiTxVector txvector,
     struct snrDbm snr, uint8_t);


  /**
   * Public method used to fire a MonitorSniffer trace for a wifi packet being transmitted.

   */
  void NotifyMonitorSniffTx (Ptr<const Packet> packet, uint16_t channelFreqMhz,
                             uint16_t channelNumber, uint32_t rate,
                             bool isShortPreamble, WifiTxVector txvector, uint8_t packetType);

  /**
   * TracedCallback signature for monitor mode transmit events.

   *        units used both for the radiotap and for the prism header)
   * \param isShortPreamble true if short preamble is used, false otherwise
   * \param txVector the txvector that holds tx parameters
   * \param packetType Type of the packet
   */
  typedef void (* MonitorSnifferTxCallback)
    (const Ptr<const Packet> packet, uint16_t channelFreqMhz,
     uint16_t channelNumber, uint32_t rate,
     bool isShortPreamble, WifiTxVector txvector, uint8_t packetType);

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

   *
   * \see class CallBackTraceSource
   */
  TracedCallback<Ptr<const Packet>, uint16_t, uint16_t, uint32_t, bool, WifiTxVector, struct snrDbm, uint8_t> m_phyMonitorSniffRxTrace;

  /**
   * A trace source that emulates a wifi device in monitor mode

   *
   * \see class CallBackTraceSource
   */
  TracedCallback<Ptr<const Packet>, uint16_t, uint16_t, uint32_t, bool, WifiTxVector, uint8_t> m_phyMonitorSniffTxTrace;
    
  uint32_t m_totalAmpduNumSymbols; //!< Number of symbols previously transmitted for the MPDUs in an A-MPDU, used for the computation of the number of symbols needed for the last MPDU in the A-MPDU
  uint32_t m_totalAmpduSize;       //!< Total size of the previously transmitted MPDUs in an A-MPDU, used for the computation of the number of symbols needed for the last MPDU in the A-MPDU




 *
 * Author: Nicola Baldo <nbaldo@cttc.es>
 *       : Ghada Badawy <gbadawy@gmail.com>
 *		 : Hany Assasa <hany.assasa@imdea.org>
 */

#include "ns3/wifi-tx-vector.h"

    m_nss (1),
    m_ness (0),
    m_stbc (false),
    m_aggregated (false),
    m_modeInitialized (false),
    m_txPowerLevelInitialized (false)
{

    m_nss(nss),
    m_ness(ness),
    m_stbc(stbc),
    m_aggregated (false),
    m_modeInitialized (true),
    m_txPowerLevelInitialized (true)
{

    }
  return m_mode;
}

uint8_t 
WifiTxVector::GetTxPowerLevel (void) const
{

    }
  return m_txPowerLevel;
}

uint8_t 
WifiTxVector::GetRetries (void) const
{
  return m_retries;
}

bool 
WifiTxVector::IsShortGuardInterval (void) const
{
 return m_shortGuardInterval;
}

uint8_t 
WifiTxVector::GetNss (void) const
{
  return m_nss;
}

uint8_t 
WifiTxVector::GetNess (void) const
{
  return m_ness;
}

bool 
WifiTxVector::IsStbc (void) const
{

  m_mode=mode;
  m_modeInitialized = true;
}

void 
WifiTxVector::SetTxPowerLevel (uint8_t powerlevel)
{
  m_txPowerLevel=powerlevel;
  m_txPowerLevelInitialized = true;
}

void 
WifiTxVector::SetRetries (uint8_t retries)
{
  m_retries = retries;
}

void 
WifiTxVector::SetShortGuardInterval (bool guardinterval)
{
  m_shortGuardInterval=guardinterval;
}

void 
WifiTxVector::SetNss (uint8_t nss)
{
  m_nss= nss;
}

void 
WifiTxVector::SetNess (uint8_t ness)
{
  m_ness=ness;
}

void 
WifiTxVector::SetStbc (bool stbc)
{
  m_stbc=stbc;
}

bool
WifiTxVector::IsAggregated (void) const
{
  return m_aggregated;
}

void
WifiTxVector::SetAggregated (bool aggregated)
{
  m_aggregated = aggregated;
}

std::ostream & operator << ( std::ostream &os, const WifiTxVector &v)
{ 
  os << "mode:" << v.GetMode() <<

    " Short GI: " << v.IsShortGuardInterval() <<
    " Nss: " << (uint32_t)v.GetNss() <<
    " Ness: " << (uint32_t)v.GetNess() <<
    " STBC: " << v.IsStbc() <<
    " Aggregation: " << v.IsAggregated();
  return os;
}





 *
 * Author: Nicola Baldo <nbaldo@cttc.es>
 *       : Ghada Badawy <gbadawy@gmail.com>
 *       : Hany Assasa <hany.assasa@imdea.org>
 */

#ifndef WIFI_TX_VECTOR_H

   * \param stbc enable or disable STBC
   */
  void SetStbc (bool stbc);
  /**
   * Checks whether the PSDU contains A-MPDU.
   *  \returns true if this packet has A-MPDU aggregation,
   *           false otherwise.
   */
  bool IsAggregated (void) const;
  /**
   * Sets if PSDU contains A-MPDU.
   *
   * \param aggregated whether the packet contains A-MPDU or not.
   */
  void SetAggregated(bool aggregated);

  
private:

  WifiMode m_mode;         /**< The DATARATE parameter in Table 15-4. 

  uint8_t  m_nss; /**< number of streams */
  uint8_t  m_ness; /**< number of streams in beamforming */
  bool     m_stbc; /**< STBC used or not */
  bool     m_aggregated;  /** Flag whether the PSDU contains A-MPDU. */

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

(-)original/src/wifi/model/yans-wifi-phy.cc (-4 / +6 lines)

Lines 779-785 YansWifiPhy::SendPacket (Ptr<const Packe	Link Here

779

      dataRate500KbpsUnits = txVector.GetMode ().GetDataRate () * txVector.GetNss () / 500000;

779

      dataRate500KbpsUnits = txVector.GetMode ().GetDataRate () * txVector.GetNss () / 500000;

780

781

  bool isShortPreamble = (WIFI_PREAMBLE_SHORT == preamble);

781

  bool isShortPreamble = (WIFI_PREAMBLE_SHORT == preamble);

782

  NotifyMonitorSniffTx (packet, (uint16_t)GetChannelFrequencyMhz (), GetChannelNumber (), dataRate500KbpsUnits, isShortPreamble, txVector);

782

  NotifyMonitorSniffTx (packet, (uint16_t)GetChannelFrequencyMhz (), GetChannelNumber (), dataRate500KbpsUnits, isShortPreamble, txVector, packetType);

783

  m_state->SwitchToTx (txDuration, packet, GetPowerDbm (txVector.GetTxPowerLevel ()), txVector, preamble);

783

  m_state->SwitchToTx (txDuration, packet, GetPowerDbm (txVector.GetTxPowerLevel ()), txVector, preamble);

784

  m_channel->Send (this, packet, GetPowerDbm (txVector.GetTxPowerLevel ()) + m_txGainDb, txVector, preamble, packetType, txDuration);

784

  m_channel->Send (this, packet, GetPowerDbm (txVector.GetTxPowerLevel ()) + m_txGainDb, txVector, preamble, packetType, txDuration);

785

Lines 1097-1105 YansWifiPhy::EndReceive (Ptr<Packet> pac	Link Here

1097

              dataRate500KbpsUnits = event->GetPayloadMode ().GetDataRate () * event->GetTxVector ().GetNss () / 500000;

1097

              dataRate500KbpsUnits = event->GetPayloadMode ().GetDataRate () * event->GetTxVector ().GetNss () / 500000;

1098

1099

          bool isShortPreamble = (WIFI_PREAMBLE_SHORT == event->GetPreambleType ());

1099

          bool isShortPreamble = (WIFI_PREAMBLE_SHORT == event->GetPreambleType ());

1100

          double signalDbm = RatioToDb (event->GetRxPowerW ()) + 30;

1100

          struct snrDbm snr;

1101

          double noiseDbm = RatioToDb (event->GetRxPowerW () / snrPer.snr) - GetRxNoiseFigure () + 30;

1101

          snr.signal = RatioToDb (event->GetRxPowerW ()) + 30;

1102

          NotifyMonitorSniffRx (packet, (uint16_t)GetChannelFrequencyMhz (), GetChannelNumber (), dataRate500KbpsUnits, isShortPreamble, event->GetTxVector (), signalDbm, noiseDbm);

1102

          snr.noise = RatioToDb (event->GetRxPowerW () / snrPer.snr) - GetRxNoiseFigure () + 30;

1103

1104

          NotifyMonitorSniffRx (packet, (uint16_t)GetChannelFrequencyMhz (), GetChannelNumber (), dataRate500KbpsUnits, isShortPreamble, event->GetTxVector (), snr, packetType);

1103

          m_state->SwitchFromRxEndOk (packet, snrPer.snr, event->GetTxVector (), event->GetPreambleType ());

1105

          m_state->SwitchFromRxEndOk (packet, snrPer.snr, event->GetTxVector (), event->GetPreambleType ());

1104

1106

1105

      else

1107

      else

Return to bug 2096