From 16b9a73cc4bd4c4fafc8618fdd4c05ab72195df1 Mon Sep 17 00:00:00 2001 From: Martin Willi Date: Thu, 16 Mar 2006 15:25:06 +0000 Subject: - reworked configuration framework completly - configuration is now split up in: connections, policies, credentials and daemon config - further alloc/free fixes needed! --- Source/charon/threads/thread_pool.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'Source/charon/threads/thread_pool.c') diff --git a/Source/charon/threads/thread_pool.c b/Source/charon/threads/thread_pool.c index 8e14fc37e..f3e2fd8e6 100644 --- a/Source/charon/threads/thread_pool.c +++ b/Source/charon/threads/thread_pool.c @@ -340,13 +340,10 @@ static void process_initiate_ike_sa_job(private_thread_pool_t *this, initiate_ik status_t status; - this->worker_logger->log(this->worker_logger, CONTROL|LEVEL2, "Create and checking out IKE SA"); - + this->worker_logger->log(this->worker_logger, CONTROL|LEVEL2, "Creating and checking out IKE SA"); charon->ike_sa_manager->create_and_checkout(charon->ike_sa_manager, &ike_sa); - this->worker_logger->log(this->worker_logger, CONTROL, "Initiating connection \"%s\"", - job->get_configuration_name(job)); - status = ike_sa->initialize_connection(ike_sa, job->get_configuration_name(job)); + status = ike_sa->initiate_connection(ike_sa, job->get_connection(job)); if (status != SUCCESS) { this->worker_logger->log(this->worker_logger, ERROR, "Initiation returned %s, going to delete IKE_SA.", -- cgit v1.2.3