stream: create library instance of stream-manager
authorMartin Willi <martin@revosec.ch>
Thu, 27 Jun 2013 08:16:00 +0000 (10:16 +0200)
committerMartin Willi <martin@revosec.ch>
Thu, 18 Jul 2013 14:00:28 +0000 (16:00 +0200)
src/libstrongswan/library.c
src/libstrongswan/library.h
src/libstrongswan/networking/streams/stream.c
src/libstrongswan/networking/streams/stream_manager.h
src/libstrongswan/networking/streams/stream_service.c

index 35d7420..f2fa3e0 100644 (file)
@@ -80,6 +80,7 @@ void library_deinit()
        /* make sure the cache is clear before unloading plugins */
        lib->credmgr->flush_cache(lib->credmgr, CERT_ANY);
 
+       this->public.streams->destroy(this->public.streams);
        this->public.watcher->destroy(this->public.watcher);
        this->public.scheduler->destroy(this->public.scheduler);
        this->public.processor->destroy(this->public.processor);
@@ -268,6 +269,7 @@ bool library_init(char *settings)
        this->public.processor = processor_create();
        this->public.scheduler = scheduler_create();
        this->public.watcher = watcher_create();
+       this->public.streams = stream_manager_create();
        this->public.plugins = plugin_loader_create();
 
        if (!check_memwipe())
index d549725..560da27 100644 (file)
@@ -58,6 +58,9 @@
  * @defgroup networking networking
  * @ingroup libstrongswan
  *
+ * @defgroup streams streams
+ * @ingroup networking
+ *
  * @defgroup plugins plugins
  * @ingroup libstrongswan
  *
@@ -90,6 +93,7 @@
 #include "utils/printf_hook.h"
 #include "utils/utils.h"
 #include "networking/host_resolver.h"
+#include "networking/streams/stream_manager.h"
 #include "processing/processor.h"
 #include "processing/scheduler.h"
 #include "processing/watcher.h"
@@ -203,6 +207,11 @@ struct library_t {
        watcher_t *watcher;
 
        /**
+        * Streams and Services
+        */
+       stream_manager_t *streams;
+
+       /**
         * resolve hosts by DNS name
         */
        host_resolver_t *hosts;
index c6a73df..43a6bd4 100644 (file)
@@ -13,8 +13,7 @@
  * for more details.
  */
 
-#include "stream.h"
-
+#include <library.h>
 #include <errno.h>
 #include <unistd.h>
 
index 347596f..ab01417 100644 (file)
@@ -23,7 +23,6 @@
 
 typedef struct stream_manager_t stream_manager_t;
 
-#include <networking/streams/stream.h>
 #include <networking/streams/stream_service.h>
 
 /**
index 4979ed6..489edae 100644 (file)
@@ -13,8 +13,7 @@
  * for more details.
  */
 
-#include "stream_service.h"
-
+#include <library.h>
 #include <threading/thread.h>
 #include <processing/jobs/callback_job.h>