added fetcher_finalize() to clean up libcurl

diff --git a/src/charon/daemon.c b/src/charon/daemon.c
index e2f079d5e789ae445a89ff78e1d11fb984525239..05acd36bf61ccebcb53164a56c01221f25180c6f 100644 (file)
--- a/src/charon/daemon.c
+++ b/src/charon/daemon.c
@@ -505,6 +505,7 @@ int main(int argc, char *argv[])
        run(private_charon);
        
        eap_method_unload();
+       fetcher_finalize();
        /* normal termination, cleanup and exit */
        destroy(private_charon);
        unlink(PID_FILE);

diff --git a/src/libstrongswan/utils/fetcher.c b/src/libstrongswan/utils/fetcher.c
index 6cc89a0094d46a5825b0e73d97168227973e0255..f5cd342b9d3ac54f48b4f0bdfbd6b913c6db8b91 100644 (file)
--- a/src/libstrongswan/utils/fetcher.c
+++ b/src/libstrongswan/utils/fetcher.c
@@ -173,7 +173,7 @@ void fetcher_initialize(void)
  #ifdef LIBCURL
        CURLcode res;
 
-       /* init libcurl */
+       /* initialize libcurl */
        DBG1("initializing libcurl");
        res = curl_global_init(CURL_GLOBAL_NOTHING);
        if (res != CURLE_OK)
@@ -182,3 +182,16 @@ void fetcher_initialize(void)
     }
 #endif /* LIBCURL */
 }
+
+/**
+ * Described in header.
+ */
+void fetcher_finalize(void)
+{
+ #ifdef LIBCURL
+       /* finalize libcurl */
+       DBG1("finalizing libcurl");
+       curl_global_cleanup();
+#endif /* LIBCURL */
+}
+

diff --git a/src/libstrongswan/utils/fetcher.h b/src/libstrongswan/utils/fetcher.h
index ca39186970b5d2f2da0e2a39e05dfcabc5c99064..ea7dd22b818beda05757c6547729ffcb3013cb9a 100644 (file)
--- a/src/libstrongswan/utils/fetcher.h
+++ b/src/libstrongswan/utils/fetcher.h
@@ -83,4 +83,13 @@ fetcher_t* fetcher_create(const char *uri);
  */
 void fetcher_initialize(void);
 
+/**
+ * @brief Finalizes the fetcher_t class
+ *
+ * call this function only once befor exiting the main program
+ *
+ * @ingroup utils
+ */
+void fetcher_finalize(void);
+
 #endif /*FETCHER_H_*/