Add an IMV constructor taking a set of custom TNC_IMV functions

This commit is contained in:
Martin Willi 2012-11-14 12:30:19 +01:00
parent f1f500c724
commit fd885fd390
3 changed files with 78 additions and 5 deletions

View File

@ -36,8 +36,16 @@ imc_t* tnc_imc_create(char *name, char *filename);
/**
* Create an Integrity Measurement Collector from a set of IMC functions.
*
* @param name name of the IMC
* @return instance of the imc_t interface
* @param name name of the IMC
* @param initialize TNC_IMC_InitializePointer
* @param notify_connection_change TNC_IMC_NotifyConnectionChangePointer
* @param begin_handshake TNC_IMC_BeginHandshakePointer
* @param receive_message TNC_IMC_ReceiveMessagePointer
* @param receive_message_long TNC_IMC_ReceiveMessageLongPointer
* @param batch_ending TNC_IMC_BatchEndingPointer
* @param terminate TNC_IMC_TerminatePointer
* @param provide_bind_function TNC_IMC_ProvideBindFunctionPointer
* @return instance of the imc_t interface
*/
imc_t* tnc_imc_create_from_functions(char *name,
TNC_IMC_InitializePointer initialize,

View File

@ -311,9 +311,9 @@ METHOD(imv_t, destroy, void,
}
/**
* Described in header.
* Generic constructor.
*/
imv_t* tnc_imv_create(char *name, char *path)
static private_tnc_imv_t* tnc_imv_create_empty(char *name)
{
private_tnc_imv_t *this;
@ -334,6 +334,18 @@ imv_t* tnc_imv_create(char *name, char *path)
.mutex = mutex_create(MUTEX_TYPE_DEFAULT),
);
return this;
}
/**
* Described in header.
*/
imv_t* tnc_imv_create(char *name, char *path)
{
private_tnc_imv_t *this;
this = tnc_imv_create_empty(name);
this->handle = dlopen(path, RTLD_LAZY);
if (!this->handle)
{
@ -381,3 +393,32 @@ imv_t* tnc_imv_create(char *name, char *path)
return &this->public;
}
/**
* Described in header.
*/
imv_t* tnc_imv_create_from_functions(char *name,
TNC_IMV_InitializePointer initialize,
TNC_IMV_NotifyConnectionChangePointer notify_connection_change,
TNC_IMV_ReceiveMessagePointer receive_message,
TNC_IMV_ReceiveMessageLongPointer receive_message_long,
TNC_IMV_SolicitRecommendationPointer solicit_recommendation,
TNC_IMV_BatchEndingPointer batch_ending,
TNC_IMV_TerminatePointer terminate,
TNC_IMV_ProvideBindFunctionPointer provide_bind_function)
{
private_tnc_imv_t *this;
this = tnc_imv_create_empty(name);
this->public.initialize = initialize;
this->public.notify_connection_change = notify_connection_change;
this->public.receive_message = receive_message;
this->public.receive_message_long = receive_message_long;
this->public.solicit_recommendation = solicit_recommendation;
this->public.batch_ending = batch_ending;
this->public.terminate = terminate;
this->public.provide_bind_function = provide_bind_function;
return &this->public;
}

View File

@ -25,7 +25,7 @@
#include <tnc/imv/imv.h>
/**
* Create an Integrity Measurement Verifier.
* Create an Integrity Measurement Verifier loaded from a library.
*
* @param name name of the IMV
* @param filename path to the dynamic IMV library
@ -33,4 +33,28 @@
*/
imv_t* tnc_imv_create(char *name, char *filename);
/**
* Create an Integrity Measurement Verifier from a set of IMV functions.
*
* @param name name of the IMV
* @param initialize TNC_IMV_InitializePointer
* @param notify_connection_change TNC_IMV_NotifyConnectionChangePointer
* @param receive_message TNC_IMV_ReceiveMessagePointer
* @param receive_message_long TNC_IMV_ReceiveMessageLongPointer
* @param solicit_recommendation TNC_IMV_SolicitRecommendationPointer
* @param batch_ending TNC_IMV_BatchEndingPointer
* @param terminate TNC_IMV_TerminatePointer
* @param provide_bind_function TNC_IMV_ProvideBindFunctionPointer
* @return instance of the imv_t interface
*/
imv_t* tnc_imv_create_from_functions(char *name,
TNC_IMV_InitializePointer initialize,
TNC_IMV_NotifyConnectionChangePointer notify_connection_change,
TNC_IMV_ReceiveMessagePointer receive_message,
TNC_IMV_ReceiveMessageLongPointer receive_message_long,
TNC_IMV_SolicitRecommendationPointer solicit_recommendation,
TNC_IMV_BatchEndingPointer batch_ending,
TNC_IMV_TerminatePointer terminate,
TNC_IMV_ProvideBindFunctionPointer provide_bind_function);
#endif /** TNC_IMV_H_ @}*/