aboutsummaryrefslogtreecommitdiffstats
path: root/wpa_supplicant
diff options
context:
space:
mode:
authorJouni Malinen <j@w1.fi>2009-01-17 17:54:40 +0200
committerJouni Malinen <j@w1.fi>2009-01-17 17:54:40 +0200
commit0f057fb2c705010c96175e4c5e658f076fef0701 (patch)
treeda53bd559271af93c200a86fded03155cf991014 /wpa_supplicant
parentb9a2e577b431a54afc045a4dceb787ed50ab955c (diff)
downloadexternal_wpa_supplicant_8_ti-0f057fb2c705010c96175e4c5e658f076fef0701.zip
external_wpa_supplicant_8_ti-0f057fb2c705010c96175e4c5e658f076fef0701.tar.gz
external_wpa_supplicant_8_ti-0f057fb2c705010c96175e4c5e658f076fef0701.tar.bz2
Added a separate ctx pointer for wpa_msg() calls in WPA supp
This is needed to allow IBSS RSN to use per-peer context while maintaining support for wpa_msg() calls to get *wpa_s as the pointer.
Diffstat (limited to 'wpa_supplicant')
-rw-r--r--wpa_supplicant/ibss_rsn.c1
-rw-r--r--wpa_supplicant/preauth_test.c1
-rw-r--r--wpa_supplicant/tests/test_wpa.c1
-rw-r--r--wpa_supplicant/wpas_glue.c1
4 files changed, 4 insertions, 0 deletions
diff --git a/wpa_supplicant/ibss_rsn.c b/wpa_supplicant/ibss_rsn.c
index d605def..080c1f6 100644
--- a/wpa_supplicant/ibss_rsn.c
+++ b/wpa_supplicant/ibss_rsn.c
@@ -144,6 +144,7 @@ int ibss_rsn_supp_init(struct ibss_rsn_peer *peer, const u8 *own_addr,
return -1;
ctx->ctx = peer;
+ ctx->msg_ctx = peer->ibss_rsn->wpa_s;
ctx->set_state = supp_set_state;
ctx->ether_send = supp_ether_send;
ctx->get_beacon_ie = supp_get_beacon_ie;
diff --git a/wpa_supplicant/preauth_test.c b/wpa_supplicant/preauth_test.c
index 86307a8..db43071 100644
--- a/wpa_supplicant/preauth_test.c
+++ b/wpa_supplicant/preauth_test.c
@@ -239,6 +239,7 @@ static void wpa_init_conf(struct wpa_supplicant *wpa_s, const char *ifname)
assert(ctx != NULL);
ctx->ctx = wpa_s;
+ ctx->msg_ctx = wpa_s;
ctx->set_state = _wpa_supplicant_set_state;
ctx->get_state = _wpa_supplicant_get_state;
ctx->deauthenticate = _wpa_supplicant_deauthenticate;
diff --git a/wpa_supplicant/tests/test_wpa.c b/wpa_supplicant/tests/test_wpa.c
index 61b6336..4c341b6 100644
--- a/wpa_supplicant/tests/test_wpa.c
+++ b/wpa_supplicant/tests/test_wpa.c
@@ -180,6 +180,7 @@ static int supp_init(struct wpa *wpa)
return -1;
ctx->ctx = wpa;
+ ctx->msg_ctx = wpa;
ctx->set_state = supp_set_state;
ctx->get_bssid = supp_get_bssid;
ctx->ether_send = supp_ether_send;
diff --git a/wpa_supplicant/wpas_glue.c b/wpa_supplicant/wpas_glue.c
index 2b96aa7..eb2796e 100644
--- a/wpa_supplicant/wpas_glue.c
+++ b/wpa_supplicant/wpas_glue.c
@@ -586,6 +586,7 @@ int wpa_supplicant_init_wpa(struct wpa_supplicant *wpa_s)
}
ctx->ctx = wpa_s;
+ ctx->msg_ctx = wpa_s;
ctx->set_state = _wpa_supplicant_set_state;
ctx->get_state = _wpa_supplicant_get_state;
ctx->deauthenticate = _wpa_supplicant_deauthenticate;