diff options
| author | Martin Willi <martin@strongswan.org> | 2006-03-16 15:25:06 +0000 |
|---|---|---|
| committer | Martin Willi <martin@strongswan.org> | 2006-03-16 15:25:06 +0000 |
| commit | 16b9a73cc4bd4c4fafc8618fdd4c05ab72195df1 (patch) | |
| tree | b7d3214d59942dbd75ad8b9b8f86468f82f7a496 /Source/charon/threads | |
| parent | b1953ccd05b5e6cf5a87c557208d5f8a1fcad231 (diff) | |
| download | strongswan-16b9a73cc4bd4c4fafc8618fdd4c05ab72195df1.tar.bz2 strongswan-16b9a73cc4bd4c4fafc8618fdd4c05ab72195df1.tar.xz | |
- reworked configuration framework completly
- configuration is now split up in: connections, policies, credentials and daemon config
- further alloc/free fixes needed!
Diffstat (limited to 'Source/charon/threads')
| -rw-r--r-- | Source/charon/threads/Makefile.threads | 4 | ||||
| -rw-r--r-- | Source/charon/threads/thread_pool.c | 7 |
2 files changed, 6 insertions, 5 deletions
diff --git a/Source/charon/threads/Makefile.threads b/Source/charon/threads/Makefile.threads index d756bd0ae..402ab96c4 100644 --- a/Source/charon/threads/Makefile.threads +++ b/Source/charon/threads/Makefile.threads @@ -33,3 +33,7 @@ $(BUILD_DIR)thread_pool.o : $(THREADS_DIR)thread_pool.c $(THREADS_DIR)thread_po OBJS+= $(BUILD_DIR)kernel_interface.o $(BUILD_DIR)kernel_interface.o :$(THREADS_DIR)kernel_interface.c $(THREADS_DIR)kernel_interface.h $(CC) $(CFLAGS) -c -o $@ $< + +OBJS+= $(BUILD_DIR)stroke.o +$(BUILD_DIR)stroke.o : $(THREADS_DIR)stroke.c $(THREADS_DIR)stroke.h + $(CC) $(CFLAGS) -c -o $@ $< 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.", |