diff options
| author | Rene Mayrhofer <rene@mayrhofer.eu.org> | 2009-03-01 10:48:08 +0000 |
|---|---|---|
| committer | Rene Mayrhofer <rene@mayrhofer.eu.org> | 2009-03-01 10:48:08 +0000 |
| commit | a6f902baed7abb17a1a9c014e01bb100077f8198 (patch) | |
| tree | 82114e22e251e9260d9a712f1232e52e1ef494e3 /src/charon/processing/jobs | |
| parent | 1450c9df799b0870477f6e63357f4bcb63537f4f (diff) | |
| download | vyos-strongswan-a6f902baed7abb17a1a9c014e01bb100077f8198.tar.gz vyos-strongswan-a6f902baed7abb17a1a9c014e01bb100077f8198.zip | |
- Updated to new upstream revision.
Diffstat (limited to 'src/charon/processing/jobs')
| -rw-r--r-- | src/charon/processing/jobs/delete_ike_sa_job.c | 7 | ||||
| -rw-r--r-- | src/charon/processing/jobs/migrate_job.c | 4 |
2 files changed, 8 insertions, 3 deletions
diff --git a/src/charon/processing/jobs/delete_ike_sa_job.c b/src/charon/processing/jobs/delete_ike_sa_job.c index 95b60ad01..c37e4e389 100644 --- a/src/charon/processing/jobs/delete_ike_sa_job.c +++ b/src/charon/processing/jobs/delete_ike_sa_job.c @@ -13,7 +13,7 @@ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * for more details. * - * $Id: delete_ike_sa_job.c 3589 2008-03-13 14:14:44Z martin $ + * $Id: delete_ike_sa_job.c 4722 2008-11-28 15:44:25Z martin $ */ #include "delete_ike_sa_job.h" @@ -63,6 +63,11 @@ static void execute(private_delete_ike_sa_job_t *this) this->ike_sa_id); if (ike_sa) { + if (ike_sa->get_state(ike_sa) == IKE_PASSIVE) + { + charon->ike_sa_manager->checkin(charon->ike_sa_manager, ike_sa); + return destroy(this); + } if (this->delete_if_established) { if (ike_sa->delete(ike_sa) == DESTROY_ME) diff --git a/src/charon/processing/jobs/migrate_job.c b/src/charon/processing/jobs/migrate_job.c index ec0a76fb9..47ff658f1 100644 --- a/src/charon/processing/jobs/migrate_job.c +++ b/src/charon/processing/jobs/migrate_job.c @@ -12,7 +12,7 @@ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * for more details. * - * $Id: migrate_job.c 4662 2008-11-16 21:19:58Z andreas $ + * $Id: migrate_job.c 4677 2008-11-19 15:31:27Z martin $ */ #include "migrate_job.h" @@ -110,7 +110,7 @@ static void execute(private_migrate_job_t *this) host->set_port(host, IKEV2_UDP_PORT); ike_sa->set_other_host(ike_sa, host); - if (child_sa->update_hosts(child_sa, this->local, this->remote, + if (child_sa->update(child_sa, this->local, this->remote, ike_sa->get_virtual_ip(ike_sa, TRUE), ike_sa->has_condition(ike_sa, COND_NAT_ANY)) == NOT_SUPPORTED) { |