denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Martin Willi
2010-06-07 15:06:09 +02:00
parent 550d9085fa
commit 5493ffde0b
2 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/daemon.c
-5
View File
@@ -29,7 +29,6 @@
#include "daemon.h" #include "daemon.h"
#include <library.h> #include <library.h>
#include <selectors/traffic_selector.h>
#include <config/proposal.h> #include <config/proposal.h>
#ifndef LOG_AUTHPRIV /* not defined on OpenSolaris */ #ifndef LOG_AUTHPRIV /* not defined on OpenSolaris */
@@ -429,10 +428,6 @@ bool libcharon_init()
this = daemon_create(); this = daemon_create();
charon = &this->public; 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', lib->printf_hook->add_handler(lib->printf_hook, 'P',
proposal_printf_hook, proposal_printf_hook,
PRINTF_HOOK_ARGTYPE_POINTER, PRINTF_HOOK_ARGTYPE_POINTER,
src/libstrongswan/library.c
+8 -5
View File
@@ -18,12 +18,13 @@
#include <stdlib.h> #include <stdlib.h>
#include "debug.h" #include <debug.h>
#include "threading/thread.h" #include <threading/thread.h>
#include "utils/identification.h" #include <utils/identification.h>
#include "utils/host.h" #include <utils/host.h>
#include <selectors/traffic_selector.h>
#ifdef LEAK_DETECTIVE #ifdef LEAK_DETECTIVE
#include "utils/leak_detective.h" #include <utils/leak_detective.h>
#endif #endif
#define CHECKSUM_LIBRARY IPSEC_DIR"/libchecksum.so" #define CHECKSUM_LIBRARY IPSEC_DIR"/libchecksum.so"
@@ -129,6 +130,8 @@ bool library_init(char *settings)
PRINTF_HOOK_ARGTYPE_END); PRINTF_HOOK_ARGTYPE_END);
pfh->add_handler(pfh, 'Y', identification_printf_hook, pfh->add_handler(pfh, 'Y', identification_printf_hook,
PRINTF_HOOK_ARGTYPE_POINTER, PRINTF_HOOK_ARGTYPE_END); 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.settings = settings_create(settings);
this->public.crypto = crypto_factory_create(); this->public.crypto = crypto_factory_create();