Add a prefix to the global visible tnc names to avoid name clashes, move to tncifimv

4 files changed, 12 insertions, 10 deletions

diff --git a/src/libcharon/plugins/tnc_imv/tnc_imv_manager.c b/src/libcharon/plugins/tnc_imv/tnc_imv_manager.c
index d8bb60799..b098200cd 100644
--- a/src/libcharon/plugins/tnc_imv/tnc_imv_manager.c
+++ b/src/libcharon/plugins/tnc_imv/tnc_imv_manager.c
@@ -18,7 +18,6 @@
 
 #include <tnc/imv/imv_manager.h>
 #include <tnc/tncifimv.h>
-#include <tnc/tncifimv_names.h>
 
 #include <debug.h>
 #include <daemon.h>
diff --git a/src/libcharon/plugins/tnc_imv/tnc_imv_recommendations.c b/src/libcharon/plugins/tnc_imv/tnc_imv_recommendations.c
index 2c16070ae..3f701a4d1 100644
--- a/src/libcharon/plugins/tnc_imv/tnc_imv_recommendations.c
+++ b/src/libcharon/plugins/tnc_imv/tnc_imv_recommendations.c
@@ -14,7 +14,7 @@
 
 #include <debug.h>
 #include <daemon.h>
-#include <tnc/tncifimv_names.h>
+#include <tnc/tncifimv.h>
 #include <tnc/imv/imv.h>
 #include <tnc/imv/imv_recommendations.h>
 
@@ -87,8 +87,9 @@ METHOD(recommendations_t, provide_recommendation, TNC_Result,
 	recommendation_entry_t *entry;
 	bool found = FALSE;
 
-	DBG2(DBG_TNC, "IMV %u provides recommendation '%N' and evaluation '%N'",
-		 id, action_recommendation_names, rec, evaluation_result_names, eval);
+	DBG2(DBG_TNC, "IMV %u provides recommendation '%N' and evaluation '%N'", id,
+		 TNC_IMV_Action_Recommendation_names, rec,
+		 TNC_IMV_Evaluation_Result_names, eval);
 
 	enumerator = this->recs->create_enumerator(this->recs);
 	while (enumerator->enumerate(enumerator, &entry))
diff --git a/src/libcharon/plugins/tnccs_11/tnccs_11.c b/src/libcharon/plugins/tnccs_11/tnccs_11.c
index b5b2a8a34..2d2c4a1e5 100644
--- a/src/libcharon/plugins/tnccs_11/tnccs_11.c
+++ b/src/libcharon/plugins/tnccs_11/tnccs_11.c
@@ -26,7 +26,7 @@
 #include <debug.h>
 #include <threading/mutex.h>
 #include <tnc/tncif.h>
-#include <tnc/tncifimv_names.h>
+#include <tnc/tncifimv.h>
 #include <tnc/tnccs/tnccs.h>
 
 typedef struct private_tnccs_11_t private_tnccs_11_t;
@@ -153,7 +153,7 @@ static void handle_message(private_tnccs_11_t *this, tnccs_msg_t *msg)
 				break;
 			}
 			DBG1(DBG_TNC, "TNC recommendation is '%N'",
-						   action_recommendation_names, rec);
+				 TNC_IMV_Action_Recommendation_names, rec);
 			switch (rec)
 			{
 				case TNC_IMV_ACTION_RECOMMENDATION_ALLOW:
@@ -436,7 +436,8 @@ METHOD(tls_t, is_complete, bool,
 	if (this->recs && this->recs->have_recommendation(this->recs, &rec, &eval))
 	{
 		DBG2(DBG_TNC, "Final recommendation is '%N' and evaluation is '%N'",
-			 action_recommendation_names, rec, evaluation_result_names, eval);
+			 TNC_IMV_Action_Recommendation_names, rec,
+			 TNC_IMV_Evaluation_Result_names, eval);
 
 		return charon->imvs->enforce_recommendation(charon->imvs, rec);
 	}
diff --git a/src/libcharon/plugins/tnccs_20/tnccs_20.c b/src/libcharon/plugins/tnccs_20/tnccs_20.c
index 7d39dc43e..429497c61 100644
--- a/src/libcharon/plugins/tnccs_20/tnccs_20.c
+++ b/src/libcharon/plugins/tnccs_20/tnccs_20.c
@@ -30,7 +30,7 @@
 #include <daemon.h>
 #include <threading/mutex.h>
 #include <tnc/tncif.h>
-#include <tnc/tncifimv_names.h>
+#include <tnc/tncifimv.h>
 #include <tnc/tnccs/tnccs.h>
 
 typedef struct private_tnccs_20_t private_tnccs_20_t;
@@ -165,7 +165,7 @@ static void handle_message(private_tnccs_20_t *this, pb_tnc_msg_t *msg)
 			assess_msg = (pb_assessment_result_msg_t*)msg;
 			result = assess_msg->get_assessment_result(assess_msg);
 			DBG1(DBG_TNC, "PB-TNC assessment result is '%N'",
-						   evaluation_result_names, result);
+				 TNC_IMV_Evaluation_Result_names, result);
 			break;
 		}
 		case PB_MSG_ACCESS_RECOMMENDATION:
@@ -607,7 +607,8 @@ METHOD(tls_t, is_complete, bool,
 	if (this->recs && this->recs->have_recommendation(this->recs, &rec, &eval))
 	{
 		DBG2(DBG_TNC, "Final recommendation is '%N' and evaluation is '%N'",
-			 action_recommendation_names, rec, evaluation_result_names, eval);
+			 TNC_IMV_Action_Recommendation_names, rec,
+			 TNC_IMV_Evaluation_Result_names, eval);
 
 		return charon->imvs->enforce_recommendation(charon->imvs, rec);
 	}