ims-volte-vowifi
/
strongswan
9
0
Fork 0
Code Pull Requests Releases Activity

Log the proper type for virtual EAP methods

This commit is contained in:
Tobias Brunner 2012-08-23 16:10:47 +02:00
parent 333c3b6228
commit 7f2e3091ee
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/libcharon/sa/ikev2/authenticators/eap_authenticator.c
View File

@ -187,9 +187,9 @@ static eap_payload_t* server_initiate_eap(private_eap_authenticator_t *this,
if (this->method) if (this->method)
{ {
action = "initiating"; action = "initiating";
type = this->method->get_type(this->method, &vendor);
if (this->method->initiate(this->method, &out) == NEED_MORE) if (this->method->initiate(this->method, &out) == NEED_MORE)
{ {
type = this->method->get_type(this->method, &vendor);
if (vendor) if (vendor)
{ {
DBG1(DBG_IKE, "initiating EAP vendor type %d-%d method (id 0x%02X)", 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; return out;
} }
/* type might have changed for virtual methods */
type = this->method->get_type(this->method, &vendor);
} }
if (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)); return eap_payload_create_code(EAP_SUCCESS, in->get_identifier(in));
case FAILED: case FAILED:
default: default:
/* type might have changed for virtual methods */
type = this->method->get_type(this->method, &vendor);
if (vendor) if (vendor)
{ {
DBG1(DBG_IKE, "EAP vendor specific method %d-%d failed for " DBG1(DBG_IKE, "EAP vendor specific method %d-%d failed for "