moved imv_manager to libtnccs

12 files changed, 81 insertions, 41 deletions

diff --git a/src/libcharon/Makefile.am b/src/libcharon/Makefile.am
index 6ddf41c53..b51027ab4 100644
--- a/src/libcharon/Makefile.am
+++ b/src/libcharon/Makefile.am
@@ -87,8 +87,6 @@ sa/tasks/ike_reauth.c sa/tasks/ike_reauth.h \
 sa/tasks/ike_auth_lifetime.c sa/tasks/ike_auth_lifetime.h \
 sa/tasks/ike_vendor.c sa/tasks/ike_vendor.h \
 sa/tasks/task.c sa/tasks/task.h \
-tnc/imv/imv.h tnc/imv/imv_manager.h \
-tnc/imv/imv_recommendations.c tnc/imv/imv_recommendations.h \
 tnc/tnccs/tnccs.c tnc/tnccs/tnccs.h \
 tnc/tnccs/tnccs_manager.c tnc/tnccs/tnccs_manager.h
 
diff --git a/src/libcharon/daemon.h b/src/libcharon/daemon.h
index 3230e7201..6bbaa4f58 100644
--- a/src/libcharon/daemon.h
+++ b/src/libcharon/daemon.h
@@ -152,7 +152,6 @@ typedef struct daemon_t daemon_t;
 #include <sa/shunt_manager.h>
 #include <config/backend_manager.h>
 #include <sa/authenticators/eap/eap_manager.h>
-#include <tnc/imv/imv_manager.h>
 #include <tnc/tnccs/tnccs_manager.h>
 
 #ifdef ME
@@ -241,11 +240,6 @@ struct daemon_t {
 	eap_manager_t *eap;
 
 	/**
-	 * TNC IMV manager controlling Integrity Measurement Verifiers
-	 */
-	imv_manager_t *imvs;
-
-	/**
 	 * TNCCS manager to maintain registered TNCCS protocols
 	 */
 	tnccs_manager_t *tnccs;
diff --git a/src/libcharon/plugins/tnc_imv/tnc_imv_plugin.c b/src/libcharon/plugins/tnc_imv/tnc_imv_plugin.c
index 45cf95c1b..bec151047 100644
--- a/src/libcharon/plugins/tnc_imv/tnc_imv_plugin.c
+++ b/src/libcharon/plugins/tnc_imv/tnc_imv_plugin.c
@@ -24,13 +24,31 @@
 #include <errno.h>
 #include <fcntl.h>
 
-#include <daemon.h>
 #include <utils/lexparser.h>
+#include <debug.h>
+
+typedef struct private_tnc_imv_plugin_t private_tnc_imv_plugin_t;
+
+/**
+ * Private data of a tnc_imv_plugin_t object.
+ */
+struct private_tnc_imv_plugin_t {
+
+	/**
+	 * Public interface.
+	 */
+	tnc_imv_plugin_t public;
+
+	/**
+	 * TNC IMV manager controlling Integrity Measurement Verifiers
+	 */
+	imv_manager_t *imvs;
+};
 
 /**
  * load IMVs from a configuration file
  */
-static bool load_imvs(char *filename)
+static bool load_imvs(private_tnc_imv_plugin_t *this, char *filename)
 {
 	int fd, line_nr = 0;
 	chunk_t src, line;
@@ -128,7 +146,7 @@ static bool load_imvs(char *filename)
 			free(path);
 			return FALSE;
 		}
-		if (!charon->imvs->add(charon->imvs, imv))
+		if (!this->imvs->add(this->imvs, imv))
 		{
 			if (imv->terminate &&
 				imv->terminate(imv->get_id(imv)) != TNC_RESULT_SUCCESS)
@@ -153,10 +171,21 @@ METHOD(plugin_t, get_name, char*,
 	return "tnc-imv";
 }
 
+METHOD(plugin_t, get_features, int,
+	private_tnc_imv_plugin_t *this, plugin_feature_t *features[])
+{
+	static plugin_feature_t f[] = {
+		PLUGIN_PROVIDE(CUSTOM, "imv-manager"),
+	};
+	*features = f;
+	return countof(f);
+}
+
 METHOD(plugin_t, destroy, void,
 	tnc_imv_plugin_t *this)
 {
-	charon->imvs->destroy(charon->imvs);
+	lib->set(lib, "imv-manager", NULL);
+	this->imvs->destroy(this->imvs);
 	free(this);
 }
 
@@ -169,27 +198,26 @@ plugin_t *tnc_imv_plugin_create()
 	tnc_imv_plugin_t *this;
 
 	INIT(this,
-		.plugin = {
-			.get_name = _get_name,
-			.reload = (void*)return_false,
-			.destroy = _destroy,
+		.public = {
+			.plugin = {
+				.get_name = _get_name,
+				.get_features = _get_features,
+				.destroy = _destroy,
+			},
 		},
+		.imvs = tnc_imv_manager_create(),
 	);
 
-	tnc_config = lib->settings->get_str(lib->settings,
-					"charon.plugins.tnc-imv.tnc_config", "/etc/tnc_config");
-
-	/* Create IMV manager */
-	charon->imvs = tnc_imv_manager_create();
+	lib->set(lib, "imv-manager", this->imvs);
 
 	/* Load IMVs and abort if not all instances initalize successfully */
-	if (!load_imvs(tnc_config))
+	tnc_config = lib->settings->get_str(lib->settings,
+					"charon.plugins.tnc-imv.tnc_config", "/etc/tnc_config");
+	if (!load_imvs(this, tnc_config))
 	{
-		charon->imvs->destroy(charon->imvs);
-		charon->imvs = NULL;
-		free(this);
+		destroy(this);
 		return NULL;
 	}
-	return &this->plugin;
+	return &this->public.plugin;
 }
 
diff --git a/src/libcharon/plugins/tnccs_11/tnccs_11.c b/src/libcharon/plugins/tnccs_11/tnccs_11.c
index c7f96731e..4000ae2be 100644
--- a/src/libcharon/plugins/tnccs_11/tnccs_11.c
+++ b/src/libcharon/plugins/tnccs_11/tnccs_11.c
@@ -99,6 +99,11 @@ struct private_tnccs_11_t {
 	 */
 	imc_manager_t *imcs;
 
+	/**
+	 * TNC IMV manager controlling Integrity Measurement Verifiers
+	 */
+	imc_manager_t *imvs;
+
 };
 
 METHOD(tnccs_t, send_msg, TNC_Result,
@@ -181,7 +186,7 @@ static void handle_message(private_tnccs_11_t *this, tnccs_msg_t *msg)
 			this->send_msg = TRUE;
 			if (this->is_server)
 			{
-				charon->imvs->receive_message(charon->imvs,
+				this->imvs->receive_message(this->imvs,
 				this->connection_id, msg_body.ptr, msg_body.len, msg_type);
 			}
 			else
@@ -343,7 +348,7 @@ METHOD(tls_t, process, status_t,
 		this->send_msg = TRUE;
 		if (this->is_server)
 		{
-			charon->imvs->batch_ending(charon->imvs, this->connection_id);
+			this->imvs->batch_ending(this->imvs, this->connection_id);
 		}
 		else
 		{
@@ -540,6 +545,7 @@ tls_t *tnccs_11_create(bool is_server)
 		.is_server = is_server,
 		.mutex = mutex_create(MUTEX_TYPE_DEFAULT),
 		.imcs = lib->get(lib, "imc-manager"),
+		.imvs = lib->get(lib, "imv-manager"),
 	);
 
 	return &this->public;
diff --git a/src/libcharon/plugins/tnccs_20/tnccs_20.c b/src/libcharon/plugins/tnccs_20/tnccs_20.c
index c9e62e093..d3a560f6f 100644
--- a/src/libcharon/plugins/tnccs_20/tnccs_20.c
+++ b/src/libcharon/plugins/tnccs_20/tnccs_20.c
@@ -99,6 +99,11 @@ struct private_tnccs_20_t {
 	 */
 	imc_manager_t *imcs;
 
+	/**
+	 * TNC IMV manager controlling Integrity Measurement Verifiers
+	 */
+	imv_manager_t *imvs;
+
 };
 
 METHOD(tnccs_t, send_msg, TNC_Result,
@@ -198,7 +203,7 @@ static void handle_message(private_tnccs_20_t *this, pb_tnc_msg_t *msg)
 			this->send_msg = TRUE;
 			if (this->is_server)
 			{
-				charon->imvs->receive_message(charon->imvs,
+				this->imvs->receive_message(this->imvs,
 				this->connection_id, msg_body.ptr, msg_body.len, msg_type);
 			}
 			else
@@ -447,7 +452,7 @@ METHOD(tls_t, process, status_t,
 		this->send_msg = TRUE;
 		if (this->is_server)
 		{
-			charon->imvs->batch_ending(charon->imvs, this->connection_id);
+			this->imvs->batch_ending(this->imvs, this->connection_id);
 		}
 		else
 		{
@@ -740,6 +745,7 @@ tls_t *tnccs_20_create(bool is_server)
 		.state_machine = pb_tnc_state_machine_create(is_server),
 		.mutex = mutex_create(MUTEX_TYPE_DEFAULT),
 		.imcs = lib->get(lib, "imc-manager"),
+		.imvs = lib->get(lib, "imv-manager"),
 	);
 
 	return &this->public;
diff --git a/src/libcharon/tnc/tnccs/tnccs_manager.c b/src/libcharon/tnc/tnccs/tnccs_manager.c
index 0e4107eef..d23076509 100644
--- a/src/libcharon/tnc/tnccs/tnccs_manager.c
+++ b/src/libcharon/tnc/tnccs/tnccs_manager.c
@@ -18,7 +18,7 @@
 #include "tnccs_manager.h"
 
 #include <imc/imc_manager.h>
-#include <tnc/imv/imv_recommendations.h>
+#include <imv/imv_manager.h>
 
 #include <debug.h>
 #include <daemon.h>
@@ -116,6 +116,11 @@ struct private_tnccs_manager_t {
 	 */
 	imc_manager_t *imcs;
 
+	/**
+	 * TNC IMV manager controlling Integrity Measurement Verifiers
+	 */
+	imv_manager_t *imvs;
+
 };
 
 METHOD(tnccs_manager_t, add_method, void,
@@ -193,13 +198,17 @@ METHOD(tnccs_manager_t, create_connection, TNC_ConnectionID,
 	if (recs)
 	{
 		/* we assume a TNC Server needing recommendations from IMVs */
-		if (!charon->imvs)
+		if (!this->imvs)
+		{
+			this->imvs = lib->get(lib, "imv-manager");
+		}
+		if (!this->imvs)
 		{
 			DBG1(DBG_TNC, "no IMV manager available!");
 			free(entry);
 			return 0;
 		}
-		entry->recs = charon->imvs->create_recommendations(charon->imvs);
+		entry->recs = this->imvs->create_recommendations(this->imvs);
 		*recs = entry->recs;
 	}
 	else
@@ -234,9 +243,9 @@ METHOD(tnccs_manager_t, remove_connection, void,
 
 	if (is_server)
 	{
-		if (charon->imvs)
+		if (this->imvs)
 		{
-			charon->imvs->notify_connection_change(charon->imvs, id,
+			this->imvs->notify_connection_change(this->imvs, id,
 										TNC_CONNECTION_STATE_DELETE);
 		}
 	}
@@ -511,6 +520,7 @@ tnccs_manager_t *tnccs_manager_create()
 			.protocol_lock = rwlock_create(RWLOCK_TYPE_DEFAULT),
 			.connection_lock = rwlock_create(RWLOCK_TYPE_DEFAULT),
 			.imcs = lib->get(lib, "imc-manager"),
+			.imvs = lib->get(lib, "imv-manager"),
 	);
 
 	return &this->public;
diff --git a/src/libcharon/tnc/tnccs/tnccs_manager.h b/src/libcharon/tnc/tnccs/tnccs_manager.h
index 5051d4bb3..3282192c5 100644
--- a/src/libcharon/tnc/tnccs/tnccs_manager.h
+++ b/src/libcharon/tnc/tnccs/tnccs_manager.h
@@ -27,7 +27,7 @@ typedef struct tnccs_manager_t tnccs_manager_t;
 
 #include "tnccs.h"
 
-#include <tnc/imv/imv_recommendations.h>
+#include <imv/imv_recommendations.h>
 
 /**
  * The TNCCS manager manages all TNCCS implementations and creates instances.
diff --git a/src/libtnccs/Makefile.am b/src/libtnccs/Makefile.am
index 034814402..e75d1bdbc 100644
--- a/src/libtnccs/Makefile.am
+++ b/src/libtnccs/Makefile.am
@@ -6,5 +6,7 @@ ipseclib_LTLIBRARIES = libtnccs.la
 libtnccs_la_LIBADD = $(top_builddir)/src/libtncif/libtncif.la
 
 libtnccs_la_SOURCES = \
-	imc/imc.h imc/imc_manager.h
+	imc/imc.h imc/imc_manager.h \
+	imv/imv.h imv/imv_manager.h \
+	imv/imv_recommendations.h imv/imv_recommendations.c 
 
diff --git a/src/libcharon/tnc/imv/imv.h b/src/libtnccs/imv/imv.h
index df338d40a..df338d40a 100644
--- a/src/libcharon/tnc/imv/imv.h
+++ b/src/libtnccs/imv/imv.h
diff --git a/src/libcharon/tnc/imv/imv_manager.h b/src/libtnccs/imv/imv_manager.h
index 97daedb13..bd10a6920 100644
--- a/src/libcharon/tnc/imv/imv_manager.h
+++ b/src/libtnccs/imv/imv_manager.h
@@ -23,8 +23,6 @@
 
 typedef struct imv_manager_t imv_manager_t;
 
-#ifdef USE_TNC
-
 #include "imv.h"
 #include "imv_recommendations.h"
 
@@ -144,6 +142,4 @@ struct imv_manager_t {
 	void (*destroy)(imv_manager_t *this);
 };
 
-#endif /* USE_TNC */
-
 #endif /** IMV_MANAGER_H_ @}*/
diff --git a/src/libcharon/tnc/imv/imv_recommendations.c b/src/libtnccs/imv/imv_recommendations.c
index 9daaca16c..9daaca16c 100644
--- a/src/libcharon/tnc/imv/imv_recommendations.c
+++ b/src/libtnccs/imv/imv_recommendations.c
diff --git a/src/libcharon/tnc/imv/imv_recommendations.h b/src/libtnccs/imv/imv_recommendations.h
index d694e16ae..d694e16ae 100644
--- a/src/libcharon/tnc/imv/imv_recommendations.h
+++ b/src/libtnccs/imv/imv_recommendations.h