From 140a6b7b34f5f0f7694da74195fd90454298c9a6 Mon Sep 17 00:00:00 2001 From: Adrian-Ken Rueegsegger Date: Tue, 18 Dec 2012 17:15:58 +0100 Subject: [PATCH] Make IKE and EES sockets configurable The IKE and EES sockets are now read from strongswan.conf. They can be specified like this: charon-tkm { ike_socket = /tmp/tkm.rpc.ike ees_socket = /tmp/tkm.rpc.ees } The socket names given above are used by default if none are configured. --- src/charon-tkm/src/tkm/tkm.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/src/charon-tkm/src/tkm/tkm.c b/src/charon-tkm/src/tkm/tkm.c index 47e1eb963..9cf54b087 100644 --- a/src/charon-tkm/src/tkm/tkm.c +++ b/src/charon-tkm/src/tkm/tkm.c @@ -14,6 +14,8 @@ * for more details. */ +#include + #include #include @@ -61,16 +63,25 @@ bool tkm_init() /* initialize TKM client library */ tkmlib_init(); - ehandler_init(); - if (ike_init(IKE_SOCKET) != TKM_OK) + const char * const ikesock = lib->settings->get_str(lib->settings, + "%s.ike_socket", + IKE_SOCKET, + charon->name); + if (ike_init(ikesock) != TKM_OK) { tkmlib_final(); return FALSE; } + DBG1(DBG_DMN, "connected to TKM via socket '%s'", ikesock); - ees_server_init(EES_SOCKET); + const char * const eessock = lib->settings->get_str(lib->settings, + "%s.ees_socket", + EES_SOCKET, + charon->name); + ees_server_init(eessock); + DBG1(DBG_DMN, "serving EES requests on socket '%s'", eessock); if (ike_tkm_reset() != TKM_OK) {