diff options
| author | Rene Mayrhofer <rene@mayrhofer.eu.org> | 2010-02-23 10:34:14 +0000 | 
|---|---|---|
| committer | Rene Mayrhofer <rene@mayrhofer.eu.org> | 2010-02-23 10:34:14 +0000 | 
| commit | ed7d79f96177044949744da10f4431c1d6242241 (patch) | |
| tree | 3aabaa55ed3b5291daef891cfee9befb5235e2b8 /src/manager/controller/control_controller.c | |
| parent | 7410d3c6d6a9a1cd7aa55083c938946af6ff9498 (diff) | |
| download | vyos-strongswan-ed7d79f96177044949744da10f4431c1d6242241.tar.gz vyos-strongswan-ed7d79f96177044949744da10f4431c1d6242241.zip | |
[svn-upgrade] Integrating new upstream version, strongswan (4.3.6)
Diffstat (limited to 'src/manager/controller/control_controller.c')
| -rw-r--r-- | src/manager/controller/control_controller.c | 12 | 
1 files changed, 6 insertions, 6 deletions
| diff --git a/src/manager/controller/control_controller.c b/src/manager/controller/control_controller.c index c22591182..fdf66bf14 100644 --- a/src/manager/controller/control_controller.c +++ b/src/manager/controller/control_controller.c @@ -33,7 +33,7 @@ struct private_control_controller_t {  	 * public functions  	 */  	control_controller_t public; -	 +  	/**  	 * manager instance  	 */ @@ -50,7 +50,7 @@ static void handle_result(private_control_controller_t *this, request_t *r,  	xml_t *xml;  	char *name, *value;  	int num = 0; -	 +  	if (e)  	{  		while (e->enumerate(e, &xml, &name, &value)) @@ -113,7 +113,7 @@ static void terminate(private_control_controller_t *this, request_t *r,  {  	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); @@ -145,7 +145,7 @@ static void handle(private_control_controller_t *this,  	if (action)  	{  		u_int32_t id; -	 +  		if (streq(action, "terminateike"))  		{  			if (str && (id = atoi(str))) @@ -196,9 +196,9 @@ controller_t *control_controller_create(context_t *context, void *param)  	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;  	this->public.controller.destroy = (void(*)(controller_t*))destroy; -	 +  	this->manager = (manager_t*)context; -	 +  	return &this->public.controller;  } | 
