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

Change behavior of responder during roaming.

Browse Source 
If the current source address is not available anymore, the responder
uses ike_mobike_t.roam, thus, uses multiple address combinations when
trying to notify the initiator.
This commit is contained in:
Tobias Brunner
2010-10-12 11:11:05 +02:00
parent c5770f864f
commit 5774408898
1 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/sa/ike_sa.c
+17 -16
View File
@@ -1788,20 +1788,6 @@ METHOD(ike_sa_t, roam, status_t,
default: default:
break; break;
} }
/* responder just updates the peer about changed address config */
if (!this->ike_sa_id->is_initiator(this->ike_sa_id))
{
if (supports_extension(this, EXT_MOBIKE) && address)
{
DBG1(DBG_IKE, "sending address list update using MOBIKE");
mobike = ike_mobike_create(&this->public, TRUE);
mobike->addresses(mobike);
this->task_manager->queue_task(this->task_manager,
(task_t*)mobike);
return this->task_manager->initiate(this->task_manager);
}
return SUCCESS;
}
/* keep existing path if possible */ /* keep existing path if possible */
if (is_current_path_valid(this)) if (is_current_path_valid(this))
@@ -1834,14 +1820,29 @@ METHOD(ike_sa_t, roam, status_t,
/* update addresses with mobike, if supported ... */ /* update addresses with mobike, if supported ... */
if (supports_extension(this, EXT_MOBIKE)) if (supports_extension(this, EXT_MOBIKE))
{ {
DBG1(DBG_IKE, "requesting address change using MOBIKE"); if (!has_condition(this, COND_ORIGINAL_INITIATOR))
{ /* responder updates the peer about changed address config */
DBG1(DBG_IKE, "sending address list update using MOBIKE, "
"implicitly requesting an address change");
address = TRUE;
}
else
{
DBG1(DBG_IKE, "requesting address change using MOBIKE");
}
mobike = ike_mobike_create(&this->public, TRUE); mobike = ike_mobike_create(&this->public, TRUE);
mobike->roam(mobike, address); mobike->roam(mobike, address);
this->task_manager->queue_task(this->task_manager, (task_t*)mobike); this->task_manager->queue_task(this->task_manager, (task_t*)mobike);
return this->task_manager->initiate(this->task_manager); return this->task_manager->initiate(this->task_manager);
} }
DBG1(DBG_IKE, "reauthenticating IKE_SA due to address change");
/* ... reauth if not */ /* ... reauth if not */
if (!has_condition(this, COND_ORIGINAL_INITIATOR))
{ /* responder does not reauthenticate */
set_condition(this, COND_STALE, TRUE);
return SUCCESS;
}
DBG1(DBG_IKE, "reauthenticating IKE_SA due to address change");
return reauth(this); return reauth(this);
} }