Attachment #2076 for bug #2096

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

(-)a/src/network/utils/radiotap-header.cc (-2 / +296 lines)

Lines 38-44	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)

  NS_LOG_FUNCTION (this);

  NS_LOG_FUNCTION (this);

Lines 128-133	Link Here

128

131

129

      start.WriteU8 (m_antennaNoise);

132

      start.WriteU8 (m_antennaNoise);

130

133

134

135

//

136

  // Quality of Barker code lock.

137

//

138

  if (m_present & RADIOTAP_LOCK_QUALITY) // bit 7

139

140

      start.WriteU16 (0);

141

142

143

//

144

  // Transmit power expressed as unitless distance from max power

145

  // set at factory calibration (0 is max power).

146

//

147

  if (m_present & RADIOTAP_TX_ATTENUATION) // bit 8

148

149

      start.WriteU16 (0);

150

151

152

//

153

  // Transmit power expressed as decibel distance from max power

154

  // set at factory calibration (0 is max power).

155

//

156

  if (m_present & RADIOTAP_DB_TX_ATTENUATION) // bit 9

157

158

      start.WriteU16 (0);

159

160

161

//

162

  // Transmit power expressed as dBm (decibels from a 1 milliwatt reference).

163

  // This is the absolute power level measured at the antenna port.

164

//

165

  if (m_present & RADIOTAP_DBM_TX_POWER) // bit 10

166

167

      start.WriteU8 (0);

168

169

170

//

171

  // Unitless indication of the Rx/Tx antenna for this packet.

172

  // The first antenna is antenna 0.

173

//

174

  if (m_present & RADIOTAP_ANTENNA) // bit 11

175

176

      start.WriteU8 (0);

177

178

179

//

180

  // RF signal power at the antenna (decibel difference from an arbitrary fixed reference).

181

//

182

  if (m_present & RADIOTAP_DB_ANTSIGNAL) // bit 12

183

184

      start.WriteU8 (0);

185

186

187

//

188

  // RF noise power at the antenna (decibel difference from an arbitrary fixed reference).

189

//

190

  if (m_present & RADIOTAP_DB_ANTNOISE) // bit 13

191

192

      start.WriteU8 (0);

193

194

195

//

196

  // Properties of received frames.

197

//

198

  if (m_present & RADIOTAP_RX_FLAGS) // bit 14

199

200

      start.WriteU16 (0);

201

202

203

//

204

  // MCS field.

205

//

206

  if (m_present & RADIOTAP_MCS) // bit 19

207

208

      start.WriteU8 (m_mcsKnown);

209

      start.WriteU8 (m_mcsFlags);

210

      start.WriteU8 (m_mcsRate);

211

212

213

//

214

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

215

//

216

  if (m_present & RADIOTAP_AMPDU_STATUS) // bit 20

217

218

      start.WriteU8(0, m_ampduStatusPad);

219

      start.WriteU32 (m_ampduStatusRef);

220

      start.WriteU16 (m_ampduStatusFlags);

221

      start.WriteU8 (m_ampduStatusCRC);

222

      start.WriteU8 (0);

223

224

225

//

226

  // Information about the received or transmitted VHT frame.

227

//

228

  if (m_present & RADIOTAP_VHT) // bit 21

229

230

      start.WriteU16 (0);

231

      start.WriteU8 (0);

232

      start.WriteU8 (0);

233

      start.WriteU8 (0);

234

      start.WriteU8 (0);

235

      start.WriteU8 (0);

236

      start.WriteU16 (0);

237

131

238

132

239

133

uint32_t

240

uint32_t

Lines 211-216	Link Here

211

      ++bytesRead;

318

      ++bytesRead;

212

319

213

320

321

//

322

  // Quality of Barker code lock.

323

//

324

  if (m_present & RADIOTAP_LOCK_QUALITY) // bit 7

325

326

      start.ReadU16 ();

327

      bytesRead += 2;

328

329

330

//

331

  // Transmit power expressed as unitless distance from max power

332

  // set at factory calibration (0 is max power).

333

//

334

  if (m_present & RADIOTAP_TX_ATTENUATION) // bit 8

335

336

      start.ReadU16 ();

337

      bytesRead += 2;

338

339

340

//

341

  // Transmit power expressed as decibel distance from max power

342

  // set at factory calibration (0 is max power).

343

//

344

  if (m_present & RADIOTAP_DB_TX_ATTENUATION) // bit 9

345

346

      start.ReadU16 ();

347

      bytesRead += 2;

348

349

350

//

351

  // Transmit power expressed as dBm (decibels from a 1 milliwatt reference).

352

  // This is the absolute power level measured at the antenna port.

353

//

354

  if (m_present & RADIOTAP_DBM_TX_POWER) // bit 10

355

356

      start.ReadU8 ();

357

      ++bytesRead;

358

359

360

//

361

  // Unitless indication of the Rx/Tx antenna for this packet.

362

  // The first antenna is antenna 0.

363

//

364

  if (m_present & RADIOTAP_ANTENNA) // bit 11

365

366

      start.ReadU8 ();

367

      ++bytesRead;

368

369

370

//

371

  // RF signal power at the antenna (decibel difference from an arbitrary fixed reference).

372

//

373

  if (m_present & RADIOTAP_DB_ANTSIGNAL) // bit 12

374

375

      start.ReadU8 ();

376

      ++bytesRead;

377

378

379

//

380

  // RF noise power at the antenna (decibel difference from an arbitrary fixed reference).

381

//

382

  if (m_present & RADIOTAP_DB_ANTNOISE) // bit 13

383

384

      start.ReadU8 ();

385

      ++bytesRead;

386

387

388

//

389

  // Properties of received frames.

390

//

391

  if (m_present & RADIOTAP_RX_FLAGS) // bit 14

392

393

      start.ReadU16 ();

394

      bytesRead += 2;

395

396

397

//

398

  // MCS field.

399

//

400

  if (m_present & RADIOTAP_MCS) // bit 19

401

402

      m_mcsKnown = start.ReadU8 ();

403

      m_mcsFlags = start.ReadU8 ();

404

      m_mcsRate = start.ReadU8 ();

405

      bytesRead += 3;

406

407

408

//

409

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

410

//

411

  if (m_present & RADIOTAP_AMPDU_STATUS) // bit 20

412

413

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

414

      start.Next (m_ampduStatusPad);

415

      m_ampduStatusRef = start.ReadU32 ();

416

      m_ampduStatusFlags = start.ReadU16 ();

417

      m_ampduStatusCRC = start.ReadU8 ();

418

      start.ReadU8 ();

419

      bytesRead += (8 + m_ampduStatusPad);

420

421

422

//

423

  // Information about the received or transmitted VHT frame.

424

//

425

  if (m_present & RADIOTAP_VHT) // bit 21

426

427

      start.ReadU16 ();

428

      start.ReadU8 ();

429

      start.ReadU8 ();

430

      start.ReadU8 ();

431

      start.ReadU8 ();

432

      start.ReadU8 ();

433

      start.ReadU16 ();

434

435

214

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

436

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

215

  return bytesRead;

437

  return bytesRead;

216

438

Lines 225-231	Link Here

225

     << " freq=" << m_channelFreq

447

     << " freq=" << m_channelFreq

226

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

448

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

227

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

449

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

228

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

450

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

451

     << " mcsKnown=" << m_mcsKnown

452

     << " mcsFlags=" << m_mcsFlags

453

     << " mcsRate=" << m_mcsRate

454

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

229

455

230

456

231

void

457

void

Lines 390-393	Link Here

390

  return m_antennaNoise;

616

  return m_antennaNoise;

391

617

392

618

619

void

620

RadiotapHeader::SetMcsFields (uint8_t known, uint8_t flags, uint8_t mcs)

621

622

  NS_LOG_FUNCTION (this << known << flags << mcs);

623

  m_mcsKnown = known;

624

  m_mcsFlags = flags;

625

  m_mcsRate = mcs;

626

  if (!(m_present & RADIOTAP_MCS))

627

628

      m_present |= RADIOTAP_MCS;

629

      m_length += 3;

630

631

632

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

633

634

635

uint8_t

636

RadiotapHeader::GetMcsKnown () const

637

638

  NS_LOG_FUNCTION (this);

639

  return m_mcsKnown;

640

641

642

uint8_t

643

RadiotapHeader::GetMcsFlags () const

644

645

  NS_LOG_FUNCTION (this);

646

  return m_mcsFlags;

647

648

649

uint8_t

650

RadiotapHeader::GetMcsRate () const

651

652

  NS_LOG_FUNCTION (this);

653

  return m_mcsRate;

654

655

656

void

657

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

658

659

  NS_LOG_FUNCTION (this << referenceNumber << flags);

660

  m_ampduStatusRef = referenceNumber;

661

  m_ampduStatusFlags = flags;

662

  m_ampduStatusCRC = crc;

663

  if (!(m_present & RADIOTAP_AMPDU_STATUS))

664

665

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

666

      m_present |= RADIOTAP_AMPDU_STATUS;

667

      m_length += 8 + m_ampduStatusPad;

668

669

670

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

671

672

673

uint32_t

674

RadiotapHeader::GetAmpduStatusRef () const

675

676

  NS_LOG_FUNCTION (this);

677

  return m_ampduStatusRef;

678

679

680

uint16_t

681

RadiotapHeader::GetAmpduStatusFlags () const

682

683

  NS_LOG_FUNCTION (this);

684

  return m_ampduStatusFlags;

685

686

393

} // namespace ns3

687

} // namespace ns3




   *          from an arbitrary, fixed reference. 
   */
  uint8_t GetAntennaNoisePower (void) const;
  
  enum {
    MCS_KNOWN_NONE           = 0x00, /**< No flags set */
    MCS_KNOWN_BANDWIDTH      = 0x01, /**< Bandwidth */
    MCS_KNOWN_INDEX          = 0x02, /**< MCS index known */
    MCS_KNOWN_GUARD_INTERVAL = 0x04, /**< Guard interval */
    MCS_KNOWN_HT_FORMAT      = 0x08, /**< HT format */
    MCS_KNOWN_FEC_TYPE       = 0x10, /**< FEC type */
    MCS_KNOWN_STBC           = 0x20, /**< STBC known */
    MCS_KNOWN_NESS           = 0x40, /**< Ness known (Number of extension spatial streams) */
    MCS_KNOWN_NESS_BIT_1     = 0x80, /**< Ness data - bit 1 (MSB) of Number of extension spatial streams */
  };
  
  enum {
    MCS_FLAGS_NONE           = 0x00, /**< Default: 20 MHz, long guard interval, mixed HT format and BCC FEC type */
    MCS_FLAGS_BANDWIDTH_40   = 0x01, /**< 40 MHz */
    MCS_FLAGS_BANDWIDTH_20L  = 0x02, /**< 20L (20 MHz in lower half of 40 MHz channel) */
    MCS_FLAGS_BANDWIDTH_20U  = 0x03, /**< 20U (20 MHz in upper half of 40 MHz channel) */
    MCS_FLAGS_GUARD_INTERVAL = 0x04, /**< Short guard interval */
    MCS_FLAGS_HT_GREENFIELD  = 0x08, /**< Greenfield HT format */
    MCS_FLAGS_FEC_TYPE       = 0x10, /**< LDPC FEC type */
    MCS_FLAGS_STBC_STREAMS   = 0x60, /**< STBC enabled */
    MCS_FLAGS_NESS_BIT_0     = 0x80, /**< Ness - bit 0 (LSB) of Number of extension spatial streams */
  };
 
  /**
   * @brief Set the MCS fields
   *
   * @param known The kwown flags.
   * @param flags The flags to set.
   * @param mcs The MCS index value.
   */
  void SetMcsFields (uint8_t known, uint8_t flags, uint8_t mcs);

  /**
   * @brief Get the MCS known bitmap.
   *
   * @returns The MCS known bitmap.
   */
  uint8_t GetMcsKnown (void) const;
  /**
   * @brief Get the MCS flags.
   *
   * @returns The MCS flags.
   */
  uint8_t GetMcsFlags (void) const;
  /**
   * @brief Get the MCS index value.
   *
   * @returns The MCS index value.
   */
  uint8_t GetMcsRate (void) const;

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

  /**
   * @brief Set the A-MPDU status fields
   *
   * @param referenceNumber The A-MPDU reference number to identify all subframes belonging to the same A-MPDU.
   * @param flags The flags to set.
   * @param crc The CRC value value.
   */
  void SetAmpduStatus (uint32_t referenceNumber, uint16_t flags, uint8_t crc);

  /**
   * @brief Get the A-MPDU reference number.
   *
   * @returns The A-MPDU reference number.
   */
  uint32_t GetAmpduStatusRef (void) const;
  /**
   * @brief Get the A-MPDU status flags.
   *
   * @returns The A-MPDU status flags.
   */
  uint16_t GetAmpduStatusFlags (void) const;


private:
  enum {

    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,
    RADIOTAP_VHT               = 0x00200000,
    RADIOTAP_EXT               = 0x10000000
  };
 

  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_mcsKnown; //!< MCS Flags, known information field.
  uint8_t m_mcsFlags; //!< MCS Flags, flags field.
  uint8_t m_mcsRate; //!< MCS Flags, mcs rate index.

  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.
};

} // namespace ns3

(-)a/src/wifi/examples/test-interference-helper.cc (-2 / +2 lines)

Lines 106-112	Link Here

106

  WifiTxVector txVector;

106

  WifiTxVector txVector;

107

  txVector.SetTxPowerLevel (m_input.txPowerLevelA);

107

  txVector.SetTxPowerLevel (m_input.txPowerLevelA);

108

  txVector.SetMode (WifiMode (m_input.txModeA));

108

  txVector.SetMode (WifiMode (m_input.txModeA));

109

  m_txA->SendPacket (p, txVector, m_input.preamble, 0);

109

  m_txA->SendPacket (p, txVector, m_input.preamble, 0, 0);

110

111

112

void

112

void

Lines 116-122	Link Here

116

  WifiTxVector txVector;

116

  WifiTxVector txVector;

117

  txVector.SetTxPowerLevel (m_input.txPowerLevelB);

117

  txVector.SetTxPowerLevel (m_input.txPowerLevelB);

118

  txVector.SetMode (WifiMode (m_input.txModeB));

118

  txVector.SetMode (WifiMode (m_input.txModeB));

119

  m_txB->SendPacket (p, txVector, m_input.preamble, 0);

119

  m_txB->SendPacket (p, txVector, m_input.preamble, 0, 0);

120

121

122

InterferenceExperiment::InterferenceExperiment ()

122

InterferenceExperiment::InterferenceExperiment ()




  WifiTxVector txVector;
  txVector.SetTxPowerLevel (m_input.txPowerLevel);
  txVector.SetMode (mode);
  m_tx->SendPacket (p, txVector, WIFI_PREAMBLE_LONG, 0, 0);
}

void

  WifiTxVector txVector;
  txVector.SetTxPowerLevel (m_input.txPowerLevelA);
  txVector.SetMode (WifiMode (m_input.txModeA));
  m_txA->SendPacket (p, txVector, WIFI_PREAMBLE_LONG, 0, 0);
}

void

  WifiTxVector txVector;
  txVector.SetTxPowerLevel (m_input.txPowerLevelB);
  txVector.SetMode (WifiMode (m_input.txModeB));
  m_txB->SendPacket (p, txVector, WIFI_PREAMBLE_LONG, 0, 0);
}

void




#include "ns3/propagation-delay-model.h"
#include "ns3/yans-wifi-channel.h"
#include "ns3/yans-wifi-phy.h"
#include "ns3/ampdu-subframe-header.h"
#include "ns3/wifi-net-device.h"
#include "ns3/radiotap-header.h"
#include "ns3/pcap-file-wrapper.h"

  uint16_t             channelFreqMhz,
  uint16_t             channelNumber,
  uint32_t             rate,
  WifiPreamble         preamble,
  WifiTxVector         txvector,
  struct mpduInfo      aMpdu)
{
  uint32_t dlt = file->GetDataLinkType ();


        //Our capture includes the FCS, so we set the flag to say so.
        frameFlags |= RadiotapHeader::FRAME_FLAG_FCS_INCLUDED;

        if (preamble == WIFI_PREAMBLE_SHORT)
          {
            frameFlags |= RadiotapHeader::FRAME_FLAG_SHORT_PREAMBLE;
          }

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

        header.SetFrameFlags (frameFlags);
        header.SetRate (rate);

        uint16_t channelFlags = 0;
        switch (rate)
          {
          case 2:  //1Mbps
          case 4:  //2Mbps
          case 10: //5Mbps
          case 22: //11Mbps
            channelFlags |= RadiotapHeader::CHANNEL_FLAG_CCK;
            break;

          default:
            channelFlags |= RadiotapHeader::CHANNEL_FLAG_OFDM;
            break;
          }

        if (channelFreqMhz < 2500)
          {
            channelFlags |= RadiotapHeader::CHANNEL_FLAG_SPECTRUM_2GHZ;
          }
        else
          {
            channelFlags |= RadiotapHeader::CHANNEL_FLAG_SPECTRUM_5GHZ;
          }

        header.SetChannelFrequencyAndFlags (channelFreqMhz, channelFlags);
        
        if (preamble == WIFI_PREAMBLE_HT_MF || preamble == WIFI_PREAMBLE_HT_GF || preamble == WIFI_PREAMBLE_NONE)
          {
            uint8_t mcsRate = 0;
            uint8_t mcsKnown = RadiotapHeader::MCS_KNOWN_NONE;
            uint8_t mcsFlags = RadiotapHeader::MCS_FLAGS_NONE;
            
            mcsKnown |= RadiotapHeader::MCS_KNOWN_INDEX;
            mcsRate = rate - 128;
            
            mcsKnown |= RadiotapHeader::MCS_KNOWN_BANDWIDTH;
            if (txvector.GetMode ().GetBandwidth () == 40000000)
              {
                mcsFlags |= RadiotapHeader::MCS_FLAGS_BANDWIDTH_40;
              }
              
            mcsKnown |= RadiotapHeader::MCS_KNOWN_GUARD_INTERVAL;
            if (txvector.IsShortGuardInterval ())
              {
                mcsFlags |= RadiotapHeader::MCS_FLAGS_GUARD_INTERVAL;
              }

            mcsKnown |= RadiotapHeader::MCS_KNOWN_HT_FORMAT;
            if (preamble == WIFI_PREAMBLE_HT_GF)
              {
                mcsFlags |= RadiotapHeader::MCS_FLAGS_HT_GREENFIELD;
              }
              
            mcsKnown |= RadiotapHeader::MCS_KNOWN_NESS;
            if (txvector.GetNess () & 0x01) //bit 1
              {
                mcsFlags |= RadiotapHeader::MCS_FLAGS_NESS_BIT_0;
              }
            if (txvector.GetNess () & 0x02) //bit 2
              {
                mcsKnown |= RadiotapHeader::MCS_KNOWN_NESS_BIT_1;
              }
              
            mcsKnown |= RadiotapHeader::MCS_KNOWN_FEC_TYPE; //TODO
              
            mcsKnown |= RadiotapHeader::MCS_KNOWN_STBC;
            if (txvector.IsStbc ())
              {
                mcsFlags |= RadiotapHeader::MCS_FLAGS_STBC_STREAMS;
              }
              
            header.SetMcsFields (mcsKnown, mcsFlags, mcsRate);
          }
        
        if (txvector.IsAggregation ())
          {
            uint16_t ampduStatusFlags = RadiotapHeader::A_MPDU_STATUS_NONE;
            ampduStatusFlags |= RadiotapHeader::A_MPDU_STATUS_DELIMITER_CRC_KNOWN;
            ampduStatusFlags |= RadiotapHeader::A_MPDU_STATUS_LAST_KNOWN;
            if (aMpdu.packetType == 2)
              {
               ampduStatusFlags |= 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 (aMpdu.referenceNumber, ampduStatusFlags, hdr.GetCrc ());
          }

        p->AddHeader (header);
        file->Write (Simulator::Now (), p);
        return;
      }
    default:
      NS_ABORT_MSG ("PcapSniffTxEvent(): Unexpected data link type " << dlt);
    }
}

static void
PcapSniffRxEvent (
  Ptr<PcapFileWrapper> file,
  Ptr<const Packet>    packet,
  uint16_t             channelFreqMhz,
  uint16_t             channelNumber,
  uint32_t             rate,
  WifiPreamble         preamble,
  WifiTxVector         txvector,
  struct mpduInfo      aMpdu,
  struct snrDbm        snr)
{
  uint32_t dlt = file->GetDataLinkType ();

  switch (dlt)
    {
    case PcapHelper::DLT_IEEE802_11:
      file->Write (Simulator::Now (), packet);
      return;
    case PcapHelper::DLT_PRISM_HEADER:
      {
        NS_FATAL_ERROR ("PcapSniffRxEvent(): DLT_PRISM_HEADER not implemented");
        return;
      }
    case PcapHelper::DLT_IEEE802_11_RADIO:
      {
        Ptr<Packet> p = packet->Copy ();
        RadiotapHeader header;
        uint8_t frameFlags = RadiotapHeader::FRAME_FLAG_NONE;
        header.SetTsft (Simulator::Now ().GetMicroSeconds ());

        //Our capture includes the FCS, so we set the flag to say so.
        frameFlags |= RadiotapHeader::FRAME_FLAG_FCS_INCLUDED;

        if (preamble == WIFI_PREAMBLE_SHORT)
          {
            frameFlags |= RadiotapHeader::FRAME_FLAG_SHORT_PREAMBLE;
          }


        header.SetChannelFrequencyAndFlags (channelFreqMhz, channelFlags);

        header.SetAntennaSignalPower (snr.signal);
        header.SetAntennaNoisePower (snr.noise);
        
        if (preamble == WIFI_PREAMBLE_HT_MF || preamble == WIFI_PREAMBLE_HT_GF || preamble == WIFI_PREAMBLE_NONE)
          {
            uint8_t mcsRate = 0;
            uint8_t mcsKnown = RadiotapHeader::MCS_KNOWN_NONE;
            uint8_t mcsFlags = RadiotapHeader::MCS_FLAGS_NONE;
            
            mcsKnown |= RadiotapHeader::MCS_KNOWN_INDEX;
            mcsRate = rate - 128;
            
            mcsKnown |= RadiotapHeader::MCS_KNOWN_BANDWIDTH;
            if (txvector.GetMode ().GetBandwidth () == 40000000)
              {
                mcsFlags |= RadiotapHeader::MCS_FLAGS_BANDWIDTH_40;
              }
              
            mcsKnown |= RadiotapHeader::MCS_KNOWN_GUARD_INTERVAL;
            if (txvector.IsShortGuardInterval ())
              {
                mcsFlags |= RadiotapHeader::MCS_FLAGS_GUARD_INTERVAL;
              }

            mcsKnown |= RadiotapHeader::MCS_KNOWN_HT_FORMAT;
            if (preamble == WIFI_PREAMBLE_HT_GF)
              {
                mcsFlags |= RadiotapHeader::MCS_FLAGS_HT_GREENFIELD;
              }
              
            mcsKnown |= RadiotapHeader::MCS_KNOWN_NESS;
            if (txvector.GetNess () & 0x01) //bit 1
              {
                mcsFlags |= RadiotapHeader::MCS_FLAGS_NESS_BIT_0;
              }
            if (txvector.GetNess () & 0x02) //bit 2
              {
                mcsKnown |= RadiotapHeader::MCS_KNOWN_NESS_BIT_1;
              }
              
            mcsKnown |= RadiotapHeader::MCS_KNOWN_FEC_TYPE; //TODO
              
            mcsKnown |= RadiotapHeader::MCS_KNOWN_STBC;
            if (txvector.IsStbc ())
              {
                mcsFlags |= RadiotapHeader::MCS_FLAGS_STBC_STREAMS;
              }
            
            header.SetMcsFields (mcsKnown, mcsFlags, mcsRate);
          }
        
        if (txvector.IsAggregation())
        uint8_t frameFlags = RadiotapHeader::FRAME_FLAG_NONE;
        header.SetTsft (Simulator::Now ().GetMicroSeconds ());

        //Our capture includes the FCS, so we set the flag to say so.
        frameFlags |= RadiotapHeader::FRAME_FLAG_FCS_INCLUDED;

        if (isShortPreamble)
          {
            uint16_t ampduStatus_Flags = 0;
            ampduStatus_Flags |= RadiotapHeader::A_MPDU_STATUS_DELIMITER_CRC_KNOWN;
            ampduStatus_Flags |= RadiotapHeader::A_MPDU_STATUS_LAST_KNOWN;
            if (aMpdu.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 (aMpdu.referenceNumber, ampduStatus_Flags, hdr.GetCrc ());
          }

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

        header.SetFrameFlags (frameFlags);
        header.SetRate (rate);

        uint16_t channelFlags = 0;
        switch (rate)
          {
          case 2:  //1Mbps
          case 4:  //2Mbps
          case 10: //5Mbps
          case 22: //11Mbps
            channelFlags |= RadiotapHeader::CHANNEL_FLAG_CCK;
            break;

          default:
            channelFlags |= RadiotapHeader::CHANNEL_FLAG_OFDM;
            break;
          }

        if (channelFreqMhz < 2500)
          {
            channelFlags |= RadiotapHeader::CHANNEL_FLAG_SPECTRUM_2GHZ;
          }
        else
          {
            channelFlags |= RadiotapHeader::CHANNEL_FLAG_SPECTRUM_5GHZ;
          }

        header.SetChannelFrequencyAndFlags (channelFreqMhz, channelFlags);

        header.SetAntennaSignalPower (signalDbm);
        header.SetAntennaNoisePower (noiseDbm);

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

(-)a/src/wifi/model/aarf-wifi-manager.cc (-2 / +2 lines)

Lines 232-238	Link Here

232

233

  NS_LOG_FUNCTION (this << st << size);

233

  NS_LOG_FUNCTION (this << st << size);

234

  AarfWifiRemoteStation *station = (AarfWifiRemoteStation *) st;

234

  AarfWifiRemoteStation *station = (AarfWifiRemoteStation *) st;

235

  return WifiTxVector (GetSupported (station, station->m_rate), GetDefaultTxPowerLevel (), GetLongRetryCount (station), GetShortGuardInterval (station), Min (GetNumberOfReceiveAntennas (station), GetNumberOfTransmitAntennas ()), GetNess (station), GetStbc (station));

235

  return WifiTxVector (GetSupported (station, station->m_rate), GetDefaultTxPowerLevel (), GetLongRetryCount (station), GetShortGuardInterval (station), Min (GetNumberOfReceiveAntennas (station), GetNumberOfTransmitAntennas ()), GetNess (station), GetAggregation (station), GetStbc (station));

236

237

238

WifiTxVector

238

WifiTxVector

Lines 242-248	Link Here

242

  /// \todo we could/should implement the Aarf algorithm for

242

  /// \todo we could/should implement the Aarf algorithm for

243

  /// RTS only by picking a single rate within the BasicRateSet.

243

  /// RTS only by picking a single rate within the BasicRateSet.

244

  AarfWifiRemoteStation *station = (AarfWifiRemoteStation *) st;

244

  AarfWifiRemoteStation *station = (AarfWifiRemoteStation *) st;

245

  return WifiTxVector (GetSupported (station, 0), GetDefaultTxPowerLevel (), GetLongRetryCount (station), GetShortGuardInterval (station), Min (GetNumberOfReceiveAntennas (station), GetNumberOfTransmitAntennas ()), GetNess (station), GetStbc (station));

245

  return WifiTxVector (GetSupported (station, 0), GetDefaultTxPowerLevel (), GetLongRetryCount (station), GetShortGuardInterval (station), Min (GetNumberOfReceiveAntennas (station), GetNumberOfTransmitAntennas ()), GetNess (station), GetAggregation (station), GetStbc (station));

246

247

248

bool

248

bool

(-)a/src/wifi/model/aarfcd-wifi-manager.cc (-2 / +2 lines)

Lines 304-310	Link Here

304

305

  NS_LOG_FUNCTION (this << st << size);

305

  NS_LOG_FUNCTION (this << st << size);

306

  AarfcdWifiRemoteStation *station = (AarfcdWifiRemoteStation *) st;

306

  AarfcdWifiRemoteStation *station = (AarfcdWifiRemoteStation *) st;

307

  return WifiTxVector (GetSupported (station, station->m_rate), GetDefaultTxPowerLevel (), GetLongRetryCount (station), GetShortGuardInterval (station), Min (GetNumberOfReceiveAntennas (station), GetNumberOfTransmitAntennas ()), GetNess (station), GetStbc (station));

307

  return WifiTxVector (GetSupported (station, station->m_rate), GetDefaultTxPowerLevel (), GetLongRetryCount (station), GetShortGuardInterval (station), Min (GetNumberOfReceiveAntennas (station), GetNumberOfTransmitAntennas ()), GetNess (station), GetAggregation (station), GetStbc (station));

308

309

WifiTxVector

309

WifiTxVector

310

AarfcdWifiManager::DoGetRtsTxVector (WifiRemoteStation *st)

310

AarfcdWifiManager::DoGetRtsTxVector (WifiRemoteStation *st)

Lines 313-319	Link Here

313

  /// \todo we could/should implement the Aarf algorithm for

313

  /// \todo we could/should implement the Aarf algorithm for

314

  /// RTS only by picking a single rate within the BasicRateSet.

314

  /// RTS only by picking a single rate within the BasicRateSet.

315

  AarfcdWifiRemoteStation *station = (AarfcdWifiRemoteStation *) st;

315

  AarfcdWifiRemoteStation *station = (AarfcdWifiRemoteStation *) st;

316

  return WifiTxVector (GetSupported (station, 0), GetDefaultTxPowerLevel (), GetShortRetryCount (station), GetShortGuardInterval (station), Min (GetNumberOfReceiveAntennas (station), GetNumberOfTransmitAntennas ()), GetNess (station), GetStbc (station));

316

  return WifiTxVector (GetSupported (station, 0), GetDefaultTxPowerLevel (), GetShortRetryCount (station), GetShortGuardInterval (station), Min (GetNumberOfReceiveAntennas (station), GetNumberOfTransmitAntennas ()), GetNess (station), GetAggregation (station), GetStbc (station));

317

318

319

bool

319

bool

(-)a/src/wifi/model/amrr-wifi-manager.cc (-2 / +2 lines)

Lines 336-342	Link Here

336

337

338

339

  return WifiTxVector (GetSupported (station, rateIndex), GetDefaultTxPowerLevel (), GetLongRetryCount (station), GetShortGuardInterval (station), Min (GetNumberOfReceiveAntennas (station), GetNumberOfTransmitAntennas ()), GetNess (station), GetStbc (station));

339

  return WifiTxVector (GetSupported (station, rateIndex), GetDefaultTxPowerLevel (), GetLongRetryCount (station), GetShortGuardInterval (station), Min (GetNumberOfReceiveAntennas (station), GetNumberOfTransmitAntennas ()), GetNess (station), GetAggregation (station), GetStbc (station));

340

341

342

WifiTxVector

342

WifiTxVector

Lines 346-352	Link Here

346

  AmrrWifiRemoteStation *station = (AmrrWifiRemoteStation *)st;

346

  AmrrWifiRemoteStation *station = (AmrrWifiRemoteStation *)st;

347

  UpdateMode (station);

347

  UpdateMode (station);

348

  /// \todo can we implement something smarter ?

348

  /// \todo can we implement something smarter ?

349

  return WifiTxVector (GetSupported (station, 0), GetDefaultTxPowerLevel (), GetLongRetryCount (station), GetShortGuardInterval (station), Min (GetNumberOfReceiveAntennas (station), GetNumberOfTransmitAntennas ()), GetNess (station), GetStbc (station));

349

  return WifiTxVector (GetSupported (station, 0), GetDefaultTxPowerLevel (), GetLongRetryCount (station), GetShortGuardInterval (station), Min (GetNumberOfReceiveAntennas (station), GetNumberOfTransmitAntennas ()), GetNess (station), GetAggregation (station), GetStbc (station));

350

351

352

bool

352

bool

(-)a/src/wifi/model/aparf-wifi-manager.cc (-2 / +2 lines)

Lines 322-328	Link Here

322

  NS_LOG_FUNCTION (this << st << size);

322

  NS_LOG_FUNCTION (this << st << size);

323

  AparfWifiRemoteStation *station = (AparfWifiRemoteStation *) st;

323

  AparfWifiRemoteStation *station = (AparfWifiRemoteStation *) st;

324

  CheckInit (station);

324

  CheckInit (station);

325

  return WifiTxVector (GetSupported (station, station->m_rate), station->m_power, GetLongRetryCount (station), GetShortGuardInterval (station), Min (GetNumberOfReceiveAntennas (station),GetNumberOfTransmitAntennas ()), GetNumberOfTransmitAntennas (station), GetStbc (station));

325

  return WifiTxVector (GetSupported (station, station->m_rate), station->m_power, GetLongRetryCount (station), GetShortGuardInterval (station), Min (GetNumberOfReceiveAntennas (station),GetNumberOfTransmitAntennas ()), GetNumberOfTransmitAntennas (station), GetAggregation (station), GetStbc (station));

326

327

328

WifiTxVector

328

WifiTxVector

Lines 332-338	Link Here

332

  /// \todo we could/should implement the Arf algorithm for

332

  /// \todo we could/should implement the Arf algorithm for

333

  /// RTS only by picking a single rate within the BasicRateSet.

333

  /// RTS only by picking a single rate within the BasicRateSet.

334

  AparfWifiRemoteStation *station = (AparfWifiRemoteStation *) st;

334

  AparfWifiRemoteStation *station = (AparfWifiRemoteStation *) st;

335

  return WifiTxVector (GetSupported (station, 0), GetDefaultTxPowerLevel (), GetShortRetryCount (station), GetShortGuardInterval (station), Min (GetNumberOfReceiveAntennas (station),GetNumberOfTransmitAntennas ()), GetNumberOfTransmitAntennas (station), GetStbc (station));

335

  return WifiTxVector (GetSupported (station, 0), GetDefaultTxPowerLevel (), GetShortRetryCount (station), GetShortGuardInterval (station), Min (GetNumberOfReceiveAntennas (station),GetNumberOfTransmitAntennas ()), GetNumberOfTransmitAntennas (station), GetAggregation (station), GetStbc (station));

336

337

338

bool

338

bool

(-)a/src/wifi/model/arf-wifi-manager.cc (-2 / +2 lines)

Lines 208-214	Link Here

208

209

  NS_LOG_FUNCTION (this << st << size);

209

  NS_LOG_FUNCTION (this << st << size);

210

  ArfWifiRemoteStation *station = (ArfWifiRemoteStation *) st;

210

  ArfWifiRemoteStation *station = (ArfWifiRemoteStation *) st;

211

  return WifiTxVector (GetSupported (station, station->m_rate), GetDefaultTxPowerLevel (), GetLongRetryCount (station), GetShortGuardInterval (station), Min (GetNumberOfReceiveAntennas (station), GetNumberOfTransmitAntennas ()), GetNess (station), GetStbc (station));

211

  return WifiTxVector (GetSupported (station, station->m_rate), GetDefaultTxPowerLevel (), GetLongRetryCount (station), GetShortGuardInterval (station), Min (GetNumberOfReceiveAntennas (station), GetNumberOfTransmitAntennas ()), GetNess (station), GetAggregation (station), GetStbc (station));

212

213

214

WifiTxVector

214

WifiTxVector

Lines 218-224	Link Here

218

  /// \todo we could/should implement the Arf algorithm for

218

  /// \todo we could/should implement the Arf algorithm for

219

  /// RTS only by picking a single rate within the BasicRateSet.

219

  /// RTS only by picking a single rate within the BasicRateSet.

220

  ArfWifiRemoteStation *station = (ArfWifiRemoteStation *) st;

220

  ArfWifiRemoteStation *station = (ArfWifiRemoteStation *) st;

221

  return WifiTxVector (GetSupported (station, 0), GetDefaultTxPowerLevel (), GetLongRetryCount (station), GetShortGuardInterval (station), Min (GetNumberOfReceiveAntennas (station), GetNumberOfTransmitAntennas ()), GetNess (station), GetStbc (station));

221

  return WifiTxVector (GetSupported (station, 0), GetDefaultTxPowerLevel (), GetLongRetryCount (station), GetShortGuardInterval (station), Min (GetNumberOfReceiveAntennas (station), GetNumberOfTransmitAntennas ()), GetNess (station), GetAggregation (station), GetStbc (station));

222

223

224

bool

224

bool

(-)a/src/wifi/model/cara-wifi-manager.cc (-2 / +2 lines)

Lines 183-189	Link Here

183

184

  NS_LOG_FUNCTION (this << st << size);

184

  NS_LOG_FUNCTION (this << st << size);

185

  CaraWifiRemoteStation *station = (CaraWifiRemoteStation *) st;

185

  CaraWifiRemoteStation *station = (CaraWifiRemoteStation *) st;

186

  return WifiTxVector (GetSupported (station, station->m_rate), GetDefaultTxPowerLevel (), GetLongRetryCount (station), GetShortGuardInterval (station), Min (GetNumberOfReceiveAntennas (station), GetNumberOfTransmitAntennas ()), GetNess (station), GetStbc (station));

186

  return WifiTxVector (GetSupported (station, station->m_rate), GetDefaultTxPowerLevel (), GetLongRetryCount (station), GetShortGuardInterval (station), Min (GetNumberOfReceiveAntennas (station), GetNumberOfTransmitAntennas ()), GetNess (station), GetAggregation (station), GetStbc (station));

187

188

189

WifiTxVector

189

WifiTxVector

Lines 192-198	Link Here

192

  NS_LOG_FUNCTION (this << st);

192

  NS_LOG_FUNCTION (this << st);

193

  /// \todo we could/should implement the Arf algorithm for

193

  /// \todo we could/should implement the Arf algorithm for

194

  /// RTS only by picking a single rate within the BasicRateSet.

194

  /// RTS only by picking a single rate within the BasicRateSet.

195

  return WifiTxVector (GetSupported (st, 0), GetDefaultTxPowerLevel (), GetLongRetryCount (st), GetShortGuardInterval (st), Min (GetNumberOfReceiveAntennas (st), GetNumberOfTransmitAntennas ()), GetNess (st), GetStbc (st));

195

  return WifiTxVector (GetSupported (st, 0), GetDefaultTxPowerLevel (), GetLongRetryCount (st), GetShortGuardInterval (st), Min (GetNumberOfReceiveAntennas (st), GetNumberOfTransmitAntennas ()), GetNess (st), GetAggregation (st), GetStbc (st));

196

197

198

bool

198

bool




ConstantRateWifiManager::DoGetDataTxVector (WifiRemoteStation *st, uint32_t size)
{
  NS_LOG_FUNCTION (this << st << size);
  return WifiTxVector (m_dataMode, GetDefaultTxPowerLevel (), GetLongRetryCount (st), GetShortGuardInterval (st), Min (GetNumberOfReceiveAntennas (st), GetNumberOfTransmitAntennas ()), GetNess (st), GetAggregation (st), GetStbc (st));
}

WifiTxVector
ConstantRateWifiManager::DoGetRtsTxVector (WifiRemoteStation *st)
{
  NS_LOG_FUNCTION (this << st);
  return WifiTxVector (m_ctlMode, GetDefaultTxPowerLevel (), GetShortRetryCount (st), GetShortGuardInterval (st), Min (GetNumberOfReceiveAntennas (st), GetNumberOfTransmitAntennas ()), GetNess (st), GetAggregation (st), GetStbc (st));
}

bool

(-)a/src/wifi/model/ideal-wifi-manager.cc (-2 / +2 lines)

Lines 169-175	Link Here

169

          maxMode = mode;

169

          maxMode = mode;

170

171

172

  return WifiTxVector (maxMode, GetDefaultTxPowerLevel (), GetLongRetryCount (station), GetShortGuardInterval (station), Min (GetNumberOfReceiveAntennas (station), GetNumberOfTransmitAntennas ()), GetNess (station), GetStbc (station));

172

  return WifiTxVector (maxMode, GetDefaultTxPowerLevel (), GetLongRetryCount (station), GetShortGuardInterval (station), Min (GetNumberOfReceiveAntennas (station), GetNumberOfTransmitAntennas ()), GetNess (station), GetAggregation (station), GetStbc (station));

173

174

175

WifiTxVector

175

WifiTxVector

Lines 192-198	Link Here

192

          maxMode = mode;

192

          maxMode = mode;

193

194

195

  return WifiTxVector (maxMode, GetDefaultTxPowerLevel (), GetShortRetryCount (station), GetShortGuardInterval (station), Min (GetNumberOfReceiveAntennas (station), GetNumberOfTransmitAntennas ()), GetNess (station), GetStbc (station));

195

  return WifiTxVector (maxMode, GetDefaultTxPowerLevel (), GetShortRetryCount (station), GetShortGuardInterval (station), Min (GetNumberOfReceiveAntennas (station), GetNumberOfTransmitAntennas ()), GetNess (station), GetAggregation (station), GetStbc (station));

196

197

198

bool

198

bool

(-)a/src/wifi/model/mac-low.cc (-6 / +12 lines)

Lines 366-372	Link Here

366

    m_listener (0),

366

    m_listener (0),

367

    m_phyMacLowListener (0),

367

    m_phyMacLowListener (0),

368

    m_ctsToSelfSupported (false),

368

    m_ctsToSelfSupported (false),

369

    m_receivedAtLeastOneMpdu (false)

369

    m_receivedAtLeastOneMpdu (false),

370

    m_mpduReferenceNumber (0)

370

371

  NS_LOG_FUNCTION (this);

372

  NS_LOG_FUNCTION (this);

372

  m_lastNavDuration = Seconds (0);

373

  m_lastNavDuration = Seconds (0);

Lines 1556-1562	Link Here

1556

                ", seq=0x" << std::hex << m_currentHdr.GetSequenceControl () << std::dec);

1557

                ", seq=0x" << std::hex << m_currentHdr.GetSequenceControl () << std::dec);

1557

  if (!m_ampdu || hdr->IsRts ())

1558

  if (!m_ampdu || hdr->IsRts ())

1558

1559

      m_phy->SendPacket (packet, txVector, preamble, 0);

1560

      m_phy->SendPacket (packet, txVector, preamble, 0, 0);

1560

1561

  else

1562

  else

1562

1563

Lines 1571-1576	Link Here

1571

      AmpduTag ampdutag;

1572

      AmpduTag ampdutag;

1572

      ampdutag.SetAmpdu (true);

1573

      ampdutag.SetAmpdu (true);

1573

      Time delay = Seconds (0);

1574

      Time delay = Seconds (0);

1575

      if (queueSize > 1)

1576

1577

          txVector.SetAggregation (true);

1578

1574

      for (; queueSize > 0; queueSize--)

1579

      for (; queueSize > 0; queueSize--)

1575

1580

1576

          dequeuedPacket = m_aggregateQueue->Dequeue (&newHdr);

1581

          dequeuedPacket = m_aggregateQueue->Dequeue (&newHdr);

Lines 1591-1601	Link Here

1591

1596

1592

              NS_LOG_DEBUG ("Sending MPDU as part of A-MPDU");

1597

              NS_LOG_DEBUG ("Sending MPDU as part of A-MPDU");

1593

              packetType = 1;

1598

              packetType = 1;

1594

              m_phy->SendPacket (newPacket, txVector, preamble, packetType);

1599

              m_phy->SendPacket (newPacket, txVector, preamble, packetType, m_mpduReferenceNumber);

1595

1600

1596

          else

1601

          else

1597

1602

1598

              Simulator::Schedule (delay, &MacLow::SendPacket, this, newPacket, txVector, preamble, packetType);

1603

              Simulator::Schedule (delay, &MacLow::SendPacket, this, newPacket, txVector, preamble, packetType, m_mpduReferenceNumber);

1599

1604

1600

          if (queueSize > 1)

1605

          if (queueSize > 1)

1601

1606

Lines 1603-1616	Link Here

1603

1608

1604

          preamble = WIFI_PREAMBLE_NONE;

1609

          preamble = WIFI_PREAMBLE_NONE;

1605

1610

1611

        m_mpduReferenceNumber = ((m_mpduReferenceNumber + 1) % 4294967296);

1606

1612

1607

1613

1608

1614

1609

void

1615

void

1610

MacLow::SendPacket (Ptr<const Packet> packet, WifiTxVector txVector, WifiPreamble preamble, uint8_t packetType)

1616

MacLow::SendPacket (Ptr<const Packet> packet, WifiTxVector txVector, WifiPreamble preamble, uint8_t packetType, uint32_t mpduReferenceNumber)

1611

1617

1612

  NS_LOG_DEBUG ("Sending MPDU as part of A-MPDU");

1618

  NS_LOG_DEBUG ("Sending MPDU as part of A-MPDU");

1613

  m_phy->SendPacket (packet, txVector, preamble, packetType);

1619

  m_phy->SendPacket (packet, txVector, preamble, packetType, mpduReferenceNumber);

1614

1620

1615

1621

1616

void

1622

void

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

Lines 886-893	Link Here

886

   * \param hdr

886

   * \param hdr

887

   * \param txVector

887

   * \param txVector

888

   * \param preamble

888

   * \param preamble

889

   * \param packetType

890

   * \param mpduReferenceNumber

889

*/

891

*/

890

  void SendPacket (Ptr<const Packet> packet, WifiTxVector txVector, WifiPreamble preamble, uint8_t packetType);

892

  void SendPacket (Ptr<const Packet> packet, WifiTxVector txVector, WifiPreamble preamble, uint8_t packetType, uint32_t mpduReferenceNumber);

891

/**

893

/**

892

   * Return a TXVECTOR for the RTS frame given the destination.

894

   * Return a TXVECTOR for the RTS frame given the destination.

893

   * The function consults WifiRemoteStationManager, which controls the rate

895

   * The function consults WifiRemoteStationManager, which controls the rate

Lines 1367-1372	Link Here

1367

  WifiTxVector m_currentTxVector;     //!< TXVECTOR used for the current packet transmission

1369

  WifiTxVector m_currentTxVector;     //!< TXVECTOR used for the current packet transmission

1368

  bool m_receivedAtLeastOneMpdu;      //!< Flag whether an MPDU has already been successfully received while receiving an A-MPDU

1370

  bool m_receivedAtLeastOneMpdu;      //!< Flag whether an MPDU has already been successfully received while receiving an A-MPDU

1369

  std::vector<Item> m_txPackets;      //!< Contain temporary items to be sent with the next A-MPDU transmission, once RTS/CTS exchange has succeeded. It is not used in other cases.

1371

  std::vector<Item> m_txPackets;      //!< Contain temporary items to be sent with the next A-MPDU transmission, once RTS/CTS exchange has succeeded. It is not used in other cases.

1372

  uint32_t m_mpduReferenceNumber;       //!< A-MPDU reference number to identify all subframes belonging to the same A-MPDU

1370

};

1373

};

1371

1374

1372

} //namespace ns3

1375

} //namespace ns3

(-)a/src/wifi/model/minstrel-wifi-manager.cc (-2 / +2 lines)

Lines 482-488	Link Here

482

      station->m_txrate = m_nsupported / 2;

482

      station->m_txrate = m_nsupported / 2;

483

484

  UpdateStats (station);

484

  UpdateStats (station);

485

  return WifiTxVector (GetSupported (station, station->m_txrate), GetDefaultTxPowerLevel (), GetLongRetryCount (station), GetShortGuardInterval (station), Min (GetNumberOfReceiveAntennas (station),GetNumberOfTransmitAntennas ()), GetNess (station), GetStbc (station));

485

  return WifiTxVector (GetSupported (station, station->m_txrate), GetDefaultTxPowerLevel (), GetLongRetryCount (station), GetShortGuardInterval (station), Min (GetNumberOfReceiveAntennas (station),GetNumberOfTransmitAntennas ()), GetNess (station), GetAggregation (station), GetStbc (station));

486

487

488

WifiTxVector

488

WifiTxVector

Lines 491-497	Link Here

491

  MinstrelWifiRemoteStation *station = (MinstrelWifiRemoteStation *) st;

491

  MinstrelWifiRemoteStation *station = (MinstrelWifiRemoteStation *) st;

492

  NS_LOG_DEBUG ("DoGetRtsMode m_txrate=" << station->m_txrate);

492

  NS_LOG_DEBUG ("DoGetRtsMode m_txrate=" << station->m_txrate);

493

494

  return WifiTxVector (GetSupported (station, 0), GetDefaultTxPowerLevel (), GetShortRetryCount (station), GetShortGuardInterval (station), Min (GetNumberOfReceiveAntennas (station),GetNumberOfTransmitAntennas ()), GetNess (station), GetStbc (station));

494

  return WifiTxVector (GetSupported (station, 0), GetDefaultTxPowerLevel (), GetShortRetryCount (station), GetShortGuardInterval (station), Min (GetNumberOfReceiveAntennas (station),GetNumberOfTransmitAntennas ()), GetNess (station), GetAggregation (station), GetStbc (station));

495

496

497

bool

497

bool

(-)a/src/wifi/model/onoe-wifi-manager.cc (-2 / +2 lines)

Lines 278-284	Link Here

278

          rateIndex = station->m_txrate;

278

          rateIndex = station->m_txrate;

279

280

281

  return WifiTxVector (GetSupported (station, rateIndex), GetDefaultTxPowerLevel (), GetLongRetryCount (station), GetShortGuardInterval (station), Min (GetNumberOfReceiveAntennas (station), GetNumberOfTransmitAntennas ()), GetNess (station), GetStbc (station));

281

  return WifiTxVector (GetSupported (station, rateIndex), GetDefaultTxPowerLevel (), GetLongRetryCount (station), GetShortGuardInterval (station), Min (GetNumberOfReceiveAntennas (station), GetNumberOfTransmitAntennas ()), GetNess (station), GetAggregation (station), GetStbc (station));

282

283

284

WifiTxVector

284

WifiTxVector

Lines 287-293	Link Here

287

  OnoeWifiRemoteStation *station = (OnoeWifiRemoteStation *)st;

287

  OnoeWifiRemoteStation *station = (OnoeWifiRemoteStation *)st;

288

  UpdateMode (station);

288

  UpdateMode (station);

289

  /// \todo can we implement something smarter ?

289

  /// \todo can we implement something smarter ?

290

  return WifiTxVector (GetSupported (station, 0), GetDefaultTxPowerLevel (), GetShortRetryCount (station), GetShortGuardInterval (station), Min (GetNumberOfReceiveAntennas (station), GetNumberOfTransmitAntennas ()), GetNess (station), GetStbc (station));

290

  return WifiTxVector (GetSupported (station, 0), GetDefaultTxPowerLevel (), GetShortRetryCount (station), GetShortGuardInterval (station), Min (GetNumberOfReceiveAntennas (station), GetNumberOfTransmitAntennas ()), GetNess (station), GetAggregation (station), GetStbc (station));

291

292

293

bool

293

bool

(-)a/src/wifi/model/parf-wifi-manager.cc (-2 / +2 lines)

Lines 294-300	Link Here

294

  NS_LOG_FUNCTION (this << st << size);

294

  NS_LOG_FUNCTION (this << st << size);

295

  ParfWifiRemoteStation *station = (ParfWifiRemoteStation *) st;

295

  ParfWifiRemoteStation *station = (ParfWifiRemoteStation *) st;

296

  CheckInit (station);

296

  CheckInit (station);

297

  return WifiTxVector (GetSupported (station, station->m_currentRate), station->m_currentPower, GetLongRetryCount (station), GetShortGuardInterval (station), Min (GetNumberOfReceiveAntennas (station), GetNumberOfTransmitAntennas ()), GetNumberOfTransmitAntennas (station), GetStbc (station));

297

  return WifiTxVector (GetSupported (station, station->m_currentRate), station->m_currentPower, GetLongRetryCount (station), GetShortGuardInterval (station), Min (GetNumberOfReceiveAntennas (station), GetNumberOfTransmitAntennas ()), GetNumberOfTransmitAntennas (station), GetAggregation (station), GetStbc (station));

298

299

300

WifiTxVector

300

WifiTxVector

Lines 304-310	Link Here

304

  /// \todo we could/should implement the Arf algorithm for

304

  /// \todo we could/should implement the Arf algorithm for

305

  /// RTS only by picking a single rate within the BasicRateSet.

305

  /// RTS only by picking a single rate within the BasicRateSet.

306

  ParfWifiRemoteStation *station = (ParfWifiRemoteStation *) st;

306

  ParfWifiRemoteStation *station = (ParfWifiRemoteStation *) st;

307

  return WifiTxVector (GetSupported (station, 0), GetDefaultTxPowerLevel (), GetShortRetryCount (station), GetShortGuardInterval (station), Min (GetNumberOfReceiveAntennas (station), GetNumberOfTransmitAntennas ()), GetNumberOfTransmitAntennas (station), GetStbc (station));

307

  return WifiTxVector (GetSupported (station, 0), GetDefaultTxPowerLevel (), GetShortRetryCount (station), GetShortGuardInterval (station), Min (GetNumberOfReceiveAntennas (station), GetNumberOfTransmitAntennas ()), GetNumberOfTransmitAntennas (station), GetAggregation (station), GetStbc (station));

308

309

310

bool

310

bool




    {
      ResetCountersBasic (station);
    }
  return WifiTxVector (GetSupported (station, station->m_rate), GetDefaultTxPowerLevel (), GetLongRetryCount (station), GetShortGuardInterval (station), Min (GetNumberOfReceiveAntennas (station), GetNumberOfTransmitAntennas ()), GetNess (station), GetAggregation (station), GetStbc (station));
}

WifiTxVector
RraaWifiManager::DoGetRtsTxVector (WifiRemoteStation *st)
{
  return WifiTxVector (GetSupported (st, 0), GetDefaultTxPowerLevel (), GetShortRetryCount (st), GetShortGuardInterval (st), Min (GetNumberOfReceiveAntennas (st), GetNumberOfTransmitAntennas ()), GetNess (st), GetAggregation (st), GetStbc (st));
}

bool




}

void
WifiPhy::NotifyMonitorSniffRx (Ptr<const Packet> packet, uint16_t channelFreqMhz, uint16_t channelNumber, uint32_t rate, WifiPreamble preamble, WifiTxVector txvector, struct mpduInfo aMpdu, struct snrDbm snr)
{
  m_phyMonitorSniffRxTrace (packet, channelFreqMhz, channelNumber, rate, preamble, txvector, aMpdu, snr);
}

void
WifiPhy::NotifyMonitorSniffTx (Ptr<const Packet> packet, uint16_t channelFreqMhz, uint16_t channelNumber, uint32_t rate, WifiPreamble preamble, WifiTxVector txvector, struct mpduInfo aMpdu)
{
  m_phyMonitorSniffTxTrace (packet, channelFreqMhz, channelNumber, rate, preamble, txvector, aMpdu);
}






class WifiChannel;
class NetDevice;

struct snrDbm
{
  double signal;
  double noise;
};

struct mpduInfo
{
  uint8_t packetType;
  uint32_t referenceNumber;
};

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

   *        power is calculated as txPowerMin + txPowerLevel * (txPowerMax - txPowerMin) / nTxLevels
   * \param preamble the type of preamble to use to send this packet.
   * \param packetType the type of the packet 0 is not A-MPDU, 1 is a MPDU that is part of an A-MPDU and 2 is the last MPDU in an A-MPDU
   * \param mpduReferenceNumber the A-MPDU reference number (must be a different value for each A-MPDU but the same for each subframe within one A-MPDU)
   */
  virtual void SendPacket (Ptr<const Packet> packet, WifiTxVector txvector, enum WifiPreamble preamble, uint8_t packetType, uint32_t mpduReferenceNumber) = 0;

  /**
   * \param listener the new listener

   * \param channelNumber the channel on which the packet is received
   * \param rate the PHY data rate in units of 500kbps (i.e., the same
   *        units used both for the radiotap and for the prism header)
   * \param preamble the preamble of the packet
   * \param txVector the txvector that holds rx parameters
   * \param aMpdu the type of the packet (0 is not A-MPDU, 1 is a MPDU that is part of an A-MPDU and 2 is the last MPDU in an A-MPDU)
   *        and the A-MPDU reference number (must be a different value for each A-MPDU but the same for each subframe within one A-MPDU)
   * \param snr signal power and noise power in dBm
   */
  void NotifyMonitorSniffRx (Ptr<const Packet> packet, uint16_t channelFreqMhz,
                             uint16_t channelNumber, uint32_t rate, WifiPreamble preamble,
                             WifiTxVector txvector, struct mpduInfo aMpdu, struct snrDbm snr);
                             double signalDbm, double noiseDbm);

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

   * \param channelNumber the channel on which the packet is received
   * \param rate the PHY data rate in units of 500kbps (i.e., the same
   *        units used both for the radiotap and for the prism header)
   * \param preamble the preamble of the packet
   * \param txVector the txvector that holds rx parameters
   * \param aMpdu the type of the packet (0 is not A-MPDU, 1 is a MPDU that is part of an A-MPDU and 2 is the last MPDU in an A-MPDU)
   *        and the A-MPDU reference number (must be a different value for each A-MPDU but the same for each subframe within one A-MPDU)
   * \param snr signal power and noise power in dBm
   */
  typedef void (* MonitorSnifferRxCallback)(Ptr<const Packet> packet, uint16_t channelFreqMhz,
                                            uint16_t channelNumber, uint32_t rate, WifiPreamble preamble,
                                            WifiTxVector txvector, struct mpduInfo aMpdu, struct snrDbm snr);
                                            double signalDbm, double noiseDbm);

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

   * \param channelNumber the channel on which the packet is transmitted
   * \param rate the PHY data rate in units of 500kbps (i.e., the same
   *        units used both for the radiotap and for the prism header)
   * \param preamble the preamble of the packet
   * \param txVector the txvector that holds tx parameters
   * \param aMpdu the type of the packet (0 is not A-MPDU, 1 is a MPDU that is part of an A-MPDU and 2 is the last MPDU in an A-MPDU)
   *        and the A-MPDU reference number (must be a different value for each A-MPDU but the same for each subframe within one A-MPDU)
   */
  void NotifyMonitorSniffTx (Ptr<const Packet> packet, uint16_t channelFreqMhz,
                             uint16_t channelNumber, uint32_t rate, WifiPreamble preamble,
                             WifiTxVector txvector, struct mpduInfo aMpdu);

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

   * \param channelNumber the channel on which the packet is transmitted
   * \param rate the PHY data rate in units of 500kbps (i.e., the same
   *        units used both for the radiotap and for the prism header)
   * \param preamble the preamble of the packet
   * \param txVector the txvector that holds tx parameters
   * \param aMpdu the type of the packet (0 is not A-MPDU, 1 is a MPDU that is part of an A-MPDU and 2 is the last MPDU in an A-MPDU)
   *        and the A-MPDU reference number (must be a different value for each A-MPDU but the same for each subframe within one A-MPDU)
   */
  typedef void (* MonitorSnifferTxCallback)(const Ptr<const Packet> packet, uint16_t channelFreqMhz,
                                            uint16_t channelNumber, uint32_t rate, WifiPreamble preamble,
                                            WifiTxVector txvector, struct mpduInfo aMpdu);

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

   *
   * \see class CallBackTraceSource
   */
  TracedCallback<Ptr<const Packet>, uint16_t, uint16_t, uint32_t, WifiPreamble, WifiTxVector, struct mpduInfo, struct snrDbm> 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, WifiPreamble, WifiTxVector, struct mpduInfo> 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

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

Lines 661-666	Link Here

661

                       m_wifiPhy->GetGuardInterval (),

661

                       m_wifiPhy->GetGuardInterval (),

662

                       GetNumberOfTransmitAntennas (),

662

                       GetNumberOfTransmitAntennas (),

663

                       GetNumberOfTransmitAntennas (),

663

                       GetNumberOfTransmitAntennas (),

664

                       false,

664

                       false);

665

                       false);

665

666

667

Lines 1271-1276	Link Here

1271

  state->m_rx = 1;

1272

  state->m_rx = 1;

1272

  state->m_tx = 1;

1273

  state->m_tx = 1;

1273

  state->m_ness = 0;

1274

  state->m_ness = 0;

1275

  state->m_aggregation = false;

1274

  state->m_stbc = false;

1276

  state->m_stbc = false;

1275

  const_cast<WifiRemoteStationManager *> (this)->m_states.push_back (state);

1277

  const_cast<WifiRemoteStationManager *> (this)->m_states.push_back (state);

1276

  NS_LOG_DEBUG ("WifiRemoteStationManager::LookupState returning new state");

1278

  NS_LOG_DEBUG ("WifiRemoteStationManager::LookupState returning new state");

Lines 1488-1493	Link Here

1488

1490

1489

1491

1490

bool

1492

bool

1493

WifiRemoteStationManager::GetAggregation (const WifiRemoteStation *station) const

1494

1495

  return station->m_state->m_aggregation;

1496

1497

1498

bool

1491

WifiRemoteStationManager::GetStbc (const WifiRemoteStation *station) const

1499

WifiRemoteStationManager::GetStbc (const WifiRemoteStation *station) const

1492

1500

1493

  return station->m_state->m_stbc;

1501

  return station->m_state->m_stbc;




   */
  bool GetShortGuardInterval (const WifiRemoteStation *station) const;
  /**
   * Return whether the given station supports A-MPDU.
   *
   * \param station the station being queried
   *
   * \return true if the station supports MPDU aggregation,
   *         false otherwise
   */
  bool GetAggregation (const WifiRemoteStation *station) const;
  /**
   * Return whether the given station supports space-time block coding (STBC).
   *
   * \param station the station being queried

  uint32_t m_tx;              //!< Number of TX antennas of the remote station
  uint32_t m_ness;            //!< Number of streams in beamforming of the remote station
  bool m_stbc;                //!< Flag if STBC is used by the remote station
  bool m_aggregation;         //!< Flag if MPDU aggregation is used by the remote station
  bool m_greenfield;          //!< Flag if green field is used by the remote station
};





    m_shortGuardInterval (false),
    m_nss (1),
    m_ness (0),
    m_aggregation (false),
    m_stbc (false),
    m_modeInitialized (false),
    m_txPowerLevelInitialized (false)

}

WifiTxVector::WifiTxVector (WifiMode mode, uint8_t powerLevel, uint8_t retries,
                            bool shortGuardInterval, uint8_t nss, uint8_t ness,
                            bool aggregation, bool stbc)
  : m_mode (mode),
    m_txPowerLevel (powerLevel),
    m_retries (retries),
    m_shortGuardInterval (shortGuardInterval),
    m_nss (nss),
    m_ness (ness),
    m_aggregation (aggregation),
    m_stbc (stbc),
    m_modeInitialized (true),
    m_txPowerLevelInitialized (true)

}

bool
WifiTxVector::IsAggregation (void) const
{
  return m_aggregation;
}

bool
WifiTxVector::IsStbc (void) const
{
  return m_stbc;

}

void
WifiTxVector::SetAggregation (bool aggregation)
{
  m_aggregation = aggregation;
}

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

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

(-)a/src/wifi/model/wifi-tx-vector.h (-1 / +21 lines)

Lines 73-79	Link Here

   * \param ness the number of extension spatial streams (NESS)

   * \param ness the number of extension spatial streams (NESS)

   * \param stbc enable or disable STBC

   * \param stbc enable or disable STBC

*/

*/

  WifiTxVector (WifiMode mode, uint8_t powerLevel, uint8_t retries, bool shortGuardInterval, uint8_t nss, uint8_t ness, bool stbc);

  WifiTxVector (WifiMode mode,

                uint8_t powerLevel,

                uint8_t retries,

                bool shortGuardInterval,

                uint8_t nss,

                uint8_t ness,

                bool aggregation,

                bool stbc);

/**

/**

   * \returns the txvector payload mode

   * \returns the txvector payload mode

*/

*/

Lines 135-140	Link Here

135

*/

142

*/

136

  void SetNess (uint8_t ness);

143

  void SetNess (uint8_t ness);

137

/**

144

/**

145

   * Checks whether the PSDU contains A-MPDU.

146

   *  \returns true if this PSDU has A-MPDU aggregation,

147

   *           false otherwise.

148

*/

149

  bool IsAggregation (void) const;

150

/**

151

   * Sets if PSDU contains A-MPDU.

152

153

   * \param aggregated whether the PSDU contains A-MPDU or not.

154

*/

155

  void SetAggregation(bool aggregation);

156

/**

138

   * Check if STBC is used or not

157

   * Check if STBC is used or not

139

158

140

   * \returns true if STBC is used,

159

   * \returns true if STBC is used,

Lines 162-167	Link Here

162

  bool     m_shortGuardInterval; /**< true if short GI is going to be used */

181

  bool     m_shortGuardInterval; /**< true if short GI is going to be used */

163

  uint8_t  m_nss;                /**< number of streams */

182

  uint8_t  m_nss;                /**< number of streams */

164

  uint8_t  m_ness;               /**< number of streams in beamforming */

183

  uint8_t  m_ness;               /**< number of streams in beamforming */

184

  bool     m_aggregation;        /** Flag whether the PSDU contains A-MPDU. */

165

  bool     m_stbc;               /**< STBC used or not */

185

  bool     m_stbc;               /**< STBC used or not */

166

186

167

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

187

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




#include "ns3/pointer.h"
#include "ns3/object-factory.h"
#include "yans-wifi-channel.h"
#include "yans-wifi-phy.h"
#include "ns3/propagation-loss-model.h"
#include "ns3/propagation-delay-model.h"



void
YansWifiChannel::Send (Ptr<YansWifiPhy> sender, Ptr<const Packet> packet, double txPowerDbm,
                       WifiTxVector txVector, WifiPreamble preamble, struct mpduInfo aMpdu, Time duration) const
{
  Ptr<MobilityModel> senderMobility = sender->GetMobility ()->GetObject<MobilityModel> ();
  NS_ASSERT (senderMobility != 0);

              dstNode = dstNetDevice->GetObject<NetDevice> ()->GetNode ()->GetId ();
            }

          struct Parameters parameters;
          parameters.rxPowerDbm = rxPowerDbm;
          parameters.aMpdu = aMpdu;
          parameters.duration = duration;
          parameters.txVector = txVector;
          parameters.preamble = preamble;

          Simulator::ScheduleWithContext (dstNode,
                                          delay, &YansWifiChannel::Receive, this,
                                          j, copy, parameters);
        }
    }
}

void
YansWifiChannel::Receive (uint32_t i, Ptr<Packet> packet, struct Parameters parameters) const
                          WifiTxVector txVector, WifiPreamble preamble) const
{
  m_phyList[i]->StartReceivePreambleAndHeader (packet, parameters.rxPowerDbm, parameters.txVector, parameters.preamble, parameters.aMpdu, parameters.duration);
  delete[] atts;
}

uint32_t

(-)a/src/wifi/model/yans-wifi-channel.h (-6 / +15 lines)

Lines 28-33	Link Here

#include "wifi-mode.h"

#include "wifi-mode.h"

#include "wifi-preamble.h"

#include "wifi-preamble.h"

#include "wifi-tx-vector.h"

#include "wifi-tx-vector.h"

#include "yans-wifi-phy.h"

#include "ns3/nstime.h"

#include "ns3/nstime.h"

namespace ns3 {

namespace ns3 {

Lines 35-41	Link Here

class NetDevice;

class NetDevice;

class PropagationLossModel;

class PropagationLossModel;

class PropagationDelayModel;

class PropagationDelayModel;

class YansWifiPhy;

struct Parameters

  double rxPowerDbm;

  struct mpduInfo aMpdu;

  Time duration;

  WifiTxVector txVector;

  WifiPreamble preamble;

};

/**

/**

 * \brief A Yans wifi channel

 * \brief A Yans wifi channel

Lines 83-89	Link Here

   * \param txPowerDbm the tx power associated to the packet

   * \param txPowerDbm the tx power associated to the packet

   * \param txVector the TXVECTOR associated to the packet

   * \param txVector the TXVECTOR associated to the packet

   * \param preamble the preamble associated to the packet

   * \param preamble the preamble associated to the packet

   * \param packetType the type of packet, used for A-MPDU to say whether it's the last MPDU or not

   * \param aMpdu the type of the packet (0 is not A-MPDU, 1 is a MPDU that is part of an A-MPDU and 2 is the last MPDU in an A-MPDU)

   *        and the A-MPDU reference number (must be a different value for each A-MPDU but the same for each subframe within one A-MPDU)

   * \param duration the transmission duration associated to the packet

   * \param duration the transmission duration associated to the packet

   * This method should not be invoked by normal users. It is

   * This method should not be invoked by normal users. It is

Lines 92-98	Link Here

   * e.g. PHYs that are operating on the same channel.

102

   * e.g. PHYs that are operating on the same channel.

*/

103

*/

  void Send (Ptr<YansWifiPhy> sender, Ptr<const Packet> packet, double txPowerDbm,

104

  void Send (Ptr<YansWifiPhy> sender, Ptr<const Packet> packet, double txPowerDbm,

             WifiTxVector txVector, WifiPreamble preamble, uint8_t packetType, Time duration) const;

105

             WifiTxVector txVector, WifiPreamble preamble, struct mpduInfo aMpdu, Time duration) const;

106

/**

107

/**

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

108

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

Lines 111-116	Link Here

111

   * A vector of pointers to YansWifiPhy.

121

   * A vector of pointers to YansWifiPhy.

112

*/

122

*/

113

  typedef std::vector<Ptr<YansWifiPhy> > PhyList;

123

  typedef std::vector<Ptr<YansWifiPhy> > PhyList;

124

114

/**

125

/**

115

   * This method is scheduled by Send for each associated YansWifiPhy.

126

   * This method is scheduled by Send for each associated YansWifiPhy.

116

   * The method then calls the corresponding YansWifiPhy that the first

127

   * The method then calls the corresponding YansWifiPhy that the first

Lines 122-130	Link Here

122

   * \param txVector the TXVECTOR of the packet

133

   * \param txVector the TXVECTOR of the packet

123

   * \param preamble the type of preamble being used to send the packet

134

   * \param preamble the type of preamble being used to send the packet

124

*/

135

*/

125

  void Receive (uint32_t i, Ptr<Packet> packet, double *atts,

136

  void Receive (uint32_t i, Ptr<Packet> packet, struct Parameters parameters) const;

126

                WifiTxVector txVector, WifiPreamble preamble) const;

127

128

137

129

  PhyList m_phyList;                   //!< List of YansWifiPhys connected to this YansWifiChannel

138

  PhyList m_phyList;                   //!< List of YansWifiPhys connected to this YansWifiChannel

130

  Ptr<PropagationLossModel> m_loss;    //!< Propagation loss model

139

  Ptr<PropagationLossModel> m_loss;    //!< Propagation loss model




                                            double rxPowerDbm,
                                            WifiTxVector txVector,
                                            enum WifiPreamble preamble,
                                            struct mpduInfo aMpdu, Time rxDuration)
{
  //This function should be later split to check separately wether plcp preamble and plcp header can be successfully received.
  //Note: plcp preamble reception is not yet modeled.
  NS_LOG_FUNCTION (this << packet << rxPowerDbm << txVector.GetMode () << preamble << (uint32_t)aMpdu.packetType);
  AmpduTag ampduTag;
  rxPowerDbm += m_rxGainDb;
  double rxPowerW = DbmToW (rxPowerDbm);

            {
              NS_ASSERT (m_endPlcpRxEvent.IsExpired ());
              m_endPlcpRxEvent = Simulator::Schedule (preambleAndHeaderDuration, &YansWifiPhy::StartReceivePacket, this,
                                                      packet, txVector, preamble, aMpdu, event);
            }

          NS_ASSERT (m_endRxEvent.IsExpired ());
          m_endRxEvent = Simulator::Schedule (rxDuration, &YansWifiPhy::EndReceive, this,
                                              packet, preamble, aMpdu, event);
        }
      else
        {

YansWifiPhy::StartReceivePacket (Ptr<Packet> packet,
                                 WifiTxVector txVector,
                                 enum WifiPreamble preamble,
                                 struct mpduInfo aMpdu,
                                 Ptr<InterferenceHelper::Event> event)
{
  NS_LOG_FUNCTION (this << packet << txVector.GetMode () << preamble << (uint32_t)aMpdu.packetType);
  NS_ASSERT (IsStateRx ());
  NS_ASSERT (m_endPlcpRxEvent.IsExpired ());
  AmpduTag ampduTag;

}

void
YansWifiPhy::SendPacket (Ptr<const Packet> packet, WifiTxVector txVector, WifiPreamble preamble, uint8_t packetType, uint32_t mpduReferenceNumber)
{
  NS_LOG_FUNCTION (this << packet << txVector.GetMode () << preamble << (uint32_t)txVector.GetTxPowerLevel () << (uint32_t)packetType);
  /* Transmission can happen if:

    {
      dataRate500KbpsUnits = txVector.GetMode ().GetDataRate () * txVector.GetNss () / 500000;
    }
  struct mpduInfo aMpdu;
  aMpdu.packetType = packetType;
  aMpdu.referenceNumber = mpduReferenceNumber;
  NotifyMonitorSniffTx (packet, (uint16_t)GetChannelFrequencyMhz (), GetChannelNumber (), dataRate500KbpsUnits, preamble, txVector, aMpdu);
  m_state->SwitchToTx (txDuration, packet, GetPowerDbm (txVector.GetTxPowerLevel ()), txVector, preamble);
  m_channel->Send (this, packet, GetPowerDbm (txVector.GetTxPowerLevel ()) + m_txGainDb, txVector, preamble, aMpdu, txDuration);
}

uint32_t

}

void
YansWifiPhy::EndReceive (Ptr<Packet> packet, enum WifiPreamble preamble, struct mpduInfo aMpdu, Ptr<InterferenceHelper::Event> event)
{
  NS_LOG_FUNCTION (this << packet << event);
  NS_ASSERT (IsStateRx ());

            {
              dataRate500KbpsUnits = event->GetPayloadMode ().GetDataRate () * event->GetTxVector ().GetNss () / 500000;
            }
          struct snrDbm snr;
          snr.signal = RatioToDb (event->GetRxPowerW ()) + 30;
          snr.noise = RatioToDb (event->GetRxPowerW () / snrPer.snr) - GetRxNoiseFigure () + 30;
          NotifyMonitorSniffRx (packet, (uint16_t)GetChannelFrequencyMhz (), GetChannelNumber (), dataRate500KbpsUnits, event->GetPreambleType (), event->GetTxVector (), aMpdu, snr);
          m_state->SwitchFromRxEndOk (packet, snrPer.snr, event->GetTxVector (), event->GetPreambleType ());
        }
      else

      m_state->SwitchFromRxEndError (packet, snrPer.snr);
    }

  if (preamble == WIFI_PREAMBLE_NONE && aMpdu.packetType == 2)
    {
      m_plcpSuccess = false;
    }




   * \param rxPowerDbm the receive power in dBm
   * \param txVector the TXVECTOR of the arriving packet
   * \param preamble the preamble of the arriving packet
   * \param aMpdu the type of the packet (0 is not A-MPDU, 1 is a MPDU that is part of an A-MPDU and 2 is the last MPDU in an A-MPDU)
   *        and the A-MPDU reference number (must be a different value for each A-MPDU but the same for each subframe within one A-MPDU)
   * \param rxDuration the duration needed for the reception of the packet
   */
  void StartReceivePreambleAndHeader (Ptr<Packet> packet,
                                      double rxPowerDbm,
                                      WifiTxVector txVector,
                                      WifiPreamble preamble,
                                      struct mpduInfo aMpdu,
                                      Time rxDuration);
  /**
   * Starting receiving the payload of a packet (i.e. the first bit of the packet has arrived).

   * \param packet the arriving packet
   * \param txVector the TXVECTOR of the arriving packet
   * \param preamble the preamble of the arriving packet
   * \param aMpdu the type of the packet (0 is not A-MPDU, 1 is a MPDU that is part of an A-MPDU and 2 is the last MPDU in an A-MPDU)
   *        and the A-MPDU reference number (must be a different value for each A-MPDU but the same for each subframe within one A-MPDU)
   * \param event the corresponding event of the first time the packet arrives
   */
  void StartReceivePacket (Ptr<Packet> packet,
                           WifiTxVector txVector,
                           WifiPreamble preamble,
                           struct mpduInfo aMpdu,
                           Ptr<InterferenceHelper::Event> event);

  /**


  virtual void SetReceiveOkCallback (WifiPhy::RxOkCallback callback);
  virtual void SetReceiveErrorCallback (WifiPhy::RxErrorCallback callback);
  virtual void SendPacket (Ptr<const Packet> packet, WifiTxVector txvector, enum WifiPreamble preamble, uint8_t packetType, uint32_t mpduReferenceNumber);
  virtual void RegisterListener (WifiPhyListener *listener);
  virtual void UnregisterListener (WifiPhyListener *listener);
  virtual void SetSleepMode (void);

   *
   * \param packet the packet that the last bit has arrived
   * \param preamble the preamble of the arriving packet
   * \param aMpdu the type of the packet (0 is not A-MPDU, 1 is a MPDU that is part of an A-MPDU and 2 is the last MPDU in an A-MPDU)
   *        and the A-MPDU reference number (must be a different value for each A-MPDU but the same for each subframe within one A-MPDU)
   * \param event the corresponding event of the first time the packet arrives
   */
  void EndReceive (Ptr<Packet> packet, enum WifiPreamble preamble, struct mpduInfo aMpdu, Ptr<InterferenceHelper::Event> event);

  bool     m_initialized;         //!< Flag for runtime initialization
  double   m_edThresholdW;        //!< Energy detection threshold in watts

Return to bug 2096