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

mobike: try to keep existing source address before switching to another

Browse Source
This commit is contained in:
Martin Willi
2008-10-08 08:23:46 +00:00
parent e39b271b17
commit ce5b17082d
7 changed files with 43 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/charon/sa/ike_sa.c
+13 -13
View File
@@ -1098,7 +1098,7 @@ static void resolve_hosts(private_ike_sa_t *this)
{
host->destroy(host);
host = charon->kernel_interface->get_source_addr(
charon->kernel_interface, this->other_host);
charon->kernel_interface, this->other_host, NULL);
if (host)
{
host->set_port(host, IKEV2_UDP_PORT);
@@ -2206,7 +2206,7 @@ static void set_auth_lifetime(private_ike_sa_t *this, u_int32_t lifetime)
*/
static status_t roam(private_ike_sa_t *this, bool address)
{
host_t *me, *other;
host_t *src;
ike_mobike_t *mobike;
switch (this->state)
@@ -2230,21 +2230,21 @@ static status_t roam(private_ike_sa_t *this, bool address)
return SUCCESS;
}
/* get best address pair to use */
other = this->other_host;
me = charon->kernel_interface->get_source_addr(charon->kernel_interface,
other);
if (me)
/* keep existing path if possible */
src = charon->kernel_interface->get_source_addr(charon->kernel_interface,
this->other_host, this->my_host);
if (src)
{
if (me->ip_equals(me, this->my_host) &&
other->ip_equals(other, this->other_host))
if (src->ip_equals(src, this->my_host))
{
DBG2(DBG_IKE, "keeping connection path %H - %H", this->other_host, me);
me->destroy(me);
DBG2(DBG_IKE, "keeping connection path %H - %H",
src, this->other_host);
src->destroy(src);
return SUCCESS;
}
me->destroy(me);
/* old address is not valid anymore, try with new one */
src->set_port(src, this->my_host->get_port(this->my_host));
set_my_host(this, src);
}
/* update addresses with mobike, if supported ... */
src/charon/sa/tasks/ike_mobike.c
+2 -2
View File
@@ -277,7 +277,7 @@ static void transmit(private_ike_mobike_t *this, packet_t *packet)
other_old = this->ike_sa->get_other_host(this->ike_sa);
me = charon->kernel_interface->get_source_addr(
charon->kernel_interface, other_old);
charon->kernel_interface, other_old, NULL);
if (me)
{
me->set_port(me, me->ip_equals(me, me_old) ?
@@ -289,7 +289,7 @@ static void transmit(private_ike_mobike_t *this, packet_t *packet)
while (iterator->iterate(iterator, (void**)&other))
{
me = charon->kernel_interface->get_source_addr(
charon->kernel_interface, other);
charon->kernel_interface, other, NULL);
if (me)
{
if (me->get_family(me) != other->get_family(other))
src/charon/sa/tasks/ike_natd.c
+2 -3
View File
@@ -341,9 +341,8 @@ static status_t build_i(private_ike_natd_t *this, message_t *message)
}
else
{
host = charon->kernel_interface->get_source_addr(
charon->kernel_interface,
this->ike_sa->get_other_host(this->ike_sa));
host = charon->kernel_interface->get_source_addr(charon->kernel_interface,
this->ike_sa->get_other_host(this->ike_sa), NULL);
if (host)
{ /* 2. */
host->set_port(host, IKEV2_UDP_PORT);