Initialize TKM client library in tkm.c

diff --git a/src/charon-tkm/src/charon-tkm.c b/src/charon-tkm/src/charon-tkm.c
index 8731d783141d8a4e0d72dcaff3c589e23f7fd375..3e52fa47d30718e245751e78cd881b959d75695f 100644 (file)
--- a/src/charon-tkm/src/charon-tkm.c
+++ b/src/charon-tkm/src/charon-tkm.c
@@ -32,7 +32,7 @@
 #include <utils/backtrace.h>
 #include <threading/thread.h>
 
-#include <tkm/client.h>
+#include "tkm.h"
 
 /**
  * PID file, in which charon-tkm stores its process id
@@ -294,8 +294,12 @@ int main(int argc, char *argv[])
                goto deinit;
        }
 
-       /* initialize TKM client lib */
-       tkmlib_init();
+       /* initialize TKM client */
+       if (!tkm_init())
+       {
+               DBG1(DBG_DMN, "init of TKM client failed - aborting %s", dmn_name);
+               goto deinit;
+       }
 
        /* add handler for SEGV and ILL,
         * INT and TERM are handled by sigwait() in run() */
@@ -320,11 +324,11 @@ int main(int argc, char *argv[])
 
        unlink_pidfile();
        status = 0;
-       tkmlib_final();
 
 deinit:
        libcharon_deinit();
        libhydra_deinit();
        library_deinit();
+       tkm_deinit();
        return status;
 }

diff --git a/src/charon-tkm/src/tkm/tkm.c b/src/charon-tkm/src/tkm/tkm.c
index 1e61f882b4771a1627a5564578a6e36b56a23e66..ebff089e5c2bd4d9c3062ae0d060ec5e99eef633 100644 (file)
--- a/src/charon-tkm/src/tkm/tkm.c
+++ b/src/charon-tkm/src/tkm/tkm.c
@@ -14,8 +14,13 @@
  * for more details.
  */
 
+#include <tkm/client.h>
+#include <tkm/constants.h>
+
 #include "tkm.h"
 
+#define IKE_SOCKET "/tmp/tkm.rpc.ike"
+
 typedef struct private_tkm_t private_tkm_t;
 
 /**
@@ -41,6 +46,20 @@ bool tkm_init()
 {
        private_tkm_t *this;
 
+       /* initialize TKM client library */
+       tkmlib_init();
+       if (ike_init(IKE_SOCKET) != TKM_OK)
+       {
+               tkmlib_final();
+               return FALSE;
+       }
+
+       if (ike_tkm_reset() != TKM_OK)
+       {
+               tkmlib_final();
+               return FALSE;
+       }
+
        INIT(this,
                .public = {
                        .idmgr = tkm_id_manager_create(),
@@ -62,6 +81,8 @@ void tkm_deinit()
        }
        private_tkm_t *this = (private_tkm_t*)tkm;
        this->public.idmgr->destroy(this->public.idmgr);
+
+       tkmlib_final();
        free(this);
        tkm = NULL;
 }

diff --git a/src/charon-tkm/tests/test_runner.c b/src/charon-tkm/tests/test_runner.c
index 61c2524168e85cd1683e00d49a19961273da9ff6..c16ad35b1dcaaccbe8b2ed937a024d0a06b1dade 100644 (file)
--- a/src/charon-tkm/tests/test_runner.c
+++ b/src/charon-tkm/tests/test_runner.c
@@ -14,12 +14,17 @@
  * for more details.
  */
 
-#include <stdlib.h>
-
+#include "tkm.h"
 #include "test_runner.h"
 
 int main(void)
 {
+       if (!tkm_init())
+       {
+               fprintf(stderr, "Could not connect to TKM, aborting tests\n");
+               return EXIT_FAILURE;
+       }
+
        int number_failed;
        Suite *s = suite_create("TKM tests");
        suite_add_tcase(s, make_id_manager_tests());
@@ -30,6 +35,7 @@ int main(void)
        srunner_run_all(sr, CK_NORMAL);
        number_failed = srunner_ntests_failed(sr);
 
+       tkm_deinit();
        srunner_free(sr);
 
        return (number_failed == 0) ? EXIT_SUCCESS : EXIT_FAILURE;