2007-08-28 Dan Williams <dcbw@redhat.com>
Remove NMAPSecurity objects, they are replaced with flags on the APs for each AP's capabilities, and by NMConnection/NMSettings objects for user defined connections. * include/NetworkManager.h - Redefine 802.11 security properties. There are now device capabilities and AP flags and AP security flags. It was way to unclear before. * src/Makefile.am src/nm-ap-security-leap.h src/nm-ap-security-leap.c src/nm-ap-security-wpa-eap.c src/nm-ap-security-wpa-eap.h src/nm-ap-security-private.h src/nm-ap-security-wpa-psk.c src/nm-ap-security-wpa-psk.h src/nm-ap-security-wep.c src/nm-ap-security-wep.h src/nm-ap-security.c src/nm-ap-security.h - Removed, to be replaced with NMConnection/NMSettings objects * src/nm-dbus-nmi.c src/nm-dbus-nmi.h - Removed, to be replaced by code that talks to the new info daemon interface and gets NMConnection/NMSettings objects * src/backends/NetworkManagerSuSE.c - Remove usage of NMAPSecurity; should be replaced by a system-level info-daemon that does the same thing but talks the new info-daemon D-Bus interface * src/NetworkManagerAP.h src/NetworkManagerAP.c src/NetworkManagerAPList.c libnm-glib/libnm-glib-test.c - Remove usage of NMAPSecurity objects and adjust to new flags for WPA/RSN * libnm-glib/nm-access-point.c libnm-glib/nm-access-point.h introspection/nm-access-point.xml test/nm-tool.c - Adjust to new flags for AP security * utils/nm-utils.c utils/nm-utils.h src/vpn-manager/nm-dbus-vpn.c - Remove D-Bus pending call stuff from nm-utils and put it in the VPN stuff which is the only place it's used * src/nm-device-interface.c src/nm-device-interface.h introspection/nm-device.xml src/nm-activation-request.c src/nm-activation-request.h src/nm-device.c - Add a new 'specific_object' argument that hints to NM what actual AP or other device-specific thing the connection should apply to. NMConnection objects can apply to more than one actual device/AP. * libnm-util/nm-connection.c * libnm-util/nm-connection.h - Add 'have_secrets" call stubs * libnm-util/cipher.h - Move NM_AUTH_TYPE_* defines here for now * src/nm-device-802-11-wireless.c - Remove usage of NMAPSecurity, to be replaced with NMConnection/ NMSettings objects * src/NetworkManagerDbus.c * src/NetworkManagerPolicy.c - Remove usage of update_allowed_networks, should be pushing data in a different manner git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@2738 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Dan Williams
@@ -79,47 +79,42 @@ typedef enum NMDeviceType
|
||||
#define NM_DEVICE_CAP_CARRIER_DETECT 0x00000002
|
||||
|
||||
|
||||
/* 802.11 wireless-specific device capability bits */
|
||||
#define NM_802_11_CAP_NONE 0x00000000
|
||||
#define NM_802_11_CAP_PROTO_NONE 0x00000001
|
||||
#define NM_802_11_CAP_PROTO_WEP 0x00000002
|
||||
#define NM_802_11_CAP_PROTO_WPA 0x00000004
|
||||
#define NM_802_11_CAP_PROTO_WPA2 0x00000008
|
||||
#define NM_802_11_CAP_RESERVED1 0x00000010
|
||||
#define NM_802_11_CAP_RESERVED2 0x00000020
|
||||
#define NM_802_11_CAP_KEY_MGMT_PSK 0x00000040
|
||||
#define NM_802_11_CAP_KEY_MGMT_802_1X 0x00000080
|
||||
#define NM_802_11_CAP_RESERVED3 0x00000100
|
||||
#define NM_802_11_CAP_RESERVED4 0x00000200
|
||||
#define NM_802_11_CAP_RESERVED5 0x00000400
|
||||
#define NM_802_11_CAP_RESERVED6 0x00000800
|
||||
#define NM_802_11_CAP_CIPHER_WEP40 0x00001000
|
||||
#define NM_802_11_CAP_CIPHER_WEP104 0x00002000
|
||||
#define NM_802_11_CAP_CIPHER_TKIP 0x00004000
|
||||
#define NM_802_11_CAP_CIPHER_CCMP 0x00008000
|
||||
/* 802.11 wireless device-specific capabilities */
|
||||
#define NM_802_11_DEVICE_CAP_NONE 0x00000000
|
||||
#define NM_802_11_DEVICE_CAP_CIPHER_WEP40 0x00000001
|
||||
#define NM_802_11_DEVICE_CAP_CIPHER_WEP104 0x00000002
|
||||
#define NM_802_11_DEVICE_CAP_CIPHER_TKIP 0x00000004
|
||||
#define NM_802_11_DEVICE_CAP_CIPHER_CCMP 0x00000008
|
||||
#define NM_802_11_DEVICE_CAP_WPA 0x00000010
|
||||
#define NM_802_11_DEVICE_CAP_RSN 0x00000020
|
||||
|
||||
|
||||
/*
|
||||
* NM-supported Authentication Methods
|
||||
* 802.11 Access Point flags
|
||||
*
|
||||
*/
|
||||
#define NM_AUTH_TYPE_WPA_PSK_AUTO 0x00000000
|
||||
#define NM_AUTH_TYPE_NONE 0x00000001
|
||||
#define NM_AUTH_TYPE_WEP40 0x00000002
|
||||
#define NM_AUTH_TYPE_WPA_PSK_TKIP 0x00000004
|
||||
#define NM_AUTH_TYPE_WPA_PSK_CCMP 0x00000008
|
||||
#define NM_AUTH_TYPE_WEP104 0x00000010
|
||||
#define NM_AUTH_TYPE_WPA_EAP 0x00000020
|
||||
#define NM_AUTH_TYPE_LEAP 0x00000040
|
||||
#define NM_802_11_AP_FLAGS_NONE 0x00000000
|
||||
#define NM_802_11_AP_FLAGS_PRIVACY 0x00000001
|
||||
|
||||
/*
|
||||
* EAP Methods
|
||||
* 802.11 Access Point security flags
|
||||
*
|
||||
* These describe the current security requirements of the BSSID as extracted
|
||||
* from various pieces of beacon information, like beacon flags and various
|
||||
* information elements.
|
||||
*/
|
||||
#define NM_EAP_METHOD_MD5 0x00000001 /* EAP-MD5 */
|
||||
#define NM_EAP_METHOD_MSCHAP 0x00000002 /* EAP-MSCHAPv2 */
|
||||
#define NM_EAP_METHOD_OTP 0x00000004 /* EAP-OTP */
|
||||
#define NM_EAP_METHOD_GTC 0x00000008 /* EAP-GTC */
|
||||
#define NM_EAP_METHOD_PEAP 0x00000010 /* EAP-PEAP */
|
||||
#define NM_EAP_METHOD_TLS 0x00000020 /* EAP-TLS */
|
||||
#define NM_EAP_METHOD_TTLS 0x00000040 /* EAP-TTLS */
|
||||
#define NM_802_11_AP_SEC_NONE 0x00000000
|
||||
#define NM_802_11_AP_SEC_PAIR_WEP40 0x00000001
|
||||
#define NM_802_11_AP_SEC_PAIR_WEP104 0x00000002
|
||||
#define NM_802_11_AP_SEC_PAIR_TKIP 0x00000004
|
||||
#define NM_802_11_AP_SEC_PAIR_CCMP 0x00000008
|
||||
#define NM_802_11_AP_SEC_GROUP_WEP40 0x00000010
|
||||
#define NM_802_11_AP_SEC_GROUP_WEP104 0x00000020
|
||||
#define NM_802_11_AP_SEC_GROUP_TKIP 0x00000040
|
||||
#define NM_802_11_AP_SEC_GROUP_CCMP 0x00000080
|
||||
#define NM_802_11_AP_SEC_KEY_MGMT_PSK 0x00000100
|
||||
#define NM_802_11_AP_SEC_KEY_MGMT_802_1X 0x00000200
|
||||
|
||||
|
||||
/*
|
||||
* Wireless network types
|
||||
|
||||
Reference in New Issue
Block a user