diff options
| author | author Timo Teräs timo.teras@iki.fi 1442826138 +0300 <author Timo Teräs timo.teras@iki.fi 1442826138 +0300> | 2015-09-21 12:02:18 +0300 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2015-09-21 14:22:41 +0300 |
| commit | bffeca85f0d7cf485aeabb17dd0d40735fe2b2ee (patch) | |
| tree | 1b554c92454930300c19e392352193cdd683c208 /main/strongswan/1002-vici-send-certificates-for-ike-sa-events.patch | |
| parent | 79d8c05b7c382123dd04bd4dfb7ed7472d87c5d7 (diff) | |
| download | aports-bffeca85f0d7cf485aeabb17dd0d40735fe2b2ee.tar.bz2 aports-bffeca85f0d7cf485aeabb17dd0d40735fe2b2ee.tar.xz | |
main/strongswan: upgrade to 5.3.3
remove upstreamed patches; rebase the rest
Diffstat (limited to 'main/strongswan/1002-vici-send-certificates-for-ike-sa-events.patch')
| -rw-r--r-- | main/strongswan/1002-vici-send-certificates-for-ike-sa-events.patch | 44 |
1 files changed, 33 insertions, 11 deletions
diff --git a/main/strongswan/1002-vici-send-certificates-for-ike-sa-events.patch b/main/strongswan/1002-vici-send-certificates-for-ike-sa-events.patch index 7737220643..8caabd063c 100644 --- a/main/strongswan/1002-vici-send-certificates-for-ike-sa-events.patch +++ b/main/strongswan/1002-vici-send-certificates-for-ike-sa-events.patch @@ -1,6 +1,6 @@ -From dde551360cbe9ac09f1cd2d01047131c6332c576 Mon Sep 17 00:00:00 2001 +From 2a175cc40c5754b803ccfe3f641b438f54b569ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi> -Date: Thu, 30 Apr 2015 12:08:13 +0300 +Date: Mon, 21 Sep 2015 13:42:05 +0300 Subject: [PATCH] vici: send certificates for ike-sa events MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 @@ -8,11 +8,11 @@ Content-Transfer-Encoding: 8bit Signed-off-by: Timo Teräs <timo.teras@iki.fi> --- - src/libcharon/plugins/vici/vici_query.c | 42 +++++++++++++++++++++++++++++---- - 1 file changed, 38 insertions(+), 4 deletions(-) + src/libcharon/plugins/vici/vici_query.c | 48 ++++++++++++++++++++++++++++----- + 1 file changed, 41 insertions(+), 7 deletions(-) diff --git a/src/libcharon/plugins/vici/vici_query.c b/src/libcharon/plugins/vici/vici_query.c -index d94d760..3d461f7 100644 +index 98d264f..5245afc 100644 --- a/src/libcharon/plugins/vici/vici_query.c +++ b/src/libcharon/plugins/vici/vici_query.c @@ -225,13 +225,15 @@ static void list_task_queue(private_vici_query_t *this, vici_builder_t *b, @@ -83,17 +83,30 @@ index d94d760..3d461f7 100644 b->begin_section(b, "child-sas"); csas = ike_sa->create_child_sa_enumerator(ike_sa); -@@ -1055,7 +1089,7 @@ METHOD(listener_t, ike_updown, bool, +@@ -1063,7 +1097,7 @@ METHOD(listener_t, ike_updown, bool, + } - b = vici_builder_create(); b->begin_section(b, ike_sa->get_name(ike_sa)); - list_ike(this, b, ike_sa, now); + list_ike(this, b, ike_sa, now, up); - b->begin_section(b, "child-sas"); b->end_section(b); - b->end_section(b); -@@ -1081,7 +1115,7 @@ METHOD(listener_t, child_updown, bool, + + this->dispatcher->raise_event(this->dispatcher, +@@ -1088,10 +1122,10 @@ METHOD(listener_t, ike_rekey, bool, b = vici_builder_create(); + b->begin_section(b, old->get_name(old)); + b->begin_section(b, "old"); +- list_ike(this, b, old, now); ++ list_ike(this, b, old, now, TRUE); + b->end_section(b); + b->begin_section(b, "new"); +- list_ike(this, b, new, now); ++ list_ike(this, b, new, now, TRUE); + b->end_section(b); + b->end_section(b); + +@@ -1121,7 +1155,7 @@ METHOD(listener_t, child_updown, bool, + } b->begin_section(b, ike_sa->get_name(ike_sa)); - list_ike(this, b, ike_sa, now); @@ -101,6 +114,15 @@ index d94d760..3d461f7 100644 b->begin_section(b, "child-sas"); b->begin_section(b, child_sa->get_name(child_sa)); +@@ -1153,7 +1187,7 @@ METHOD(listener_t, child_rekey, bool, + b = vici_builder_create(); + + b->begin_section(b, ike_sa->get_name(ike_sa)); +- list_ike(this, b, ike_sa, now); ++ list_ike(this, b, ike_sa, now, TRUE); + b->begin_section(b, "child-sas"); + + b->begin_section(b, old->get_name(old)); -- -2.4.6 +2.5.3 |