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

2005-12-14 Dan Williams <dcbw@redhat.com>

Browse Source 
* include/NetworkManager.h
	  src/NetworkManagerWireless.c
		- Rearrange 802.11 wireless-specific capabilities again

	* src/Makefile.am
		- Forgot to add wpa.c/wpa.h to the makefiles

	* src/NetworkManagerAP.[ch]
		- Implement access point capabilities and parse the
			WPA/RSN IEs into the capability bitfield
		- Switch the "encrypted" attribute to utilize the bitfield
			and capabilities rather than being independent

	* src/NetworkManagerDevice.c
		- (nm_device_wireless_get_activation_ap): break it horribly
			until we can push NMAPSecurity objects into access point
			objects and through the activation chain
		- Stuff WPA & RSN IEs into AP capabilities

	* src/nm-dbus-nm.c
		- Take a shot at actually making setActiveDevice work

	* src/wpa.[ch]
		- Make the API a bit saner


git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@1191 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Dan Williams
2005-12-14 20:48:08 +00:00
parent 423383c0e5
commit 7ae6819f31
11 changed files with 163 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
include/NetworkManager.h
View File

@@ -105,22 +105,18 @@ typedef enum NMEncKeyType
/* 802.11 wireless-specific device capability bits */
#define NM_802_11_CAP_NONE 0x00000000
#define NM_802_11_CAP_KEY_MGMT_WPA 0x00000001
#define NM_802_11_CAP_KEY_MGMT_WPA_PSK 0x00000002
#define NM_802_11_CAP_KEY_MGMT_WPA2 0x00000004
#define NM_802_11_CAP_KEY_MGMT_WPA2_PSK 0x00000008
#define NM_802_11_CAP_KEY_MGMT_IEEE8021X 0x00000010
#define NM_802_11_CAP_KEY_MGMT_RESERVED1 0x00000020
#define NM_802_11_CAP_KEY_MGMT_RESERVED2 0x00000040
#define NM_802_11_CAP_KEY_MGMT_RESERVED3 0x00000080
#define NM_802_11_CAP_PROTO_WEP 0x00000001
#define NM_802_11_CAP_PROTO_WPA 0x00000002
#define NM_802_11_CAP_PROTO_WPA2 0x00000004
#define NM_802_11_CAP_RESERVED1 0x00000008
#define NM_802_11_CAP_KEY_MGMT_PSK 0x00000010
#define NM_802_11_CAP_KEY_MGMT_802_1X 0x00000020
#define NM_802_11_CAP_RESERVED2 0x00000040
#define NM_802_11_CAP_RESERVED3 0x00000080
#define NM_802_11_CAP_CIPHER_WEP40 0x00000100
#define NM_802_11_CAP_CIPHER_WEP104 0x00000200
#define NM_802_11_CAP_CIPHER_TKIP 0x00000400
#define NM_802_11_CAP_CIPHER_CCMP 0x00000800
#define NM_802_11_CAP_CIPHER_RESERVED1 0x00001000
#define NM_802_11_CAP_CIPHER_RESERVED2 0x00002000
#define NM_802_11_CAP_CIPHER_RESERVED3 0x00004000
#define NM_802_11_CAP_CIPHER_RESERVED4 0x00008000
/*