NetworkManager r3748 - in branches/NETWORKMANAGER_0_6_0_RELEASE: . src

[dcbw svn gnome org]

Author: dcbw
Date: Wed Jun 11 16:09:28 2008
New Revision: 3748
URL: http://svn.gnome.org/viewvc/NetworkManager?rev=3748&view=rev

Log:
2008-06-11  Dan Williams  <dcbw redhat com>

	* src/nm-device-802-11-wireless.c
		- (add_new_ap_to_device_list): ignore APs with invalid BSSIDs
			(debian #461500)



Modified:
   branches/NETWORKMANAGER_0_6_0_RELEASE/ChangeLog
   branches/NETWORKMANAGER_0_6_0_RELEASE/src/nm-device-802-11-wireless.c

Modified: branches/NETWORKMANAGER_0_6_0_RELEASE/src/nm-device-802-11-wireless.c
==============================================================================
--- branches/NETWORKMANAGER_0_6_0_RELEASE/src/nm-device-802-11-wireless.c	(original)
+++ branches/NETWORKMANAGER_0_6_0_RELEASE/src/nm-device-802-11-wireless.c	Wed Jun 11 16:09:28 2008
@@ -3152,10 +3152,19 @@
 {
 	GTimeVal cur_time;
 	NMAccessPointList *	ap_list;
+	const struct ether_addr *addr;
+	const char bad_bssid1[ETH_ALEN] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
+	const char bad_bssid2[ETH_ALEN] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF };
 
 	g_return_if_fail (dev != NULL);
 	g_return_if_fail (ap != NULL);
 
+	/* Ignore invalid APs */
+	addr = nm_ap_get_address (ap);
+	if (   !memcmp (addr->ether_addr_octet, bad_bssid1, ETH_ALEN)
+	    || !memcmp (addr->ether_addr_octet, bad_bssid2, ETH_ALEN))
+    	return;
+
 	g_get_current_time (&cur_time);
 	nm_ap_set_last_seen (ap, &cur_time);