diff options
| author | Tobias Brunner <tobias@strongswan.org> | 2010-08-03 18:57:30 +0200 |
|---|---|---|
| committer | Tobias Brunner <tobias@strongswan.org> | 2010-09-02 19:04:23 +0200 |
| commit | f6697eadb90a132431e82682e1af48f3314fcf27 (patch) | |
| tree | c8dbb1190b4a3c40c745a3745fe3d604e8467a26 /src | |
| parent | 44b4f0d06f4e1585fe32ceb9c813b1bc1888c784 (diff) | |
| download | strongswan-f6697eadb90a132431e82682e1af48f3314fcf27.tar.bz2 strongswan-f6697eadb90a132431e82682e1af48f3314fcf27.tar.xz | |
Scheduler and processor have been moved to libstrongswan.
Also reverts 0c21dc000d3cd5c82eb22c4481e6459978456364 as the dependency
to libcharon is no longer required.
Diffstat (limited to 'src')
| -rw-r--r-- | src/libcharon/plugins/ha/ha_cache.c | 2 | ||||
| -rw-r--r-- | src/libstrongswan/plugins/pkcs11/Makefile.am | 3 | ||||
| -rw-r--r-- | src/libstrongswan/plugins/pkcs11/pkcs11_manager.c | 3 |
3 files changed, 3 insertions, 5 deletions
diff --git a/src/libcharon/plugins/ha/ha_cache.c b/src/libcharon/plugins/ha/ha_cache.c index 1ebc33ca4..9ff3fd5ff 100644 --- a/src/libcharon/plugins/ha/ha_cache.c +++ b/src/libcharon/plugins/ha/ha_cache.c @@ -354,7 +354,7 @@ ha_cache_t *ha_cache_create(ha_kernel_t *kernel, ha_socket_t *socket, if (sync) { /* request a resync as soon as we are up */ - charon->scheduler->schedule_job(charon->scheduler, (job_t*) + lib->scheduler->schedule_job(lib->scheduler, (job_t*) callback_job_create((callback_job_cb_t)request_resync, this, NULL, NULL), 1); } diff --git a/src/libstrongswan/plugins/pkcs11/Makefile.am b/src/libstrongswan/plugins/pkcs11/Makefile.am index 7d395e051..199039d95 100644 --- a/src/libstrongswan/plugins/pkcs11/Makefile.am +++ b/src/libstrongswan/plugins/pkcs11/Makefile.am @@ -1,6 +1,5 @@ -INCLUDES = -I$(top_srcdir)/src/libstrongswan \ - -I$(top_srcdir)/src/libcharon -I$(top_srcdir)/src/libhydra +INCLUDES = -I$(top_srcdir)/src/libstrongswan AM_CFLAGS = -rdynamic diff --git a/src/libstrongswan/plugins/pkcs11/pkcs11_manager.c b/src/libstrongswan/plugins/pkcs11/pkcs11_manager.c index 8ff63fd4a..0c27600a6 100644 --- a/src/libstrongswan/plugins/pkcs11/pkcs11_manager.c +++ b/src/libstrongswan/plugins/pkcs11/pkcs11_manager.c @@ -21,7 +21,6 @@ #include "pkcs11_library.h" -#include <daemon.h> #include <processing/jobs/callback_job.h> typedef struct private_pkcs11_manager_t private_pkcs11_manager_t; @@ -392,7 +391,7 @@ pkcs11_manager_t *pkcs11_manager_create(pkcs11_manager_token_event_t cb, query_slots(entry); entry->job = callback_job_create((void*)dispatch_slot_events, entry, (void*)end_dispatch, NULL); - charon->processor->queue_job(charon->processor, (job_t*)entry->job); + lib->processor->queue_job(lib->processor, (job_t*)entry->job); } enumerator->destroy(enumerator); |