restructured file layout

new configuration structure:
  peer_cfg: configuration related to a peer (authenitcation, ...=
  ike_cfg: config to use for IKE setup (proposals)
  child_Cfg: config for CHILD_SA (proposals, traffic selectors)
  a peer_cfg has one ike_cfg and multiple child_cfg's
stroke now uses fixed count of threads

1 files changed, 0 insertions, 98 deletions

diff --git a/src/charon/queues/jobs/acquire_job.c b/src/charon/queues/jobs/acquire_job.c
deleted file mode 100644
index b4ffb258d..000000000
--- a/src/charon/queues/jobs/acquire_job.c
+++ /dev/null
@@ -1,98 +0,0 @@
-/**
- * @file acquire_job.c
- * 
- * @brief Implementation of acquire_job_t.
- * 
- */
-
-/*
- * Copyright (C) 2006 Martin Willi
- * Hochschule fuer Technik Rapperswil
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2 of the License, or (at your
- * option) any later version.  See <http://www.fsf.org/copyleft/gpl.txt>.
- *
- * This program is distributed in the hope that it will be useful, but
- * 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.
- */
-
-#include "acquire_job.h"
-
-#include <daemon.h>
-
-
-typedef struct private_acquire_job_t private_acquire_job_t;
-
-/**
- * Private data of an acquire_job_t object.
- */
-struct private_acquire_job_t {
-	/**
-	 * Public acquire_job_t interface.
-	 */
-	acquire_job_t public;
-	
-	/**
-	 * reqid of the child to rekey
-	 */
-	u_int32_t reqid;
-};
-
-/**
- * Implementation of job_t.get_type.
- */
-static job_type_t get_type(private_acquire_job_t *this)
-{
-	return ACQUIRE;
-}
-
-/**
- * Implementation of job_t.execute.
- */
-static status_t execute(private_acquire_job_t *this)
-{
-	ike_sa_t *ike_sa;
-	
-	ike_sa = charon->ike_sa_manager->checkout_by_id(charon->ike_sa_manager,
-													this->reqid, TRUE);
-	if (ike_sa == NULL)
-	{
-		DBG2(DBG_JOB, "CHILD_SA with reqid %d not found for acquiring",
-			 this->reqid);
-		return DESTROY_ME;
-	}
-	ike_sa->acquire(ike_sa, this->reqid);
-	
-	charon->ike_sa_manager->checkin(charon->ike_sa_manager, ike_sa);
-	return DESTROY_ME;
-}
-
-/**
- * Implementation of job_t.destroy.
- */
-static void destroy(private_acquire_job_t *this)
-{
-	free(this);
-}
-
-/*
- * Described in header
- */
-acquire_job_t *acquire_job_create(u_int32_t reqid)
-{
-	private_acquire_job_t *this = malloc_thing(private_acquire_job_t);
-	
-	/* interface functions */
-	this->public.job_interface.get_type = (job_type_t (*) (job_t *)) get_type;
-	this->public.job_interface.execute = (status_t (*) (job_t *)) execute;
-	this->public.job_interface.destroy = (void (*)(job_t*)) destroy;
-	
-	/* private variables */
-	this->reqid = reqid;
-	
-	return &(this->public);
-}