mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-12-26 05:28:58 +02:00
c537863342
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@13096 3c298f89-4303-0410-b956-a3cf2f4a3e73
50 lines
1.5 KiB
Diff
50 lines
1.5 KiB
Diff
This patch fixes the detection of hidden SSIDs as transmitted
|
|
by some cisco systems.
|
|
|
|
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
|
|
|
|
--- a/net80211/ieee80211_scan_sta.c
|
|
+++ b/net80211/ieee80211_scan_sta.c
|
|
@@ -209,6 +209,19 @@ saveie(u_int8_t **iep, const u_int8_t *i
|
|
ieee80211_saveie(iep, ie);
|
|
}
|
|
|
|
+
|
|
+static inline int is_empty_ssid(u_int8_t *ssid)
|
|
+{
|
|
+ if (!ssid)
|
|
+ return 1;
|
|
+ if (ssid[1] == 0)
|
|
+ return 1;
|
|
+ if ((ssid[1] == 1) && (ssid[2] == 0))
|
|
+ return 1;
|
|
+ return 0;
|
|
+}
|
|
+
|
|
+
|
|
/*
|
|
* Process a beacon or probe response frame; create an
|
|
* entry in the scan cache or update any previous entry.
|
|
@@ -233,8 +246,8 @@ sta_add(struct ieee80211_scan_state *ss,
|
|
SCAN_STA_LOCK_IRQ(st);
|
|
LIST_FOREACH(se, &st->st_hash[hash], se_hash)
|
|
if (IEEE80211_ADDR_EQ(se->base.se_macaddr, macaddr) &&
|
|
- sp->ssid[1] == se->base.se_ssid[1] &&
|
|
- !memcmp(se->base.se_ssid+2, sp->ssid+2, se->base.se_ssid[1]))
|
|
+ (is_empty_ssid(sp->ssid) || (sp->ssid[1] == se->base.se_ssid[1] &&
|
|
+ !memcmp(se->base.se_ssid+2, sp->ssid+2, se->base.se_ssid[1]))))
|
|
goto found;
|
|
|
|
MALLOC(se, struct sta_entry *, sizeof(struct sta_entry),
|
|
@@ -252,8 +265,8 @@ found:
|
|
ise = &se->base;
|
|
|
|
/* XXX ap beaconing multiple ssid w/ same bssid */
|
|
- if (sp->ssid[1] != 0 &&
|
|
- (ISPROBE(subtype) || ise->se_ssid[1] == 0))
|
|
+ if (!is_empty_ssid(sp->ssid) &&
|
|
+ (ISPROBE(subtype) || is_empty_ssid(ise->se_ssid)))
|
|
memcpy(ise->se_ssid, sp->ssid, 2 + sp->ssid[1]);
|
|
|
|
memcpy(ise->se_rates, sp->rates,
|