denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed state and logging of IKE_SA when using EAP authentication

Browse Source
This commit is contained in:
Martin Willi
2007-03-27 16:11:29 +00:00
parent e23a59f635
commit c00840478e
1 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/charon/sa/tasks/ike_auth.c
+16 -5
View File
@@ -310,11 +310,17 @@ static status_t build_auth_eap(private_ike_auth_t *this, message_t *message)
return FAILED; return FAILED;
} }
message->add_payload(message, (payload_t*)auth_payload); message->add_payload(message, (payload_t*)auth_payload);
if (this->initiator) if (!this->initiator)
{ {
return NEED_MORE; this->ike_sa->set_state(this->ike_sa, IKE_ESTABLISHED);
SIG(IKE_UP_SUCCESS, "IKE_SA established between %D[%H]...[%H]%D",
this->ike_sa->get_my_id(this->ike_sa),
this->ike_sa->get_my_host(this->ike_sa),
this->ike_sa->get_other_host(this->ike_sa),
this->ike_sa->get_other_id(this->ike_sa));
return SUCCESS;
} }
return SUCCESS; return NEED_MORE;
} }
/** /**
@@ -351,6 +357,12 @@ static status_t process_auth_eap(private_ike_auth_t *this, message_t *message)
} }
if (this->initiator) if (this->initiator)
{ {
this->ike_sa->set_state(this->ike_sa, IKE_ESTABLISHED);
SIG(IKE_UP_SUCCESS, "IKE_SA established between %D[%H]...[%H]%D",
this->ike_sa->get_my_id(this->ike_sa),
this->ike_sa->get_my_host(this->ike_sa),
this->ike_sa->get_other_host(this->ike_sa),
this->ike_sa->get_other_id(this->ike_sa));
return SUCCESS; return SUCCESS;
} }
return NEED_MORE; return NEED_MORE;
@@ -523,7 +535,7 @@ static status_t build_r(private_ike_auth_t *this, message_t *message)
policy = this->ike_sa->get_policy(this->ike_sa); policy = this->ike_sa->get_policy(this->ike_sa);
if (policy == NULL) if (policy == NULL)
{ {
SIG(IKE_UP_SUCCESS, "no acceptable policy found"); SIG(IKE_UP_FAILED, "no acceptable policy found");
message->add_notify(message, TRUE, AUTHENTICATION_FAILED, chunk_empty); message->add_notify(message, TRUE, AUTHENTICATION_FAILED, chunk_empty);
return FAILED; return FAILED;
} }
@@ -538,7 +550,6 @@ static status_t build_r(private_ike_auth_t *this, message_t *message)
/* use "traditional" authentication if we could authenticate peer */ /* use "traditional" authentication if we could authenticate peer */
if (this->peer_authenticated) if (this->peer_authenticated)
{ {
this->ike_sa->set_state(this->ike_sa, IKE_ESTABLISHED); this->ike_sa->set_state(this->ike_sa, IKE_ESTABLISHED);
SIG(IKE_UP_SUCCESS, "IKE_SA established between %D[%H]...[%H]%D", SIG(IKE_UP_SUCCESS, "IKE_SA established between %D[%H]...[%H]%D",
this->ike_sa->get_my_id(this->ike_sa), this->ike_sa->get_my_id(this->ike_sa),