Attachment #1141 for bug #827

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




    .AddTraceSource ("PhyRxDrop",
                     "Trace source indicating a packet has been dropped by the device during reception",
                     MakeTraceSourceAccessor (&WifiPhy::m_phyRxDropTrace))
    .AddTraceSource ("MonitorSnifferRx",
                     "Trace source simulating a wifi device in monitor mode sniffing all received frames",
                     MakeTraceSourceAccessor (&WifiPhy::m_phyMonitorSniffRxTrace))
    .AddTraceSource ("MonitorSnifferTx",
                     "Trace source simulating the capability of a wifi device in monitor mode to sniff all frames being transmitted",
                     MakeTraceSourceAccessor (&WifiPhy::m_phyMonitorSniffTxTrace))
  ;
  return tid;
}

}

void
WifiPhy::NotifyMonitorSniffRx (Ptr<const Packet> packet, uint16_t channelFreqMhz, uint16_t channelNumber, uint32_t rate, bool isShortPreamble, double signalDbm, double noiseDbm)
{
  m_phyMonitorSniffRxTrace (packet, channelFreqMhz, channelNumber, rate, isShortPreamble, signalDbm, noiseDbm);
}

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







  /**
   *
   * Public method used to fire a MonitorSniffer trace for a wifi packet being received.  Implemented for encapsulation
   * purposes.
   *
   * @param packet the packet being received

   * @param signalDbm signal power in dBm
   * @param noiseDbm  noise power in dBm
   */
  void NotifyMonitorSniffRx (Ptr<const Packet> packet, uint16_t channelFreqMhz, uint16_t channelNumber, uint32_t rate, bool isShortPreamble,
                             double signalDbm, double noiseDbm);

  /**
   *
   * Public method used to fire a MonitorSniffer trace for a wifi packet being transmitted.  Implemented for encapsulation
   * purposes.
   *
   * @param packet the packet being transmitted

   * units used both for the radiotap and for the prism header)
   * @param isShortPreamble true if short preamble is used, false otherwise
   */
  void NotifyMonitorSniffTx (Ptr<const Packet> packet, uint16_t channelFreqMhz, uint16_t channelNumber, uint32_t rate, bool isShortPreamble);


private:

   *
   * \see class CallBackTraceSource
   */
  TracedCallback<Ptr<const Packet>, uint16_t, uint16_t, uint32_t, bool, double, double> m_phyMonitorSniffRxTrace;

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

   *
   * \see class CallBackTraceSource
   */
  TracedCallback<Ptr<const Packet>, uint16_t, uint16_t, uint32_t, bool> m_phyMonitorSniffTxTrace;

};


(-)a/src/wifi/model/yans-wifi-phy.cc (-2 / +2 lines)

Lines 516-522	Link Here

516

  NotifyTxBegin (packet);

516

  NotifyTxBegin (packet);

517

  uint32_t dataRate500KbpsUnits = txMode.GetDataRate () / 500000;

517

  uint32_t dataRate500KbpsUnits = txMode.GetDataRate () / 500000;

518

  bool isShortPreamble = (WIFI_PREAMBLE_SHORT == preamble);

518

  bool isShortPreamble = (WIFI_PREAMBLE_SHORT == preamble);

519

  NotifyPromiscSniffTx (packet, (uint16_t)GetChannelFrequencyMhz (), GetChannelNumber (), dataRate500KbpsUnits, isShortPreamble);

519

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

520

  m_state->SwitchToTx (txDuration, packet, txMode, preamble, txPower);

520

  m_state->SwitchToTx (txDuration, packet, txMode, preamble, txPower);

521

  m_channel->Send (this, packet, GetPowerDbm (txPower) + m_txGainDb, txMode, preamble);

521

  m_channel->Send (this, packet, GetPowerDbm (txPower) + m_txGainDb, txMode, preamble);

522

Lines 787-793	Link Here

787

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

787

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

788

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

788

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

789

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

789

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

790

      NotifyPromiscSniffRx (packet, (uint16_t)GetChannelFrequencyMhz (), GetChannelNumber (), dataRate500KbpsUnits, isShortPreamble, signalDbm, noiseDbm);

790

      NotifyMonitorSniffRx (packet, (uint16_t)GetChannelFrequencyMhz (), GetChannelNumber (), dataRate500KbpsUnits, isShortPreamble, signalDbm, noiseDbm);

791

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

791

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

792

793

  else

793

  else

Return to bug 827