colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2007-08-28 Dan Williams <dcbw@redhat.com>

Browse Source 
* src/NetworkManagerMain.h
	  src/nm-device-802-11-wireless.c
	  src/NetworkManager.c
		- Remove invalid AP list from NMData; need to rework this somewhat, but
		for now we should set the 'invalid' property on individual APs, and when
		we need to invalidate a whole ESS, set the 'invalid' on every member of
		that ESS



git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@2741 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Dan Williams
2007-08-28 15:33:29 +00:00
parent 3443abf3f9
commit 0f1310cda0
4 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@@ -1,3 +1,13 @@
2007-08-28 Dan Williams <dcbw@redhat.com>
* src/NetworkManagerMain.h
src/nm-device-802-11-wireless.c
src/NetworkManager.c
- Remove invalid AP list from NMData; need to rework this somewhat, but
for now we should set the 'invalid' property on individual APs, and when
we need to invalidate a whole ESS, set the 'invalid' on every member of
that ESS
2007-08-28 Dan Williams <dcbw@redhat.com> 2007-08-28 Dan Williams <dcbw@redhat.com>
* src/NetworkManagerAP.c * src/NetworkManagerAP.c

10
src/NetworkManager.c
View File

@@ -120,14 +120,6 @@ static NMData *nm_data_new (void)
data = g_slice_new0 (NMData); data = g_slice_new0 (NMData);
/* Initialize the access point lists */
data->invalid_ap_list = nm_ap_list_new (NETWORK_TYPE_INVALID);
if (!data->invalid_ap_list) {
nm_data_free (data);
nm_warning ("could not create access point lists.");
return NULL;
}
return data; return data;
} }
@@ -142,8 +134,6 @@ static void nm_data_free (NMData *data)
{ {
g_return_if_fail (data != NULL); g_return_if_fail (data != NULL);
nm_ap_list_unref (data->invalid_ap_list);
g_slice_free (NMData, data); g_slice_free (NMData, data);
} }

1
src/NetworkManagerMain.h
View File

@@ -34,7 +34,6 @@ typedef struct NMVPNManager NMVPNManager;
typedef struct NMData typedef struct NMData
{ {
struct NMAccessPointList *invalid_ap_list;
} NMData; } NMData;
#endif #endif

5
src/nm-device-802-11-wireless.c
View File

@@ -831,7 +831,7 @@ nm_device_802_11_wireless_get_best_ap (NMDevice80211Wireless *self)
/* Only keep if its not in the invalid list and its _is_ in our scanned list */ /* Only keep if its not in the invalid list and its _is_ in our scanned list */
if ( keep if ( keep
&& !nm_ap_list_get_ap_by_ssid (app_data->invalid_ap_list, ssid) && !nm_ap_get_invalid (cur_ap)
&& nm_device_802_11_wireless_ap_list_get_ap_by_ssid (self, ssid)) && nm_device_802_11_wireless_ap_list_get_ap_by_ssid (self, ssid))
{ {
return (NMAccessPoint *) g_object_ref (cur_ap); return (NMAccessPoint *) g_object_ref (cur_ap);
@@ -846,7 +846,7 @@ nm_device_802_11_wireless_get_best_ap (NMDevice80211Wireless *self)
const GByteArray * ap_ssid = nm_ap_get_ssid (scan_ap); const GByteArray * ap_ssid = nm_ap_get_ssid (scan_ap);
/* Access points in the "invalid" list cannot be used */ /* Access points in the "invalid" list cannot be used */
if (nm_ap_list_get_ap_by_ssid (app_data->invalid_ap_list, ap_ssid)) if (nm_ap_get_invalid (scan_ap))
continue; continue;
// FIXME: match up an NMConnection with some NMAccessPoint for the // FIXME: match up an NMConnection with some NMAccessPoint for the
@@ -2865,7 +2865,6 @@ activation_failure_handler (NMDevice *dev)
{ {
/* Add the AP to the invalid list */ /* Add the AP to the invalid list */
nm_ap_set_invalid (ap, TRUE); nm_ap_set_invalid (ap, TRUE);
nm_ap_list_append_ap (app_data->invalid_ap_list, ap);
} }
} }