From 8eb78d652dc4a97865db2dd19ee3a163c6777e26 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Mon, 4 Dec 2006 20:44:30 +0000 Subject: [PATCH] 2006-12-04 Dan Williams * src/nm-device-802-11-wireless.c - (supplicant_iface_scanned_ap_cb): fix parsing of hidden APs due to odd length of ESSID returned from ieee80211 stack-based drivers git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@2165 4912f4e0-d625-0410-9fb7-b9a5a253dbdc --- ChangeLog | 6 ++++++ src/nm-device-802-11-wireless.c | 5 +++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3a2540f65e..b6e4f2388e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2006-12-04 Dan Williams + + * src/nm-device-802-11-wireless.c + - (supplicant_iface_scanned_ap_cb): fix parsing of hidden APs due to + odd length of ESSID returned from ieee80211 stack-based drivers + 2006-12-04 Dan Williams * src/nm-device-802-11-wireless.c diff --git a/src/nm-device-802-11-wireless.c b/src/nm-device-802-11-wireless.c index 2e0bc60037..3fe0451364 100644 --- a/src/nm-device-802-11-wireless.c +++ b/src/nm-device-802-11-wireless.c @@ -2209,8 +2209,9 @@ supplicant_iface_scanned_ap_cb (NMSupplicantInterface * iface, if (ssid_len <= 0) goto next; /* Stupid ieee80211 layer uses */ - if ((ssid_len == 8) && (memcmp (entry.bytearray_value, "", 8) == 0)) - goto out; + if (((ssid_len == 8) || (ssid_len == 9)) + && (memcmp (entry.bytearray_value, "", 8) == 0)) + goto next; memset (&ssid, 0, sizeof (ssid)); memcpy (&ssid, entry.bytearray_value, ssid_len); ssid[32] = '\0';