Changeset 3374

Timestamp:

Oct 20, 2012 2:20:13 AM (7 months ago)

Author:

quozl

Message:

WLAN - scan buffer display overran actual length, only seen with 8787, see ​http://dev.laptop.org/ticket/12144

Files:

• dev/ath9k/rx.fth (modified) (1 diff)
• dev/libertas.fth (modified) (5 diffs)
• ofw/wifi/eapol.fth (modified) (2 diffs)

dev/ath9k/rx.fth

@@ -339 +339 @@
    ." Scanning channel: " dup idx>ch .d ." ..." cr
    re-set-channel (scan-ch)
-   scanbuf .ssids
+   scanbuf /tsbuf .ssids
 ;
 : scan-ch-2GHz  ( -- )  d# 11 0  do  i scan-ch  loop  ;

dev/libertas.fth

@@ -20 +20 @@
 : supplicant-process-eapol  ( adr len -- )  " process-eapol" $call-supplicant  ;
 : .scan  ( adr -- )  " .scan" $call-supplicant  ;
-: .ssids  ( adr -- )  " .ssids" $call-supplicant  ;
+: .ssids  ( adr len -- )  " .ssids" $call-supplicant  ;
 
 defer load-all-fw  ( -- error? )   ' false to load-all-fw
@@ -486 +486 @@
       0076  of  ." CMD_802_11_RATE_ADAPT_RATESET"       endof
       007f  of  ." CMD_TX_RATE_QUERY"                   endof
+      00a4  of  ." CMD_802_11_RSSI_INFO"                endof
       00a5  of  ." CMD_SET_BOOT2_VER"                   endof  \ Thin firmware only
       00a9  of  ." CMD_FUNC_INIT"                       endof  \ Multifunction versions
@@ -1812 +1813 @@
 ;
 
+0 [if]
+: set-rssi-v14  ( nbcn ndata -- )
+   swap >r >r                                           ( r: antenna action )
+   6 h# a4 ( CMD_802_11_RSSI_INFO ) prepare-cmd
+   1 +xw \ ACT_SET
+   r> +xw \ Ndata
+   r> +xw \ Nbcn
+   outbuf-wait  drop
+;
+
+: get-rssi-v14  ( -- avg_nf avg_snr nf snr )
+   6 h# a4 ( CMD_802_11_RSSI_INFO ) prepare-cmd
+   0 +xw \ ACT_GET
+   0 +xw \ Ndata
+   0 +xw \ Nbcn
+   outbuf-wait  drop
+   respbuf >fw-data >r
+   r@ h# 14 + le-w@ w->n ( avg_nf )                     \ dBm
+   r@ h# 12 + le-w@ w->n ( avg_nf avg_rssi )            \ dBm
+   r@ h# 10 + le-w@ w->n ( avg_nf avg_rssi nf )         \ dBm
+   r@ h# 0e + le-w@ w->n ( avg_nf avg_rssi nf rssi )    \ dBm
+   r> drop
+;
+[then]
+
 : get-rssi  ( -- avg_nf avg_snr nf snr )
    2 h# 1f ( CMD_802_11_RSSI ) prepare-cmd
@@ -2327 +2353 @@
             2drop false       ( error? )
          else
-            over .ssids       ( adr len )
+            2dup .ssids       ( adr len )
             test-association  ( error? )
          then                 ( error? )
@@ -2415 +2441 @@
    ." scan"  cr
    (scan)                               ( adr len error? )
-   0=  if  drop .ssids cr  then         ( )
+   0=  if  .ssids cr  then              ( )
 ;
 

ofw/wifi/eapol.fth

@@ -642 +642 @@
 ;
 
+0 value scanbuf-end
+
 : .ap-ssid  ( adr -- )
+   dup le-w@ over + 2 + scanbuf-end >=  if  drop exit  then
+
    ." RSSI: " dup 8 + c@ .d 
    dup le-w@ swap 2 + swap d# 19 /string        ( adr' len' )
@@ -651 +655 @@
 ;
 
-: .ssids  ( adr -- )
-   dup 3 +                              ( 'ap )
+: .ssids  ( adr len -- )
+   over + to scanbuf-end                ( adr )
+
+   dup le-w@                            ( adr size )
+   over + scanbuf-end >=  if
+      ." scan truncated" cr
+   then                                 ( adr )
+
+   dup 3 +                              ( adr 'ap )
    swap 2 + c@                          ( 'ap #ap )
    0  ?do                               ( 'ap )
       dup .ap-ssid  cr                  ( 'ap )
       dup le-w@ + 2 +                   ( 'ap' )
+      dup scanbuf-end >=  if  drop unloop exit  then
    loop  drop                           ( )
-;   
+;
 
 : #ssids  ( adr -- n )  2 + c@  ;