Changeset 1720

Timestamp:

09/20/06 06:58:19 (2 years ago)

Author:

kelmo

Message:

The attached patch fixes several issues with monitor mode:

• Record the correct rate for transmitted packets (both prism and
  radiotap encapsulations were referencing the rx rate even for tx
  frames, which was wrong).
  
• Record the antenna for tranmitted packets instead of just using 0
  
• Record the TSF for tranmitted packets when using radiotap
  
• Don't expose kernel memory to userspace in ieee80211_input_monitor
  

ieee80211_input_monitor was taking a u_int32_t containing the TSF for
the frame, but was copying 8 bytes of memory into the monitoring
header from it's address. This patch changes ieee80211_input_monitor
to take a u_int64_t and touches the appropriate parts in ath/if_ath.c

Signed-off-by: Scott Raynel <scottraynel@gmail.com>

Files:

• trunk/ath/if_ath.c (modified) (4 diffs)
• trunk/net80211/ieee80211_monitor.c (modified) (4 diffs)
• trunk/net80211/ieee80211_monitor.h (modified) (3 diffs)

trunk/ath/if_ath.c

@@ -5196 +5196 @@
-
-/*
+ * Extend 15-bit time stamp from rx descriptor to
+ * a full 64-bit TSF using the current h/w TSF.
+ */
+static __inline u_int64_t
+ath_extend_tsf(struct ath_hal *ah, u_int32_t rstamp)
+{
+        u_int64_t tsf;
+
+        tsf = ath_hal_gettsf64(ah);
+        if ((tsf & 0x7fff) < rstamp)
+                tsf -= 0x8000;
+        return ((tsf &~ 0x7fff) | rstamp);
+}
+
+/*
- * Add a prism2 header to a received frame and
- * dispatch it to capture tools like kismet.
@@ -5205 +5220 @@
-        struct ieee80211com *ic = &sc->sc_ic;
-        struct ieee80211_frame *wh;
-32
+64
-
-        /* Pass up tsf clock in mactime
-         * Rx descriptor has the low 15 bits of the tsf at
-         * the time the frame was received.  Use the current
-
-
-
-
-
-
+
+
+
-
-        KASSERT(ic->ic_flags & IEEE80211_F_DATAPAD,
@@ -5246 +5258 @@
-        int extra = A_MAX(sizeof(struct ath_tx_radiotap_header), 
-                          A_MAX(sizeof(wlan_ng_prism2_header), ATHDESC_HEADER_SIZE));
+        u_int64_t tsf;
+
+        /* Pass up tsf clock in mactime
+         * tx descriptor has the low 15 bits of the tsf at
+         * the time the frame was received.  Use the current
+         * tsf to extend this to 64 bits.
+         */
+        tsf = ath_extend_tsf(sc->sc_ah, ds->ds_txstat.ts_tstamp);
+
-        /*                                                                      
-         * release the owner of this skb since we're basically                  
@@ -5279 +5300 @@
-                goto done;
-        }
-0
+tsf
- done:
-        dev_kfree_skb(skb);
-}
-
-/*
- * Extend 15-bit time stamp from rx descriptor to
- * a full 64-bit TSF using the current h/w TSF.
- */
-static __inline u_int64_t
-ath_extend_tsf(struct ath_hal *ah, u_int32_t rstamp)
-{
-        u_int64_t tsf;
-
-        tsf = ath_hal_gettsf64(ah);
-        if ((tsf & 0x7fff) < rstamp)
-                tsf -= 0x8000;
-        return ((tsf &~ 0x7fff) | rstamp);
-}
-

trunk/net80211/ieee80211_monitor.c

@@ -207 +207 @@
-void
-ieee80211_input_monitor(struct ieee80211com *ic, struct sk_buff *skb,
-32
+64
-{
-        struct ieee80211vap *vap, *next;
@@ -268 +268 @@
-                        ph->hosttime.len = 4;
-                        ph->hosttime.data = jiffies;
+                        
-                        /* Pass up tsf clock in mactime */
+                        /* NB: the prism mactime field is 32bit, so we lose TSF precision here */
-                        ph->mactime.did = DIDmsg_lnxind_wlansniffrm_mactime;
-                        ph->mactime.status = 0;
@@ -309 +311 @@
-                        ph->rate.status = 0;
-                        ph->rate.len = 4;
-
+
+
+
+
-                        break;
-                }
@@ -328 +333 @@
-                                th->wt_ihdr.it_len = cpu_to_le16(sizeof(struct ath_tx_radiotap_header));
-                                th->wt_ihdr.it_present = cpu_to_le32(ATH_TX_RADIOTAP_PRESENT);
+
+                                /* radiotap's TSF field is the full 64 bits, so we don't lose
+                                 * any TSF precision when using radiotap */
+                                memcpy(&th->wt_tsft, &mactime, IEEE80211_TSF_LEN);
+                                th->wt_tsft = cpu_to_le64(th->wt_tsft);
+                        
-                                th->wt_flags = 0;
-rxstat.r
+txstat.t
-                                th->wt_txpower = 0;
-0
+ds->ds_txstat.ts_antenna
-                        } else {
-                                struct ath_rx_radiotap_header *th;

trunk/net80211/ieee80211_monitor.h

@@ -136 +136 @@
-
-#define ATH_TX_RADIOTAP_PRESENT (               \
+        (1 << IEEE80211_RADIOTAP_TSFT)          | \
-        (1 << IEEE80211_RADIOTAP_FLAGS)         | \
-        (1 << IEEE80211_RADIOTAP_RATE)          | \
@@ -144 +145 @@
-struct ath_tx_radiotap_header {
-        struct ieee80211_radiotap_header wt_ihdr;
-
+
+
-        u_int8_t wt_rate;
-        u_int8_t wt_txpower;
@@ -155 +157 @@
- */
-void ieee80211_input_monitor(struct ieee80211com *, struct sk_buff *,
-32
+64
-
-