ims-volte-vowifi
/
strongswan
9
0
Fork 0
Code Pull Requests Releases Activity

explicitly activate use of TNC headers

This commit is contained in:
Andreas Steffen 2011-06-07 12:19:23 +02:00
parent 4876f896a4
commit 328b377efa
12 changed files with 37 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/libcharon/daemon.c
View File

@ -29,6 +29,8 @@
# endif /* CAPABILITIES_NATIVE */
#endif /* CAPABILITIES */
#define USE_TNC /* for tnccs_manager */
#include "daemon.h"
#include <library.h>

3
src/libcharon/plugins/eap_tnc/Makefile.am
View File

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

4
src/libcharon/plugins/eap_tnc/eap_tnc.c
View File

@ -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;

2
src/libcharon/plugins/tnc_imc/Makefile.am
View File

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

2
src/libcharon/plugins/tnc_imv/Makefile.am
View File

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

2
src/libcharon/plugins/tnccs_11/Makefile.am
View File

@ -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}

2
src/libcharon/plugins/tnccs_20/Makefile.am
View File

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

5
src/libcharon/plugins/tnccs_dynamic/Makefile.am
View File

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

8
src/libcharon/tnc/imc/imc_manager.h
View File

@ -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_ @}*/

8
src/libcharon/tnc/imv/imv_manager.h
View File

@ -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_ @}*/

6
src/libcharon/tnc/tnccs/tnccs_manager.c
View File

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

10
src/libcharon/tnc/tnccs/tnccs_manager.h
View File

@ -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_ @}*/