denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

implemented IKE_SA initiation in manager

Browse Source
This commit is contained in:
Martin Willi
2007-11-13 11:58:28 +00:00
parent 30a68d715b
commit e8287a405e
16 changed files with 275 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/manager/controller/auth_controller.c
+1 -1
View File
@@ -60,7 +60,7 @@ static void check(private_auth_controller_t *this, request_t *request)
if (username && password &&
this->manager->login(this->manager, username, password))
{
request->redirect(request, "status/ikesalist");
request->redirect(request, "ikesa/list");
}
else
{
src/manager/controller/config_controller.c
+5 -4
View File
@@ -55,7 +55,7 @@ static void process_peerconfig(private_config_controller_t *this,
{
xml_t *xml;
enumerator_t *e1, *e2, *e3;
char *name, *value, *config = "", *child = "";
char *name, *value, *config = "", *child = "", *section = "";
while (e->enumerate(e, &xml, &name, &value))
{
@@ -80,7 +80,7 @@ static void process_peerconfig(private_config_controller_t *this,
e1 = xml->children(xml);
while (e1->enumerate(e1, &xml, &name, &value))
{
if (streq(name, "childcfg"))
if (streq(name, "childconfig"))
{
int num = 0;
@@ -93,13 +93,14 @@ static void process_peerconfig(private_config_controller_t *this,
}
else if (streq(name, "local") || streq(name, "remote"))
{
section = name;
e3 = xml->children(xml);
while (e3->enumerate(e3, &xml, &name, &value))
{
if (streq(name, "network"))
{
r->setf(r, "peercfgs.%s.childcfgs.%s.%s.%d=%s",
config, child, name, ++num, value);
r->setf(r, "peercfgs.%s.childcfgs.%s.%s.networks.%d=%s",
config, child, section, ++num, value);
}
}
e3->destroy(e3);
src/manager/controller/control_controller.c
+85 -12
View File
@@ -48,17 +48,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
{
@@ -68,6 +97,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
*/
@@ -80,7 +139,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 +155,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");
}
/**
src/manager/controller/gateway_controller.c
+1 -1
View File
@@ -82,7 +82,7 @@ static void _select(private_gateway_controller_t *this, request_t *request)
{
if (this->manager->select_gateway(this->manager, atoi(id)))
{
request->redirect(request, "status/ikesalist");
request->redirect(request, "ikesa/list");
return;
}
}
src/manager/controller/status_controller.c → src/manager/controller/ikesa_controller.c
+19 -19
View File
@@ -1,7 +1,7 @@
/**
* @file status_controller.c
* @file ikesa_controller.c
*
* @brief Implementation of status_controller_t.
* @brief Implementation of ikesa_controller_t.
*
*/
@@ -20,7 +20,7 @@
* for more details.
*/
#include "status_controller.h"
#include "ikesa_controller.h"
#include "../manager.h"
#include "../gateway.h"
@@ -29,17 +29,17 @@
#include <library.h>
typedef struct private_status_controller_t private_status_controller_t;
typedef struct private_ikesa_controller_t private_ikesa_controller_t;
/**
* private data of the task manager
*/
struct private_status_controller_t {
struct private_ikesa_controller_t {
/**
* public functions
*/
status_controller_t public;
ikesa_controller_t public;
/**
* manager instance
@@ -50,7 +50,7 @@ struct private_status_controller_t {
/**
* read XML of a childsa element and fill template
*/
static void process_childsa(private_status_controller_t *this, char *id,
static void process_childsa(private_ikesa_controller_t *this, char *id,
enumerator_t *e, request_t *r)
{
xml_t *xml;
@@ -102,7 +102,7 @@ static void process_childsa(private_status_controller_t *this, char *id,
/**
* read XML of a ikesa element and fill template
*/
static void process_ikesa(private_status_controller_t *this,
static void process_ikesa(private_ikesa_controller_t *this,
enumerator_t *e, request_t *r)
{
xml_t *xml;
@@ -146,7 +146,7 @@ static void process_ikesa(private_status_controller_t *this,
}
}
static void ikesalist(private_status_controller_t *this, request_t *r)
static void list(private_ikesa_controller_t *this, request_t *r)
{
gateway_t *gateway;
xml_t *xml;
@@ -176,22 +176,22 @@ static void ikesalist(private_status_controller_t *this, request_t *r)
}
e1->destroy(e1);
r->render(r, "templates/status/ikesalist.cs");
r->render(r, "templates/ikesa/list.cs");
}
}
/**
* Implementation of controller_t.get_name
*/
static char* get_name(private_status_controller_t *this)
static char* get_name(private_ikesa_controller_t *this)
{
return "status";
return "ikesa";
}
/**
* Implementation of controller_t.handle
*/
static void handle(private_status_controller_t *this,
static void handle(private_ikesa_controller_t *this,
request_t *request, char *action)
{
if (!this->manager->logged_in(this->manager))
@@ -204,18 +204,18 @@ static void handle(private_status_controller_t *this,
}
if (action)
{
if (streq(action, "ikesalist"))
if (streq(action, "list"))
{
return ikesalist(this, request);
return list(this, request);
}
}
return request->redirect(request, "status/ikesalist");
return request->redirect(request, "ikesa/list");
}
/**
* Implementation of controller_t.destroy
*/
static void destroy(private_status_controller_t *this)
static void destroy(private_ikesa_controller_t *this)
{
free(this);
}
@@ -223,9 +223,9 @@ static void destroy(private_status_controller_t *this)
/*
* see header file
*/
controller_t *status_controller_create(context_t *context, void *param)
controller_t *ikesa_controller_create(context_t *context, void *param)
{
private_status_controller_t *this = malloc_thing(private_status_controller_t);
private_ikesa_controller_t *this = malloc_thing(private_ikesa_controller_t);
this->public.controller.get_name = (char*(*)(controller_t*))get_name;
this->public.controller.handle = (void(*)(controller_t*,request_t*,char*,char*,char*,char*,char*))handle;
src/manager/controller/status_controller.h → src/manager/controller/ikesa_controller.h
+9 -9
View File
@@ -1,7 +1,7 @@
/**
* @file status_controller.h
* @file ikesa_controller.h
*
* @brief Interface of status_controller_t.
* @brief Interface of ikesa_controller_t.
*
*/
@@ -20,18 +20,18 @@
* for more details.
*/
#ifndef STATUS_CONTROLLER_H_
#define STATUS_CONTROLLER_H_
#ifndef IKESA_CONTROLLER_H_
#define IKESA_CONTROLLER_H_
#include <controller.h>
typedef struct status_controller_t status_controller_t;
typedef struct ikesa_controller_t ikesa_controller_t;
/**
* @brief Status controller.
*/
struct status_controller_t {
struct ikesa_controller_t {
/**
* Implements controller_t interface.
@@ -40,8 +40,8 @@ struct status_controller_t {
};
/**
* @brief Create a status_controller controller instance.
* @brief Create a ikesa_controller controller instance.
*/
controller_t *status_controller_create(context_t *context, void *param);
controller_t *ikesa_controller_create(context_t *context, void *param);
#endif /* STATUS_CONTROLLER_H_ */
#endif /* IKESA_CONTROLLER_H_ */