aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Brunner <tobias@strongswan.org>2012-08-23 16:10:47 +0200
committerTobias Brunner <tobias@strongswan.org>2012-08-31 11:42:03 +0200
commit7f2e3091ee2593b59119dccbb8c41e6fed7cabb4 (patch)
treefe59a1d3f1e2d4e50fb1b085eb538732bf8b2e82
parent333c3b62285d9a9861845843f8ec0f4492012fc9 (diff)
downloadstrongswan-7f2e3091ee2593b59119dccbb8c41e6fed7cabb4.tar.bz2
strongswan-7f2e3091ee2593b59119dccbb8c41e6fed7cabb4.tar.xz
Log the proper type for virtual EAP methods
-rw-r--r--src/libcharon/sa/ikev2/authenticators/eap_authenticator.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/libcharon/sa/ikev2/authenticators/eap_authenticator.c b/src/libcharon/sa/ikev2/authenticators/eap_authenticator.c
index a340c04d7..aa0644033 100644
--- a/src/libcharon/sa/ikev2/authenticators/eap_authenticator.c
+++ b/src/libcharon/sa/ikev2/authenticators/eap_authenticator.c
@@ -187,9 +187,9 @@ static eap_payload_t* server_initiate_eap(private_eap_authenticator_t *this,
if (this->method)
{
action = "initiating";
- type = this->method->get_type(this->method, &vendor);
if (this->method->initiate(this->method, &out) == NEED_MORE)
{
+ type = this->method->get_type(this->method, &vendor);
if (vendor)
{
DBG1(DBG_IKE, "initiating EAP vendor type %d-%d method (id 0x%02X)",
@@ -202,6 +202,8 @@ static eap_payload_t* server_initiate_eap(private_eap_authenticator_t *this,
}
return out;
}
+ /* type might have changed for virtual methods */
+ type = this->method->get_type(this->method, &vendor);
}
if (vendor)
{
@@ -314,6 +316,8 @@ static eap_payload_t* server_process_eap(private_eap_authenticator_t *this,
return eap_payload_create_code(EAP_SUCCESS, in->get_identifier(in));
case FAILED:
default:
+ /* type might have changed for virtual methods */
+ type = this->method->get_type(this->method, &vendor);
if (vendor)
{
DBG1(DBG_IKE, "EAP vendor specific method %d-%d failed for "