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

ike-init: Ignore notifies related to redirects during rekeying

Browse Source 
Also don't query redirect providers in this case.
This commit is contained in:
Tobias Brunner
2016-03-04 16:03:00 +01:00
parent c6ebd0332e
commit 9282bc39a7
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/sa/ikev2/tasks/ike_init.c
+13 -3
View File
@@ -437,8 +437,11 @@ static void process_payloads(private_ike_init_t *this, message_t *message)
/* fall-through */ /* fall-through */
} }
case REDIRECT_SUPPORTED: case REDIRECT_SUPPORTED:
this->ike_sa->enable_extension(this->ike_sa, if (!this->old_sa)
EXT_IKE_REDIRECTION); {
this->ike_sa->enable_extension(this->ike_sa,
EXT_IKE_REDIRECTION);
}
break; break;
default: default:
/* other notifies are handled elsewhere */ /* other notifies are handled elsewhere */
@@ -612,7 +615,8 @@ METHOD(task_t, build_r, status_t,
this->ike_sa->set_proposal(this->ike_sa, this->proposal); this->ike_sa->set_proposal(this->ike_sa, this->proposal);
/* check if we'd have to redirect the client */ /* check if we'd have to redirect the client */
if (this->ike_sa->supports_extension(this->ike_sa, EXT_IKE_REDIRECTION) && if (!this->old_sa &&
this->ike_sa->supports_extension(this->ike_sa, EXT_IKE_REDIRECTION) &&
charon->redirect->redirect_on_init(charon->redirect, this->ike_sa, charon->redirect->redirect_on_init(charon->redirect, this->ike_sa,
&gateway)) &gateway))
{ {
@@ -750,6 +754,12 @@ METHOD(task_t, process_i, status_t,
chunk_t data, nonce = chunk_empty; chunk_t data, nonce = chunk_empty;
status_t status = FAILED; status_t status = FAILED;
if (this->old_sa)
{
DBG1(DBG_IKE, "received REDIRECT notify during rekeying"
", ignored");
break;
}
data = notify->get_notification_data(notify); data = notify->get_notification_data(notify);
gateway = redirect_data_parse(data, &nonce); gateway = redirect_data_parse(data, &nonce);
enumerator->destroy(enumerator); enumerator->destroy(enumerator);