aboutsummaryrefslogtreecommitdiffstats
path: root/src/wps
diff options
context:
space:
mode:
authorJouni Malinen <j@w1.fi>2009-01-03 17:57:22 (GMT)
committerJouni Malinen <j@w1.fi>2009-01-03 17:57:22 (GMT)
commit5a8c6d33535fed249b6b67774843b52e619a4f64 (patch)
treed6792e479bb17899d4e062622613ae22fbd645b2 /src/wps
parentae2633af63eac43f069240ee3f9a9a08f3f087af (diff)
downloadhostap-06-5a8c6d33535fed249b6b67774843b52e619a4f64.zip
hostap-06-5a8c6d33535fed249b6b67774843b52e619a4f64.tar.gz
hostap-06-5a8c6d33535fed249b6b67774843b52e619a4f64.tar.bz2
Removed duplicated authenticator yes/no from wps_config and wps_data
wps_context::ap is available for this purpose and there is no need to change between AP and not AP between protocol runs.
Diffstat (limited to 'src/wps')
-rw-r--r--src/wps/wps.c1
-rw-r--r--src/wps/wps.h6
-rw-r--r--src/wps/wps_enrollee.c14
-rw-r--r--src/wps/wps_i.h6
-rw-r--r--src/wps/wps_registrar.c2
5 files changed, 8 insertions, 21 deletions
diff --git a/src/wps/wps.c b/src/wps/wps.c
index 2369a30..3a1606f 100644
--- a/src/wps/wps.c
+++ b/src/wps/wps.c
@@ -35,7 +35,6 @@ struct wps_data * wps_init(const struct wps_config *cfg)
struct wps_data *data = os_zalloc(sizeof(*data));
if (data == NULL)
return NULL;
- data->authenticator = cfg->authenticator;
data->wps = cfg->wps;
data->registrar = cfg->registrar;
if (cfg->registrar) {
diff --git a/src/wps/wps.h b/src/wps/wps.h
index 8c62234..9d723fe 100644
--- a/src/wps/wps.h
+++ b/src/wps/wps.h
@@ -86,12 +86,6 @@ struct wps_device_data {
*/
struct wps_config {
/**
- * authenticator - Whether the local end is Authenticator
- * 1 = Authenticator, 0 = Supplicant
- */
- int authenticator;
-
- /**
* wps - Pointer to long term WPS context
*/
struct wps_context *wps;
diff --git a/src/wps/wps_enrollee.c b/src/wps/wps_enrollee.c
index 4f98262..f6a828d 100644
--- a/src/wps/wps_enrollee.c
+++ b/src/wps/wps_enrollee.c
@@ -288,7 +288,7 @@ static struct wpabuf * wps_build_m7(struct wps_data *wps)
wps_build_msg_type(msg, WPS_M7) ||
wps_build_registrar_nonce(wps, msg) ||
wps_build_e_snonce2(wps, plain) ||
- (wps->authenticator &&
+ (wps->wps->ap &&
(wps_build_cred_ssid(wps, plain) ||
wps_build_cred_mac_addr(wps, plain) ||
wps_build_cred_auth_type(wps, plain) ||
@@ -326,7 +326,7 @@ static struct wpabuf * wps_build_wsc_done(struct wps_data *wps)
return NULL;
}
- if (wps->authenticator)
+ if (wps->wps->ap)
wps->state = RECV_ACK;
else {
wps_success_event(wps->wps);
@@ -404,7 +404,7 @@ struct wpabuf * wps_enrollee_get_msg(struct wps_data *wps,
*op_code = WSC_MSG;
break;
case RECEIVED_M2D:
- if (wps->authenticator) {
+ if (wps->wps->ap) {
msg = wps_build_wsc_nack(wps);
*op_code = WSC_NACK;
break;
@@ -642,7 +642,7 @@ static int wps_process_creds(struct wps_data *wps, const u8 *cred[],
{
size_t i;
- if (wps->authenticator)
+ if (wps->wps->ap)
return 0;
if (num_cred == 0) {
@@ -665,7 +665,7 @@ static int wps_process_ap_settings_e(struct wps_data *wps,
{
struct wps_credential cred;
- if (!wps->authenticator)
+ if (!wps->wps->ap)
return 0;
if (wps_process_ap_settings(attr, &cred) < 0)
@@ -703,7 +703,7 @@ static enum wps_process_res wps_process_m2(struct wps_data *wps,
return WPS_CONTINUE;
}
- if (wps->authenticator && wps->wps->ap_setup_locked) {
+ if (wps->wps->ap && wps->wps->ap_setup_locked) {
wpa_printf(MSG_DEBUG, "WPS: AP Setup is locked - refuse "
"registration of a new Registrar");
wps->config_error = WPS_CFG_SETUP_LOCKED;
@@ -1023,7 +1023,7 @@ static enum wps_process_res wps_process_wsc_ack(struct wps_data *wps,
return WPS_FAILURE;
}
- if (wps->state == RECV_ACK && wps->authenticator) {
+ if (wps->state == RECV_ACK && wps->wps->ap) {
wpa_printf(MSG_DEBUG, "WPS: External Registrar registration "
"completed successfully");
wps_success_event(wps->wps);
diff --git a/src/wps/wps_i.h b/src/wps/wps_i.h
index 4b7ad25..b67a42a 100644
--- a/src/wps/wps_i.h
+++ b/src/wps/wps_i.h
@@ -25,12 +25,6 @@
*/
struct wps_data {
/**
- * authenticator - Whether the local end is Authenticator
- * 1 = Authenticator, 0 = Supplicant
- */
- int authenticator;
-
- /**
* wps - Pointer to long term WPS context
*/
struct wps_context *wps;
diff --git a/src/wps/wps_registrar.c b/src/wps/wps_registrar.c
index e3b1f2c..a364a68 100644
--- a/src/wps/wps_registrar.c
+++ b/src/wps/wps_registrar.c
@@ -1040,7 +1040,7 @@ static struct wpabuf * wps_build_m2d(struct wps_data *wps)
if (msg == NULL)
return NULL;
- if (wps->authenticator && wps->wps->ap_setup_locked)
+ if (wps->wps->ap && wps->wps->ap_setup_locked)
err = WPS_CFG_SETUP_LOCKED;
if (wps_build_version(msg) ||