Attachment #539 for bug #644

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




}


void PcapWriter::WriteWifiMonitorPacket(Ptr<const Packet> packet, uint16_t channelFreqMhz, uint16_t channelNumber,                                        
                                        uint32_t rate, bool isShortPreamble, bool isTx, 
                                        double signalDbm, double noiseDbm)
{  


      Write32(PRISM_DID_CHANNEL);
      Write16(PRISM_STATUS_PRESENT);
      Write16(PRISM_ITEM_LENGTH);             
      Write32((uint32_t) channelNumber);
      // correct only for IEEE 802.11b/g channels 1-13.
      Write32((2437 - 2407) / 5);

      Write32(PRISM_DID_RSSI);
      Write16(PRISM_STATUS_PRESENT);

#define	RADIOTAP_FLAG_DATAPAD	   0x20	
#define	RADIOTAP_FLAG_BADFCS	   0x40	

#define	RADIOTAP_CHANNEL_TURBO	         0x0010
#define	RADIOTAP_CHANNEL_CCK	         0x0020
#define	RADIOTAP_CHANNEL_OFDM	         0x0040
#define	RADIOTAP_CHANNEL_2GHZ	         0x0080
#define	RADIOTAP_CHANNEL_5GHZ	         0x0100
#define	RADIOTAP_CHANNEL_PASSIVE         0x0200
#define	RADIOTAP_CHANNEL_DYN_CCK_OFDM    0x0400
#define	RADIOTAP_CHANNEL_GFSK	         0x0800
#define	RADIOTAP_CHANNEL_GSM             0x1000
#define	RADIOTAP_CHANNEL_STATIC_TURBO    0x2000
#define	RADIOTAP_CHANNEL_HALF_RATE       0x4000
#define	RADIOTAP_CHANNEL_QUARTER_RATE    0x8000

#define RADIOTAP_RX_PRESENT (RADIOTAP_TSFT | RADIOTAP_FLAGS | RADIOTAP_RATE | RADIOTAP_CHANNEL | RADIOTAP_DBM_ANTSIGNAL | RADIOTAP_DBM_ANTNOISE)
#define RADIOTAP_RX_LENGTH (8+8+1+1+2+2+1+1)


      Write8(rate); 

      Write16(channelFreqMhz); 
      
      uint16_t channelFlags;
      if (channelFreqMhz < 2500)
        {
          // TODO: when 802.11g WifiModes will be implemented
          // we will need to check dinamically whether channelFlags
          // needs to be set to RADIOTAP_CHANNEL_CCK,
          // RADIOTAP_CHANNEL_DYN or RADIOTAP_CHANNEL_OFDM.          
          channelFlags = RADIOTAP_CHANNEL_2GHZ | RADIOTAP_CHANNEL_CCK;
        }
      else
        {
          // TODO: we should handle correctly the case of half rate
          // (10 MHz channel) and quarter rate (5 Mhz channel). 
          channelFlags = RADIOTAP_CHANNEL_5GHZ | RADIOTAP_CHANNEL_OFDM;
        }                
      Write16(channelFlags); 
    
      if (!isTx)
        {

(-)a/src/common/pcap-writer.h (-1 / +3 lines)

Lines 116-121	Link Here

116

   * transmitted. This is because it is possible to have the receiver

116

   * transmitted. This is because it is possible to have the receiver

117

   * tuned on a given channel and still to be able to receive packets

117

   * tuned on a given channel and still to be able to receive packets

118

   * on a nearby channel.

118

   * on a nearby channel.

119

   * @param channelNumber the channel number, as defined by the

120

   * IEEE 802.11 standard.

119

   * @param rate the PHY data rate in units of 500kbps (i.e., the same

121

   * @param rate the PHY data rate in units of 500kbps (i.e., the same

120

   * units used both for the radiotap and for the prism header)

122

   * units used both for the radiotap and for the prism header)

121

   * @param isShortPreamble true if short preamble is used, false otherwise

123

   * @param isShortPreamble true if short preamble is used, false otherwise

Lines 124-130	Link Here

124

   * @param signalDbm signal power in dBm

126

   * @param signalDbm signal power in dBm

125

   * @param noiseDbm  noise power in dBm

127

   * @param noiseDbm  noise power in dBm

126

*/

128

*/

127

  void WriteWifiMonitorPacket(Ptr<const Packet> packet, uint16_t channelFreqMhz,

129

  void WriteWifiMonitorPacket(Ptr<const Packet> packet, uint16_t channelFreqMhz,  uint16_t channelNumber,

128

                              uint32_t rate, bool isShortPreamble, bool isTx,

130

                              uint32_t rate, bool isShortPreamble, bool isTx,

129

                              double signalDbm, double noiseDbm);

131

                              double signalDbm, double noiseDbm);

130

132




}

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

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

WifiMode 




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

  /** 

   * units used both for the radiotap and for the prism header) 
   * @param isShortPreamble true if short preamble is used, false otherwise
   */
  void NotifyPromiscSniffTx (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_phyPromiscSniffRxTrace;

  /**
   * 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_phyPromiscSniffTxTrace;

};


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

Lines 451-457	Link Here

451

  NotifyTxBegin (packet);

451

  NotifyTxBegin (packet);

452

  uint32_t dataRate500KbpsUnits = txMode.GetDataRate () / 500000;

452

  uint32_t dataRate500KbpsUnits = txMode.GetDataRate () / 500000;

453

  bool isShortPreamble = (WIFI_PREAMBLE_SHORT == preamble);

453

  bool isShortPreamble = (WIFI_PREAMBLE_SHORT == preamble);

454

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

454

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

455

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

455

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

456

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

456

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

457

Lines 657-663	Link Here

657

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

657

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

658

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

658

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

659

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

659

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

660

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

660

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

661

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

661

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

662

663

  else

663

  else





namespace ns3 {

static void PcapSniffTxEvent (Ptr<PcapWriter> writer, Ptr<const Packet> packet, uint16_t channelFreqMhz,  uint16_t channelNumber, 
                              uint32_t rate, bool isShortPreamble)
{
  const double unusedValue = 0;
  writer->WriteWifiMonitorPacket(packet, channelFreqMhz, channelNumber, rate, isShortPreamble, true, unusedValue, unusedValue); 
}


static void PcapSniffRxEvent (Ptr<PcapWriter> writer, Ptr<const Packet> packet, uint16_t channelFreqMhz,  uint16_t channelNumber,
                              uint32_t rate, bool isShortPreamble, double signalDbm, double noiseDbm)
{
  writer->WriteWifiMonitorPacket(packet, channelFreqMhz, channelNumber, rate, isShortPreamble, false, signalDbm, noiseDbm); 
}



Return to bug 644