Cast first argument for %.*s to int
[strongswan.git] / src / libstrongswan / library.c
index b85ebea..30a7774 100644 (file)
 
 #include <stdlib.h>
 
-#include <debug.h>
+#include <utils/debug.h>
 #include <threading/thread.h>
 #include <utils/identification.h>
-#include <utils/host.h>
-#include <utils/hashtable.h>
+#include <networking/host.h>
+#include <collections/hashtable.h>
 #include <utils/backtrace.h>
 #include <selectors/traffic_selector.h>
 
 #define CHECKSUM_LIBRARY IPSEC_LIB_DIR"/libchecksum.so"
-#define HOST_RESOLVER_MAX_THREADS 2
 
 typedef struct private_library_t private_library_t;
 
@@ -45,12 +44,22 @@ struct private_library_t {
         * Hashtable with registered objects (name => object)
         */
        hashtable_t *objects;
+
+       /**
+        * Integrity check failed?
+        */
+       bool integrity_failed;
+
+       /**
+        * Number of times we have been initialized
+        */
+       refcount_t ref;
 };
 
 /**
  * library instance
  */
-library_t *lib;
+library_t *lib = NULL;
 
 /**
  * Deinitialize library
@@ -60,6 +69,11 @@ void library_deinit()
        private_library_t *this = (private_library_t*)lib;
        bool detailed;
 
+       if (!this || !ref_put(&this->ref))
+       {       /* have more users */
+               return;
+       }
+
        detailed = lib->settings->get_bool(lib->settings,
                                                                "libstrongswan.leak_detective.detailed", TRUE);
 
@@ -143,11 +157,19 @@ bool library_init(char *settings)
        private_library_t *this;
        printf_hook_t *pfh;
 
+       if (lib)
+       {       /* already initialized, increase refcount */
+               this = (private_library_t*)lib;
+               ref_get(&this->ref);
+               return !this->integrity_failed;
+       }
+
        INIT(this,
                .public = {
                        .get = _get,
                        .set = _set,
                },
+               .ref = 1,
        );
        lib = &this->public;
 
@@ -184,8 +206,8 @@ bool library_init(char *settings)
 
        this->objects = hashtable_create((hashtable_hash_t)hash,
                                                                         (hashtable_equals_t)equals, 4);
-       this->public.hosts = host_resolver_create(HOST_RESOLVER_MAX_THREADS);
        this->public.settings = settings_create(settings);
+       this->public.hosts = host_resolver_create();
        this->public.proposal = proposal_keywords_create();
        this->public.crypto = crypto_factory_create();
        this->public.creds = credential_factory_create();
@@ -205,14 +227,14 @@ bool library_init(char *settings)
                if (!lib->integrity->check(lib->integrity, "libstrongswan", library_init))
                {
                        DBG1(DBG_LIB, "integrity check of libstrongswan failed");
-                       return FALSE;
+                       this->integrity_failed = TRUE;
                }
 #else /* !INTEGRITY_TEST */
                DBG1(DBG_LIB, "integrity test enabled, but not supported");
-               return FALSE;
+               this->integrity_failed = TRUE;
 #endif /* INTEGRITY_TEST */
        }
 
-       return TRUE;
+       return !this->integrity_failed;
 }