Attachment #3202 for bug #2460

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

(-)a/examples/energy/energy-model-example.cc (-1 / +1 lines)

Lines 179-185	Link Here

179

  YansWifiPhyHelper wifiPhy = YansWifiPhyHelper::Default ();

179

  YansWifiPhyHelper wifiPhy = YansWifiPhyHelper::Default ();

180

  wifiPhy.Set ("RxGain", DoubleValue (-10));

180

  wifiPhy.Set ("RxGain", DoubleValue (-10));

181

  wifiPhy.Set ("TxGain", DoubleValue (offset + Prss));

181

  wifiPhy.Set ("TxGain", DoubleValue (offset + Prss));

182

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

182

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

183

  /***************************************************************************/

183

  /***************************************************************************/

184

185

  /** wifi channel **/

185

  /** wifi channel **/

(-)a/examples/energy/energy-model-with-harvesting-example.cc (-1 / +1 lines)

Lines 220-226	Link Here

220

  YansWifiPhyHelper wifiPhy = YansWifiPhyHelper::Default ();

220

  YansWifiPhyHelper wifiPhy = YansWifiPhyHelper::Default ();

221

  wifiPhy.Set ("RxGain", DoubleValue (-10));

221

  wifiPhy.Set ("RxGain", DoubleValue (-10));

222

  wifiPhy.Set ("TxGain", DoubleValue (offset + Prss));

222

  wifiPhy.Set ("TxGain", DoubleValue (offset + Prss));

223

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

223

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

224

  /***************************************************************************/

224

  /***************************************************************************/

225

226

  /** wifi channel **/

226

  /** wifi channel **/

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

Lines 208-215	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) );

211

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

212

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

213

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

212

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

214

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

213

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

215

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

214

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

(-)a/examples/wireless/wifi-simple-interference.cc (-2 / +1 lines)

Lines 180-186	Link Here

180

  YansWifiPhyHelper wifiPhy =  YansWifiPhyHelper::Default ();

180

  YansWifiPhyHelper wifiPhy =  YansWifiPhyHelper::Default ();

181

  // set it to zero; otherwise, gain will be added

181

  // set it to zero; otherwise, gain will be added

182

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

182

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

183

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

183

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

184

185

  // ns-3 supports RadioTap and Prism tracing extensions for 802.11b

185

  // ns-3 supports RadioTap and Prism tracing extensions for 802.11b

186

  wifiPhy.SetPcapDataLinkType (WifiPhyHelper::DLT_IEEE802_11_RADIO);

186

  wifiPhy.SetPcapDataLinkType (WifiPhyHelper::DLT_IEEE802_11_RADIO);

Lines 200-206	Link Here

200

  NetDeviceContainer devices = wifi.Install (wifiPhy, wifiMac, c.Get (0));

200

  NetDeviceContainer devices = wifi.Install (wifiPhy, wifiMac, c.Get (0));

201

  // This will disable these sending devices from detecting a signal

201

  // This will disable these sending devices from detecting a signal

202

  // so that they do not backoff

202

  // so that they do not backoff

203

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

204

  wifiPhy.Set ("TxGain", DoubleValue (offset + Prss) );

203

  wifiPhy.Set ("TxGain", DoubleValue (offset + Prss) );

205

  devices.Add (wifi.Install (wifiPhy, wifiMac, c.Get (1)));

204

  devices.Add (wifi.Install (wifiPhy, wifiMac, c.Get (1)));

206

  wifiPhy.Set ("TxGain", DoubleValue (offset + Irss) );

205

  wifiPhy.Set ("TxGain", DoubleValue (offset + Irss) );

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

Lines 183-191	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	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	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

(-)a/examples/wireless/wifi-tcp.cc (-2 / +1 lines)

Lines 125-132	Link Here

125

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

125

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

126

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

126

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

127

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

127

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

128

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

128

  wifiPhy.Set ("CcaEdThreshold", DoubleValue (-79));

129

  wifiPhy.Set ("EnergyDetectionThreshold", DoubleValue (-79 + 3));

130

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

129

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

131

  wifiHelper.SetRemoteStationManager ("ns3::ConstantRateWifiManager",

130

  wifiHelper.SetRemoteStationManager ("ns3::ConstantRateWifiManager",

132

                                      "DataMode", StringValue (phyRate),

131

                                      "DataMode", StringValue (phyRate),

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

Lines 168-175	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	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	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	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	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	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");

(-)a/src/test/ns3wifi/wifi-interference-test-suite.cc (-2 / +1 lines)

Lines 140-146	Link Here

140

  // This is one parameter that matters when using FixedRssLossModel

140

  // This is one parameter that matters when using FixedRssLossModel

141

  // set it to zero; otherwise, gain will be added

141

  // set it to zero; otherwise, gain will be added

142

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

142

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

143

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

143

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

144

145

  // ns-3 supports RadioTap and Prism tracing extensions for 802.11b

145

  // ns-3 supports RadioTap and Prism tracing extensions for 802.11b

146

  wifiPhy.SetPcapDataLinkType (WifiPhyHelper::DLT_IEEE802_11_RADIO);

146

  wifiPhy.SetPcapDataLinkType (WifiPhyHelper::DLT_IEEE802_11_RADIO);

Lines 172-178	Link Here

172

173

  // This will disable these sending devices from detecting a signal

173

  // This will disable these sending devices from detecting a signal

174

  // so that they do not backoff

174

  // so that they do not backoff

175

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

176

  wifiPhy.Set ("TxGain", DoubleValue (offset + Prss) );

175

  wifiPhy.Set ("TxGain", DoubleValue (offset + Prss) );

177

  devices.Add (wifi.Install (wifiPhy, wifiMac, c.Get (1)));

176

  devices.Add (wifi.Install (wifiPhy, wifiMac, c.Get (1)));

178

  wifiPhy.Set ("TxGain", DoubleValue (offset + Irss) );

177

  wifiPhy.Set ("TxGain", DoubleValue (offset + Irss) );

(-)a/src/wifi/examples/wifi-manager-example.cc (-2 / +1 lines)

Lines 337-344	Link Here

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));

339

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

340

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

340

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

341

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

342

341

343

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

342

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

344

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

343

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




  // Log the signal arrival to the trace source
  m_signalCb (wifiRxParams ? true : false, senderNodeId, WToDbm (rxPowerW), rxDuration);

  // Do no further processing if signal is too weak
  // Current implementation assumes constant rx power over the packet duration
  if (rxPowerW < GetRxSensitivity ())
    {
      NS_LOG_INFO ("Received signal too weak to process: " << WToDbm (rxPowerW) << " dBm");
      return;
    }
  if (wifiRxParams == 0)
    {
      NS_LOG_INFO ("Received non Wi-Fi signal");

      return;
    }

  Ptr<Packet> packet = wifiRxParams->packet->Copy ();
  // Do no further processing if signal is too weak
  // Current implementation assumes constant rx power over the packet duration
  if (rxPowerW < GetRxSensitivity ())
    {
      NS_LOG_INFO ("Dropped packet because received signal is too weak to process: " << WToDbm (rxPowerW) << " dBm");
      NotifyRxDrop (packet);
      return;
    }

  NS_LOG_INFO ("Received Wi-Fi signal");
  Ptr<Packet> packet = wifiRxParams->packet->Copy ();
  StartReceivePreambleAndHeader (packet, rxPowerW, rxDuration);
}





                   MakeUintegerAccessor (&WifiPhy::SetChannelNumber,
                                         &WifiPhy::GetChannelNumber),
                   MakeUintegerChecker<uint8_t> (0, 196))
    .AddAttribute ("EnergyDetectionThreshold",
                   "The energy of a received signal should be higher than "
                   "this threshold (dbm) to allow the PHY layer to detect the signal.",
                   DoubleValue (-96.0),
                   MakeDoubleAccessor (&WifiPhy::SetEdThreshold),
                   MakeDoubleChecker<double> (),
                   TypeId::DEPRECATED, "Replaced by RxSensitivity")
    .AddAttribute ("RxSensitivity",
                   "The energy of a received signal should be higher than "
                   "this threshold (dBm) for the PHY to detect the signal.",

                   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::SetEdThreshold (double threshold)
{
  NS_LOG_FUNCTION (this << threshold);
  m_edThresholdW = DbmToW (threshold);
}

double
WifiPhy::GetEdThreshold (void) const
{
  return WToDbm (m_edThresholdW);
}

void
WifiPhy::SetRxSensitivity (double threshold)
{
  NS_LOG_FUNCTION (this << threshold);

}

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));




  virtual int64_t AssignStreams (int64_t stream);

  /**
   * Sets the energy detection threshold (dBm).
   * The energy of a received signal should be higher than
   * this threshold (dbm) to allow the PHY layer to detect the signal.
   *
   * This parameter is being deprecated (renamed to RxSensitivity)
   *
   * \param threshold the energy detection threshold in dBm
   */
  void SetEdThreshold (double threshold);
  /**
   * Return the energy detection threshold (dBm).
   *
   * This parameter is being deprecated (renamed to RxSensitivity)
   *
   * \return the energy detection threshold in dBm
   */
  NS_DEPRECATED
  double GetEdThreshold (void) const;
  /**
   * 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 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_edThresholdW;        //!< Energy detection threshold in watts
  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 (-1 / +2 lines)

Lines 129-135	Link Here

129

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

129

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

130

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

130

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

131

132

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

132

      NS_LOG_INFO ("Dropped packet because received signal is too weak to process: " << rxPowerDbm << " dBm");

133

      phy->NotifyRxDrop (packet);

133

      return;

134

      return;

134

135

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

136

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

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

Lines 167-174	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	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