aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/libcharon/daemon.c2
-rw-r--r--src/libcharon/plugins/eap_tnc/Makefile.am3
-rw-r--r--src/libcharon/plugins/eap_tnc/eap_tnc.c4
-rw-r--r--src/libcharon/plugins/tnc_imc/Makefile.am2
-rw-r--r--src/libcharon/plugins/tnc_imv/Makefile.am2
-rw-r--r--src/libcharon/plugins/tnccs_11/Makefile.am2
-rw-r--r--src/libcharon/plugins/tnccs_20/Makefile.am2
-rw-r--r--src/libcharon/plugins/tnccs_dynamic/Makefile.am5
-rw-r--r--src/libcharon/tnc/imc/imc_manager.h8
-rw-r--r--src/libcharon/tnc/imv/imv_manager.h8
-rw-r--r--src/libcharon/tnc/tnccs/tnccs_manager.c6
-rw-r--r--src/libcharon/tnc/tnccs/tnccs_manager.h10
12 files changed, 37 insertions, 17 deletions
diff --git a/src/libcharon/daemon.c b/src/libcharon/daemon.c
index 6aa771ef0..a2fe6aea5 100644
--- a/src/libcharon/daemon.c
+++ b/src/libcharon/daemon.c
@@ -29,6 +29,8 @@
# endif /* CAPABILITIES_NATIVE */
#endif /* CAPABILITIES */
+#define USE_TNC /* for tnccs_manager */
+
#include "daemon.h"
#include <library.h>
diff --git a/src/libcharon/plugins/eap_tnc/Makefile.am b/src/libcharon/plugins/eap_tnc/Makefile.am
index 9c5a445c5..8d5dddbeb 100644
--- a/src/libcharon/plugins/eap_tnc/Makefile.am
+++ b/src/libcharon/plugins/eap_tnc/Makefile.am
@@ -1,6 +1,7 @@
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/libcharon -I$(top_srcdir)/src/libtls \
+ -I$(top_srcdir)/src/libtncif
AM_CFLAGS = -rdynamic
diff --git a/src/libcharon/plugins/eap_tnc/eap_tnc.c b/src/libcharon/plugins/eap_tnc/eap_tnc.c
index ab3f87688..3d3a51a30 100644
--- a/src/libcharon/plugins/eap_tnc/eap_tnc.c
+++ b/src/libcharon/plugins/eap_tnc/eap_tnc.c
@@ -16,9 +16,11 @@
#include "eap_tnc.h"
#include <tls_eap.h>
+#include <debug.h>
+
+#define USE_TNC
#include <daemon.h>
-#include <debug.h>
typedef struct private_eap_tnc_t private_eap_tnc_t;
diff --git a/src/libcharon/plugins/tnc_imc/Makefile.am b/src/libcharon/plugins/tnc_imc/Makefile.am
index 42a4ea8d8..35c9715ce 100644
--- a/src/libcharon/plugins/tnc_imc/Makefile.am
+++ b/src/libcharon/plugins/tnc_imc/Makefile.am
@@ -2,7 +2,7 @@
INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra \
-I$(top_srcdir)/src/libcharon -I$(top_srcdir)/src/libtncif
-AM_CFLAGS = -rdynamic
+AM_CFLAGS = -DUSE_TNC -rdynamic
if MONOLITHIC
noinst_LTLIBRARIES = libstrongswan-tnc-imc.la
diff --git a/src/libcharon/plugins/tnc_imv/Makefile.am b/src/libcharon/plugins/tnc_imv/Makefile.am
index 6ad7cfff3..355c07ef2 100644
--- a/src/libcharon/plugins/tnc_imv/Makefile.am
+++ b/src/libcharon/plugins/tnc_imv/Makefile.am
@@ -2,7 +2,7 @@
INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra \
-I$(top_srcdir)/src/libcharon -I$(top_srcdir)/src/libtncif
-AM_CFLAGS = -rdynamic
+AM_CFLAGS = -DUSE_TNC -rdynamic
if MONOLITHIC
noinst_LTLIBRARIES = libstrongswan-tnc-imv.la
diff --git a/src/libcharon/plugins/tnccs_11/Makefile.am b/src/libcharon/plugins/tnccs_11/Makefile.am
index 165346a49..4b51a3c63 100644
--- a/src/libcharon/plugins/tnccs_11/Makefile.am
+++ b/src/libcharon/plugins/tnccs_11/Makefile.am
@@ -3,7 +3,7 @@ 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 ${xml_CFLAGS}
-AM_CFLAGS = -rdynamic
+AM_CFLAGS = -DUSE_TNC -rdynamic
libstrongswan_tnccs_11_la_LIBADD = ${xml_LIBS}
diff --git a/src/libcharon/plugins/tnccs_20/Makefile.am b/src/libcharon/plugins/tnccs_20/Makefile.am
index 9a1e915c2..ec348357c 100644
--- a/src/libcharon/plugins/tnccs_20/Makefile.am
+++ b/src/libcharon/plugins/tnccs_20/Makefile.am
@@ -3,7 +3,7 @@ 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
-AM_CFLAGS = -rdynamic
+AM_CFLAGS = -DUSE_TNC -rdynamic
if MONOLITHIC
noinst_LTLIBRARIES = libstrongswan-tnccs-20.la
diff --git a/src/libcharon/plugins/tnccs_dynamic/Makefile.am b/src/libcharon/plugins/tnccs_dynamic/Makefile.am
index 25172c7b0..4a84ef124 100644
--- a/src/libcharon/plugins/tnccs_dynamic/Makefile.am
+++ b/src/libcharon/plugins/tnccs_dynamic/Makefile.am
@@ -1,8 +1,9 @@
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/libcharon -I$(top_srcdir)/src/libtls \
+ -I$(top_srcdir)/src/libtncif
-AM_CFLAGS = -rdynamic
+AM_CFLAGS = -DUSE_TNC -rdynamic
if MONOLITHIC
noinst_LTLIBRARIES = libstrongswan-tnccs-dynamic.la
diff --git a/src/libcharon/tnc/imc/imc_manager.h b/src/libcharon/tnc/imc/imc_manager.h
index ad83cf552..11104b649 100644
--- a/src/libcharon/tnc/imc/imc_manager.h
+++ b/src/libcharon/tnc/imc/imc_manager.h
@@ -21,12 +21,14 @@
#ifndef IMC_MANAGER_H_
#define IMC_MANAGER_H_
+typedef struct imc_manager_t imc_manager_t;
+
+#ifdef USE_TNC
+
#include "imc.h"
#include <library.h>
-typedef struct imc_manager_t imc_manager_t;
-
/**
* The IMC manager controls all IMC instances.
*/
@@ -121,4 +123,6 @@ struct imc_manager_t {
void (*destroy)(imc_manager_t *this);
};
+#endif /* USE_TNC */
+
#endif /** IMC_MANAGER_H_ @}*/
diff --git a/src/libcharon/tnc/imv/imv_manager.h b/src/libcharon/tnc/imv/imv_manager.h
index 0dd2d6253..97daedb13 100644
--- a/src/libcharon/tnc/imv/imv_manager.h
+++ b/src/libcharon/tnc/imv/imv_manager.h
@@ -21,13 +21,15 @@
#ifndef IMV_MANAGER_H_
#define IMV_MANAGER_H_
+typedef struct imv_manager_t imv_manager_t;
+
+#ifdef USE_TNC
+
#include "imv.h"
#include "imv_recommendations.h"
#include <library.h>
-typedef struct imv_manager_t imv_manager_t;
-
/**
* The IMV manager controls all IMV instances.
*/
@@ -142,4 +144,6 @@ struct imv_manager_t {
void (*destroy)(imv_manager_t *this);
};
+#endif /* USE_TNC */
+
#endif /** IMV_MANAGER_H_ @}*/
diff --git a/src/libcharon/tnc/tnccs/tnccs_manager.c b/src/libcharon/tnc/tnccs/tnccs_manager.c
index 609742dc8..6f120ea14 100644
--- a/src/libcharon/tnc/tnccs/tnccs_manager.c
+++ b/src/libcharon/tnc/tnccs/tnccs_manager.c
@@ -13,6 +13,8 @@
* for more details.
*/
+#define USE_TNC
+
#include "tnccs_manager.h"
#include <tnc/imv/imv_recommendations.h>
@@ -172,7 +174,7 @@ METHOD(tnccs_manager_t, create_instance, tnccs_t*,
}
METHOD(tnccs_manager_t, create_connection, TNC_ConnectionID,
- private_tnccs_manager_t *this, tnccs_t *tnccs,
+ private_tnccs_manager_t *this, tnccs_t *tnccs,
tnccs_send_message_t send_message, bool* request_handshake_retry,
recommendations_t **recs)
{
@@ -187,7 +189,7 @@ METHOD(tnccs_manager_t, create_connection, TNC_ConnectionID,
/* we assume a TNC Server needing recommendations from IMVs */
if (!charon->imvs)
{
- DBG1(DBG_TNC, "no IMV manager available!");
+ DBG1(DBG_TNC, "no IMV manager available!");
free(entry);
return 0;
}
diff --git a/src/libcharon/tnc/tnccs/tnccs_manager.h b/src/libcharon/tnc/tnccs/tnccs_manager.h
index 34f60029d..5051d4bb3 100644
--- a/src/libcharon/tnc/tnccs/tnccs_manager.h
+++ b/src/libcharon/tnc/tnccs/tnccs_manager.h
@@ -21,12 +21,14 @@
#ifndef TNCCS_MANAGER_H_
#define TNCCS_MANAGER_H_
+typedef struct tnccs_manager_t tnccs_manager_t;
+
+#ifdef USE_TNC
+
#include "tnccs.h"
#include <tnc/imv/imv_recommendations.h>
-typedef struct tnccs_manager_t tnccs_manager_t;
-
/**
* The TNCCS manager manages all TNCCS implementations and creates instances.
*
@@ -76,7 +78,7 @@ struct tnccs_manager_t {
TNC_ConnectionID (*create_connection)(tnccs_manager_t *this, tnccs_t *tnccs,
tnccs_send_message_t send_message,
bool *request_handshake_retry,
- recommendations_t **recs);
+ recommendations_t **recs);
/**
* Remove a TNCCS connection using its connection ID.
@@ -183,4 +185,6 @@ struct tnccs_manager_t {
*/
tnccs_manager_t *tnccs_manager_create();
+#endif /* USE_TNC */
+
#endif /** TNCCS_MANAGER_H_ @}*/
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-28 14:55:38 +0000