diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2016-08-18 13:39:38 +0300 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2016-08-18 13:40:50 +0300 |
| commit | 8cff117adb70765c083260d727f9e2a3c3fe9407 (patch) | |
| tree | c4070bfad2ba2b823a45f402d962d793a824819c /main/strongswan/0205-ike-Adhere-to-IKE_SA-limit-when-checking-out-by-conf.patch | |
| parent | d69f651532084cd3842feaf6042650f72ab30ee4 (diff) | |
| download | aports-8cff117adb70765c083260d727f9e2a3c3fe9407.tar.bz2 aports-8cff117adb70765c083260d727f9e2a3c3fe9407.tar.xz | |
main/strongswan: upgrade to 5.5.0
Diffstat (limited to 'main/strongswan/0205-ike-Adhere-to-IKE_SA-limit-when-checking-out-by-conf.patch')
| -rw-r--r-- | main/strongswan/0205-ike-Adhere-to-IKE_SA-limit-when-checking-out-by-conf.patch | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/main/strongswan/0205-ike-Adhere-to-IKE_SA-limit-when-checking-out-by-conf.patch b/main/strongswan/0205-ike-Adhere-to-IKE_SA-limit-when-checking-out-by-conf.patch index 6f960e2e33..1d13f7dab2 100644 --- a/main/strongswan/0205-ike-Adhere-to-IKE_SA-limit-when-checking-out-by-conf.patch +++ b/main/strongswan/0205-ike-Adhere-to-IKE_SA-limit-when-checking-out-by-conf.patch @@ -1,19 +1,19 @@ -From c36fc076075f94176d0c95bd7437822e07f8c5c0 Mon Sep 17 00:00:00 2001 +From 5a5b26a7dce4c112f62882cfe16dc37659d766e8 Mon Sep 17 00:00:00 2001 From: Tobias Brunner <tobias@strongswan.org> Date: Fri, 17 Jul 2015 11:53:58 +0200 -Subject: [PATCH] ike: Adhere to IKE_SA limit when checking out by config +Subject: [PATCH 1/5] ike: Adhere to IKE_SA limit when checking out by config This prevents new SAs from getting created if we hit the global IKE_SA limit (we still allow checkout_new(), which is used for rekeying). --- - src/libcharon/sa/ike_sa_manager.c | 69 ++++++++++++++++++++------------------- - 1 file changed, 36 insertions(+), 33 deletions(-) + src/libcharon/sa/ike_sa_manager.c | 71 ++++++++++++++++++++------------------- + 1 file changed, 37 insertions(+), 34 deletions(-) diff --git a/src/libcharon/sa/ike_sa_manager.c b/src/libcharon/sa/ike_sa_manager.c -index 307ea3b..e8190a9 100644 +index ce44207..37d49da 100644 --- a/src/libcharon/sa/ike_sa_manager.c +++ b/src/libcharon/sa/ike_sa_manager.c -@@ -1401,47 +1401,50 @@ METHOD(ike_sa_manager_t, checkout_by_config, ike_sa_t*, +@@ -1401,48 +1401,51 @@ METHOD(ike_sa_manager_t, checkout_by_config, ike_sa_t*, DBG2(DBG_MGR, "checkout IKE_SA by config"); @@ -34,7 +34,8 @@ index 307ea3b..e8190a9 100644 { - continue; - } -- if (entry->ike_sa->get_state(entry->ike_sa) == IKE_DELETING) +- if (entry->ike_sa->get_state(entry->ike_sa) == IKE_DELETING || +- entry->ike_sa->get_state(entry->ike_sa) == IKE_REKEYED) - { /* skip IKE_SAs which are not usable, wake other waiting threads */ - entry->condvar->signal(entry->condvar); - continue; @@ -55,7 +56,8 @@ index 307ea3b..e8190a9 100644 - break; + continue; } -+ if (entry->ike_sa->get_state(entry->ike_sa) == IKE_DELETING) ++ if (entry->ike_sa->get_state(entry->ike_sa) == IKE_DELETING || ++ entry->ike_sa->get_state(entry->ike_sa) == IKE_REKEYED) + { /* skip IKE_SAs which are not usable, wake other waiting threads */ + entry->condvar->signal(entry->condvar); + continue; @@ -98,5 +100,5 @@ index 307ea3b..e8190a9 100644 } charon->bus->set_sa(charon->bus, ike_sa); -- -2.7.4 +2.5.0 |