aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2008-07-12 22:23:46 +0000
committerFelix Fietkau <nbd@openwrt.org>2008-07-12 22:23:46 +0000
commit53bbcb6ad46fee23dbaae794ba7a7a30f6296d78 (patch)
tree264b90ac1e13731e020c9b693ab8a3682db88af1
parent59373f6fda811a65fc4d218ebb9ecaf5d4d5b4ac (diff)
downloadupstream-53bbcb6ad46fee23dbaae794ba7a7a30f6296d78.tar.gz
upstream-53bbcb6ad46fee23dbaae794ba7a7a30f6296d78.tar.bz2
upstream-53bbcb6ad46fee23dbaae794ba7a7a30f6296d78.zip
madwifi: recognize hidden essid with length=1 containing a nullbyte
SVN-Revision: 11793
-rw-r--r--package/madwifi/patches/356-hidden_ssid.patch38
1 files changed, 38 insertions, 0 deletions
diff --git a/package/madwifi/patches/356-hidden_ssid.patch b/package/madwifi/patches/356-hidden_ssid.patch
new file mode 100644
index 0000000000..92d0480d26
--- /dev/null
+++ b/package/madwifi/patches/356-hidden_ssid.patch
@@ -0,0 +1,38 @@
+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 @@
+ 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.
+@@ -252,8 +265,8 @@
+ 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,