--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/002-monitor-rename-wifi-phy.patch Tue May 17 12:31:46 2011 +0200
@@ -0,0 +1,122 @@
+# HG changeset patch
+# Parent e810ecb5340da4cba6d7c3595f24230c16260d57
+# User Ruben Merz <ruben@net.t-labs.tu-berlin.de>
+# Date 1305625730 -7200
+
+[Bug 827] Rename promisc trace to monitor in WifiPhy
+
+diff --git a/src/wifi/model/wifi-phy.cc b/src/wifi/model/wifi-phy.cc
+--- a/src/wifi/model/wifi-phy.cc
++++ b/src/wifi/model/wifi-phy.cc
+@@ -74,12 +74,12 @@
+ .AddTraceSource ("PhyRxDrop",
+ "Trace source indicating a packet has been dropped by the device during reception",
+ MakeTraceSourceAccessor (&WifiPhy::m_phyRxDropTrace))
+- .AddTraceSource ("PromiscSnifferRx",
++ .AddTraceSource ("MonitorSnifferRx",
+ "Trace source simulating a wifi device in monitor mode sniffing all received frames",
+- MakeTraceSourceAccessor (&WifiPhy::m_phyPromiscSniffRxTrace))
+- .AddTraceSource ("PromiscSnifferTx",
++ 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_phyPromiscSniffTxTrace))
++ MakeTraceSourceAccessor (&WifiPhy::m_phyMonitorSniffTxTrace))
+ ;
+ return tid;
+ }
+@@ -338,15 +338,15 @@
+ }
+
+ void
+-WifiPhy::NotifyPromiscSniffRx (Ptr<const Packet> packet, uint16_t channelFreqMhz, uint16_t channelNumber, uint32_t rate, bool isShortPreamble, double signalDbm, double noiseDbm)
++WifiPhy::NotifyMonitorSniffRx (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);
++ m_phyMonitorSniffRxTrace (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)
++WifiPhy::NotifyMonitorSniffTx (Ptr<const Packet> packet, uint16_t channelFreqMhz, uint16_t channelNumber, uint32_t rate, bool isShortPreamble)
+ {
+- m_phyPromiscSniffTxTrace (packet, channelFreqMhz, channelNumber, rate, isShortPreamble);
++ m_phyMonitorSniffTxTrace (packet, channelFreqMhz, channelNumber, rate, isShortPreamble);
+ }
+
+
+diff --git a/src/wifi/model/wifi-phy.h b/src/wifi/model/wifi-phy.h
+--- a/src/wifi/model/wifi-phy.h
++++ b/src/wifi/model/wifi-phy.h
+@@ -415,7 +415,7 @@
+
+ /**
+ *
+- * Public method used to fire a PromiscSniffer trace for a wifi packet being received. Implemented for encapsulation
++ * Public method used to fire a MonitorSniffer trace for a wifi packet being received. Implemented for encapsulation
+ * purposes.
+ *
+ * @param packet the packet being received
+@@ -433,12 +433,12 @@
+ * @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,
++ 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 PromiscSniffer trace for a wifi packet being transmitted. Implemented for encapsulation
++ * Public method used to fire a MonitorSniffer trace for a wifi packet being transmitted. Implemented for encapsulation
+ * purposes.
+ *
+ * @param packet the packet being transmitted
+@@ -449,7 +449,7 @@
+ * 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);
++ void NotifyMonitorSniffTx (Ptr<const Packet> packet, uint16_t channelFreqMhz, uint16_t channelNumber, uint32_t rate, bool isShortPreamble);
+
+
+ private:
+@@ -510,7 +510,7 @@
+ *
+ * \see class CallBackTraceSource
+ */
+- TracedCallback<Ptr<const Packet>, uint16_t, uint16_t, uint32_t, bool, double, double> m_phyPromiscSniffRxTrace;
++ 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
+@@ -522,7 +522,7 @@
+ *
+ * \see class CallBackTraceSource
+ */
+- TracedCallback<Ptr<const Packet>, uint16_t, uint16_t, uint32_t, bool> m_phyPromiscSniffTxTrace;
++ TracedCallback<Ptr<const Packet>, uint16_t, uint16_t, uint32_t, bool> m_phyMonitorSniffTxTrace;
+
+ };
+
+diff --git a/src/wifi/model/yans-wifi-phy.cc b/src/wifi/model/yans-wifi-phy.cc
+--- a/src/wifi/model/yans-wifi-phy.cc
++++ b/src/wifi/model/yans-wifi-phy.cc
+@@ -516,7 +516,7 @@
+ NotifyTxBegin (packet);
+ uint32_t dataRate500KbpsUnits = txMode.GetDataRate () / 500000;
+ bool isShortPreamble = (WIFI_PREAMBLE_SHORT == preamble);
+- NotifyPromiscSniffTx (packet, (uint16_t)GetChannelFrequencyMhz (), GetChannelNumber (), dataRate500KbpsUnits, isShortPreamble);
++ NotifyMonitorSniffTx (packet, (uint16_t)GetChannelFrequencyMhz (), GetChannelNumber (), dataRate500KbpsUnits, isShortPreamble);
+ m_state->SwitchToTx (txDuration, packet, txMode, preamble, txPower);
+ m_channel->Send (this, packet, GetPowerDbm (txPower) + m_txGainDb, txMode, preamble);
+ }
+@@ -787,7 +787,7 @@
+ bool isShortPreamble = (WIFI_PREAMBLE_SHORT == event->GetPreambleType ());
+ double signalDbm = RatioToDb (event->GetRxPowerW ()) + 30;
+ double noiseDbm = RatioToDb (event->GetRxPowerW () / snrPer.snr) - GetRxNoiseFigure () + 30 ;
+- NotifyPromiscSniffRx (packet, (uint16_t)GetChannelFrequencyMhz (), GetChannelNumber (), dataRate500KbpsUnits, isShortPreamble, signalDbm, noiseDbm);
++ NotifyMonitorSniffRx (packet, (uint16_t)GetChannelFrequencyMhz (), GetChannelNumber (), dataRate500KbpsUnits, isShortPreamble, signalDbm, noiseDbm);
+ m_state->SwitchFromRxEndOk (packet, snrPer.snr, event->GetPayloadMode (), event->GetPreambleType ());
+ }
+ else