From 0013ae11781c997f7feea5aa2b85579e102c4446 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Fri, 10 Nov 2006 02:51:02 +0000 Subject: [PATCH] 2006-11-09 Dan Williams * src/NetworkManagerAPList.c - (nm_ap_list_copy_one_essid_by_address): fix bug due to previous code cleanup in revision 1.56; the split of the !nm_ap_get_essid() from the nm_ap_list_get_ap_by_address() call was incorrect and broke hidden SSID matching. Found by Bill Moss. git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@2105 4912f4e0-d625-0410-9fb7-b9a5a253dbdc --- ChangeLog | 8 ++++++++ src/NetworkManagerAPList.c | 15 ++++++++------- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index c416c22516..34883438f8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2006-11-09 Dan Williams + + * src/NetworkManagerAPList.c + - (nm_ap_list_copy_one_essid_by_address): fix bug due to previous + code cleanup in revision 1.56; the split of the !nm_ap_get_essid() + from the nm_ap_list_get_ap_by_address() call was incorrect and + broke hidden SSID matching. Found by Bill Moss. + 2006-10-25 Dan Williams * src/nm-dbus-nm.c diff --git a/src/NetworkManagerAPList.c b/src/NetworkManagerAPList.c index f36c8df4a4..d2f06080d8 100644 --- a/src/NetworkManagerAPList.c +++ b/src/NetworkManagerAPList.c @@ -588,20 +588,21 @@ nm_ap_list_copy_one_essid_by_address (NMDevice80211Wireless *dev, { NMAccessPoint * found_ap; - if (!ap || !search_list) + g_return_if_fail (ap != NULL); + + if (!search_list) return; - if (!nm_ap_get_essid (ap)) + /* Ignore APs that already have an ESSID */ + if (nm_ap_get_essid (ap)) return; found_ap = nm_ap_list_get_ap_by_address (search_list, nm_ap_get_address (ap)); - if (!found_ap) + if (!found_ap || !nm_ap_get_essid (found_ap)) return; - if (nm_ap_get_essid (found_ap)) { - nm_ap_set_essid (ap, nm_ap_get_essid (found_ap)); - nm_dbus_signal_wireless_network_change (dev, ap, NETWORK_STATUS_APPEARED, 0); - } + nm_ap_set_essid (ap, nm_ap_get_essid (found_ap)); + nm_dbus_signal_wireless_network_change (dev, ap, NETWORK_STATUS_APPEARED, 0); }