aboutsummaryrefslogtreecommitdiffstats
path: root/wpa_supplicant
diff options
context:
space:
mode:
authorJouni Malinen <j@w1.fi>2009-01-03 17:50:49 (GMT)
committerJouni Malinen <j@w1.fi>2009-01-03 17:50:49 (GMT)
commitf90c86d4a3b73d1a4db69f2e97009eab3ee2d28e (patch)
tree8d4b31567327e2394cfcab142e40b89cf3bd32d1 /wpa_supplicant
parent875f6d7b93c4ccd834b40433d371412fcff33879 (diff)
downloadhostap-06-f90c86d4a3b73d1a4db69f2e97009eab3ee2d28e.zip
hostap-06-f90c86d4a3b73d1a4db69f2e97009eab3ee2d28e.tar.gz
hostap-06-f90c86d4a3b73d1a4db69f2e97009eab3ee2d28e.tar.bz2
Added Doxygen documentation for WPS code
Diffstat (limited to 'wpa_supplicant')
-rw-r--r--wpa_supplicant/scan.c6
-rw-r--r--wpa_supplicant/wpa_supplicant.c1
-rw-r--r--wpa_supplicant/wps_supplicant.c4
-rw-r--r--wpa_supplicant/wps_supplicant.h5
4 files changed, 8 insertions, 8 deletions
diff --git a/wpa_supplicant/scan.c b/wpa_supplicant/scan.c
index a9f86ea..afc3411 100644
--- a/wpa_supplicant/scan.c
+++ b/wpa_supplicant/scan.c
@@ -19,7 +19,6 @@
#include "config.h"
#include "wpa_supplicant_i.h"
#include "mlme.h"
-#include "wps/wps.h"
#include "wps_supplicant.h"
@@ -43,7 +42,8 @@ static void wpa_supplicant_gen_assoc_event(struct wpa_supplicant *wpa_s)
#ifdef CONFIG_WPS
-static int wpas_wps_in_use(struct wpa_config *conf, u8 *req_type)
+static int wpas_wps_in_use(struct wpa_config *conf,
+ enum wps_request_type *req_type)
{
struct wpa_ssid *ssid;
int wps = 0;
@@ -75,7 +75,7 @@ static void wpa_supplicant_scan(void *eloop_ctx, void *timeout_ctx)
size_t extra_ie_len = 0;
int wps = 0;
#ifdef CONFIG_WPS
- u8 req_type = 0;
+ enum wps_request_type req_type = WPS_REQ_ENROLLEE_INFO;
#endif /* CONFIG_WPS */
if (wpa_s->disconnected && !wpa_s->scan_req)
diff --git a/wpa_supplicant/wpa_supplicant.c b/wpa_supplicant/wpa_supplicant.c
index 04995cf..42e285f 100644
--- a/wpa_supplicant/wpa_supplicant.c
+++ b/wpa_supplicant/wpa_supplicant.c
@@ -38,7 +38,6 @@
#include "ieee802_11_defs.h"
#include "blacklist.h"
#include "wpas_glue.h"
-#include "wps/wps.h"
#include "wps_supplicant.h"
const char *wpa_supplicant_version =
diff --git a/wpa_supplicant/wps_supplicant.c b/wpa_supplicant/wps_supplicant.c
index a538338..662d117 100644
--- a/wpa_supplicant/wps_supplicant.c
+++ b/wpa_supplicant/wps_supplicant.c
@@ -24,8 +24,6 @@
#include "uuid.h"
#include "wpa_ctrl.h"
#include "eap_common/eap_wsc_common.h"
-#include "wps/wps.h"
-#include "wps/wps_defs.h"
#include "wps_supplicant.h"
@@ -223,7 +221,7 @@ static void wpa_supplicant_wps_event(void *ctx, enum wps_event event,
}
-u8 wpas_wps_get_req_type(struct wpa_ssid *ssid)
+enum wps_request_type wpas_wps_get_req_type(struct wpa_ssid *ssid)
{
if (eap_is_wps_pbc_enrollee(&ssid->eap) ||
eap_is_wps_pin_enrollee(&ssid->eap))
diff --git a/wpa_supplicant/wps_supplicant.h b/wpa_supplicant/wps_supplicant.h
index 248f25f..2993049 100644
--- a/wpa_supplicant/wps_supplicant.h
+++ b/wpa_supplicant/wps_supplicant.h
@@ -17,10 +17,13 @@
#ifdef CONFIG_WPS
+#include "wps/wps.h"
+#include "wps/wps_defs.h"
+
int wpas_wps_init(struct wpa_supplicant *wpa_s);
void wpas_wps_deinit(struct wpa_supplicant *wpa_s);
int wpas_wps_eapol_cb(struct wpa_supplicant *wpa_s);
-u8 wpas_wps_get_req_type(struct wpa_ssid *ssid);
+enum wps_request_type wpas_wps_get_req_type(struct wpa_ssid *ssid);
int wpas_wps_start_pbc(struct wpa_supplicant *wpa_s, const u8 *bssid);
int wpas_wps_start_pin(struct wpa_supplicant *wpa_s, const u8 *bssid,
const char *pin);