1 files changed, 34 insertions, 1 deletions

diff --git a/src/libcharon/plugins/tnc_imv/tnc_imv.c b/src/libcharon/plugins/tnc_imv/tnc_imv.c
index f88b645d6..fe628ee7e 100644
--- a/src/libcharon/plugins/tnc_imv/tnc_imv.c
+++ b/src/libcharon/plugins/tnc_imv/tnc_imv.c
@@ -19,6 +19,7 @@
 
 #include <debug.h>
 #include <library.h>
+#include <threading/mutex.h>
 
 typedef struct private_tnc_imv_t private_tnc_imv_t;
 
@@ -61,6 +62,11 @@ struct private_tnc_imv_t {
 	 * Number of supported message types
 	 */
 	TNC_UInt32 type_count;
+
+	/**
+	 * mutex to lock the imv_t object
+	 */
+	mutex_t *mutex;
 };
 
 METHOD(imv_t, set_id, void,
@@ -85,6 +91,14 @@ METHOD(imv_t, set_message_types, void,
 	private_tnc_imv_t *this, TNC_MessageTypeList supported_types,
 							 TNC_UInt32 type_count)
 {
+	char buf[512];
+	char *pos = buf;
+	int len = sizeof(buf);
+	int written;
+
+	/* lock the imv_t instance */
+	this->mutex->lock(this->mutex);
+
 	/* Free an existing MessageType list */
 	free(this->supported_types);
 	this->supported_types = NULL;
@@ -95,10 +109,27 @@ METHOD(imv_t, set_message_types, void,
 	{
 		size_t size = type_count * sizeof(TNC_MessageType);
 
+		int i;
+
+		for (i = 0; i < type_count; i++)
+		{
+			written = snprintf(pos, len, " 0x%08x", supported_types[i]);
+			if (written >= len)
+			{
+				break;
+			}
+			pos += written;
+			len -= written;
+		}
 		this->supported_types = malloc(size);
 		memcpy(this->supported_types, supported_types, size);
 	}
-	DBG2(DBG_TNC, "IMV %u supports %u message types", this->id, type_count);
+	*pos = '\0';
+	DBG2(DBG_TNC, "IMV %u supports %u message types:%s",
+				  this->id, type_count, buf);
+
+	/* lock the imv_t instance */
+	this->mutex->unlock(this->mutex);
 }
 
 METHOD(imv_t, type_supported, bool,
@@ -132,6 +163,7 @@ METHOD(imv_t, destroy, void,
 	private_tnc_imv_t *this)
 {
 	dlclose(this->handle);
+	this->mutex->destroy(this->mutex);
 	free(this->supported_types);
 	free(this->name);
 	free(this->path);
@@ -156,6 +188,7 @@ imv_t* tnc_imv_create(char *name, char *path)
 		},
 		.name = name,
 		.path = path,
+		.mutex = mutex_create(MUTEX_TYPE_DEFAULT),
 	);
 
 	this->handle = dlopen(path, RTLD_LAZY);