main/strongswan: minor update to patches

- take the multiple CA fixes from upstream git branch
- add more child_sa states that can be monitored

1 files changed, 25 insertions, 9 deletions

diff --git a/main/strongswan/1003-vici-add-support-rekeying-events-and-individual-sa-s.patch b/main/strongswan/1003-vici-add-support-rekeying-events-and-individual-sa-s.patch
index a52450306c..c42b40d2d3 100644
--- a/main/strongswan/1003-vici-add-support-rekeying-events-and-individual-sa-s.patch
+++ b/main/strongswan/1003-vici-add-support-rekeying-events-and-individual-sa-s.patch
@@ -1,4 +1,4 @@
-From b8b84525b8c8c9e5cc1d1409a89347bb8869f893 Mon Sep 17 00:00:00 2001
+From 728f1a0afc45264715ee7a77d5ce6614cec42863 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
 Date: Thu, 30 Apr 2015 10:58:15 +0300
 Subject: [PATCH] vici: add support rekeying events, and individual sa state
@@ -11,14 +11,14 @@ Useful for monitoring and tracking full SA.
 
 Signed-off-by: Timo Teräs <timo.teras@iki.fi>
 ---
- src/libcharon/plugins/vici/vici_query.c | 160 ++++++++++++++++++++++++++++++++
- 1 file changed, 160 insertions(+)
+ src/libcharon/plugins/vici/vici_query.c | 176 ++++++++++++++++++++++++++++++++
+ 1 file changed, 176 insertions(+)
 
 diff --git a/src/libcharon/plugins/vici/vici_query.c b/src/libcharon/plugins/vici/vici_query.c
-index 3d461f7..ade181c 100644
+index 3d461f7..316c698 100644
 --- a/src/libcharon/plugins/vici/vici_query.c
 +++ b/src/libcharon/plugins/vici/vici_query.c
-@@ -1065,7 +1065,13 @@ static void manage_commands(private_vici_query_t *this, bool reg)
+@@ -1065,7 +1065,17 @@ static void manage_commands(private_vici_query_t *this, bool reg)
  	this->dispatcher->manage_event(this->dispatcher, "list-conn", reg);
  	this->dispatcher->manage_event(this->dispatcher, "list-cert", reg);
  	this->dispatcher->manage_event(this->dispatcher, "ike-updown", reg);
@@ -27,12 +27,16 @@ index 3d461f7..ade181c 100644
 +	this->dispatcher->manage_event(this->dispatcher, "ike-state-destroying", reg);
  	this->dispatcher->manage_event(this->dispatcher, "child-updown", reg);
 +	this->dispatcher->manage_event(this->dispatcher, "child-rekey", reg);
++	this->dispatcher->manage_event(this->dispatcher, "child-state-installing", reg);
 +	this->dispatcher->manage_event(this->dispatcher, "child-state-installed", reg);
++	this->dispatcher->manage_event(this->dispatcher, "child-state-updating", reg);
++	this->dispatcher->manage_event(this->dispatcher, "child-state-rekeying", reg);
++	this->dispatcher->manage_event(this->dispatcher, "child-state-rekeyed", reg);
 +	this->dispatcher->manage_event(this->dispatcher, "child-state-destroying", reg);
  	manage_command(this, "list-sas", list_sas, reg);
  	manage_command(this, "list-policies", list_policies, reg);
  	manage_command(this, "list-conns", list_conns, reg);
-@@ -1100,6 +1106,77 @@ METHOD(listener_t, ike_updown, bool,
+@@ -1100,6 +1110,77 @@ METHOD(listener_t, ike_updown, bool,
  	return TRUE;
  }
  
@@ -110,7 +114,7 @@ index 3d461f7..ade181c 100644
  METHOD(listener_t, child_updown, bool,
  	private_vici_query_t *this, ike_sa_t *ike_sa, child_sa_t *child_sa, bool up)
  {
-@@ -1131,6 +1208,85 @@ METHOD(listener_t, child_updown, bool,
+@@ -1131,6 +1212,97 @@ METHOD(listener_t, child_updown, bool,
  	return TRUE;
  }
  
@@ -158,9 +162,21 @@ index 3d461f7..ade181c 100644
 +
 +	switch (state)
 +	{
++	case CHILD_INSTALLING:
++		event = "child-state-installing";
++		break;
 +	case CHILD_INSTALLED:
 +		event = "child-state-installed";
 +		break;
++	case CHILD_UPDATING:
++		event = "child-state-updating";
++		break;
++	case CHILD_REKEYING:
++		event = "child-state-rekeying";
++		break;
++	case CHILD_REKEYED:
++		event = "child-state-rekeyed";
++		break;
 +	case CHILD_DESTROYING:
 +		event = "child-state-destroying";
 +		break;
@@ -196,7 +212,7 @@ index 3d461f7..ade181c 100644
  METHOD(vici_query_t, destroy, void,
  	private_vici_query_t *this)
  {
-@@ -1149,7 +1305,11 @@ vici_query_t *vici_query_create(vici_dispatcher_t *dispatcher)
+@@ -1149,7 +1321,11 @@ vici_query_t *vici_query_create(vici_dispatcher_t *dispatcher)
  		.public = {
  			.listener = {
  				.ike_updown = _ike_updown,
@@ -209,5 +225,5 @@ index 3d461f7..ade181c 100644
  			.destroy = _destroy,
  		},
 -- 
-2.4.6
+2.5.0