aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/libcharon/Makefile.am3
-rw-r--r--src/libcharon/plugins/tnc_imv/tnc_imv_manager.c1
-rw-r--r--src/libcharon/plugins/tnc_imv/tnc_imv_recommendations.c7
-rw-r--r--src/libcharon/plugins/tnccs_11/tnccs_11.c7
-rw-r--r--src/libcharon/plugins/tnccs_20/tnccs_20.c7
-rw-r--r--src/libcharon/tnc/tncifimv.c (renamed from src/libcharon/tnc/tncifimv_names.c)11
-rw-r--r--src/libcharon/tnc/tncifimv.h6
-rw-r--r--src/libcharon/tnc/tncifimv_names.h29
8 files changed, 25 insertions, 46 deletions
diff --git a/src/libcharon/Makefile.am b/src/libcharon/Makefile.am
index d9bc36278..4891fa20b 100644
--- a/src/libcharon/Makefile.am
+++ b/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 \
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);
}
diff --git a/src/libcharon/tnc/tncifimv_names.c b/src/libcharon/tnc/tncifimv.c
index d64a3bed3..fbfd56566 100644
--- a/src/libcharon/tnc/tncifimv_names.c
+++ b/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",
diff --git a/src/libcharon/tnc/tncifimv.h b/src/libcharon/tnc/tncifimv.h
index 3e51824f8..0d6c729ea 100644
--- a/src/libcharon/tnc/tncifimv.h
+++ b/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)
diff --git a/src/libcharon/tnc/tncifimv_names.h b/src/libcharon/tnc/tncifimv_names.h
deleted file mode 100644
index 249304fa8..000000000
--- a/src/libcharon/tnc/tncifimv_names.h
+++ /dev/null
@@ -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_ @}*/
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-22 00:20:50 +0000