traffic_selector_t is gone into libstrongswan, migrate printf hook registration,...

diff --git a/src/libcharon/daemon.c b/src/libcharon/daemon.c
index b338f6ee66510b20411f462e249b97462dcf8bcb..aed0029e526c673c1319e71bc85496f84198e03e 100644 (file)
--- 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 8166d245738ed454bd319c935b6731d031a47fb9..7ed2916c862e684b714af606a105d9b2bc14edaa 100644 (file)
--- 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();