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.

diff --git a/src/charon-tkm/src/tkm/tkm.c b/src/charon-tkm/src/tkm/tkm.c
index 47e1eb96319bdc4fa90ce02386ea2b2c906ce59c..9cf54b087ac964e0b3fe39bb07775403bc1558b3 100644 (file)
--- a/src/charon-tkm/src/tkm/tkm.c
+++ b/src/charon-tkm/src/tkm/tkm.c
@@ -14,6 +14,8 @@
  * for more details.
  */
 
+#include <daemon.h>
+
 #include <tkm/client.h>
 #include <tkm/constants.h>
 
@@ -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;
        }
-
-       ees_server_init(EES_SOCKET);
+       DBG1(DBG_DMN, "connected to TKM via socket '%s'", ikesock);
+
+       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)
        {