Attachment #2277 for bug #2297

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

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

Lines 255-261	Link Here

255

      channelWidth = 20;

255

      channelWidth = 20;

256

257

  WifiTxVector rtsTxVector;

257

  WifiTxVector rtsTxVector;

258

  if (GetUseProtection () == false)

258

  if (GetUseNonErpProtection () == false)

259

260

      rtsTxVector = WifiTxVector (GetSupported (station, 0), GetDefaultTxPowerLevel (), GetLongRetryCount (station), false, 1, 0, channelWidth, GetAggregation (station), false);

260

      rtsTxVector = WifiTxVector (GetSupported (station, 0), GetDefaultTxPowerLevel (), GetLongRetryCount (station), false, 1, 0, channelWidth, GetAggregation (station), false);

261

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

Lines 327-333	Link Here

327

      channelWidth = 20;

327

      channelWidth = 20;

328

329

  WifiTxVector rtsTxVector;

329

  WifiTxVector rtsTxVector;

330

  if (GetUseProtection () == false)

330

  if (GetUseNonErpProtection () == false)

331

332

      rtsTxVector = WifiTxVector (GetSupported (station, 0), GetDefaultTxPowerLevel (), GetShortRetryCount (station), false, 1, 0, channelWidth, GetAggregation (station), false);

332

      rtsTxVector = WifiTxVector (GetSupported (station, 0), GetDefaultTxPowerLevel (), GetShortRetryCount (station), false, 1, 0, channelWidth, GetAggregation (station), false);

333

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

Lines 357-363	Link Here

357

358

  UpdateMode (station);

358

  UpdateMode (station);

359

  WifiTxVector rtsTxVector;

359

  WifiTxVector rtsTxVector;

360

  if (GetUseProtection () == false)

360

  if (GetUseNonErpProtection () == false)

361

362

      rtsTxVector = WifiTxVector (GetSupported (station, 0), GetDefaultTxPowerLevel (), GetLongRetryCount (station), false, 1, 0, channelWidth, GetAggregation (station), false);

362

      rtsTxVector = WifiTxVector (GetSupported (station, 0), GetDefaultTxPowerLevel (), GetLongRetryCount (station), false, 1, 0, channelWidth, GetAggregation (station), false);

363




    .SetParent<RegularWifiMac> ()
    .SetGroupName ("Wifi")
    .AddConstructor<ApWifiMac> ()
    .AddAttribute ("BeaconInterval",
                   "Delay between two beacons",
                   TimeValue (MicroSeconds (102400)),
                   MakeTimeAccessor (&ApWifiMac::GetBeaconInterval,
                                     &ApWifiMac::SetBeaconInterval),
                   MakeTimeChecker ())
    .AddAttribute ("BeaconJitter",
                   "A uniform random variable to cause the initial beacon starting time (after simulation time 0) "
                   "to be distributed between 0 and the BeaconInterval.",
                   StringValue ("ns3::UniformRandomVariable"),
                   MakePointerAccessor (&ApWifiMac::m_beaconJitter),
                   MakePointerChecker<UniformRandomVariable> ())
    .AddAttribute ("EnableBeaconJitter",
                   "If beacons are enabled, whether to jitter the initial send event.",
                   BooleanValue (false),
                   MakeBooleanAccessor (&ApWifiMac::m_enableBeaconJitter),
                   MakeBooleanChecker ())
    .AddAttribute ("BeaconGeneration",
                   "Whether or not beacons are generated.",
                   BooleanValue (true),
                   MakeBooleanAccessor (&ApWifiMac::SetBeaconGeneration,
                                        &ApWifiMac::GetBeaconGeneration),

  NS_LOG_FUNCTION (this);
  m_staList.clear();
  m_nonErpStations.clear ();
  m_nonHtStations.clear ();
}

void

  if (m_erpSupported)
    {
      information.SetNonErpPresent (!m_nonErpStations.empty ());
      information.SetUseProtection (GetUseNonErpProtection ());
      if (GetShortPreambleEnabled ())
        {
          information.SetBarkerPreambleMode (0);

  return capabilities;
}

HtOperations
ApWifiMac::GetHtOperations (void) const
{
  HtOperations operations;
  operations.SetHtSupported (1);
  if (m_htSupported)
    {
      if (!m_nonHtStations.empty ())
        {
          operations.SetHtProtection (MIXED_MODE_PROTECTION);
        }
      else
        {
          operations.SetHtProtection (NO_PROTECTION);
        }
    }
  return operations;
}

VhtCapabilities
ApWifiMac::GetVhtCapabilities (void) const
{

  if (m_htSupported || m_vhtSupported)
    {
      probe.SetHtCapabilities (GetHtCapabilities ());
      probe.SetHtOperations (GetHtOperations ());
      hdr.SetNoOrder ();
    }
  if (m_vhtSupported)

  if (m_htSupported || m_vhtSupported)
    {
      assoc.SetHtCapabilities (GetHtCapabilities ());
      assoc.SetHtOperations (GetHtOperations ());
      hdr.SetNoOrder ();
    }
  if (m_vhtSupported)

  if (m_htSupported || m_vhtSupported)
    {
      beacon.SetHtCapabilities (GetHtCapabilities ());
      beacon.SetHtOperations (GetHtOperations ());
      hdr.SetNoOrder ();
    }
  if (m_vhtSupported)

              m_stationManager->AddSupportedPlcpPreamble (from, capabilities.IsShortPreamble ());
              SupportedRates rates = assocReq.GetSupportedRates ();
              bool problem = false;
              bool isVhtStation = false;
              bool isHtStation = false;
              bool isOfdmStation = false;
              bool isErpStation = false;
              bool isDsssStation = false;
              for (uint32_t i = 0; i < m_stationManager->GetNBasicModes (); i++)

                        {
                          isErpStation = false;
                        }
                      else if (mode.GetModulationClass () == WIFI_MOD_CLASS_OFDM)
                        {
                          isOfdmStation = false;
                        }
                      if (isDsssStation == false && isErpStation == false && isOfdmStation == false)
                        {
                          problem = true;
                          break;

                        {
                          isErpStation = true;
                        }
                      else if (mode.GetModulationClass () == WIFI_MOD_CLASS_OFDM)
                        {
                          isOfdmStation = true;
                        }
                    }
                }
              m_stationManager->AddSupportedErpSlotTime (from, capabilities.IsShortSlotTime () && isErpStation);
              if (m_htSupported)
                {
                  //check whether the HT STA supports all MCSs in Basic MCS Set
                  HtCapabilities htcapabilities = assocReq.GetHtCapabilities ();
                  if (htcapabilities.GetHtCapabilitiesInfo () != 0)
                    {
                      isHtStation = true;
                      for (uint32_t i = 0; i < m_stationManager->GetNBasicMcs (); i++)
                        {
                          WifiMode mcs = m_stationManager->GetBasicMcs (i);
                          if (!htcapabilities.IsSupportedMcs (mcs.GetMcsValue ()))
                            {
                              problem = true;
                              break;
                            }
                        }
                    }
                }
              if (m_vhtSupported)
                {
                  //check whether the VHT STA supports all MCSs in Basic MCS Set
                  VhtCapabilities vhtcapabilities = assocReq.GetVhtCapabilities ();
                  if (vhtcapabilities.GetVhtCapabilitiesInfo () != 0)
                    {
                      isVhtStation = true;
                      for (uint32_t i = 0; i < m_stationManager->GetNBasicMcs (); i++)
                        {
                          WifiMode mcs = m_stationManager->GetBasicMcs (i);
                          if (!vhtcapabilities.IsSupportedTxMcs (mcs.GetMcsValue ()))
                            {
                              problem = true;
                              break;
                            }
                        }
                    }
                }

                        }
                    }
                  m_stationManager->RecordWaitAssocTxOk (from);
                  if (!isHtStation)
                    {
                      m_nonHtStations.push_back (hdr->GetAddr2 ());
                    }
                  if (!isErpStation && isDsssStation)
                    {
                      m_nonErpStations.push_back (hdr->GetAddr2 ());

                    break;
                  }
              }
              for (std::list<Mac48Address>::iterator j = m_nonHtStations.begin (); j != m_nonHtStations.end (); j++)
              {
                if ((*j) == from)
                  {
                    m_nonHtStations.erase (j);
                    break;
                  }
              }
              return;
            }
        }

}

bool
ApWifiMac::GetUseNonErpProtection (void) const
{
  bool useProtection = !m_nonErpStations.empty () && m_enableNonErpProtection;
  m_stationManager->SetUseNonErpProtection (useProtection);
  return useProtection;
}


} //namespace ns3

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

Lines 26-31	Link Here

#include "regular-wifi-mac.h"

#include "regular-wifi-mac.h"

#include "capability-information.h"

#include "capability-information.h"

#include "ht-capabilities.h"

#include "ht-capabilities.h"

#include "ht-operations.h"

#include "vht-capabilities.h"

#include "vht-capabilities.h"

#include "amsdu-subframe-header.h"

#include "amsdu-subframe-header.h"

#include "supported-rates.h"

#include "supported-rates.h"

Lines 214-219	Link Here

214

*/

215

*/

215

  HtCapabilities GetHtCapabilities (void) const;

216

  HtCapabilities GetHtCapabilities (void) const;

216

/**

217

/**

218

   * Return the HT operations of the current AP.

219

220

   * \return the HT operations that we support

221

*/

222

  HtOperations GetHtOperations (void) const;

223

/**

217

   * Return the VHT capability of the current AP.

224

   * Return the VHT capability of the current AP.

218

225

219

   * \return the VHT capability that we support

226

   * \return the VHT capability that we support

Lines 238-245	Link Here

238

   * \return true if beacons are periodically generated, false otherwise

245

   * \return true if beacons are periodically generated, false otherwise

239

*/

246

*/

240

  bool GetBeaconGeneration (void) const;

247

  bool GetBeaconGeneration (void) const;

241

248

/**

242

  bool GetUseProtection (void) const;

249

   * Return whether protection for non-ERP stations is used in the BSS.

250

251

   * \return true if protection for non-ERP stations is used in the BSS,

252

   *         false otherwise

253

*/

254

  bool GetUseNonErpProtection (void) const;

243

255

244

  virtual void DoDispose (void);

256

  virtual void DoDispose (void);

245

  virtual void DoInitialize (void);

257

  virtual void DoInitialize (void);

Lines 251-257	Link Here

251

  Ptr<UniformRandomVariable> m_beaconJitter; //!< UniformRandomVariable used to randomize the time of the first beacon

263

  Ptr<UniformRandomVariable> m_beaconJitter; //!< UniformRandomVariable used to randomize the time of the first beacon

252

  bool m_enableBeaconJitter;                 //!< Flag whether the first beacon should be generated at random time

264

  bool m_enableBeaconJitter;                 //!< Flag whether the first beacon should be generated at random time

253

  std::list<Mac48Address> m_staList;         //!< List of all stations currently associated to the AP

265

  std::list<Mac48Address> m_staList;         //!< List of all stations currently associated to the AP

254

  std::list<Mac48Address> m_nonErpStations;  //!< List of all 802.11b stations currently associated to the AP

266

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

267

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

255

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

268

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

256

};

269

};

257

270

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

Lines 346-352	Link Here

346

      channelWidth = 20;

346

      channelWidth = 20;

347

348

  WifiTxVector rtsTxVector;

348

  WifiTxVector rtsTxVector;

349

  if (GetUseProtection () == false)

349

  if (GetUseNonErpProtection () == false)

350

351

      rtsTxVector = WifiTxVector (GetSupported (station, 0), GetDefaultTxPowerLevel (), GetShortRetryCount (station), false, 1, 0, channelWidth, GetAggregation (station), false);

351

      rtsTxVector = WifiTxVector (GetSupported (station, 0), GetDefaultTxPowerLevel (), GetShortRetryCount (station), false, 1, 0, channelWidth, GetAggregation (station), false);

352

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

Lines 231-237	Link Here

231

      channelWidth = 20;

231

      channelWidth = 20;

232

233

  WifiTxVector rtsTxVector;

233

  WifiTxVector rtsTxVector;

234

  if (GetUseProtection () == false)

234

  if (GetUseNonErpProtection () == false)

235

236

      rtsTxVector = WifiTxVector (GetSupported (station, 0), GetDefaultTxPowerLevel (), GetLongRetryCount (station), false, 1, 0, channelWidth, GetAggregation (station), false);

236

      rtsTxVector = WifiTxVector (GetSupported (station, 0), GetDefaultTxPowerLevel (), GetLongRetryCount (station), false, 1, 0, channelWidth, GetAggregation (station), false);

237

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

Lines 206-212	Link Here

206

      channelWidth = 20;

206

      channelWidth = 20;

207

208

  WifiTxVector rtsTxVector;

208

  WifiTxVector rtsTxVector;

209

  if (GetUseProtection () == false)

209

  if (GetUseNonErpProtection () == false)

210

211

      rtsTxVector = WifiTxVector (GetSupported (station, 0), GetDefaultTxPowerLevel (), GetLongRetryCount (station), false, 1, 0, channelWidth, GetAggregation (station), false);

211

      rtsTxVector = WifiTxVector (GetSupported (station, 0), GetDefaultTxPowerLevel (), GetLongRetryCount (station), false, 1, 0, channelWidth, GetAggregation (station), false);

212

(-)a/src/wifi/model/ht-capabilities.cc (+25 lines)

Lines 175-185	Link Here

175

176

177

void

177

void

178

HtCapabilities::SetTxRxMcsSetUnequal (uint8_t txrxmcssetunequal)

179

180

  m_txRxMcsSetUnequal = txrxmcssetunequal;

181

182

183

void

178

HtCapabilities::SetTxMaxNSpatialStreams (uint8_t maxtxspatialstreams)

184

HtCapabilities::SetTxMaxNSpatialStreams (uint8_t maxtxspatialstreams)

179

185

180

  m_txMaxNSpatialStreams = maxtxspatialstreams;

186

  m_txMaxNSpatialStreams = maxtxspatialstreams;

181

187

182

188

189

void

190

HtCapabilities::SetTxUnequalModulation (uint8_t txunequalmodulation)

191

192

  m_txUnequalModulation = txunequalmodulation;

193

194

183

uint8_t

195

uint8_t

184

HtCapabilities::GetLdpc (void) const

196

HtCapabilities::GetLdpc (void) const

185

197

Lines 259-270	Link Here

259

271

260

272

261

uint8_t

273

uint8_t

274

HtCapabilities::GetTxRxMcsSetUnequal (void) const

275

276

  return m_txRxMcsSetUnequal;

277

278

279

280

uint8_t

262

HtCapabilities::GetTxMaxNSpatialStreams (void) const

281

HtCapabilities::GetTxMaxNSpatialStreams (void) const

263

282

264

  return m_txMaxNSpatialStreams;

283

  return m_txMaxNSpatialStreams;

265

284

266

285

267

uint8_t

286

uint8_t

287

HtCapabilities::GetTxUnequalModulation (void) const

288

289

  return m_txUnequalModulation;

290

291

292

uint8_t

268

HtCapabilities::GetInformationFieldSize () const

293

HtCapabilities::GetInformationFieldSize () const

269

294

270

  //we should not be here if ht is not supported

295

  //we should not be here if ht is not supported




  void SetRxMcsBitmask (uint8_t index);
  void SetRxHighestSupportedDataRate (uint16_t maxsupportedrate);
  void SetTxMcsSetDefined (uint8_t txmcssetdefined);
  void SetTxRxMcsSetUnequal (uint8_t txrxmcssetunequal);
  void SetTxMaxNSpatialStreams (uint8_t maxtxspatialstreams);
  void SetTxUnequalModulation (uint8_t txunequalmodulation);

  /*
   * Return the HT Capabilties Info field in the HT Capabilities information element.

  bool IsSupportedMcs (uint8_t mcs);
  uint16_t GetRxHighestSupportedDataRate (void) const;
  uint8_t GetTxMcsSetDefined (void) const;
  uint8_t GetTxRxMcsSetUnequal (void) const;
  uint8_t GetTxMaxNSpatialStreams (void) const;
  uint8_t GetTxUnequalModulation (void) const;

  WifiInformationElementId ElementId () const;
  uint8_t GetInformationFieldSize () const;




/* -*-  Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */
/*
 * Copyright (c) 2016 Sébastien Deronne
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License version 2 as
 * published by the Free Software Foundation;
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 *
 * Author: Sébastien Deronne <sebastien.deronne@gmail.com>
 */

#include "ht-operations.h"
#include "ns3/assert.h"
#include "ns3/log.h"

namespace ns3 {

NS_LOG_COMPONENT_DEFINE ("HtOperations");

HtOperations::HtOperations ()
  : m_primaryChannel (0),
    m_secondaryChannelOffset (0),
    m_staChannelWidth (0),
    m_rifsMode (0),
    m_reservedInformationSubset1 (0),
    m_htProtection (0),
    m_nonGfHtStasPresent (0),
    m_reservedInformationSubset2_1 (0),
    m_obssNonHtStasPresent (0),
    m_reservedInformationSubset2_2 (0),
    m_reservedInformationSubset3_1 (0),
    m_dualBeacon (0),
    m_dualCtsProtection (0),
    m_stbcBeacon (0),
    m_lSigTxopProtectionFullSupport (0),
    m_pcoActive (0),
    m_pcoPhase (0),
    m_reservedInformationSubset3_2 (0),
    m_reservedMcsSet1 (0),
    m_rxHighestSupportedDataRate (0),
    m_reservedMcsSet2 (0),
    m_txMcsSetDefined (0),
    m_txRxMcsSetUnequal (0),
    m_txMaxNSpatialStreams (0),
    m_txUnequalModulation (0),
    m_reservedMcsSet3 (0),
    m_htSupported (0)
{
  for (uint32_t k = 0; k < MAX_SUPPORTED_MCS; k++)
    {
      m_rxMcsBitmask[k] = 0;
    }
}

WifiInformationElementId
HtOperations::ElementId () const
{
  return IE_HT_OPERATIONS;
}

void
HtOperations::SetHtSupported (uint8_t htsupported)
{
  m_htSupported = htsupported;
}

uint8_t
HtOperations::GetInformationFieldSize () const
{
  //we should not be here if ht is not supported
  NS_ASSERT (m_htSupported > 0);
  return 22;
}

void
HtOperations::SetPrimaryChannel (uint8_t ctrl)
{
  m_primaryChannel = ctrl;
}

void
HtOperations::SetSecondaryChannelOffset (uint8_t secondarychanneloffset)
{
  m_secondaryChannelOffset = secondarychanneloffset;
}

void
HtOperations::SetStaChannelWidth (uint8_t stachannelwidth)
{
  m_staChannelWidth = stachannelwidth;
}

void
HtOperations::SetRifsMode (uint8_t rifsmode)
{
  m_rifsMode = rifsmode;
}

void
HtOperations::SetHtProtection (uint8_t htprotection)
{
  m_htProtection = htprotection;
}

void
HtOperations::SetNonGfHtStasPresent (uint8_t nongfhtstaspresent)
{
  m_nonGfHtStasPresent = nongfhtstaspresent;
}

void
HtOperations::SetObssNonHtStasPresent (uint8_t obssnonhtstaspresent)
{
  m_obssNonHtStasPresent = obssnonhtstaspresent;
}

void
HtOperations::SetDualBeacon (uint8_t dualbeacon)
{
  m_dualBeacon = dualbeacon;
}

void
HtOperations::SetDualCtsProtection (uint8_t dualctsprotection)
{
  m_dualCtsProtection = dualctsprotection;
}

void
HtOperations::SetStbcBeacon (uint8_t stbcbeacon)
{
  m_stbcBeacon = stbcbeacon;
}

void
HtOperations::SetLSigTxopProtectionFullSupport (uint8_t lsigtxopprotectionfullsupport)
{
  m_lSigTxopProtectionFullSupport = lsigtxopprotectionfullsupport;
}

void
HtOperations::SetPcoActive (uint8_t pcoactive)
{
  m_pcoActive = pcoactive;
}

void
HtOperations::SetPhase (uint8_t pcophase)
{
  m_pcoPhase = pcophase;
}

void
HtOperations::SetRxMcsBitmask (uint8_t index)
{
  m_rxMcsBitmask[index] = 1;
}

void
HtOperations::SetRxHighestSupportedDataRate (uint16_t maxsupportedrate)
{
  m_rxHighestSupportedDataRate = maxsupportedrate;
}

void
HtOperations::SetTxMcsSetDefined (uint8_t txmcssetdefined)
{
  m_txMcsSetDefined = txmcssetdefined;
}

void
HtOperations::SetTxRxMcsSetUnequal (uint8_t txrxmcssetunequal)
{
  m_txRxMcsSetUnequal = txrxmcssetunequal;
}

void
HtOperations::SetTxMaxNSpatialStreams (uint8_t maxtxspatialstreams)
{
  m_txMaxNSpatialStreams = maxtxspatialstreams;
}

void
HtOperations::SetTxUnequalModulation (uint8_t txunequalmodulation)
{
  m_txUnequalModulation = txunequalmodulation;
}

uint8_t
HtOperations::GetPrimaryChannel (void) const
{
  return m_primaryChannel;
}

uint8_t
HtOperations::GetSecondaryChannelOffset (void) const
{
  return m_secondaryChannelOffset;
}

uint8_t
HtOperations::GetStaChannelWidth (void) const
{
  return m_staChannelWidth;
}

uint8_t
HtOperations::GetRifsMode (void) const
{
  return m_rifsMode;
}

uint8_t
HtOperations::GetHtProtection (void) const
{
  return m_htProtection;
}

uint8_t
HtOperations::GetNonGfHtStasPresent (void) const
{
  return m_nonGfHtStasPresent;
}

uint8_t
HtOperations::GetObssNonHtStasPresent (void) const
{
  return m_obssNonHtStasPresent;
}

uint8_t
HtOperations::GetDualBeacon (void) const
{
  return m_dualBeacon;
}

uint8_t
HtOperations::GetDualCtsProtection (void) const
{
  return m_dualCtsProtection;
}

uint8_t
HtOperations::GetStbcBeacon (void) const
{
  return m_stbcBeacon;
}

uint8_t
HtOperations::GetLSigTxopProtectionFullSupport (void) const
{
  return m_lSigTxopProtectionFullSupport;
}

uint8_t
HtOperations::GetPcoActive (void) const
{
  return m_pcoActive;
}

uint8_t
HtOperations::GetPhase (void) const
{
  return m_pcoPhase;
}

bool
HtOperations::IsSupportedMcs (uint8_t mcs)
{
  if (m_rxMcsBitmask[mcs] == 1)
    {
      return true;
    }
  return false;
}

uint16_t
HtOperations::GetRxHighestSupportedDataRate (void) const
{
  return m_rxHighestSupportedDataRate;
}

uint8_t
HtOperations::GetTxMcsSetDefined (void) const
{
  return m_txMcsSetDefined;
}

uint8_t
HtOperations::GetTxRxMcsSetUnequal (void) const
{
  return m_txRxMcsSetUnequal;
}

uint8_t
HtOperations::GetTxMaxNSpatialStreams (void) const
{
  return m_txMaxNSpatialStreams;
}

uint8_t
HtOperations::GetTxUnequalModulation (void) const
{
  return m_txUnequalModulation;
}

Buffer::Iterator
HtOperations::Serialize (Buffer::Iterator i) const
{
  if (m_htSupported < 1)
    {
      return i;
    }
  return WifiInformationElement::Serialize (i);
}

uint16_t
HtOperations::GetSerializedSize () const
{
  if (m_htSupported < 1)
    {
      return 0;
    }
  return WifiInformationElement::GetSerializedSize ();
}

uint8_t
HtOperations::GetInformationSubset1 (void) const
{
  uint16_t val = 0;
  val |= m_secondaryChannelOffset & 0x03;
  val |= (m_staChannelWidth & 0x01) << 2;
  val |= (m_rifsMode & 0x01) << 3;
  val |= (m_reservedInformationSubset1 & 0x0f) << 4;
  return val;
}

void
HtOperations::SetInformationSubset1 (uint8_t ctrl)
{
  m_secondaryChannelOffset = ctrl & 0x03;
  m_staChannelWidth = (ctrl >> 2) & 0x01;
  m_rifsMode = (ctrl >> 3) & 0x01;
  m_reservedInformationSubset1 = (ctrl >> 4) & 0x0f;
}

uint16_t
HtOperations::GetInformationSubset2 (void) const
{
  uint16_t val = 0;
  val |= m_htProtection & 0x03;
  val |= (m_nonGfHtStasPresent & 0x01) << 2;
  val |= (m_reservedInformationSubset2_1 & 0x01) << 3;
  val |= (m_obssNonHtStasPresent & 0x01) << 4;
  val |= (m_reservedInformationSubset2_1 & 0x07ff) << 5;
  return val;
}

void
HtOperations::SetInformationSubset2 (uint16_t ctrl)
{
  m_htProtection = ctrl & 0x03;
  m_nonGfHtStasPresent = (ctrl >> 2) & 0x01;
  m_reservedInformationSubset2_1 = (ctrl >> 3) & 0x01;
  m_obssNonHtStasPresent = (ctrl >> 4) & 0x01;
  m_reservedInformationSubset2_1 = (ctrl >> 5) & 0x07ff;
}

uint16_t
HtOperations::GetInformationSubset3 (void) const
{
  uint16_t val = 0;
  val |= m_reservedInformationSubset3_1 & 0x3f;
  val |= (m_dualBeacon & 0x01) << 6;
  val |= (m_dualCtsProtection & 0x01) << 7;
  val |= (m_stbcBeacon & 0x01) << 8;
  val |= (m_lSigTxopProtectionFullSupport & 0x01) << 9;
  val |= (m_pcoActive & 0x01) << 10;
  val |= (m_pcoPhase & 0x01) << 11;
  val |= (m_reservedInformationSubset3_2 & 0x0f) << 12;
  return val;
}

void
HtOperations::SetInformationSubset3 (uint16_t ctrl)
{
  m_reservedInformationSubset3_1 = ctrl & 0x3f;
  m_dualBeacon = (ctrl >> 6) & 0x01;
  m_dualCtsProtection = (ctrl >> 7) & 0x01;
  m_stbcBeacon = (ctrl >> 8) & 0x01;
  m_lSigTxopProtectionFullSupport = (ctrl >> 9) & 0x01;
  m_pcoActive = (ctrl >> 10) & 0x01;
  m_pcoPhase = (ctrl >> 11) & 0x01;
  m_reservedInformationSubset3_2 = (ctrl >> 12) & 0x0f;
}

void
HtOperations::SetBasicMcsSet (uint64_t ctrl1, uint64_t ctrl2)
{
  for (uint64_t i = 0; i < 77; i++)
    {
      if (i < 64)
        {
          m_rxMcsBitmask[i] = (ctrl1 >> i) & 0x01;
        }
      else
        {
          m_rxMcsBitmask[i] = (ctrl2 >> (i - 64)) & 0x01;
        }
    }
  m_reservedMcsSet1 = (ctrl2 >> 13) & 0x07;
  m_rxHighestSupportedDataRate = (ctrl2 >> 16) & 0x03ff;
  m_reservedMcsSet2 = (ctrl2 >> 26) & 0x3f;
  m_txMcsSetDefined = (ctrl2 >> 32) & 0x01;
  m_txRxMcsSetUnequal = (ctrl2 >> 33) & 0x01;
  m_txMaxNSpatialStreams = (ctrl2 >> 34) & 0x03;
  m_txUnequalModulation = (ctrl2 >> 36) & 0x01;
  m_reservedMcsSet3 = (ctrl2 >> 37) & 0x07ffffff;
}

uint64_t
HtOperations::GetBasicMcsSet1 (void) const
{
  uint64_t val = 0;
  for (uint64_t i = 63; i > 0; i--)
    {
      val = (val << 1) | (m_rxMcsBitmask[i] & 0x01);
    }
  val = (val << 1) | (m_rxMcsBitmask[0] & 0x01);
  return val;
}

uint64_t
HtOperations::GetBasicMcsSet2 (void) const
{
  uint64_t val = 0;
  val = val | (m_reservedMcsSet3 & 0x07ffffff);
  val = (val << 1) | (m_txUnequalModulation & 0x01);
  val = (val << 2) | (m_txMaxNSpatialStreams & 0x03);
  val = (val << 1) | (m_txRxMcsSetUnequal & 0x01);
  val = (val << 1) | (m_txMcsSetDefined & 0x01);
  val = (val << 6) | (m_reservedMcsSet2 & 0x3f);
  val = (val << 10) | (m_rxHighestSupportedDataRate & 0x3ff);
  val = (val << 3) | (m_reservedMcsSet1 & 0x07);

  for (uint64_t i = 13; i > 0; i--)
    {
      val = (val << 1) | ( m_rxMcsBitmask[i + 63] & 0x01);
    }
  return val;
}

void
HtOperations::SerializeInformationField (Buffer::Iterator start) const
{
  if (m_htSupported == 1)
    {
      //write the corresponding value for each bit
      start.WriteU8 (GetPrimaryChannel ());
      start.WriteU8 (GetInformationSubset1 ());
      start.WriteU16 (GetInformationSubset2 ());
      start.WriteU16 (GetInformationSubset3 ());
      start.WriteHtolsbU64 (GetBasicMcsSet1 ());
      start.WriteHtolsbU64 (GetBasicMcsSet2 ());
    }
}

uint8_t
HtOperations::DeserializeInformationField (Buffer::Iterator start,
                                             uint8_t length)
{
  Buffer::Iterator i = start;
  uint8_t primarychannel = i.ReadU8 ();
  uint8_t informationsubset1 = i.ReadU8 ();
  uint8_t informationsubset2 = i.ReadU16 ();
  uint8_t informationsubset3 = i.ReadU16 ();
  uint64_t mcsset1 = i.ReadLsbtohU64 ();
  uint64_t mcsset2 = i.ReadLsbtohU64 ();
  SetPrimaryChannel (primarychannel);
  SetInformationSubset1 (informationsubset1);
  SetInformationSubset2 (informationsubset2);
  SetInformationSubset3 (informationsubset3);
  SetBasicMcsSet (mcsset1, mcsset2);
  return length;
}

ATTRIBUTE_HELPER_CPP (HtOperations);

std::ostream &
operator << (std::ostream &os, const HtOperations &htoperations)
{
  os <<  bool (htoperations.GetStaChannelWidth ())
     << "|" << bool (htoperations.GetRifsMode ())
     << "|" << bool (htoperations.GetDualCtsProtection());
    
  return os;
}

std::istream &operator >> (std::istream &is, HtOperations &htoperations)
{
  bool c1, c2, c3;
  is >> c1 >> c2 >> c3;
  htoperations.SetStaChannelWidth (c1);
  htoperations.SetRifsMode (c2);
  htoperations.SetDualCtsProtection (c3);
  
  return is;
}

} //namespace ns3




/* -*-  Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */
/*
 * Copyright (c) 2016 Sébastien Deronne
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License version 2 as
 * published by the Free Software Foundation;
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 *
 * Author: Sébastien Deronne <sebastien.deronne@gmail.com>
 */

#ifndef HT_OPERATIONS_H
#define HT_OPERATIONS_H

#include <stdint.h>
#include "ns3/buffer.h"
#include "ns3/attribute-helper.h"
#include "ns3/wifi-information-element.h"

/**
 * This defines the maximum number of supported MCSs that a STA is
 * allowed to have. Currently this number is set for IEEE 802.11n
 */
#define MAX_SUPPORTED_MCS  (77)

namespace ns3 {

enum HtProtectionType
{
  NO_PROTECTION,
  NON_MEMBER_PROTECTION,
  TWENTY_MHZ_PROTECTION,
  MIXED_MODE_PROTECTION
};

/**
 * \brief The HT Operations Information Element
 * \ingroup wifi
 *
 * This class knows how to serialise and deserialise 
 * the HT Operations Information Element
 *
 * \see attribute_HtOperations
 */
class HtOperations: public WifiInformationElement
{
public:
  HtOperations ();
  void SetHtSupported (uint8_t htsupported);
  
  /**
   * Set the Primary Channel field in the HT Operations information element.
   *
   * \param ctrl the Primary Channel field in the HT Operations information element
   */
  void SetPrimaryChannel (uint8_t ctrl);
  /**
   * Set the Information Subset 1 field in the HT Operations information element.
   *
   * \param ctrl the Information Subset 1 field in the HT Operations information element
   */
  void SetInformationSubset1 (uint8_t ctrl);
  /**
   * Set the Information Subset 2 field in the HT Operations information element.
   *
   * \param ctrl the Information Subset 2 field in the HT Operations information element
   */
  void SetInformationSubset2 (uint16_t ctrl);
  /**
   * Set the Information Subset 3 field in the HT Operations information element.
   *
   * \param ctrl the Information Subset 3 field in the HT Operations information element
   */
  void SetInformationSubset3 (uint16_t ctrl);
  /**
   * Set the Basic MCS Set field in the HT Operations information element.
   *
   * \param ctrl1 the first 64 bytes of the Basic MCS Set field in the HT Operations information element
   * \param ctrl2 the last 64 bytes of the Basic MCS Set field in the HT Operations information element
   */
  void SetBasicMcsSet (uint64_t ctrl1, uint64_t ctrl2);

  void SetSecondaryChannelOffset (uint8_t secondarychanneloffset);
  void SetStaChannelWidth (uint8_t stachannelwidth);
  void SetRifsMode (uint8_t rifsmode);

  void SetHtProtection (uint8_t htprotection);
  void SetNonGfHtStasPresent (uint8_t nongfhtstaspresent);
  void SetObssNonHtStasPresent (uint8_t obssnonhtstaspresent);

  void SetDualBeacon (uint8_t dualbeacon);
  void SetDualCtsProtection (uint8_t dualctsprotection);
  void SetStbcBeacon (uint8_t stbcbeacon);
  void SetLSigTxopProtectionFullSupport (uint8_t lsigtxopprotectionfullsupport);
  void SetPcoActive (uint8_t pcoactive);
  void SetPhase (uint8_t pcophase);

  void SetRxMcsBitmask (uint8_t index);
  void SetRxHighestSupportedDataRate (uint16_t maxsupportedrate);
  void SetTxMcsSetDefined (uint8_t txmcssetdefined);
  void SetTxRxMcsSetUnequal (uint8_t txrxmcssetunequal);
  void SetTxMaxNSpatialStreams (uint8_t maxtxspatialstreams);
  void SetTxUnequalModulation (uint8_t txunequalmodulation);
  
  /*
   * Return the Primary Channel field in the HT Operations information element.
   *
   * \return the Primary Channel field in the HT Operations information element
   */
  uint8_t GetPrimaryChannel (void) const;
  /*
   * Return the Information Subset 1 field in the HT Operations information element.
   *
   * \return the Information Subset 1 field in the HT Operations information element
   */
  uint8_t GetInformationSubset1 (void) const;
  /*
   * Return the Information Subset 2 field in the HT Operations information element.
   *
   * \return the Information Subset 2 field in the HT Operations information element
   */
  uint16_t GetInformationSubset2 (void) const;
  /*
   * Return the Information Subset 3 field in the HT Operations information element.
   *
   * \return the Information Subset 3 field in the HT Operations information element
   */
  uint16_t GetInformationSubset3 (void) const;
  /*
   * Return the first 64 bytes of the Basic MCS Set field in the HT Operations information element.
   *
   * \return the first 64 bytes of the Basic MCS Set field in the HT Operations information element
   */
  uint64_t GetBasicMcsSet1 (void) const;
  /*
   * Return the last 64 bytes of the Basic MCS Set field in the HT Operations information element.
   *
   * \return the last 64 bytes of the Basic MCS Set field in the HT Operations information element
   */
  uint64_t GetBasicMcsSet2 (void) const;
  
  uint8_t GetSecondaryChannelOffset (void) const;
  uint8_t GetStaChannelWidth (void) const;
  uint8_t GetRifsMode (void) const;
  
  uint8_t GetHtProtection (void) const;
  uint8_t GetNonGfHtStasPresent (void) const;
  uint8_t GetObssNonHtStasPresent (void) const;
  
  uint8_t GetDualBeacon (void) const;
  uint8_t GetDualCtsProtection (void) const;
  uint8_t GetStbcBeacon (void) const;
  uint8_t GetLSigTxopProtectionFullSupport (void) const;
  uint8_t GetPcoActive (void) const;
  uint8_t GetPhase (void) const;
  
  bool IsSupportedMcs (uint8_t mcs);
  uint16_t GetRxHighestSupportedDataRate (void) const;
  uint8_t GetTxMcsSetDefined (void) const;
  uint8_t GetTxRxMcsSetUnequal (void) const;
  uint8_t GetTxMaxNSpatialStreams (void) const;
  uint8_t GetTxUnequalModulation (void) const;

  WifiInformationElementId ElementId () const;
  uint8_t GetInformationFieldSize () const;
  void SerializeInformationField (Buffer::Iterator start) const;
  uint8_t DeserializeInformationField (Buffer::Iterator start,
                                       uint8_t length);
  /**
   * This information element is a bit special in that it is only
   * included if the STA is an HT STA. To support this we
   * override the Serialize and GetSerializedSize methods of
   * WifiInformationElement.
   *
   * \param start
   *
   * \return an iterator
   */
  Buffer::Iterator Serialize (Buffer::Iterator start) const;
  /**
   * Return the serialized size of this HT Operations IE.
   *
   * \return the serialized size of this HT Operations IE
   */
  uint16_t GetSerializedSize () const;


private:
  uint8_t m_primaryChannel;

  //HT Information Subset 1
  uint8_t m_secondaryChannelOffset;
  uint8_t m_staChannelWidth;
  uint8_t m_rifsMode;
  uint8_t m_reservedInformationSubset1;

  //HT Information Subset 2
  uint8_t m_htProtection;
  uint8_t m_nonGfHtStasPresent;
  uint8_t m_reservedInformationSubset2_1;
  uint8_t m_obssNonHtStasPresent;
  uint8_t m_reservedInformationSubset2_2;

  //HT Information Subset 3
  uint8_t m_reservedInformationSubset3_1;
  uint8_t m_dualBeacon;
  uint8_t m_dualCtsProtection;
  uint8_t m_stbcBeacon;
  uint8_t m_lSigTxopProtectionFullSupport;
  uint8_t m_pcoActive;
  uint8_t m_pcoPhase;
  uint8_t m_reservedInformationSubset3_2;

  //Basic MCS Set field
  uint8_t m_reservedMcsSet1;
  uint16_t m_rxHighestSupportedDataRate;
  uint8_t m_reservedMcsSet2;
  uint8_t m_txMcsSetDefined;
  uint8_t m_txRxMcsSetUnequal;
  uint8_t m_txMaxNSpatialStreams;
  uint8_t m_txUnequalModulation;
  uint32_t m_reservedMcsSet3;
  uint8_t m_rxMcsBitmask[MAX_SUPPORTED_MCS];

  //This is used to decide whether this element should be added to the frame or not
  uint8_t m_htSupported;
};

std::ostream &operator << (std::ostream &os, const HtOperations &htoperations);
std::istream &operator >> (std::istream &is, HtOperations &htoperations);

ATTRIBUTE_HELPER_HEADER (HtOperations);

} //namespace ns3

#endif /* HT_OPERATIONS_H */

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

Lines 187-193	Link Here

187

  //ensure correct packet delivery.

187

  //ensure correct packet delivery.

188

  double maxThreshold = 0.0;

188

  double maxThreshold = 0.0;

189

  WifiMode maxMode = GetDefaultMode ();

189

  WifiMode maxMode = GetDefaultMode ();

190

  if (GetUseProtection () == false)

190

  if (GetUseNonErpProtection () == false)

191

192

      for (uint32_t i = 0; i < GetNBasicModes (); i++)

192

      for (uint32_t i = 0; i < GetNBasicModes (); i++)

193

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

Lines 807-813	Link Here

807

808

  else

808

  else

809

810

      if ((m_ctsToSelfSupported || m_stationManager->GetUseProtection ()) && NeedCtsToSelf ())

810

      if ((m_ctsToSelfSupported || m_stationManager->GetUseNonErpProtection ()) && NeedCtsToSelf ())

811

812

          SendCtsToSelf ();

812

          SendCtsToSelf ();

813




}

void
MgtProbeResponseHeader::SetHtOperations (HtOperations htoperations)
{
  m_htOperations = htoperations;
}

HtOperations
MgtProbeResponseHeader::GetHtOperations (void) const
{
  return m_htOperations;
}

void
MgtProbeResponseHeader::SetVhtCapabilities (VhtCapabilities vhtcapabilities)
{
  m_vhtCapability = vhtcapabilities;

  size += m_erpInformation.GetSerializedSize ();
  size += m_rates.extended.GetSerializedSize ();
  size += m_htCapability.GetSerializedSize ();
  size += m_htOperations.GetSerializedSize ();
  size += m_vhtCapability.GetSerializedSize ();
  return size;
}

     << "rates=" << m_rates << ", "
     << "ERP information=" << m_erpInformation << ", "
     << "HT Capabilities=" << m_htCapability << " , "
     << "HT Operations=" << m_htOperations << " , "
     << "VHT Capabilities= " << m_vhtCapability;
}


  i = m_erpInformation.Serialize (i);
  i = m_rates.extended.Serialize (i);
  i = m_htCapability.Serialize (i);
  i = m_htOperations.Serialize (i);
  i = m_vhtCapability.Serialize (i);
}


  i = m_erpInformation.DeserializeIfPresent (i);
  i = m_rates.extended.DeserializeIfPresent (i);
  i = m_htCapability.DeserializeIfPresent (i);
  i = m_htOperations.DeserializeIfPresent (i);
  i = m_vhtCapability.DeserializeIfPresent (i);
  return i.GetDistanceFrom (start);
}

  m_htCapability = htcapabilities;
}

HtCapabilities
MgtAssocResponseHeader::GetHtCapabilities (void) const
{
  return m_htCapability;
}

void
MgtAssocResponseHeader::SetHtOperations (HtOperations htoperations)
{
  m_htOperations = htoperations;
}

HtOperations
MgtAssocResponseHeader::GetHtOperations (void) const
{
  return m_htOperations;
}

void
MgtAssocResponseHeader::SetVhtCapabilities (VhtCapabilities vhtcapabilities)
{

  return m_vhtCapability;
}

HtCapabilities
MgtAssocResponseHeader::GetHtCapabilities (void) const
{
  return m_htCapability;
}

void
MgtAssocResponseHeader::SetErpInformation (ErpInformation erpInformation)
{

  size += m_erpInformation.GetSerializedSize ();
  size += m_rates.extended.GetSerializedSize ();
  size += m_htCapability.GetSerializedSize ();
  size += m_htOperations.GetSerializedSize ();
  size += m_vhtCapability.GetSerializedSize ();
  return size;
}

     << "rates=" << m_rates << ", "
     << "ERP information=" << m_erpInformation << ", "
     << "HT Capabilities=" << m_htCapability << " , "
     << "HT Operations=" << m_htOperations << " , "
     << "VHT Capabilities= " << m_vhtCapability;
}


  i = m_erpInformation.Serialize (i);
  i = m_rates.extended.Serialize (i);
  i = m_htCapability.Serialize (i);
  i = m_htOperations.Serialize (i);
  i = m_vhtCapability.Serialize (i);
}


  i = m_erpInformation.DeserializeIfPresent (i);
  i = m_rates.extended.DeserializeIfPresent (i);
  i = m_htCapability.DeserializeIfPresent (i);
  i = m_htOperations.DeserializeIfPresent (i);
  i = m_vhtCapability.DeserializeIfPresent (i);
  return i.GetDistanceFrom (start);
}

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

Lines 31-36	Link Here

#include "supported-rates.h"

#include "supported-rates.h"

#include "ssid.h"

#include "ssid.h"

#include "ht-capabilities.h"

#include "ht-capabilities.h"

#include "ht-operations.h"

#include "vht-capabilities.h"

#include "vht-capabilities.h"

#include "erp-information.h"

#include "erp-information.h"

Lines 182-187	Link Here

182

*/

183

*/

183

  HtCapabilities GetHtCapabilities (void) const;

184

  HtCapabilities GetHtCapabilities (void) const;

184

/**

185

/**

186

   * Return the HT operations.

187

188

   * \return HT operations

189

*/

190

  HtOperations GetHtOperations (void) const;

191

/**

185

   * Return the ERP information.

192

   * Return the ERP information.

186

193

187

   * \return the ERP information

194

   * \return the ERP information

Lines 206-211	Link Here

206

*/

213

*/

207

  void SetHtCapabilities (HtCapabilities htcapabilities);

214

  void SetHtCapabilities (HtCapabilities htcapabilities);

208

/**

215

/**

216

   * Set the HT operations.

217

218

   * \param htoperations HT operations

219

*/

220

  void SetHtOperations (HtOperations htoperations);

221

/**

209

   * Set the supported rates.

222

   * Set the supported rates.

210

223

211

   * \param rates the supported rates

224

   * \param rates the supported rates

Lines 242-247	Link Here

242

  StatusCode m_code; //!< Status code

255

  StatusCode m_code; //!< Status code

243

  uint16_t m_aid;

256

  uint16_t m_aid;

244

  HtCapabilities m_htCapability; //!< HT capabilities

257

  HtCapabilities m_htCapability; //!< HT capabilities

258

  HtOperations m_htOperations; //!< HT operations

245

  VhtCapabilities m_vhtCapability; //!< VHT capabilities

259

  VhtCapabilities m_vhtCapability; //!< VHT capabilities

246

  ErpInformation m_erpInformation;    //!< ERP information

260

  ErpInformation m_erpInformation;    //!< ERP information

247

};

261

};

Lines 366-371	Link Here

366

*/

380

*/

367

  HtCapabilities GetHtCapabilities (void) const;

381

  HtCapabilities GetHtCapabilities (void) const;

368

/**

382

/**

383

   * Return the HT operations.

384

385

   * \return HT operations

386

*/

387

  HtOperations GetHtOperations (void) const;

388

/**

369

   * Return the VHT capabilities.

389

   * Return the VHT capabilities.

370

390

371

   * \return VHT capabilities

391

   * \return VHT capabilities

Lines 390-395	Link Here

390

*/

410

*/

391

  void SetHtCapabilities (HtCapabilities htcapabilities);

411

  void SetHtCapabilities (HtCapabilities htcapabilities);

392

/**

412

/**

413

   * Set the HT operations.

414

415

   * \param htoperations HT operations

416

*/

417

  void SetHtOperations (HtOperations htoperations);

418

/**

393

   * Set the VHT capabilities.

419

   * Set the VHT capabilities.

394

420

395

   * \param vhtcapabilities VHT capabilities

421

   * \param vhtcapabilities VHT capabilities

Lines 445-450	Link Here

445

  SupportedRates m_rates;             //!< List of supported rates

471

  SupportedRates m_rates;             //!< List of supported rates

446

  CapabilityInformation m_capability; //!< Capability information

472

  CapabilityInformation m_capability; //!< Capability information

447

  HtCapabilities m_htCapability;      //!< HT capabilities

473

  HtCapabilities m_htCapability;      //!< HT capabilities

474

  HtOperations m_htOperations;        //!< HT operations

448

  VhtCapabilities m_vhtCapability;    //!< VHT capabilities

475

  VhtCapabilities m_vhtCapability;    //!< VHT capabilities

449

  ErpInformation m_erpInformation;    //!< ERP information

476

  ErpInformation m_erpInformation;    //!< ERP information

450

};

477

};

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

Lines 503-509	Link Here

503

      channelWidth = 20;

503

      channelWidth = 20;

504

505

  WifiTxVector rtsTxVector;

505

  WifiTxVector rtsTxVector;

506

  if (GetUseProtection () == false)

506

  if (GetUseNonErpProtection () == false)

507

508

      rtsTxVector = WifiTxVector (GetSupported (station, 0), GetDefaultTxPowerLevel (), GetShortRetryCount (station), false, 1, 0, channelWidth, GetAggregation (station), false);

508

      rtsTxVector = WifiTxVector (GetSupported (station, 0), GetDefaultTxPowerLevel (), GetShortRetryCount (station), false, 1, 0, channelWidth, GetAggregation (station), false);

509

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

Lines 299-305	Link Here

299

300

  UpdateMode (station);

300

  UpdateMode (station);

301

  WifiTxVector rtsTxVector;

301

  WifiTxVector rtsTxVector;

302

  if (GetUseProtection () == false)

302

  if (GetUseNonErpProtection () == false)

303

304

      rtsTxVector = WifiTxVector (GetSupported (station, 0), GetDefaultTxPowerLevel (), GetShortRetryCount (station), false, 1, 0, channelWidth, GetAggregation (station), false);

304

      rtsTxVector = WifiTxVector (GetSupported (station, 0), GetDefaultTxPowerLevel (), GetShortRetryCount (station), false, 1, 0, channelWidth, GetAggregation (station), false);

305

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

Lines 318-324	Link Here

318

      channelWidth = 20;

318

      channelWidth = 20;

319

320

  WifiTxVector rtsTxVector;

320

  WifiTxVector rtsTxVector;

321

  if (GetUseProtection () == false)

321

  if (GetUseNonErpProtection () == false)

322

323

      rtsTxVector = WifiTxVector (GetSupported (station, 0), GetDefaultTxPowerLevel (), GetShortRetryCount (station), false, 1, 0, channelWidth, GetAggregation (station), false);

323

      rtsTxVector = WifiTxVector (GetSupported (station, 0), GetDefaultTxPowerLevel (), GetShortRetryCount (station), false, 1, 0, channelWidth, GetAggregation (station), false);

324

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

Lines 310-316	Link Here

310

      channelWidth = 20;

310

      channelWidth = 20;

311

312

  WifiTxVector rtsTxVector;

312

  WifiTxVector rtsTxVector;

313

  if (GetUseProtection () == false)

313

  if (GetUseNonErpProtection () == false)

314

315

      rtsTxVector = WifiTxVector (GetSupported (st, 0), GetDefaultTxPowerLevel (), GetShortRetryCount (st), false, 1, 0, channelWidth, GetAggregation (station), false);

315

      rtsTxVector = WifiTxVector (GetSupported (st, 0), GetDefaultTxPowerLevel (), GetShortRetryCount (st), false, 1, 0, channelWidth, GetAggregation (station), false);

316




#include "amsdu-subframe-header.h"
#include "mgt-headers.h"
#include "ht-capabilities.h"
#include "ht-operations.h"
#include "vht-capabilities.h"

/*

              isShortPreambleEnabled &= !erpInformation.GetBarkerPreambleMode ();
              if (erpInformation.GetUseProtection() == true)
                {
                  m_stationManager->SetUseNonErpProtection (true);
                }
              else
                {
                  m_stationManager->SetUseNonErpProtection (false);
                }
              if (capabilities.IsShortSlotTime () == true)
                {

              ErpInformation erpInformation = probeResp.GetErpInformation ();
              if (erpInformation.GetUseProtection() == true)
                {
                  m_stationManager->SetUseNonErpProtection (true);
                }
              else
                {
                  m_stationManager->SetUseNonErpProtection (false);
                }
              if (capabilities.IsShortSlotTime () == true)
                {

              if (m_htSupported)
                {
                  HtCapabilities htcapabilities = assocResp.GetHtCapabilities ();
                  HtOperations htOperations = assocResp.GetHtOperations ();
                  m_stationManager->AddStationHtCapabilities (hdr->GetAddr2 (),htcapabilities);
                }
              if (m_vhtSupported)

(-)a/src/wifi/model/wifi-information-element.h (-1 / +3 lines)

Lines 83-89	Link Here

#define IE_RSN                                 ((WifiInformationElementId)48)

#define IE_RSN                                 ((WifiInformationElementId)48)

// 49 is reserved in 802.11-2007

// 49 is reserved in 802.11-2007

#define IE_EXTENDED_SUPPORTED_RATES            ((WifiInformationElementId)50)

#define IE_EXTENDED_SUPPORTED_RATES            ((WifiInformationElementId)50)

// 51 to 126 are reserved in 802.11-2007

// 51 to 60 are reserved in 802.11-2007

#define IE_HT_OPERATIONS                       ((WifiInformationElementId)61)

// 62 to 126 are reserved in 802.11-2007

#define IE_EXTENDED_CAPABILITIES               ((WifiInformationElementId)127)

#define IE_EXTENDED_CAPABILITIES               ((WifiInformationElementId)127)

// 128 to 190 are reserved in 802.11-2007

// 128 to 190 are reserved in 802.11-2007

#define IE_VHT_CAPABILITIES                    ((WifiInformationElementId)191)

#define IE_VHT_CAPABILITIES                    ((WifiInformationElementId)191)

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

Lines 360-366	Link Here

360

WifiRemoteStationManager::WifiRemoteStationManager ()

360

WifiRemoteStationManager::WifiRemoteStationManager ()

361

  : m_htSupported (false),

361

  : m_htSupported (false),

362

    m_vhtSupported (false),

362

    m_vhtSupported (false),

363

    m_useProtection (false),

363

    m_useNonErpProtection (false),

364

    m_shortPreambleEnabled (false),

364

    m_shortPreambleEnabled (false),

365

    m_shortSlotTimeEnabled (false)

365

    m_shortSlotTimeEnabled (false)

366

Lines 868-875	Link Here

868

  WifiMode mode = txVector.GetMode ();

868

  WifiMode mode = txVector.GetMode ();

869

  NS_LOG_FUNCTION (this << address << *header << packet << mode);

869

  NS_LOG_FUNCTION (this << address << *header << packet << mode);

870

  if (m_protectionMode == RTS_CTS

870

  if (m_protectionMode == RTS_CTS

871

      && mode.GetModulationClass () == WIFI_MOD_CLASS_ERP_OFDM

871

      && ((mode.GetModulationClass () == WIFI_MOD_CLASS_ERP_OFDM)

872

      && m_useProtection)

872

      || (mode.GetModulationClass () == WIFI_MOD_CLASS_HT)

873

      || (mode.GetModulationClass () == WIFI_MOD_CLASS_VHT))

874

      && m_useNonErpProtection)

873

875

874

      NS_LOG_DEBUG ("WifiRemoteStationManager::NeedRTS returning true to protect non-ERP stations");

876

      NS_LOG_DEBUG ("WifiRemoteStationManager::NeedRTS returning true to protect non-ERP stations");

875

      return true;

877

      return true;

Lines 888-900	Link Here

888

  WifiMode mode = txVector.GetMode ();

890

  WifiMode mode = txVector.GetMode ();

889

  NS_LOG_FUNCTION (this << mode);

891

  NS_LOG_FUNCTION (this << mode);

890

  if (m_protectionMode == CTS_TO_SELF

892

  if (m_protectionMode == CTS_TO_SELF

891

      && mode.GetModulationClass () == WIFI_MOD_CLASS_ERP_OFDM

893

      && ((mode.GetModulationClass () == WIFI_MOD_CLASS_ERP_OFDM)

892

      && m_useProtection)

894

      || (mode.GetModulationClass () == WIFI_MOD_CLASS_HT)

895

      || (mode.GetModulationClass () == WIFI_MOD_CLASS_VHT))

896

      && m_useNonErpProtection)

893

897

894

      NS_LOG_DEBUG ("WifiRemoteStationManager::NeedCtsToSelf returning true to protect non-ERP stations");

898

      NS_LOG_DEBUG ("WifiRemoteStationManager::NeedCtsToSelf returning true to protect non-ERP stations");

895

      return true;

899

      return true;

896

900

897

  else if (!m_useProtection)

901

  else if (!m_useNonErpProtection)

898

902

899

    //search for the BSS Basic Rate set, if the used mode is in the basic set then there is no need for Cts To Self

903

    //search for the BSS Basic Rate set, if the used mode is in the basic set then there is no need for Cts To Self

900

      for (WifiModeListIterator i = m_bssBasicRateSet.begin (); i != m_bssBasicRateSet.end (); i++)

904

      for (WifiModeListIterator i = m_bssBasicRateSet.begin (); i != m_bssBasicRateSet.end (); i++)

Lines 924-938	Link Here

924

928

925

929

926

void

930

void

927

WifiRemoteStationManager::SetUseProtection (bool enable)

931

WifiRemoteStationManager::SetUseNonErpProtection (bool enable)

928

932

929

  m_useProtection = enable;

933

  m_useNonErpProtection = enable;

930

934

931

935

932

bool

936

bool

933

WifiRemoteStationManager::GetUseProtection (void) const

937

WifiRemoteStationManager::GetUseNonErpProtection (void) const

934

938

935

  return m_useProtection;

939

  return m_useNonErpProtection;

936

940

937

941

938

bool

942

bool




  
  enum ProtectionMode
  {
    RTS_CTS,
    CTS_TO_SELF
  };


   *
   * \param enable enable or disable protection for non-ERP stations
   */
  void SetUseNonErpProtection (bool enable);
  /**
   * Return whether the device supports protection of non-ERP stations.
   *
   * \return true if protection for non-ERP stations is enabled, 
   *         false otherwise
   */
  bool GetUseNonErpProtection (void) const;
  /**
   * Enable or disable short PLCP preambles.
   *

  uint32_t m_nextFragmentationThreshold;  //!< Threshold for fragmentation that will be used for the next transmission
  uint8_t m_defaultTxPowerLevel;  //!< Default tranmission power level
  WifiMode m_nonUnicastMode;  //!< Transmission mode for non-unicast DATA frames
  bool m_useNonErpProtection; //!< flag if protection for non-ERP stations against ERP transmissions is enabled
  bool m_shortPreambleEnabled; //!< flag if short PLCP preamble is enabled
  bool m_shortSlotTimeEnabled; //!< flag if short slot time is enabled
  ProtectionMode m_protectionMode; //!< Protection mode for ERP stations when non-ERP stations are detected




YansWifiPhy::Configure80211g (void)
{
  NS_LOG_FUNCTION (this);
  Configure80211b ();
  SetChannelWidth (20); //20 MHz

  m_deviceRateSet.push_back (WifiPhy::GetDsssRate1Mbps ());
  m_deviceRateSet.push_back (WifiPhy::GetDsssRate2Mbps ());
  m_deviceRateSet.push_back (WifiPhy::GetDsssRate5_5Mbps ());
  m_deviceRateSet.push_back (WifiPhy::GetErpOfdmRate6Mbps ());
  m_deviceRateSet.push_back (WifiPhy::GetErpOfdmRate9Mbps ());
  m_deviceRateSet.push_back (WifiPhy::GetDsssRate11Mbps ());
  m_deviceRateSet.push_back (WifiPhy::GetErpOfdmRate12Mbps ());
  m_deviceRateSet.push_back (WifiPhy::GetErpOfdmRate18Mbps ());
  m_deviceRateSet.push_back (WifiPhy::GetErpOfdmRate24Mbps ());

YansWifiPhy::Configure80211n (void)
{
  NS_LOG_FUNCTION (this);
  SetChannelWidth (20); //20 MHz
  if (m_channelStartingFrequency >= 2400 && m_channelStartingFrequency <= 2500) //at 2.4 GHz
    {
      Configure80211b ();
      Configure80211g ();
      m_deviceRateSet.push_back (WifiPhy::GetDsssRate5_5Mbps ());
      m_deviceRateSet.push_back (WifiPhy::GetErpOfdmRate6Mbps ());
      m_deviceRateSet.push_back (WifiPhy::GetDsssRate11Mbps ());
      m_deviceRateSet.push_back (WifiPhy::GetErpOfdmRate12Mbps ());
      m_deviceRateSet.push_back (WifiPhy::GetErpOfdmRate24Mbps ());
    }
  if (m_channelStartingFrequency >= 5000 && m_channelStartingFrequency <= 6000) //at 5 GHz
    {
      Configure80211a ();
      m_deviceRateSet.push_back (WifiPhy::GetOfdmRate12Mbps ());
      m_deviceRateSet.push_back (WifiPhy::GetOfdmRate24Mbps ());
    }
  SetChannelWidth (20); //20 MHz

  m_deviceMcsSet.push_back (WifiPhy::GetHtMcs0 ());
  m_deviceMcsSet.push_back (WifiPhy::GetHtMcs1 ());

YansWifiPhy::Configure80211ac (void)
{
  NS_LOG_FUNCTION (this);
  m_channelStartingFrequency = 5e3; //5.000 GHz
  Configure80211n ();
  SetChannelWidth (80); //80 MHz

  m_deviceRateSet.push_back (WifiPhy::GetOfdmRate6Mbps ());
  m_deviceRateSet.push_back (WifiPhy::GetOfdmRate12Mbps ());
  m_deviceRateSet.push_back (WifiPhy::GetOfdmRate24Mbps ());

  m_deviceMcsSet.push_back (WifiPhy::GetHtMcs0 ());
  m_deviceMcsSet.push_back (WifiPhy::GetHtMcs1 ());
  m_deviceMcsSet.push_back (WifiPhy::GetHtMcs2 ());
  m_deviceMcsSet.push_back (WifiPhy::GetHtMcs3 ());
  m_deviceMcsSet.push_back (WifiPhy::GetHtMcs4 ());
  m_deviceMcsSet.push_back (WifiPhy::GetHtMcs5 ());
  m_deviceMcsSet.push_back (WifiPhy::GetHtMcs6 ());
  m_deviceMcsSet.push_back (WifiPhy::GetHtMcs7 ());

  m_deviceMcsSet.push_back (WifiPhy::GetVhtMcs0 ());
  m_deviceMcsSet.push_back (WifiPhy::GetVhtMcs1 ());
  m_deviceMcsSet.push_back (WifiPhy::GetVhtMcs2 ());

(-)a/src/wifi/wscript (+2 lines)

Lines 73-78	Link Here

        'model/wifi-tx-current-model.cc',

        'model/wifi-tx-current-model.cc',

        'model/vht-capabilities.cc',

        'model/vht-capabilities.cc',

        'model/erp-information.cc',

        'model/erp-information.cc',

        'model/ht-operations.cc',

        'helper/wifi-radio-energy-model-helper.cc',

        'helper/wifi-radio-energy-model-helper.cc',

        'helper/vht-wifi-mac-helper.cc',

        'helper/vht-wifi-mac-helper.cc',

        'helper/ht-wifi-mac-helper.cc',

        'helper/ht-wifi-mac-helper.cc',

Lines 168-173	Link Here

168

        'model/wifi-tx-current-model.h',

169

        'model/wifi-tx-current-model.h',

169

        'model/vht-capabilities.h',

170

        'model/vht-capabilities.h',

170

        'model/erp-information.h',

171

        'model/erp-information.h',

172

        'model/ht-operations.h',

171

        'helper/wifi-radio-energy-model-helper.h',

173

        'helper/wifi-radio-energy-model-helper.h',

172

        'helper/vht-wifi-mac-helper.h',

174

        'helper/vht-wifi-mac-helper.h',

173

        'helper/ht-wifi-mac-helper.h',

175

        'helper/ht-wifi-mac-helper.h',

Return to bug 2297