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

src/libcharon/Makefile.am

@@ -87,8 +87,7 @@ 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/tncif.h tnc/tncifimc.h tnc/tncifimv.h \
-tnc/tncifimv_names.h tnc/tncifimv_names.c \
+tnc/tncif.h tnc/tncifimc.h tnc/tncifimv.h tnc/tncifimv.c \
 tnc/imc/imc.h tnc/imc/imc_manager.h \
 tnc/imv/imv.h tnc/imv/imv_manager.h \
 tnc/imv/imv_recommendations.c tnc/imv/imv_recommendations.h \

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>

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))

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);
 	}

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);
 	}

src/libcharon/tnc/tncifimv.c

@@ -14,18 +14,19 @@
  */
 
 #include "tncifimv.h"
-#include "tncifimv_names.h"
 
-ENUM(action_recommendation_names, TNC_IMV_ACTION_RECOMMENDATION_ALLOW,
-								  TNC_IMV_ACTION_RECOMMENDATION_NO_RECOMMENDATION,
+ENUM(TNC_IMV_Action_Recommendation_names,
+	TNC_IMV_ACTION_RECOMMENDATION_ALLOW,
+	TNC_IMV_ACTION_RECOMMENDATION_NO_RECOMMENDATION,
 	"allow",
 	"no access",
 	"isolate",
 	"no recommendation"
 );
 
-ENUM(evaluation_result_names, TNC_IMV_EVALUATION_RESULT_COMPLIANT,
-							  TNC_IMV_EVALUATION_RESULT_DONT_KNOW,
+ENUM(TNC_IMV_Evaluation_Result_names,
+	TNC_IMV_EVALUATION_RESULT_COMPLIANT,
+	TNC_IMV_EVALUATION_RESULT_DONT_KNOW,
 	"compliant",
 	"non-compliant minor",
 	"non-compliant major",

src/libcharon/tnc/tncifimv.h

@@ -52,6 +52,8 @@
 
 #include "tncif.h"
 
+#include <library.h>
+
 typedef TNC_UInt32 TNC_IMVID;
 typedef TNC_UInt32 TNC_IMV_Action_Recommendation;
 typedef TNC_UInt32 TNC_IMV_Evaluation_Result;
@@ -146,6 +148,8 @@ typedef TNC_Result (*TNC_IMV_ProvideBindFunctionPointer)(
 #define TNC_IMV_ACTION_RECOMMENDATION_ISOLATE 2
 #define TNC_IMV_ACTION_RECOMMENDATION_NO_RECOMMENDATION 3
 
+extern enum_name_t *TNC_IMV_Action_Recommendation_names;
+
 /* IMV Evaluation Result Values */
 
 #define TNC_IMV_EVALUATION_RESULT_COMPLIANT 0
@@ -154,6 +158,8 @@ typedef TNC_Result (*TNC_IMV_ProvideBindFunctionPointer)(
 #define TNC_IMV_EVALUATION_RESULT_ERROR 3
 #define TNC_IMV_EVALUATION_RESULT_DONT_KNOW 4
 
+extern enum_name_t *TNC_IMV_Evaluation_Result_names;
+
 /* Message Attribute ID Values */
 
 #define TNC_ATTRIBUTEID_PREFERRED_LANGUAGE ((TNC_AttributeID) 0x00000001)

src/libcharon/tnc/tncifimv_names.h

@@ -1,29 +0,0 @@
-/*
- * Copyright (C) 2010 Andreas Steffen
- * HSR Hochschule fuer Technik Rapperswil
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2 of the License, or (at your
- * option) any later version.  See <http://www.fsf.org/copyleft/gpl.txt>.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * for more details.
- */
-
-/**
- * @defgroup tncifimv_names tncifimv_names
- * @{ @ingroup tnc
- */
-
-#ifndef TNCIFIMV_NAMES_H_
-#define TNCIFIMV_NAMES_H_
-
-#include <library.h>
-
-extern enum_name_t *action_recommendation_names;
-extern enum_name_t *evaluation_result_names;
-
-#endif /** TNCIFIMV_NAMES_H_ @}*/