Attachment #3209 for bug #2460

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




  double interval = 1;          // seconds
  double startTime = 0.0;       // seconds
  double distanceToRx = 100.0;  // meters
  /*
   * This is a magic number used to set the transmit power, based on other
   * configuration.
   */
  double offset = 81;

  CommandLine cmd;
  cmd.AddValue ("phyMode", "Wifi Phy mode", phyMode);

  /** Wifi PHY **/
  /***************************************************************************/
  YansWifiPhyHelper wifiPhy = YansWifiPhyHelper::Default ();
  wifiPhy.Set ("RxGain", DoubleValue (-10));
  wifiPhy.Set ("TxGain", DoubleValue (offset + Prss));
  wifiPhy.Set ("CcaMode1Threshold", DoubleValue (0.0));
  /***************************************************************************/

  /** wifi channel **/
  YansWifiChannelHelper wifiChannel;
  wifiChannel.SetPropagationDelay ("ns3::ConstantSpeedPropagationDelayModel");
  wifiChannel.AddPropagationLoss ("ns3::FriisPropagationLossModel");
  
  // create wifi channel
  Ptr<YansWifiChannel> wifiChannelPtr = wifiChannel.Create ();
  wifiPhy.SetChannel (wifiChannelPtr);




  double interval = 1;          // seconds
  double startTime = 0.0;       // seconds
  double distanceToRx = 100.0;  // meters
  /*
   * This is a magic number used to set the transmit power, based on other
   * configuration.
   */
  double offset = 81;
  
  // Energy Harvester variables
  double harvestingUpdateInterval = 1;  // seconds

  /** Wifi PHY **/
  /***************************************************************************/
  YansWifiPhyHelper wifiPhy = YansWifiPhyHelper::Default ();
  wifiPhy.Set ("RxGain", DoubleValue (-10));
  wifiPhy.Set ("TxGain", DoubleValue (offset + Prss));
  wifiPhy.Set ("CcaMode1Threshold", DoubleValue (0.0));
  /***************************************************************************/

  /** wifi channel **/
  YansWifiChannelHelper wifiChannel;
  wifiChannel.SetPropagationDelay ("ns3::ConstantSpeedPropagationDelayModel");
  wifiChannel.AddPropagationLoss ("ns3::FriisPropagationLossModel");

  // create wifi channel
  Ptr<YansWifiChannel> wifiChannelPtr = wifiChannel.Create ();
  wifiPhy.SetChannel (wifiChannelPtr);

(-)a/examples/wireless/wifi-clear-channel-cmu.cc (-2 lines)

Lines 208-215 int main (int argc, char *argv[])	Link Here

208

209

          NS_LOG_DEBUG (modes[i]);

209

          NS_LOG_DEBUG (modes[i]);

210

          experiment = Experiment (modes[i]);

210

          experiment = Experiment (modes[i]);

211

          wifiPhy.Set ("EnergyDetectionThreshold", DoubleValue (-110.0) );

212

          wifiPhy.Set ("CcaMode1Threshold", DoubleValue (-110.0) );

213

          wifiPhy.Set ("TxPowerStart", DoubleValue (15.0) );

211

          wifiPhy.Set ("TxPowerStart", DoubleValue (15.0) );

214

          wifiPhy.Set ("TxPowerEnd", DoubleValue (15.0) );

212

          wifiPhy.Set ("TxPowerEnd", DoubleValue (15.0) );

215

          wifiPhy.Set ("RxGain", DoubleValue (0) );

213

          wifiPhy.Set ("RxGain", DoubleValue (0) );




  wifi.SetStandard (WIFI_PHY_STANDARD_80211b);

  YansWifiPhyHelper wifiPhy =  YansWifiPhyHelper::Default ();
  // set it to zero; otherwise, gain will be added
  wifiPhy.Set ("RxGain", DoubleValue (0) );
  wifiPhy.Set ("CcaMode1Threshold", DoubleValue (0.0) );

  // ns-3 supports RadioTap and Prism tracing extensions for 802.11b
  wifiPhy.SetPcapDataLinkType (WifiPhyHelper::DLT_IEEE802_11_RADIO);

  NetDeviceContainer devices = wifi.Install (wifiPhy, wifiMac, c.Get (0));
  // This will disable these sending devices from detecting a signal
  // so that they do not backoff
  wifiPhy.Set ("EnergyDetectionThreshold", DoubleValue (0.0) );
  wifiPhy.Set ("TxGain", DoubleValue (offset + Prss) );
  devices.Add (wifi.Install (wifiPhy, wifiMac, c.Get (1)));
  wifiPhy.Set ("TxGain", DoubleValue (offset + Irss) );

(-)a/examples/wireless/wifi-spectrum-per-example.cc (-3 lines)

Lines 183-191 int main (int argc, char *argv[])	Link Here

183

184

      else if (wifiType == "ns3::SpectrumWifiPhy")

184

      else if (wifiType == "ns3::SpectrumWifiPhy")

185

186

          //Bug 2460: CcaMode1Threshold default should be set to -62 dBm when using Spectrum

187

          Config::SetDefault ("ns3::WifiPhy::CcaMode1Threshold", DoubleValue (-62.0));

188

189

          Ptr<MultiModelSpectrumChannel> spectrumChannel

186

          Ptr<MultiModelSpectrumChannel> spectrumChannel

190

            = CreateObject<MultiModelSpectrumChannel> ();

187

            = CreateObject<MultiModelSpectrumChannel> ();

191

          Ptr<FriisPropagationLossModel> lossModel

188

          Ptr<FriisPropagationLossModel> lossModel

(-)a/examples/wireless/wifi-spectrum-per-interference.cc (-3 lines)

Lines 212-220 int main (int argc, char *argv[])	Link Here

212

213

      else if (wifiType == "ns3::SpectrumWifiPhy")

213

      else if (wifiType == "ns3::SpectrumWifiPhy")

214

215

          //Bug 2460: CcaMode1Threshold default should be set to -62 dBm when using Spectrum

216

          Config::SetDefault ("ns3::WifiPhy::CcaMode1Threshold", DoubleValue (-62.0));

217

218

          spectrumChannel

215

          spectrumChannel

219

            = CreateObject<MultiModelSpectrumChannel> ();

216

            = CreateObject<MultiModelSpectrumChannel> ();

220

          Ptr<FriisPropagationLossModel> lossModel

217

          Ptr<FriisPropagationLossModel> lossModel

(-)a/examples/wireless/wifi-spectrum-saturation-example.cc (-3 lines)

Lines 178-186 int main (int argc, char *argv[])	Link Here

178

179

      else if (wifiType == "ns3::SpectrumWifiPhy")

179

      else if (wifiType == "ns3::SpectrumWifiPhy")

180

181

          //Bug 2460: CcaMode1Threshold default should be set to -62 dBm when using Spectrum

182

          Config::SetDefault ("ns3::WifiPhy::CcaMode1Threshold", DoubleValue (-62.0));

183

184

          Ptr<MultiModelSpectrumChannel> spectrumChannel

181

          Ptr<MultiModelSpectrumChannel> spectrumChannel

185

            = CreateObject<MultiModelSpectrumChannel> ();

182

            = CreateObject<MultiModelSpectrumChannel> ();

186

          Ptr<FriisPropagationLossModel> lossModel

183

          Ptr<FriisPropagationLossModel> lossModel




  /* Setup Physical Layer */
  YansWifiPhyHelper wifiPhy = YansWifiPhyHelper::Default ();
  wifiPhy.SetChannel (wifiChannel.Create ());
  wifiPhy.Set ("TxPowerStart", DoubleValue (10.0));
  wifiPhy.Set ("TxPowerEnd", DoubleValue (10.0));
  wifiPhy.Set ("TxPowerLevels", UintegerValue (1));
  wifiPhy.Set ("TxGain", DoubleValue (0));
  wifiPhy.Set ("RxGain", DoubleValue (0));
  wifiPhy.Set ("RxNoiseFigure", DoubleValue (10));
  wifiPhy.Set ("CcaMode1Threshold", DoubleValue (-79));
  wifiPhy.Set ("EnergyDetectionThreshold", DoubleValue (-79 + 3));
  wifiPhy.SetErrorRateModel ("ns3::YansErrorRateModel");
  wifiHelper.SetRemoteStationManager ("ns3::ConstantRateWifiManager",
                                      "DataMode", StringValue (phyRate),

(-)a/src/aodv/test/aodv-regression.cc (-2 / +1 lines)

Lines 168-175 ChainRegressionTest::CreateDevices ()	Link Here

168

  YansWifiChannelHelper wifiChannel = YansWifiChannelHelper::Default ();

168

  YansWifiChannelHelper wifiChannel = YansWifiChannelHelper::Default ();

169

  Ptr<YansWifiChannel> chan = wifiChannel.Create ();

169

  Ptr<YansWifiChannel> chan = wifiChannel.Create ();

170

  wifiPhy.SetChannel (chan);

170

  wifiPhy.SetChannel (chan);

171

  wifiPhy.Set ("TxGain", DoubleValue (1.0)); //this configuration should go away in future revision to the test

171

172

  wifiPhy.Set ("RxGain", DoubleValue (1.0)); //this configuration should go away in future revision to the test

173

  // This test suite output was originally based on YansErrorRateModel

172

  // This test suite output was originally based on YansErrorRateModel

174

  wifiPhy.SetErrorRateModel ("ns3::YansErrorRateModel");

173

  wifiPhy.SetErrorRateModel ("ns3::YansErrorRateModel");

175

  WifiHelper wifi;

174

  WifiHelper wifi;

(-)a/src/mesh/test/dot11s/hwmp-proactive-regression.cc (-2 / +1 lines)

Lines 113-120 HwmpProactiveRegressionTest::CreateDevices ()	Link Here

113

  YansWifiChannelHelper wifiChannel = YansWifiChannelHelper::Default ();

113

  YansWifiChannelHelper wifiChannel = YansWifiChannelHelper::Default ();

114

  Ptr<YansWifiChannel> chan = wifiChannel.Create ();

114

  Ptr<YansWifiChannel> chan = wifiChannel.Create ();

115

  wifiPhy.SetChannel (chan);

115

  wifiPhy.SetChannel (chan);

116

  wifiPhy.Set ("TxGain", DoubleValue (1.0)); //this configuration should go away in future revision to the test

116

117

  wifiPhy.Set ("RxGain", DoubleValue (1.0)); //this configuration should go away in future revision to the test

118

  // 2. setup mesh

117

  // 2. setup mesh

119

  MeshHelper mesh = MeshHelper::Default ();

118

  MeshHelper mesh = MeshHelper::Default ();

120

  mesh.SetStackInstaller ("ns3::Dot11sStack", "Root", Mac48AddressValue (Mac48Address ("00:00:00:00:00:0d")));

119

  mesh.SetStackInstaller ("ns3::Dot11sStack", "Root", Mac48AddressValue (Mac48Address ("00:00:00:00:00:0d")));

(-)a/src/mesh/test/dot11s/hwmp-reactive-regression.cc (-2 lines)

Lines 114-121 HwmpReactiveRegressionTest::CreateDevices ()	Link Here

114

  YansWifiChannelHelper wifiChannel = YansWifiChannelHelper::Default ();

114

  YansWifiChannelHelper wifiChannel = YansWifiChannelHelper::Default ();

115

  Ptr<YansWifiChannel> chan = wifiChannel.Create ();

115

  Ptr<YansWifiChannel> chan = wifiChannel.Create ();

116

  wifiPhy.SetChannel (chan);

116

  wifiPhy.SetChannel (chan);

117

  wifiPhy.Set ("TxGain", DoubleValue (1.0)); //this configuration should go away in future revision to the test

118

  wifiPhy.Set ("RxGain", DoubleValue (1.0)); //this configuration should go away in future revision to the test

119

117

120

  // 2. setup mesh

118

  // 2. setup mesh

121

  MeshHelper mesh = MeshHelper::Default ();

119

  MeshHelper mesh = MeshHelper::Default ();

(-)a/src/mesh/test/dot11s/hwmp-simplest-regression.cc (-2 / +1 lines)

Lines 122-129 HwmpSimplestRegressionTest::CreateDevices ()	Link Here

122

  YansWifiChannelHelper wifiChannel = YansWifiChannelHelper::Default ();

122

  YansWifiChannelHelper wifiChannel = YansWifiChannelHelper::Default ();

123

  Ptr<YansWifiChannel> chan = wifiChannel.Create ();

123

  Ptr<YansWifiChannel> chan = wifiChannel.Create ();

124

  wifiPhy.SetChannel (chan);

124

  wifiPhy.SetChannel (chan);

125

  wifiPhy.Set ("TxGain", DoubleValue (1.0)); //this configuration should go away in future revision to the test

125

126

  wifiPhy.Set ("RxGain", DoubleValue (1.0)); //this configuration should go away in future revision to the test

127

  // 2. setup mesh

126

  // 2. setup mesh

128

  MeshHelper mesh = MeshHelper::Default ();

127

  MeshHelper mesh = MeshHelper::Default ();

129

  mesh.SetStackInstaller ("ns3::Dot11sStack");

128

  mesh.SetStackInstaller ("ns3::Dot11sStack");

(-)a/src/mesh/test/dot11s/hwmp-target-flags-regression.cc (-2 / +1 lines)

Lines 140-147 HwmpDoRfRegressionTest::CreateDevices ()	Link Here

140

  YansWifiChannelHelper wifiChannel = YansWifiChannelHelper::Default ();

140

  YansWifiChannelHelper wifiChannel = YansWifiChannelHelper::Default ();

141

  Ptr<YansWifiChannel> chan = wifiChannel.Create ();

141

  Ptr<YansWifiChannel> chan = wifiChannel.Create ();

142

  wifiPhy.SetChannel (chan);

142

  wifiPhy.SetChannel (chan);

143

  wifiPhy.Set ("TxGain", DoubleValue (1.0)); //this configuration should go away in future revision to the test

143

144

  wifiPhy.Set ("RxGain", DoubleValue (1.0)); //this configuration should go away in future revision to the test

145

  // 2. setup mesh

144

  // 2. setup mesh

146

  MeshHelper mesh = MeshHelper::Default ();

145

  MeshHelper mesh = MeshHelper::Default ();

147

  mesh.SetStackInstaller ("ns3::Dot11sStack");

146

  mesh.SetStackInstaller ("ns3::Dot11sStack");

(-)a/src/mesh/test/flame/flame-regression.cc (-2 / +1 lines)

Lines 99-106 FlameRegressionTest::CreateDevices ()	Link Here

  YansWifiChannelHelper wifiChannel = YansWifiChannelHelper::Default ();

  YansWifiChannelHelper wifiChannel = YansWifiChannelHelper::Default ();

100

  Ptr<YansWifiChannel> chan = wifiChannel.Create ();

100

  Ptr<YansWifiChannel> chan = wifiChannel.Create ();

101

  wifiPhy.SetChannel (chan);

101

  wifiPhy.SetChannel (chan);

102

  wifiPhy.Set ("TxGain", DoubleValue (1.0)); //this configuration should go away in future revision to the test

102

103

  wifiPhy.Set ("RxGain", DoubleValue (1.0)); //this configuration should go away in future revision to the test

104

  // 2. setup mesh

103

  // 2. setup mesh

105

  MeshHelper mesh = MeshHelper::Default ();

104

  MeshHelper mesh = MeshHelper::Default ();

106

  mesh.SetStackInstaller ("ns3::FlameStack");

105

  mesh.SetStackInstaller ("ns3::FlameStack");




  wifi.SetStandard (wifiStandard);

  YansWifiPhyHelper wifiPhy =  YansWifiPhyHelper::Default ();
  // This is one parameter that matters when using FixedRssLossModel
  // set it to zero; otherwise, gain will be added
  wifiPhy.Set ("RxGain", DoubleValue (0) ); 
  wifiPhy.Set ("CcaMode1Threshold", DoubleValue (0.0) );

  // ns-3 supports RadioTap and Prism tracing extensions for 802.11b
  wifiPhy.SetPcapDataLinkType (WifiPhyHelper::DLT_IEEE802_11_RADIO); 


  // This will disable these sending devices from detecting a signal 
  // so that they do not backoff
  wifiPhy.Set ("EnergyDetectionThreshold", DoubleValue (0.0) );
  wifiPhy.Set ("TxGain", DoubleValue (offset + Prss) ); 
  devices.Add (wifi.Install (wifiPhy, wifiMac, c.Get (1)));
  wifiPhy.Set ("TxGain", DoubleValue (offset + Irss) ); 

(-)a/src/wifi/examples/wifi-manager-example.cc (-3 lines)

Lines 336-344 int main (int argc, char *argv[])	Link Here

336

  WifiHelper wifi;

336

  WifiHelper wifi;

337

  wifi.SetStandard (serverSelectedStandard.m_standard);

337

  wifi.SetStandard (serverSelectedStandard.m_standard);

338

  YansWifiPhyHelper wifiPhy = YansWifiPhyHelper::Default ();

338

  YansWifiPhyHelper wifiPhy = YansWifiPhyHelper::Default ();

339

  wifiPhy.Set ("RxNoiseFigure", DoubleValue (0.0));

340

  wifiPhy.Set ("EnergyDetectionThreshold", DoubleValue (-110.0));

341

  wifiPhy.Set ("CcaMode1Threshold", DoubleValue (-110.0));

342

339

343

  Ptr<YansWifiChannel> wifiChannel = CreateObject<YansWifiChannel> ();

340

  Ptr<YansWifiChannel> wifiChannel = CreateObject<YansWifiChannel> ();

344

  Ptr<ConstantSpeedPropagationDelayModel> delayModel = CreateObject<ConstantSpeedPropagationDelayModel> ();

341

  Ptr<ConstantSpeedPropagationDelayModel> delayModel = CreateObject<ConstantSpeedPropagationDelayModel> ();

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

Lines 242-247 SpectrumWifiPhy::StartRx (Ptr<SpectrumSignalParameters> rxParams)	Link Here

242

243

  // Log the signal arrival to the trace source

243

  // Log the signal arrival to the trace source

244

  m_signalCb (wifiRxParams ? true : false, senderNodeId, WToDbm (rxPowerW), rxDuration);

244

  m_signalCb (wifiRxParams ? true : false, senderNodeId, WToDbm (rxPowerW), rxDuration);

245

246

  // Do no further processing if signal is too weak

247

  // Current implementation assumes constant rx power over the packet duration

248

  if (WToDbm (rxPowerW) < GetRxSensitivity ())

249

250

      NS_LOG_INFO ("Received signal too weak to process: " << WToDbm (rxPowerW) << " dBm");

251

      return;

252

245

  if (wifiRxParams == 0)

253

  if (wifiRxParams == 0)

246

254

247

      NS_LOG_INFO ("Received non Wi-Fi signal");

255

      NS_LOG_INFO ("Received non Wi-Fi signal");




                   MakeUintegerAccessor (&WifiPhy::SetChannelNumber,
                                         &WifiPhy::GetChannelNumber),
                   MakeUintegerChecker<uint8_t> (0, 196))
    .AddAttribute ("RxSensitivity",
                   "The energy of a received signal should be higher than "
                   "this threshold (dBm) for the PHY to detect the signal.",
                   DoubleValue (-101.0),
                   MakeDoubleAccessor (&WifiPhy::SetRxSensitivity,
                                       &WifiPhy::GetRxSensitivity),
                   MakeDoubleChecker<double> ())
    .AddAttribute ("CcaEdThreshold",
                   "The energy of a received signal should be higher than "
                   "this threshold (dbm) to allow the PHY layer to declare CCA BUSY state.",
                   DoubleValue (-62.0),
                   MakeDoubleAccessor (&WifiPhy::SetCcaEdThreshold,
                                       &WifiPhy::GetCcaEdThreshold),
                   MakeDoubleChecker<double> ())
    .AddAttribute ("TxGain",
                   "Transmission gain (dB).",

}

void
WifiPhy::SetRxSensitivity (double threshold)
{
  NS_LOG_FUNCTION (this << threshold);
  m_rxSensitivityW = DbmToW (threshold);
}

double
WifiPhy::GetRxSensitivity (void) const
{
  return WToDbm (m_rxSensitivityW);
}

void
WifiPhy::SetCcaEdThreshold (double threshold)
{
  NS_LOG_FUNCTION (this << threshold);
  m_ccaEdThresholdW = DbmToW (threshold);
}

double
WifiPhy::GetCcaEdThreshold (void) const
{
  return WToDbm (m_ccaEdThresholdW);
}

void

    case WifiPhyState::SLEEP:
      {
        NS_LOG_DEBUG ("resuming from sleep mode");
        Time delayUntilCcaEnd = m_interference.GetEnergyDuration (m_ccaEdThresholdW);
        m_state->SwitchFromSleep (delayUntilCcaEnd);
        break;
      }

    case WifiPhyState::OFF:
      {
        NS_LOG_DEBUG ("resuming from off mode");
        Time delayUntilCcaEnd = m_interference.GetEnergyDuration (DbmToW (GetCcaEdThreshold ()));
        m_state->SwitchFromOff (delayUntilCcaEnd);
        break;
      }

  //In this model, CCA becomes busy when the aggregation of all signals as
  //tracked by the InterferenceHelper class is higher than the CcaBusyThreshold

  Time delayUntilCcaEnd = m_interference.GetEnergyDuration (DbmToW (GetCcaEdThreshold ()));
  if (!delayUntilCcaEnd.IsZero ())
    {
      m_state->SwitchMaybeToCcaBusy (delayUntilCcaEnd);

  //In this model, CCA becomes busy when the aggregation of all signals as
  //tracked by the InterferenceHelper class is higher than the CcaBusyThreshold

  Time delayUntilCcaEnd = m_interference.GetEnergyDuration (DbmToW (GetCcaEdThreshold ()));
  if (!delayUntilCcaEnd.IsZero ())
    {
      NS_LOG_DEBUG ("Calling SwitchMaybeToCcaBusy for " << delayUntilCcaEnd.As (Time::S));

WifiPhy::StartRx (Ptr<Packet> packet, WifiTxVector txVector, MpduType mpdutype, double rxPowerW, Time rxDuration, Ptr<Event> event)
{
  NS_LOG_FUNCTION (this << packet << txVector << +mpdutype << rxPowerW << rxDuration);

  AmpduTag ampduTag;
  WifiPreamble preamble = txVector.GetPreambleType ();
  if (preamble == WIFI_PREAMBLE_NONE && (m_mpdusNum == 0 || m_plcpSuccess == false))
    {
      m_plcpSuccess = false;
      m_mpdusNum = 0;
      NS_LOG_DEBUG ("drop packet because no PLCP preamble/header has been received");
      NotifyRxDrop (packet);
      MaybeCcaBusyDuration ();
      return;
    }
  else if (preamble != WIFI_PREAMBLE_NONE && packet->PeekPacketTag (ampduTag) && m_mpdusNum == 0)
    {
      //received the first MPDU in an MPDU
      m_mpdusNum = ampduTag.GetRemainingNbOfMpdus ();
      m_rxMpduReferenceNumber++;
    }
  else if (preamble == WIFI_PREAMBLE_NONE && packet->PeekPacketTag (ampduTag) && m_mpdusNum > 0)
    {
      //received the other MPDUs that are part of the A-MPDU
      if (ampduTag.GetRemainingNbOfMpdus () < (m_mpdusNum - 1))
      else if (preamble == WIFI_PREAMBLE_NONE && packet->PeekPacketTag (ampduTag) && m_mpdusNum > 0)
        {
          //received the other MPDUs that are part of the A-MPDU
          if (ampduTag.GetRemainingNbOfMpdus () < (m_mpdusNum - 1))
            {
              NS_LOG_DEBUG ("Missing MPDU from the A-MPDU " << m_mpdusNum - ampduTag.GetRemainingNbOfMpdus ());
              m_mpdusNum = ampduTag.GetRemainingNbOfMpdus ();
            }
          else
            {
              m_mpdusNum--;
            }
        }
      else if (preamble != WIFI_PREAMBLE_NONE && packet->PeekPacketTag (ampduTag) && m_mpdusNum > 0)
        {
          NS_LOG_DEBUG ("Missing MPDU from the A-MPDU " << m_mpdusNum - ampduTag.GetRemainingNbOfMpdus ());
          m_mpdusNum = ampduTag.GetRemainingNbOfMpdus ();
        }
      else
        {
          m_mpdusNum--;
          m_mpdusNum = 0;
        }
    }
  else if (preamble != WIFI_PREAMBLE_NONE && packet->PeekPacketTag (ampduTag) && m_mpdusNum > 0)
    {
      NS_LOG_DEBUG ("New A-MPDU started while " << m_mpdusNum << " MPDUs from previous are lost");
      m_mpdusNum = ampduTag.GetRemainingNbOfMpdus ();
    }
  else if (preamble != WIFI_PREAMBLE_NONE && m_mpdusNum > 0 )
    {
      NS_LOG_DEBUG ("Didn't receive the last MPDUs from an A-MPDU " << m_mpdusNum);
      m_mpdusNum = 0;
    }

  NS_LOG_DEBUG ("sync to signal (power=" << rxPowerW << "W)");
  m_currentEvent = event;
  m_state->SwitchToRx (rxDuration);
  NS_ASSERT (m_endPlcpRxEvent.IsExpired ());
  NotifyRxBegin (packet);
  m_interference.NotifyRxStart ();

      if (preamble != WIFI_PREAMBLE_NONE)
        {
          NS_ASSERT (m_endPlcpRxEvent.IsExpired ());
          Time preambleAndHeaderDuration = CalculatePlcpPreambleAndHeaderDuration (txVector);
          m_endPlcpRxEvent = Simulator::Schedule (preambleAndHeaderDuration, &WifiPhy::StartReceivePacket, this,
                                                  packet, txVector, mpdutype, event);
        }

  if (preamble != WIFI_PREAMBLE_NONE)
      m_endRxEvent = Simulator::Schedule (rxDuration, &WifiPhy::EndReceive, this,
                                          packet, preamble, mpdutype, event);
    }
  else
    {
      NS_ASSERT (m_endPlcpRxEvent.IsExpired ());
      Time preambleAndHeaderDuration = CalculatePlcpPreambleAndHeaderDuration (txVector);
      m_endPlcpRxEvent = Simulator::Schedule (preambleAndHeaderDuration, &WifiPhy::StartReceivePacket, this,
                                              packet, txVector, mpdutype, event);
      MaybeCcaBusyDuration ();
    }

  NS_ASSERT (m_endRxEvent.IsExpired ());
  m_endRxEvent = Simulator::Schedule (rxDuration, &WifiPhy::EndReceive, this,
                                      packet, preamble, mpdutype, event);
}

int64_t




#define WIFI_PHY_H

#include "ns3/event-id.h"
#include "ns3/deprecated.h"
#include "wifi-mpdu-type.h"
#include "wifi-phy-standard.h"
#include "interference-helper.h"

  virtual int64_t AssignStreams (int64_t stream);

  /**
   * Sets the receive sensitivity threshold (dBm).
   * The energy of a received signal should be higher than
   * this threshold to allow the PHY layer to detect the signal.
   *
   * \param threshold the receive sensitivity threshold in dBm
   */
  void SetRxSensitivity (double threshold);
  /**
   * Return the receive sensitivity threshold (dBm).
   *
   * \return the receive sensitivity threshold in dBm
   */
  double GetRxSensitivity (void) const;
  /**
   * Sets the CCA threshold (dBm). The energy of a received signal
   * should be higher than this threshold to allow the PHY

   *
   * \param threshold the CCA threshold in dBm
   */
  void SetCcaEdThreshold (double threshold);
  /**
   * Return the CCA threshold (dBm).
   *
   * \return the CCA threshold in dBm
   */
  double GetCcaEdThreshold (void) const;
  /**
   * Sets the RX loss (dB) in the Signal-to-Noise-Ratio due to non-idealities in the receiver.
   *

   * Check if Phy state should move to CCA busy state based on current
   * state of interference tracker.  In this model, CCA becomes busy when
   * the aggregation of all signals as tracked by the InterferenceHelper
   * class is higher than the CcaEdThreshold
   */
  void SwitchMaybeToCcaBusy (void);


  bool m_frequencyChannelNumberInitialized; //!< Store initialization state
  uint16_t m_channelWidth;                  //!< Channel width

  double   m_rxSensitivityW;      //!< Receive sensitivity threshold in watts
  double   m_ccaEdThresholdW;     //!< Clear channel assessment (CCA) threshold in watts
  double   m_txGainDb;            //!< Transmission gain (dB)
  double   m_rxGainDb;            //!< Reception gain (dB)
  double   m_txPowerBaseDbm;      //!< Minimum transmission power (dBm)

(-)a/src/wifi/model/yans-wifi-channel.cc (+7 lines)

Lines 125-130 void	Link Here

125

YansWifiChannel::Receive (Ptr<YansWifiPhy> phy, Ptr<Packet> packet, double rxPowerDbm, Time duration)

125

YansWifiChannel::Receive (Ptr<YansWifiPhy> phy, Ptr<Packet> packet, double rxPowerDbm, Time duration)

126

127

  NS_LOG_FUNCTION (phy << packet << rxPowerDbm << duration.GetSeconds ());

127

  NS_LOG_FUNCTION (phy << packet << rxPowerDbm << duration.GetSeconds ());

128

  // Do no further processing if signal is too weak

129

  // Current implementation assumes constant rx power over the packet duration

130

  if ((rxPowerDbm + phy->GetRxGain ()) < phy->GetRxSensitivity ())

131

132

      NS_LOG_INFO ("Received signal too weak to process: " << rxPowerDbm << " dBm");

133

      return;

134

128

  phy->StartReceivePreambleAndHeader (packet, DbmToW (rxPowerDbm + phy->GetRxGain ()), duration);

135

  phy->StartReceivePreambleAndHeader (packet, DbmToW (rxPowerDbm + phy->GetRxGain ()), duration);

129

136

130

137

(-)a/src/wifi/test/spectrum-wifi-phy-test.cc (-2 lines)

Lines 167-174 SpectrumWifiPhyBasicTest::DoSetup (void)	Link Here

167

  m_phy->SetFrequency (FREQUENCY);

167

  m_phy->SetFrequency (FREQUENCY);

168

  m_phy->SetReceiveOkCallback (MakeCallback (&SpectrumWifiPhyBasicTest::SpectrumWifiPhyRxSuccess, this));

168

  m_phy->SetReceiveOkCallback (MakeCallback (&SpectrumWifiPhyBasicTest::SpectrumWifiPhyRxSuccess, this));

169

  m_phy->SetReceiveErrorCallback (MakeCallback (&SpectrumWifiPhyBasicTest::SpectrumWifiPhyRxFailure, this));

169

  m_phy->SetReceiveErrorCallback (MakeCallback (&SpectrumWifiPhyBasicTest::SpectrumWifiPhyRxFailure, this));

170

  //Bug 2460: CcaMode1Threshold default should be set to -62 dBm when using Spectrum

171

  m_phy->SetCcaMode1Threshold (-62.0);

172

170

173

171

174

// Test that the expected number of packet receptions occur.

172

// Test that the expected number of packet receptions occur.

(-)a/src/wifi/test/wifi-test.cc (-1 lines)

Lines 1269-1275 void	Link Here

1269

Bug2483TestCase::DoRun (void)

1269

Bug2483TestCase::DoRun (void)

1270

1271

  Config::SetDefault ("ns3::WifiRemoteStationManager::RtsCtsThreshold", StringValue ("500")); // so as to force RTS/CTS for data frames

1271

  Config::SetDefault ("ns3::WifiRemoteStationManager::RtsCtsThreshold", StringValue ("500")); // so as to force RTS/CTS for data frames

1272

  Config::SetDefault ("ns3::WifiPhy::CcaMode1Threshold", DoubleValue (-62.0));

1273

1272

1274

  uint16_t channelWidth = 40; // at least 40 MHz expected here

1273

  uint16_t channelWidth = 40; // at least 40 MHz expected here

1275

1274

Return to bug 2460