package/madwifi/patches/356-hidden_ssid.patch

   1 This patch fixes the detection of hidden SSIDs as transmitted
   2 by some cisco systems.
   3
   4 Signed-off-by: Felix Fietkau <nbd@openwrt.org>
   5
   6 Index: madwifi-trunk-r3314/net80211/ieee80211_scan_sta.c
   7 ===================================================================
   8 --- madwifi-trunk-r3314.orig/net80211/ieee80211_scan_sta.c      2008-07-23 11:39:10.000000000 +0200
   9 +++ madwifi-trunk-r3314/net80211/ieee80211_scan_sta.c   2008-07-24 18:24:23.000000000 +0200
  10 @@ -209,6 +209,19 @@
  11                 ieee80211_saveie(iep, ie);
  12  }
  13
  14 +
  15 +static inline int is_empty_ssid(u_int8_t *ssid)
  16 +{
  17 +       if (!ssid)
  18 +               return 1;
  19 +       if (ssid[1] == 0)
  20 +               return 1;
  21 +       if ((ssid[1] == 1) && (ssid[2] == 0))
  22 +               return 1;
  23 +       return 0;
  24 +}
  25 +
  26 +
  27  /*
  28   * Process a beacon or probe response frame; create an
  29   * entry in the scan cache or update any previous entry.
  30 @@ -233,8 +246,8 @@
  31         SCAN_STA_LOCK_IRQ(st);
  32         LIST_FOREACH(se, &st->st_hash[hash], se_hash)
  33                 if (IEEE80211_ADDR_EQ(se->base.se_macaddr, macaddr) &&
  34 -                   sp->ssid[1] == se->base.se_ssid[1] &&
  35 -                   !memcmp(se->base.se_ssid+2, sp->ssid+2, se->base.se_ssid[1]))
  36 +                   (is_empty_ssid(sp->ssid) || (sp->ssid[1] == se->base.se_ssid[1] &&
  37 +                   !memcmp(se->base.se_ssid+2, sp->ssid+2, se->base.se_ssid[1]))))
  38                         goto found;
  39
  40         MALLOC(se, struct sta_entry *, sizeof(struct sta_entry),
  41 @@ -252,8 +265,8 @@
  42         ise = &se->base;
  43
  44         /* XXX ap beaconing multiple ssid w/ same bssid */
  45 -       if (sp->ssid[1] != 0 &&
  46 -           (ISPROBE(subtype) || ise->se_ssid[1] == 0))
  47 +       if (!is_empty_ssid(sp->ssid) &&
  48 +           (ISPROBE(subtype) || is_empty_ssid(ise->se_ssid)))
  49                 memcpy(ise->se_ssid, sp->ssid, 2 + sp->ssid[1]);
  50
  51         memcpy(ise->se_rates, sp->rates,