Deleted Added
full compact
defs.h (189261) defs.h (214734)
1/*
2 * WPA Supplicant - Common definitions
3 * Copyright (c) 2004-2008, Jouni Malinen <j@w1.fi>
4 *
5 * This program is free software; you can redistribute it and/or modify
6 * it under the terms of the GNU General Public License version 2 as
7 * published by the Free Software Foundation.
8 *

--- 63 unchanged lines hidden (view full) ---

72
73
74#define WPA_PROTO_WPA BIT(0)
75#define WPA_PROTO_RSN BIT(1)
76
77#define WPA_AUTH_ALG_OPEN BIT(0)
78#define WPA_AUTH_ALG_SHARED BIT(1)
79#define WPA_AUTH_ALG_LEAP BIT(2)
1/*
2 * WPA Supplicant - Common definitions
3 * Copyright (c) 2004-2008, Jouni Malinen <j@w1.fi>
4 *
5 * This program is free software; you can redistribute it and/or modify
6 * it under the terms of the GNU General Public License version 2 as
7 * published by the Free Software Foundation.
8 *

--- 63 unchanged lines hidden (view full) ---

72
73
74#define WPA_PROTO_WPA BIT(0)
75#define WPA_PROTO_RSN BIT(1)
76
77#define WPA_AUTH_ALG_OPEN BIT(0)
78#define WPA_AUTH_ALG_SHARED BIT(1)
79#define WPA_AUTH_ALG_LEAP BIT(2)
80#define WPA_AUTH_ALG_FT BIT(3)
80
81
81
82
82typedef enum { WPA_ALG_NONE, WPA_ALG_WEP, WPA_ALG_TKIP, WPA_ALG_CCMP,
83 WPA_ALG_IGTK, WPA_ALG_PMK } wpa_alg;
84typedef enum { CIPHER_NONE, CIPHER_WEP40, CIPHER_TKIP, CIPHER_CCMP,
85 CIPHER_WEP104 } wpa_cipher;
86typedef enum { KEY_MGMT_802_1X, KEY_MGMT_PSK, KEY_MGMT_NONE,
87 KEY_MGMT_802_1X_NO_WPA, KEY_MGMT_WPA_NONE,
88 KEY_MGMT_FT_802_1X, KEY_MGMT_FT_PSK,
89 KEY_MGMT_802_1X_SHA256, KEY_MGMT_PSK_SHA256,
90 KEY_MGMT_WPS
91} wpa_key_mgmt;
83enum wpa_alg {
84 WPA_ALG_NONE,
85 WPA_ALG_WEP,
86 WPA_ALG_TKIP,
87 WPA_ALG_CCMP,
88 WPA_ALG_IGTK,
89 WPA_ALG_PMK
90};
92
93/**
91
92/**
93 * enum wpa_cipher - Cipher suites
94 */
95enum wpa_cipher {
96 CIPHER_NONE,
97 CIPHER_WEP40,
98 CIPHER_TKIP,
99 CIPHER_CCMP,
100 CIPHER_WEP104
101};
102
103/**
104 * enum wpa_key_mgmt - Key management suites
105 */
106enum wpa_key_mgmt {
107 KEY_MGMT_802_1X,
108 KEY_MGMT_PSK,
109 KEY_MGMT_NONE,
110 KEY_MGMT_802_1X_NO_WPA,
111 KEY_MGMT_WPA_NONE,
112 KEY_MGMT_FT_802_1X,
113 KEY_MGMT_FT_PSK,
114 KEY_MGMT_802_1X_SHA256,
115 KEY_MGMT_PSK_SHA256,
116 KEY_MGMT_WPS
117};
118
119/**
94 * enum wpa_states - wpa_supplicant state
95 *
96 * These enumeration values are used to indicate the current wpa_supplicant
97 * state (wpa_s->wpa_state). The current state can be retrieved with
98 * wpa_supplicant_get_state() function and the state can be changed by calling
99 * wpa_supplicant_set_state(). In WPA state machine (wpa.c and preauth.c), the
100 * wrapper functions wpa_sm_get_state() and wpa_sm_set_state() should be used
101 * to access the state variable.
102 */
120 * enum wpa_states - wpa_supplicant state
121 *
122 * These enumeration values are used to indicate the current wpa_supplicant
123 * state (wpa_s->wpa_state). The current state can be retrieved with
124 * wpa_supplicant_get_state() function and the state can be changed by calling
125 * wpa_supplicant_set_state(). In WPA state machine (wpa.c and preauth.c), the
126 * wrapper functions wpa_sm_get_state() and wpa_sm_set_state() should be used
127 * to access the state variable.
128 */
103typedef enum {
129enum wpa_states {
104 /**
105 * WPA_DISCONNECTED - Disconnected state
106 *
107 * This state indicates that client is not associated, but is likely to
108 * start looking for an access point. This state is entered when a
109 * connection is lost.
110 */
111 WPA_DISCONNECTED,

--- 12 unchanged lines hidden (view full) ---

124 * WPA_SCANNING - Scanning for a network
125 *
126 * This state is entered when wpa_supplicant starts scanning for a
127 * network.
128 */
129 WPA_SCANNING,
130
131 /**
130 /**
131 * WPA_DISCONNECTED - Disconnected state
132 *
133 * This state indicates that client is not associated, but is likely to
134 * start looking for an access point. This state is entered when a
135 * connection is lost.
136 */
137 WPA_DISCONNECTED,

--- 12 unchanged lines hidden (view full) ---

150 * WPA_SCANNING - Scanning for a network
151 *
152 * This state is entered when wpa_supplicant starts scanning for a
153 * network.
154 */
155 WPA_SCANNING,
156
157 /**
158 * WPA_AUTHENTICATING - Trying to authenticate with a BSS/SSID
159 *
160 * This state is entered when wpa_supplicant has found a suitable BSS
161 * to authenticate with and the driver is configured to try to
162 * authenticate with this BSS. This state is used only with drivers
163 * that use wpa_supplicant as the SME.
164 */
165 WPA_AUTHENTICATING,
166
167 /**
132 * WPA_ASSOCIATING - Trying to associate with a BSS/SSID
133 *
134 * This state is entered when wpa_supplicant has found a suitable BSS
135 * to associate with and the driver is configured to try to associate
136 * with this BSS in ap_scan=1 mode. When using ap_scan=2 mode, this
137 * state is entered when the driver is configured to try to associate
138 * with a network using the configured SSID and security policy.
139 */

--- 41 unchanged lines hidden (view full) ---

181 * plaintext connections, this state is entered when an association
182 * has been completed.
183 *
184 * This state indicates that the supplicant has completed its
185 * processing for the association phase and that data connection is
186 * fully configured.
187 */
188 WPA_COMPLETED
168 * WPA_ASSOCIATING - Trying to associate with a BSS/SSID
169 *
170 * This state is entered when wpa_supplicant has found a suitable BSS
171 * to associate with and the driver is configured to try to associate
172 * with this BSS in ap_scan=1 mode. When using ap_scan=2 mode, this
173 * state is entered when the driver is configured to try to associate
174 * with a network using the configured SSID and security policy.
175 */

--- 41 unchanged lines hidden (view full) ---

217 * plaintext connections, this state is entered when an association
218 * has been completed.
219 *
220 * This state indicates that the supplicant has completed its
221 * processing for the association phase and that data connection is
222 * fully configured.
223 */
224 WPA_COMPLETED
189} wpa_states;
225};
190
191#define MLME_SETPROTECTION_PROTECT_TYPE_NONE 0
192#define MLME_SETPROTECTION_PROTECT_TYPE_RX 1
193#define MLME_SETPROTECTION_PROTECT_TYPE_TX 2
194#define MLME_SETPROTECTION_PROTECT_TYPE_RX_TX 3
195
196#define MLME_SETPROTECTION_KEY_TYPE_GROUP 0
197#define MLME_SETPROTECTION_KEY_TYPE_PAIRWISE 1
198
226
227#define MLME_SETPROTECTION_PROTECT_TYPE_NONE 0
228#define MLME_SETPROTECTION_PROTECT_TYPE_RX 1
229#define MLME_SETPROTECTION_PROTECT_TYPE_TX 2
230#define MLME_SETPROTECTION_PROTECT_TYPE_RX_TX 3
231
232#define MLME_SETPROTECTION_KEY_TYPE_GROUP 0
233#define MLME_SETPROTECTION_KEY_TYPE_PAIRWISE 1
234
235
236/**
237 * enum mfp_options - Management frame protection (IEEE 802.11w) options
238 */
239enum mfp_options {
240 NO_MGMT_FRAME_PROTECTION = 0,
241 MGMT_FRAME_PROTECTION_OPTIONAL = 1,
242 MGMT_FRAME_PROTECTION_REQUIRED = 2
243};
244
245/**
246 * enum hostapd_hw_mode - Hardware mode
247 */
248enum hostapd_hw_mode {
249 HOSTAPD_MODE_IEEE80211B,
250 HOSTAPD_MODE_IEEE80211G,
251 HOSTAPD_MODE_IEEE80211A,
252 NUM_HOSTAPD_MODES
253};
254
199#endif /* DEFS_H */
255#endif /* DEFS_H */