Attachment #536 for bug #639

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

(-)a/examples/wifi-wired-bridging.cc (+1 lines)

Lines 91-96	Link Here

  YansWifiPhyHelper wifiPhy = YansWifiPhyHelper::Default ();

  YansWifiPhyHelper wifiPhy = YansWifiPhyHelper::Default ();

  wifiPhy.SetPcapFormat(YansWifiPhyHelper::PCAP_FORMAT_80211_RADIOTAP);

  wifiPhy.SetPcapFormat(YansWifiPhyHelper::PCAP_FORMAT_80211_RADIOTAP);

  wifiPhy.SetPcapCaptureSize(0);

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

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




};

PcapWriter::PcapWriter ()
  : m_captureSize(0)
{
  NS_LOG_FUNCTION (this);
  NS_LOG_LOGIC ("m_writer = 0");

      uint64_t us = current % 1000000;
      Write32 (s & 0xffffffff);
      Write32 (us & 0xffffffff);
      uint32_t thisCaptureSize;
      if (m_captureSize == 0)
        {
          thisCaptureSize = packet->GetSize ();
        }
      else
        {
          thisCaptureSize = std::min (m_captureSize, packet->GetSize ());         
        }          
      Write32 (thisCaptureSize); 
      Write32 (packet->GetSize ()); // actual packet size
      packet->CopyData (m_writer, thisCaptureSize);
    }
}


  // real devices (e.g. madwifi) handle this case, especially for TX
  // packets (radiotap specs says TSFT is not used for TX packets,
  // but madwifi actually uses it).
  uint64_t tsft = current;    

  
  uint32_t wifiMonitorHeaderSize;  
    
  if (m_pcapMode == PCAP_80211_PRISM)
    {

#define PRISM_ITEM_LENGTH       4


      wifiMonitorHeaderSize = PRISM_MSG_LENGTH;
      if (m_captureSize == 0)
        {
          Write32 (packet->GetSize () + wifiMonitorHeaderSize); // captured size == actual packet size
        }
      else
        {
          uint32_t thisCaptureSize = std::min (m_captureSize, packet->GetSize () + wifiMonitorHeaderSize);         
          Write32 (thisCaptureSize); 
        }
      Write32 (packet->GetSize () + wifiMonitorHeaderSize); // actual packet size

      Write32(PRISM_MSG_CODE);
      Write32(PRISM_MSG_LENGTH);


#define RADIOTAP_TX_PRESENT (RADIOTAP_TSFT | RADIOTAP_FLAGS  | RADIOTAP_RATE | RADIOTAP_CHANNEL)
#define RADIOTAP_TX_LENGTH (8+8+1+1+2+2)
      
      uint32_t size;
      if (isTx)
        {
          wifiMonitorHeaderSize = RADIOTAP_TX_LENGTH;
        }
      else
        {
          wifiMonitorHeaderSize = RADIOTAP_RX_LENGTH;
        }      

      if (m_captureSize == 0)
        {
          Write32 (packet->GetSize () + wifiMonitorHeaderSize); // captured size == actual packet size
        }
      else
        {
          uint32_t thisCaptureSize = std::min (m_captureSize, packet->GetSize () + wifiMonitorHeaderSize);         
          Write32 (thisCaptureSize); 
        }
      Write32 (packet->GetSize () + wifiMonitorHeaderSize); // actual packet size

      Write8(0); // radiotap version
      Write8(0); // padding

    }    

  // finally, write rest of packet
  if (m_captureSize == 0)
    {
      packet->CopyData (m_writer, packet->GetSize ());
    }
  else
    {
      packet->CopyData (m_writer, m_captureSize - wifiMonitorHeaderSize);      
    }

}
    
  
void 
PcapWriter::SetCaptureSize (uint32_t size)
{
  m_captureSize = size;
}

int8_t 
PcapWriter::RoundToInt8 (double value)

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

Lines 128-134	Link Here

128

                              uint32_t rate, bool isShortPreamble, bool isTx,

128

                              uint32_t rate, bool isShortPreamble, bool isTx,

129

                              double signalDbm, double noiseDbm);

129

                              double signalDbm, double noiseDbm);

130

131

/**

132

   * Set the maximum number of bytes to be captured for each packet.

133

134

   * @param size the maximum number of bytes to be captured. If zero

135

   * (default), the whole packet will be captured.

136

*/

137

  void SetCaptureSize (uint32_t size);

132

138

133

139

134

private:

140

private:

Lines 141-146	Link Here

141

  int8_t RoundToInt8 (double value);

147

  int8_t RoundToInt8 (double value);

142

  std::ofstream *m_writer;

148

  std::ofstream *m_writer;

143

  uint32_t m_pcapMode;

149

  uint32_t m_pcapMode;

150

  uint32_t m_captureSize;

151

144

};

152

};

145

153

146

} // namespace ns3

154

} // namespace ns3

(-)a/src/helper/yans-wifi-helper.cc (-2 / +8 lines)

Lines 148-155	Link Here

148

149

YansWifiPhyHelper::YansWifiPhyHelper ()

149

YansWifiPhyHelper::YansWifiPhyHelper ()

150

  : m_channel (0),

150

  : m_channel (0),

151

    m_pcapFormat(PCAP_FORMAT_80211)

151

    m_pcapFormat(PCAP_FORMAT_80211),

152

    m_pcapCaptureSize(0)

153

154

  m_phy.SetTypeId ("ns3::YansWifiPhy");

154

  m_phy.SetTypeId ("ns3::YansWifiPhy");

155

Lines 221-226	Link Here

221

  m_pcapFormat = format;

221

  m_pcapFormat = format;

222

223

224

void

225

YansWifiPhyHelper::SetPcapCaptureSize (uint32_t size)

226

227

  m_pcapCaptureSize = size;

228

224

229

225

void

230

void

226

YansWifiPhyHelper::EnablePcap (std::string filename, uint32_t nodeid, uint32_t deviceid)

231

YansWifiPhyHelper::EnablePcap (std::string filename, uint32_t nodeid, uint32_t deviceid)

Lines 237-242	Link Here

237

  // we must fully-qualify the call to Create below because it conflicts

242

  // we must fully-qualify the call to Create below because it conflicts

238

  // with the locally-defined WifiPhyHelper::Create method.

243

  // with the locally-defined WifiPhyHelper::Create method.

239

  Ptr<PcapWriter> pcap = ::ns3::Create<PcapWriter> ();

244

  Ptr<PcapWriter> pcap = ::ns3::Create<PcapWriter> ();

245

  pcap->SetCaptureSize (m_pcapCaptureSize);

240

  pcap->Open (oss.str ());

246

  pcap->Open (oss.str ());

241

247

242

  switch (m_pcapFormat) {

248

  switch (m_pcapFormat) {




   */
  void SetPcapFormat (enum PcapFormat format);

  /** 
   * Set the maximum number of bytes to be captured for each packet
   * appearing in the PCAP trace.  
   * 
   * @param size the maximum number of bytes to be captured. If zero
   * (default), the whole packet will be captured. 
   */
  void SetPcapCaptureSize (uint32_t size);

  /**
   * \param filename filename prefix to use for pcap files.
   * \param nodeid the id of the node to generate pcap output for.

  ObjectFactory m_errorRateModel;
  Ptr<YansWifiChannel> m_channel;
  enum PcapFormat m_pcapFormat;
  uint32_t m_pcapCaptureSize;
};

} // namespace ns3

Return to bug 639