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

Do not add additional addresses to MOBIKE path probing messages.

Browse Source
This commit is contained in:
Tobias Brunner
2010-10-12 11:11:06 +02:00
parent 5774408898
commit 1dbf0ed982
1 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/sa/tasks/ike_mobike.c
+12 -10
View File
@@ -382,7 +382,7 @@ METHOD(task_t, build_i, status_t,
build_cookie(this, message); build_cookie(this, message);
update_children(this); update_children(this);
} }
if (this->address) if (this->address && !this->check)
{ {
build_address_list(this, message); build_address_list(this, message);
} }
@@ -543,20 +543,22 @@ METHOD(task_t, process_i, status_t,
} }
if (this->update) if (this->update)
{ {
/* use the same task to ... */
if (!this->ike_sa->has_condition(this->ike_sa, if (!this->ike_sa->has_condition(this->ike_sa,
COND_ORIGINAL_INITIATOR)) COND_ORIGINAL_INITIATOR))
{ { /*... send an updated list of addresses as responder */
update_children(this); update_children(this);
return SUCCESS; this->update = FALSE;
}
else
{ /* ... send the update as original initiator */
if (this->natd)
{
this->natd->task.destroy(&this->natd->task);
}
this->natd = ike_natd_create(this->ike_sa, this->initiator);
} }
/* original initiator starts the update with the same task */
this->check = FALSE; this->check = FALSE;
this->address = FALSE;
if (this->natd)
{
this->natd->task.destroy(&this->natd->task);
}
this->natd = ike_natd_create(this->ike_sa, this->initiator);
this->ike_sa->set_pending_updates(this->ike_sa, 1); this->ike_sa->set_pending_updates(this->ike_sa, 1);
return NEED_MORE; return NEED_MORE;
} }