sharpetronics/strongswan
1
0
Fork 0
mirror of https://github.com/strongswan/strongswan.git synced 2025-10-07 00:01:49 -04:00
Code Issues Projects Releases Wiki Activity

Add locking to IMC/IMV managers to add/remove IMC/IMVs on the fly

Browse Source
This commit is contained in:
Martin Willi 2012-11-20 14:34:00 +01:00
parent 7e45257f7d
commit c543616315
2 changed files with 67 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/libcharon/plugins/tnc_imc/tnc_imc_manager.c
View File

@ -19,9 +19,10 @@
#include <tncifimc.h> #include <tncifimc.h>
#include <collections/linked_list.h>
#include <utils/debug.h>
#include <daemon.h> #include <daemon.h>
#include <utils/debug.h>
#include <threading/rwlock.h>
#include <collections/linked_list.h>
typedef struct private_tnc_imc_manager_t private_tnc_imc_manager_t; typedef struct private_tnc_imc_manager_t private_tnc_imc_manager_t;
@ -40,6 +41,11 @@ struct private_tnc_imc_manager_t {
*/ */
linked_list_t *imcs; linked_list_t *imcs;
/**
* Lock to access IMC list
*/
rwlock_t *lock;
/** /**
* Next IMC ID to be assigned * Next IMC ID to be assigned
*/ */
@ -58,8 +64,10 @@ METHOD(imc_manager_t, add, bool,
DBG1(DBG_TNC, "IMC \"%s\" failed to initialize", imc->get_name(imc)); DBG1(DBG_TNC, "IMC \"%s\" failed to initialize", imc->get_name(imc));
return FALSE; return FALSE;
} }
this->lock->write_lock(this->lock);
this->imcs->insert_last(this->imcs, imc); this->imcs->insert_last(this->imcs, imc);
this->next_imc_id++; this->next_imc_id++;
this->lock->unlock(this->lock);
if (imc->provide_bind_function(imc->get_id(imc), if (imc->provide_bind_function(imc->get_id(imc),
TNC_TNCC_BindFunction) != TNC_RESULT_SUCCESS) TNC_TNCC_BindFunction) != TNC_RESULT_SUCCESS)
@ -70,7 +78,9 @@ METHOD(imc_manager_t, add, bool,
} }
DBG1(DBG_TNC, "IMC \"%s\" failed to obtain bind function", DBG1(DBG_TNC, "IMC \"%s\" failed to obtain bind function",
imc->get_name(imc)); imc->get_name(imc));
this->lock->write_lock(this->lock);
this->imcs->remove_last(this->imcs, (void**)&imc); this->imcs->remove_last(this->imcs, (void**)&imc);
this->lock->unlock(this->lock);
return FALSE; return FALSE;
} }
return TRUE; return TRUE;
@ -82,6 +92,7 @@ METHOD(imc_manager_t, remove_, imc_t*,
enumerator_t *enumerator; enumerator_t *enumerator;
imc_t *imc, *removed_imc = NULL; imc_t *imc, *removed_imc = NULL;
this->lock->write_lock(this->lock);
enumerator = this->imcs->create_enumerator(this->imcs); enumerator = this->imcs->create_enumerator(this->imcs);
while (enumerator->enumerate(enumerator, &imc)) while (enumerator->enumerate(enumerator, &imc))
{ {
@ -93,6 +104,7 @@ METHOD(imc_manager_t, remove_, imc_t*,
} }
} }
enumerator->destroy(enumerator); enumerator->destroy(enumerator);
this->lock->unlock(this->lock);
return removed_imc; return removed_imc;
} }
@ -154,6 +166,7 @@ METHOD(imc_manager_t, is_registered, bool,
imc_t *imc; imc_t *imc;
bool found = FALSE; bool found = FALSE;
this->lock->read_lock(this->lock);
enumerator = this->imcs->create_enumerator(this->imcs); enumerator = this->imcs->create_enumerator(this->imcs);
while (enumerator->enumerate(enumerator, &imc)) while (enumerator->enumerate(enumerator, &imc))
{ {
@ -164,6 +177,7 @@ METHOD(imc_manager_t, is_registered, bool,
} }
} }
enumerator->destroy(enumerator); enumerator->destroy(enumerator);
this->lock->unlock(this->lock);
return found; return found;
} }
@ -175,6 +189,7 @@ METHOD(imc_manager_t, reserve_id, bool,
imc_t *imc; imc_t *imc;
bool found = FALSE; bool found = FALSE;
this->lock->write_lock(this->lock);
enumerator = this->imcs->create_enumerator(this->imcs); enumerator = this->imcs->create_enumerator(this->imcs);
while (enumerator->enumerate(enumerator, &imc)) while (enumerator->enumerate(enumerator, &imc))
{ {
@ -189,6 +204,7 @@ METHOD(imc_manager_t, reserve_id, bool,
} }
} }
enumerator->destroy(enumerator); enumerator->destroy(enumerator);
this->lock->unlock(this->lock);
return found; return found;
} }
@ -207,6 +223,7 @@ METHOD(imc_manager_t, notify_connection_change, void,
enumerator_t *enumerator; enumerator_t *enumerator;
imc_t *imc; imc_t *imc;
this->lock->read_lock(this->lock);
enumerator = this->imcs->create_enumerator(this->imcs); enumerator = this->imcs->create_enumerator(this->imcs);
while (enumerator->enumerate(enumerator, &imc)) while (enumerator->enumerate(enumerator, &imc))
{ {
@ -216,6 +233,7 @@ METHOD(imc_manager_t, notify_connection_change, void,
} }
} }
enumerator->destroy(enumerator); enumerator->destroy(enumerator);
this->lock->unlock(this->lock);
} }
METHOD(imc_manager_t, begin_handshake, void, METHOD(imc_manager_t, begin_handshake, void,
@ -224,12 +242,14 @@ METHOD(imc_manager_t, begin_handshake, void,
enumerator_t *enumerator; enumerator_t *enumerator;
imc_t *imc; imc_t *imc;
this->lock->read_lock(this->lock);
enumerator = this->imcs->create_enumerator(this->imcs); enumerator = this->imcs->create_enumerator(this->imcs);
while (enumerator->enumerate(enumerator, &imc)) while (enumerator->enumerate(enumerator, &imc))
{ {
imc->begin_handshake(imc->get_id(imc), id); imc->begin_handshake(imc->get_id(imc), id);
} }
enumerator->destroy(enumerator); enumerator->destroy(enumerator);
this->lock->unlock(this->lock);
} }
METHOD(imc_manager_t, set_message_types, TNC_Result, METHOD(imc_manager_t, set_message_types, TNC_Result,
@ -241,6 +261,7 @@ METHOD(imc_manager_t, set_message_types, TNC_Result,
imc_t *imc; imc_t *imc;
TNC_Result result = TNC_RESULT_FATAL; TNC_Result result = TNC_RESULT_FATAL;
this->lock->read_lock(this->lock);
enumerator = this->imcs->create_enumerator(this->imcs); enumerator = this->imcs->create_enumerator(this->imcs);
while (enumerator->enumerate(enumerator, &imc)) while (enumerator->enumerate(enumerator, &imc))
{ {
@ -252,6 +273,7 @@ METHOD(imc_manager_t, set_message_types, TNC_Result,
} }
} }
enumerator->destroy(enumerator); enumerator->destroy(enumerator);
this->lock->unlock(this->lock);
return result; return result;
} }
@ -265,6 +287,7 @@ METHOD(imc_manager_t, set_message_types_long, TNC_Result,
imc_t *imc; imc_t *imc;
TNC_Result result = TNC_RESULT_FATAL; TNC_Result result = TNC_RESULT_FATAL;
this->lock->read_lock(this->lock);
enumerator = this->imcs->create_enumerator(this->imcs); enumerator = this->imcs->create_enumerator(this->imcs);
while (enumerator->enumerate(enumerator, &imc)) while (enumerator->enumerate(enumerator, &imc))
{ {
@ -277,6 +300,7 @@ METHOD(imc_manager_t, set_message_types_long, TNC_Result,
} }
} }
enumerator->destroy(enumerator); enumerator->destroy(enumerator);
this->lock->unlock(this->lock);
return result; return result;
} }
@ -296,11 +320,12 @@ METHOD(imc_manager_t, receive_message, void,
enumerator_t *enumerator; enumerator_t *enumerator;
imc_t *imc; imc_t *imc;
this->lock->read_lock(this->lock);
enumerator = this->imcs->create_enumerator(this->imcs); enumerator = this->imcs->create_enumerator(this->imcs);
while (enumerator->enumerate(enumerator, &imc)) while (enumerator->enumerate(enumerator, &imc))
{ {
if (imc->type_supported(imc, msg_vid, msg_subtype) && if (imc->type_supported(imc, msg_vid, msg_subtype) &&
(!excl || (excl && imc->has_id(imc, dst_imc_id)) )) (!excl || (excl && imc->has_id(imc, dst_imc_id))))
{ {
if (imc->receive_message_long && src_imv_id) if (imc->receive_message_long && src_imv_id)
{ {
@ -322,6 +347,8 @@ METHOD(imc_manager_t, receive_message, void,
} }
} }
enumerator->destroy(enumerator); enumerator->destroy(enumerator);
this->lock->unlock(this->lock);
if (!type_supported) if (!type_supported)
{ {
DBG2(DBG_TNC, "message type 0x%06x/0x%08x not supported by any IMC", DBG2(DBG_TNC, "message type 0x%06x/0x%08x not supported by any IMC",
@ -335,6 +362,7 @@ METHOD(imc_manager_t, batch_ending, void,
enumerator_t *enumerator; enumerator_t *enumerator;
imc_t *imc; imc_t *imc;
this->lock->read_lock(this->lock);
enumerator = this->imcs->create_enumerator(this->imcs); enumerator = this->imcs->create_enumerator(this->imcs);
while (enumerator->enumerate(enumerator, &imc)) while (enumerator->enumerate(enumerator, &imc))
{ {
@ -344,6 +372,7 @@ METHOD(imc_manager_t, batch_ending, void,
} }
} }
enumerator->destroy(enumerator); enumerator->destroy(enumerator);
this->lock->unlock(this->lock);
} }
METHOD(imc_manager_t, destroy, void, METHOD(imc_manager_t, destroy, void,
@ -362,6 +391,7 @@ METHOD(imc_manager_t, destroy, void,
imc->destroy(imc); imc->destroy(imc);
} }
this->imcs->destroy(this->imcs); this->imcs->destroy(this->imcs);
this->lock->destroy(this->lock);
free(this); free(this);
} }
@ -390,6 +420,7 @@ imc_manager_t* tnc_imc_manager_create(void)
.destroy = _destroy, .destroy = _destroy,
}, },
.imcs = linked_list_create(), .imcs = linked_list_create(),
.lock = rwlock_create(RWLOCK_TYPE_DEFAULT),
.next_imc_id = 1, .next_imc_id = 1,
); );

37
src/libcharon/plugins/tnc_imv/tnc_imv_manager.c
View File

@ -29,9 +29,9 @@
#include <fcntl.h> #include <fcntl.h>
#include <daemon.h> #include <daemon.h>
#include <utils/lexparser.h>
#include <utils/debug.h> #include <utils/debug.h>
#include <threading/mutex.h> #include <threading/rwlock.h>
#include <collections/linked_list.h>
typedef struct private_tnc_imv_manager_t private_tnc_imv_manager_t; typedef struct private_tnc_imv_manager_t private_tnc_imv_manager_t;
@ -50,6 +50,11 @@ struct private_tnc_imv_manager_t {
*/ */
linked_list_t *imvs; linked_list_t *imvs;
/**
* Lock for IMV list
*/
rwlock_t *lock;
/** /**
* Next IMV ID to be assigned * Next IMV ID to be assigned
*/ */
@ -73,8 +78,10 @@ METHOD(imv_manager_t, add, bool,
DBG1(DBG_TNC, "IMV \"%s\" failed to initialize", imv->get_name(imv)); DBG1(DBG_TNC, "IMV \"%s\" failed to initialize", imv->get_name(imv));
return FALSE; return FALSE;
} }
this->lock->write_lock(this->lock);
this->imvs->insert_last(this->imvs, imv); this->imvs->insert_last(this->imvs, imv);
this->next_imv_id++; this->next_imv_id++;
this->lock->unlock(this->lock);
if (imv->provide_bind_function(imv->get_id(imv), if (imv->provide_bind_function(imv->get_id(imv),
TNC_TNCS_BindFunction) != TNC_RESULT_SUCCESS) TNC_TNCS_BindFunction) != TNC_RESULT_SUCCESS)
@ -85,7 +92,9 @@ METHOD(imv_manager_t, add, bool,
} }
DBG1(DBG_TNC, "IMV \"%s\" failed to obtain bind function", DBG1(DBG_TNC, "IMV \"%s\" failed to obtain bind function",
imv->get_name(imv)); imv->get_name(imv));
this->lock->write_lock(this->lock);
this->imvs->remove_last(this->imvs, (void**)&imv); this->imvs->remove_last(this->imvs, (void**)&imv);
this->lock->unlock(this->lock);
return FALSE; return FALSE;
} }
return TRUE; return TRUE;
@ -97,6 +106,7 @@ METHOD(imv_manager_t, remove_, imv_t*,
enumerator_t *enumerator; enumerator_t *enumerator;
imv_t *imv, *removed_imv = NULL; imv_t *imv, *removed_imv = NULL;
this->lock->write_lock(this->lock);
enumerator = this->imvs->create_enumerator(this->imvs); enumerator = this->imvs->create_enumerator(this->imvs);
while (enumerator->enumerate(enumerator, &imv)) while (enumerator->enumerate(enumerator, &imv))
{ {
@ -108,6 +118,7 @@ METHOD(imv_manager_t, remove_, imv_t*,
} }
} }
enumerator->destroy(enumerator); enumerator->destroy(enumerator);
this->lock->unlock(this->lock);
return removed_imv; return removed_imv;
} }
@ -169,6 +180,7 @@ METHOD(imv_manager_t, is_registered, bool,
imv_t *imv; imv_t *imv;
bool found = FALSE; bool found = FALSE;
this->lock->read_lock(this->lock);
enumerator = this->imvs->create_enumerator(this->imvs); enumerator = this->imvs->create_enumerator(this->imvs);
while (enumerator->enumerate(enumerator, &imv)) while (enumerator->enumerate(enumerator, &imv))
{ {
@ -179,6 +191,7 @@ METHOD(imv_manager_t, is_registered, bool,
} }
} }
enumerator->destroy(enumerator); enumerator->destroy(enumerator);
this->lock->unlock(this->lock);
return found; return found;
} }
@ -190,6 +203,7 @@ METHOD(imv_manager_t, reserve_id, bool,
imv_t *imv; imv_t *imv;
bool found = FALSE; bool found = FALSE;
this->lock->write_lock(this->lock);
enumerator = this->imvs->create_enumerator(this->imvs); enumerator = this->imvs->create_enumerator(this->imvs);
while (enumerator->enumerate(enumerator, &imv)) while (enumerator->enumerate(enumerator, &imv))
{ {
@ -204,6 +218,7 @@ METHOD(imv_manager_t, reserve_id, bool,
} }
} }
enumerator->destroy(enumerator); enumerator->destroy(enumerator);
this->lock->unlock(this->lock);
return found; return found;
} }
@ -283,6 +298,7 @@ METHOD(imv_manager_t, notify_connection_change, void,
enumerator_t *enumerator; enumerator_t *enumerator;
imv_t *imv; imv_t *imv;
this->lock->read_lock(this->lock);
enumerator = this->imvs->create_enumerator(this->imvs); enumerator = this->imvs->create_enumerator(this->imvs);
while (enumerator->enumerate(enumerator, &imv)) while (enumerator->enumerate(enumerator, &imv))
{ {
@ -292,6 +308,7 @@ METHOD(imv_manager_t, notify_connection_change, void,
} }
} }
enumerator->destroy(enumerator); enumerator->destroy(enumerator);
this->lock->unlock(this->lock);
} }
METHOD(imv_manager_t, set_message_types, TNC_Result, METHOD(imv_manager_t, set_message_types, TNC_Result,
@ -303,6 +320,7 @@ METHOD(imv_manager_t, set_message_types, TNC_Result,
imv_t *imv; imv_t *imv;
TNC_Result result = TNC_RESULT_FATAL; TNC_Result result = TNC_RESULT_FATAL;
this->lock->read_lock(this->lock);
enumerator = this->imvs->create_enumerator(this->imvs); enumerator = this->imvs->create_enumerator(this->imvs);
while (enumerator->enumerate(enumerator, &imv)) while (enumerator->enumerate(enumerator, &imv))
{ {
@ -314,6 +332,7 @@ METHOD(imv_manager_t, set_message_types, TNC_Result,
} }
} }
enumerator->destroy(enumerator); enumerator->destroy(enumerator);
this->lock->unlock(this->lock);
return result; return result;
} }
@ -327,6 +346,7 @@ METHOD(imv_manager_t, set_message_types_long, TNC_Result,
imv_t *imv; imv_t *imv;
TNC_Result result = TNC_RESULT_FATAL; TNC_Result result = TNC_RESULT_FATAL;
this->lock->read_lock(this->lock);
enumerator = this->imvs->create_enumerator(this->imvs); enumerator = this->imvs->create_enumerator(this->imvs);
while (enumerator->enumerate(enumerator, &imv)) while (enumerator->enumerate(enumerator, &imv))
{ {
@ -339,6 +359,7 @@ METHOD(imv_manager_t, set_message_types_long, TNC_Result,
} }
} }
enumerator->destroy(enumerator); enumerator->destroy(enumerator);
this->lock->unlock(this->lock);
return result; return result;
} }
@ -348,12 +369,14 @@ METHOD(imv_manager_t, solicit_recommendation, void,
enumerator_t *enumerator; enumerator_t *enumerator;
imv_t *imv; imv_t *imv;
this->lock->read_lock(this->lock);
enumerator = this->imvs->create_enumerator(this->imvs); enumerator = this->imvs->create_enumerator(this->imvs);
while (enumerator->enumerate(enumerator, &imv)) while (enumerator->enumerate(enumerator, &imv))
{ {
imv->solicit_recommendation(imv->get_id(imv), id); imv->solicit_recommendation(imv->get_id(imv), id);
} }
enumerator->destroy(enumerator); enumerator->destroy(enumerator);
this->lock->unlock(this->lock);
} }
METHOD(imv_manager_t, receive_message, void, METHOD(imv_manager_t, receive_message, void,
@ -374,11 +397,12 @@ METHOD(imv_manager_t, receive_message, void,
msg_type = (msg_vid << 8) | msg_subtype; msg_type = (msg_vid << 8) | msg_subtype;
this->lock->read_lock(this->lock);
enumerator = this->imvs->create_enumerator(this->imvs); enumerator = this->imvs->create_enumerator(this->imvs);
while (enumerator->enumerate(enumerator, &imv)) while (enumerator->enumerate(enumerator, &imv))
{ {
if (imv->type_supported(imv, msg_vid, msg_subtype) && if (imv->type_supported(imv, msg_vid, msg_subtype) &&
(!excl || (excl && imv->has_id(imv, dst_imv_id)) )) (!excl || (excl && imv->has_id(imv, dst_imv_id))))
{ {
if (imv->receive_message_long && src_imc_id) if (imv->receive_message_long && src_imc_id)
{ {
@ -400,6 +424,8 @@ METHOD(imv_manager_t, receive_message, void,
} }
} }
enumerator->destroy(enumerator); enumerator->destroy(enumerator);
this->lock->unlock(this->lock);
if (!type_supported) if (!type_supported)
{ {
DBG2(DBG_TNC, "message type 0x%06x/0x%08x not supported by any IMV", DBG2(DBG_TNC, "message type 0x%06x/0x%08x not supported by any IMV",
@ -413,6 +439,7 @@ METHOD(imv_manager_t, batch_ending, void,
enumerator_t *enumerator; enumerator_t *enumerator;
imv_t *imv; imv_t *imv;
this->lock->read_lock(this->lock);
enumerator = this->imvs->create_enumerator(this->imvs); enumerator = this->imvs->create_enumerator(this->imvs);
while (enumerator->enumerate(enumerator, &imv)) while (enumerator->enumerate(enumerator, &imv))
{ {
@ -422,9 +449,9 @@ METHOD(imv_manager_t, batch_ending, void,
} }
} }
enumerator->destroy(enumerator); enumerator->destroy(enumerator);
this->lock->unlock(this->lock);
} }
METHOD(imv_manager_t, destroy, void, METHOD(imv_manager_t, destroy, void,
private_tnc_imv_manager_t *this) private_tnc_imv_manager_t *this)
{ {
@ -441,6 +468,7 @@ METHOD(imv_manager_t, destroy, void,
imv->destroy(imv); imv->destroy(imv);
} }
this->imvs->destroy(this->imvs); this->imvs->destroy(this->imvs);
this->lock->destroy(this->lock);
free(this); free(this);
} }
@ -472,6 +500,7 @@ imv_manager_t* tnc_imv_manager_create(void)
.destroy = _destroy, .destroy = _destroy,
}, },
.imvs = linked_list_create(), .imvs = linked_list_create(),
.lock = rwlock_create(RWLOCK_TYPE_DEFAULT),
.next_imv_id = 1, .next_imv_id = 1,
); );