refactored TNC framework

src/libcharon/plugins/eap_tnc/Makefile.am

@@ -1,7 +1,11 @@
 
-INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra \
-	-I$(top_srcdir)/src/libcharon -I$(top_srcdir)/src/libtls \
-	-I$(top_srcdir)/src/libtncif
+INCLUDES = \
+	-I$(top_srcdir)/src/libstrongswan \
+	-I$(top_srcdir)/src/libhydra \
+	-I$(top_srcdir)/src/libcharon \
+	-I$(top_srcdir)/src/libtls \
+	-I$(top_srcdir)/src/libtncif \
+	-I$(top_srcdir)/src/libtnccs
 
 AM_CFLAGS = -rdynamic
 
@@ -9,7 +13,9 @@ if MONOLITHIC
 noinst_LTLIBRARIES = libstrongswan-eap-tnc.la
 else
 plugin_LTLIBRARIES = libstrongswan-eap-tnc.la
-libstrongswan_eap_tnc_la_LIBADD = $(top_builddir)/src/libtls/libtls.la
+libstrongswan_eap_tnc_la_LIBADD = \
+	$(top_builddir)/src/libtls/libtls.la \
+	$(top_builddir)/src/libtnccs/libtnccs.la
 endif
 
 libstrongswan_eap_tnc_la_SOURCES = \

src/libcharon/plugins/eap_tnc/eap_tnc.c

@@ -15,13 +15,11 @@
 
 #include "eap_tnc.h"
 
+#include <tnc/tnc.h>
+#include <tnc/tnccs/tnccs_manager.h>
 #include <tls_eap.h>
 #include <debug.h>
 
-#define USE_TNC
-
-#include <daemon.h>
-
 typedef struct private_eap_tnc_t private_eap_tnc_t;
 
 /**
@@ -174,7 +172,7 @@ static eap_tnc_t *eap_tnc_create(identification_t *server,
 		free(this);
 		return NULL;
 	}
-	tnccs = charon->tnccs->create_instance(charon->tnccs, type, is_server);
+	tnccs = tnc->tnccs->create_instance(tnc->tnccs, type, is_server);
 	this->tls_eap = tls_eap_create(EAP_TNC, (tls_t*)tnccs, frag_size,
 											 max_msg_count, include_length);
 	if (!this->tls_eap)

src/libcharon/plugins/eap_tnc/eap_tnc_plugin.c

@@ -31,9 +31,11 @@ METHOD(plugin_t, get_features, int,
 		PLUGIN_CALLBACK(eap_method_register, eap_tnc_create_server),
 			PLUGIN_PROVIDE(EAP_SERVER, EAP_TNC),
 				PLUGIN_DEPENDS(EAP_SERVER, EAP_TTLS),
+				PLUGIN_DEPENDS(CUSTOM, "tnccs-manager"),
 		PLUGIN_CALLBACK(eap_method_register, eap_tnc_create_peer),
 			PLUGIN_PROVIDE(EAP_PEER, EAP_TNC),
 				PLUGIN_DEPENDS(EAP_PEER, EAP_TTLS),
+				PLUGIN_DEPENDS(CUSTOM, "tnccs-manager"),
 	};
 	*features = f;
 	return countof(f);