diff options
| author | Martin Willi <martin@revosec.ch> | 2010-06-07 15:06:09 +0200 |
|---|---|---|
| committer | Martin Willi <martin@revosec.ch> | 2010-06-07 15:06:09 +0200 |
| commit | 5493ffde0b4577524048aaaa49ac0ee05f13dab4 (patch) | |
| tree | 198eac57fa9b06842827d22f4887c490ff45eccb /src | |
| parent | 550d9085fae07a2a7e8762e2d6057957860ec893 (diff) | |
| download | strongswan-5493ffde0b4577524048aaaa49ac0ee05f13dab4.tar.bz2 strongswan-5493ffde0b4577524048aaaa49ac0ee05f13dab4.tar.xz | |
traffic_selector_t is gone into libstrongswan, migrate printf hook registration, too.
Diffstat (limited to 'src')
| -rw-r--r-- | src/libcharon/daemon.c | 5 | ||||
| -rw-r--r-- | src/libstrongswan/library.c | 13 |
2 files changed, 8 insertions, 10 deletions
diff --git a/src/libcharon/daemon.c b/src/libcharon/daemon.c index b338f6ee6..aed0029e5 100644 --- a/src/libcharon/daemon.c +++ b/src/libcharon/daemon.c @@ -29,7 +29,6 @@ #include "daemon.h" #include <library.h> -#include <selectors/traffic_selector.h> #include <config/proposal.h> #ifndef LOG_AUTHPRIV /* not defined on OpenSolaris */ @@ -429,10 +428,6 @@ bool libcharon_init() this = daemon_create(); charon = &this->public; - lib->printf_hook->add_handler(lib->printf_hook, 'R', - traffic_selector_printf_hook, - PRINTF_HOOK_ARGTYPE_POINTER, - PRINTF_HOOK_ARGTYPE_END); lib->printf_hook->add_handler(lib->printf_hook, 'P', proposal_printf_hook, PRINTF_HOOK_ARGTYPE_POINTER, diff --git a/src/libstrongswan/library.c b/src/libstrongswan/library.c index 8166d2457..7ed2916c8 100644 --- a/src/libstrongswan/library.c +++ b/src/libstrongswan/library.c @@ -18,12 +18,13 @@ #include <stdlib.h> -#include "debug.h" -#include "threading/thread.h" -#include "utils/identification.h" -#include "utils/host.h" +#include <debug.h> +#include <threading/thread.h> +#include <utils/identification.h> +#include <utils/host.h> +#include <selectors/traffic_selector.h> #ifdef LEAK_DETECTIVE -#include "utils/leak_detective.h" +#include <utils/leak_detective.h> #endif #define CHECKSUM_LIBRARY IPSEC_DIR"/libchecksum.so" @@ -129,6 +130,8 @@ bool library_init(char *settings) PRINTF_HOOK_ARGTYPE_END); pfh->add_handler(pfh, 'Y', identification_printf_hook, PRINTF_HOOK_ARGTYPE_POINTER, PRINTF_HOOK_ARGTYPE_END); + pfh->add_handler(pfh, 'R', traffic_selector_printf_hook, + PRINTF_HOOK_ARGTYPE_POINTER, PRINTF_HOOK_ARGTYPE_END); this->public.settings = settings_create(settings); this->public.crypto = crypto_factory_create(); |