diff options
Diffstat (limited to 'include/NetworkManager.h')
| -rw-r--r-- | include/NetworkManager.h | 65 |
1 files changed, 30 insertions, 35 deletions
diff --git a/include/NetworkManager.h b/include/NetworkManager.h index 2992f3b690..cc2c101d0d 100644 --- a/include/NetworkManager.h +++ b/include/NetworkManager.h @@ -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 |