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

ikev2: Defer MOBIKE updates if no path is available

Browse Source
This commit is contained in:
Tobias Brunner
2014-09-12 10:29:37 +02:00
parent 8956dcecd4
commit de6ab8e85a
1 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/sa/ikev2/task_manager_v2.c
+14 -7
View File
@@ -241,16 +241,12 @@ METHOD(task_manager_t, retransmit, status_t,
if (task->get_type(task) == TASK_IKE_MOBIKE) if (task->get_type(task) == TASK_IKE_MOBIKE)
{ {
mobike = (ike_mobike_t*)task; mobike = (ike_mobike_t*)task;
if (!mobike->is_probing(mobike))
{
mobike = NULL;
}
break; break;
} }
} }
enumerator->destroy(enumerator); enumerator->destroy(enumerator);
if (mobike == NULL) if (!mobike || !mobike->is_probing(mobike))
{ {
if (this->initiating.retransmitted <= this->retransmit_tries) if (this->initiating.retransmitted <= this->retransmit_tries)
{ {
@@ -273,8 +269,19 @@ METHOD(task_manager_t, retransmit, status_t,
charon->bus->alert(charon->bus, ALERT_RETRANSMIT_SEND, charon->bus->alert(charon->bus, ALERT_RETRANSMIT_SEND,
this->initiating.packet); this->initiating.packet);
} }
packet = this->initiating.packet->clone(this->initiating.packet); if (!mobike)
charon->sender->send(charon->sender, packet); {
packet = this->initiating.packet->clone(this->initiating.packet);
charon->sender->send(charon->sender, packet);
}
else if (!mobike->transmit(mobike, this->initiating.packet))
{
DBG1(DBG_IKE, "no route found to reach peer, MOBIKE update "
"deferred");
this->ike_sa->set_condition(this->ike_sa, COND_STALE, TRUE);
this->initiating.deferred = TRUE;
return SUCCESS;
}
} }
else else
{ /* for routeability checks, we use a more aggressive behavior */ { /* for routeability checks, we use a more aggressive behavior */