X-Git-Url: https://git.strongswan.org/?p=strongswan.git;a=blobdiff_plain;f=src%2Fmanager%2Fcontroller%2Fcontrol_controller.c;h=d49941e2ff5940b1ed798689b84ef0ac18f31e14;hp=9d0789d8d6981fff30d6b356bb8833dddca533dc;hb=552cc11b1f017ce4962fca741f567d098f768574;hpb=55b02db74e09e43a7a86b60357242c77b5617f26

diff --git a/src/manager/controller/control_controller.c b/src/manager/controller/control_controller.c
index 9d0789d..d49941e 100644
--- a/src/manager/controller/control_controller.c
+++ b/src/manager/controller/control_controller.c
@@ -1,10 +1,3 @@
-/**
- * @file control_controller.c
- *
- * @brief Implementation of control_controller_t.
- *
- */
-
 /*
  * Copyright (C) 2007 Martin Willi
  * Hochschule fuer Technik Rapperswil
@@ -18,6 +11,8 @@
  * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
  * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  * for more details.
+ *
+ * $Id$
  */
 
 #include "control_controller.h"
@@ -48,17 +43,46 @@ struct private_control_controller_t {
 };
 
 /**
- * terminate a IKE or CHILD SA
+ * handle the result of a control operation
  */
-static void terminate(private_control_controller_t *this, request_t *r,
-					  bool ike, u_int32_t id)
+static void handle_result(private_control_controller_t *this, request_t *r,
+						  enumerator_t *e)
 {
-	gateway_t *gateway;
-
-	gateway = this->manager->select_gateway(this->manager, 0);
-	if (gateway->terminate(gateway, ike, id))
+	enumerator_t *e1;
+	xml_t *xml;
+	char *name, *value;
+	int num = 0;
+	
+	if (e)
 	{
-		r->redirect(r, "status/ikesalist");
+		while (e->enumerate(e, &xml, &name, &value))
+		{
+			if (streq(name, "status"))
+			{
+				if (value && atoi(value) == 0)
+				{
+					r->set(r, "result", "Operation executed successfully:");
+				}
+				else
+				{
+					r->set(r, "result", "Operation failed:");
+				}
+			}
+			else if (streq(name, "log"))
+			{
+				e1 = xml->children(xml);
+				while (e1->enumerate(e1, &xml, &name, &value))
+				{
+					if (streq(name, "item"))
+					{
+						r->setf(r, "log.%d=%s", ++num, value);
+					}
+				}
+				e1->destroy(e1);
+			}
+		}
+		e->destroy(e);
+		r->render(r, "templates/control/result.cs");
 	}
 	else
 	{
@@ -69,6 +93,36 @@ static void terminate(private_control_controller_t *this, request_t *r,
 }
 
 /**
+ * initiate an IKE or CHILD SA
+ */
+static void initiate(private_control_controller_t *this, request_t *r,
+					 bool ike, char *config)
+{
+	gateway_t *gateway;
+	enumerator_t *e;
+
+	r->setf(r, "title=Establishing %s SA %s", ike ? "IKE" : "CHILD", config);
+	gateway = this->manager->select_gateway(this->manager, 0);
+	e = gateway->initiate(gateway, ike, config);
+	handle_result(this, r, e);
+}
+
+/**
+ * terminate an IKE or CHILD SA
+ */
+static void terminate(private_control_controller_t *this, request_t *r,
+					  bool ike, u_int32_t id)
+{
+	gateway_t *gateway;
+	enumerator_t *e;
+	
+	r->setf(r, "title=Terminate %s SA %d", ike ? "IKE" : "CHILD", id);
+	gateway = this->manager->select_gateway(this->manager, 0);
+	e = gateway->terminate(gateway, ike, id);
+	handle_result(this, r, e);
+}
+
+/**
  * Implementation of controller_t.get_name
  */
 static char* get_name(private_control_controller_t *this)
@@ -80,7 +134,7 @@ static char* get_name(private_control_controller_t *this)
  * Implementation of controller_t.handle
  */
 static void handle(private_control_controller_t *this,
-				   request_t *request, char *action, char *strid)
+				   request_t *request, char *action, char *str)
 {
 	if (!this->manager->logged_in(this->manager))
 	{
@@ -96,20 +150,34 @@ static void handle(private_control_controller_t *this,
 	
 		if (streq(action, "terminateike"))
 		{
-			if (strid && (id = atoi(strid)))
+			if (str && (id = atoi(str)))
 			{
 				return terminate(this, request, TRUE, id);
 			}
 		}
 		if (streq(action, "terminatechild"))
 		{
-			if (strid && (id = atoi(strid)))
+			if (str && (id = atoi(str)))
 			{
 				return terminate(this, request, FALSE, id);
 			}
 		}
+		if (streq(action, "initiateike"))
+		{
+			if (str)
+			{
+				return initiate(this, request, TRUE, str);
+			}
+		}
+		if (streq(action, "initiatechild"))
+		{
+			if (str)
+			{
+				return initiate(this, request, FALSE, str);
+			}
+		}
 	}
-	return request->redirect(request, "status/ikesalist");
+	return request->redirect(request, "ikesa/list");
 }
 
 /**