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 --- a/net80211/ieee80211_scan_sta.c
   7 +++ b/net80211/ieee80211_scan_sta.c
   8 @@ -209,6 +209,19 @@
   9                 ieee80211_saveie(iep, ie);
  10  }
  11
  12 +
  13 +static inline int is_empty_ssid(u_int8_t *ssid)
  14 +{
  15 +       if (!ssid)
  16 +               return 1;
  17 +       if (ssid[1] == 0)
  18 +               return 1;
  19 +       if ((ssid[1] == 1) && (ssid[2] == 0))
  20 +               return 1;
  21 +       return 0;
  22 +}
  23 +
  24 +
  25  /*
  26   * Process a beacon or probe response frame; create an
  27   * entry in the scan cache or update any previous entry.
  28 @@ -233,8 +246,8 @@
  29         SCAN_STA_LOCK_IRQ(st);
  30         LIST_FOREACH(se, &st->st_hash[hash], se_hash)
  31                 if (IEEE80211_ADDR_EQ(se->base.se_macaddr, macaddr) &&
  32 -                   sp->ssid[1] == se->base.se_ssid[1] &&
  33 -                   !memcmp(se->base.se_ssid+2, sp->ssid+2, se->base.se_ssid[1]))
  34 +                   (is_empty_ssid(sp->ssid) || (sp->ssid[1] == se->base.se_ssid[1] &&
  35 +                   !memcmp(se->base.se_ssid+2, sp->ssid+2, se->base.se_ssid[1]))))
  36                         goto found;
  37
  38         MALLOC(se, struct sta_entry *, sizeof(struct sta_entry),
  39 @@ -252,8 +265,8 @@
  40         ise = &se->base;
  41
  42         /* XXX ap beaconing multiple ssid w/ same bssid */
  43 -       if (sp->ssid[1] != 0 &&
  44 -           (ISPROBE(subtype) || ise->se_ssid[1] == 0))
  45 +       if (!is_empty_ssid(sp->ssid) &&
  46 +           (ISPROBE(subtype) || is_empty_ssid(ise->se_ssid)))
  47                 memcpy(ise->se_ssid, sp->ssid, 2 + sp->ssid[1]);
  48
  49         memcpy(ise->se_rates, sp->rates,