fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-01-03 08:10:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

2006-01-03 Dan Williams <dcbw@redhat.com>

Browse source 
* src/NetworkManagerAP.c
		- (nm_ap_add_capabilities_from_ie): presume no WEP unless
			the WPA IE specifies that WEP is supported

	* src/nm-device-802-11-wireless.c
		- (process_scan_results): don't mark an AP as supporting WEP
			if there's already other encryption capability info


git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@1256 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Dan Williams 2006-01-03 19:00:09 +00:00
parent 21446d1fa6
commit d23aba6524
3 changed files with 21 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
ChangeLog
View file

@ -1,3 +1,13 @@
2006-01-03 Dan Williams <dcbw@redhat.com>
* src/NetworkManagerAP.c
- (nm_ap_add_capabilities_from_ie): presume no WEP unless
the WPA IE specifies that WEP is supported
* src/nm-device-802-11-wireless.c
- (process_scan_results): don't mark an AP as supporting WEP
if there's already other encryption capability info
2006-01-03 Dan Williams <dcbw@redhat.com>
* src/dhcp-manager/nm-dhcp-manager.c

4
src/NetworkManagerAP.c
View file

@ -579,6 +579,10 @@ void nm_ap_add_capabilities_from_ie (NMAccessPoint *ap, const guint8 *wpa_ie, gu
return;
caps = nm_ap_get_capabilities (ap);
/* Mark WEP as unsupported, if it's supported it will be added below */
caps &= ~NM_802_11_CAP_PROTO_WEP;
if (cap_data->proto & IW_AUTH_WPA_VERSION_WPA)
{
caps |= NM_802_11_CAP_PROTO_WPA;

8
src/nm-device-802-11-wireless.c
View file

@ -2836,7 +2836,13 @@ process_scan_results (NMDevice80211Wireless *dev,
break;
case SIOCGIWENCODE:
if (!(iwe->u.data.flags & IW_ENCODE_DISABLED))
nm_ap_add_capabilities_for_wep (ap);
{
/* Only add WEP capabilities if this AP doesn't have
* any encryption capabilities yet.
*/
if (nm_ap_get_capabilities (ap) & NM_802_11_CAP_PROTO_NONE)
nm_ap_add_capabilities_for_wep (ap);
}
break;
#if 0
case SIOCGIWRATE: