denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add features support to eap-sim-file plugin

Browse Source
This commit is contained in:
Martin Willi
2011-10-14 10:05:48 +02:00
parent 49458758f6
commit 5f17a09323
2 changed files with 33 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/plugins/eap_sim_file/Makefile.am
+1
View File
@@ -8,6 +8,7 @@ if MONOLITHIC
noinst_LTLIBRARIES = libstrongswan-eap-sim-file.la noinst_LTLIBRARIES = libstrongswan-eap-sim-file.la
else else
plugin_LTLIBRARIES = libstrongswan-eap-sim-file.la plugin_LTLIBRARIES = libstrongswan-eap-sim-file.la
libstrongswan_eap_sim_file_la_LIBADD = $(top_builddir)/src/libsimaka/libsimaka.la
endif endif
libstrongswan_eap_sim_file_la_SOURCES = \ libstrongswan_eap_sim_file_la_SOURCES = \
src/libcharon/plugins/eap_sim_file/eap_sim_file_plugin.c
+32 -23
View File
@@ -56,17 +56,40 @@ METHOD(plugin_t, get_name, char*,
return "eap-sim-file"; return "eap-sim-file";
} }
/**
* Callback providing our card to register
*/
static simaka_card_t* get_card(private_eap_sim_file_t *this)
{
return &this->card->card;
}
/**
* Callback providing our provider to register
*/
static simaka_provider_t* get_provider(private_eap_sim_file_t *this)
{
return &this->provider->provider;
}
METHOD(plugin_t, get_features, int,
private_eap_sim_file_t *this, plugin_feature_t *features[])
{
static plugin_feature_t f[] = {
PLUGIN_CALLBACK(simaka_manager_register, get_card),
PLUGIN_PROVIDE(CUSTOM, "sim-card"),
PLUGIN_DEPENDS(CUSTOM, "sim-manager"),
PLUGIN_CALLBACK(simaka_manager_register, get_provider),
PLUGIN_PROVIDE(CUSTOM, "sim-provider"),
PLUGIN_DEPENDS(CUSTOM, "sim-manager"),
};
*features = f;
return countof(f);
}
METHOD(plugin_t, destroy, void, METHOD(plugin_t, destroy, void,
private_eap_sim_file_t *this) private_eap_sim_file_t *this)
{ {
simaka_manager_t *mgr;
mgr = lib->get(lib, "sim-manager");
if (mgr)
{
mgr->remove_card(mgr, &this->card->card);
mgr->remove_provider(mgr, &this->provider->provider);
}
this->card->destroy(this->card); this->card->destroy(this->card);
this->provider->destroy(this->provider); this->provider->destroy(this->provider);
this->triplets->destroy(this->triplets); this->triplets->destroy(this->triplets);
@@ -79,34 +102,20 @@ METHOD(plugin_t, destroy, void,
plugin_t *eap_sim_file_plugin_create() plugin_t *eap_sim_file_plugin_create()
{ {
private_eap_sim_file_t *this; private_eap_sim_file_t *this;
simaka_manager_t *mgr;
INIT(this, INIT(this,
.public = { .public = {
.plugin = { .plugin = {
.get_name = _get_name, .get_name = _get_name,
.reload = (void*)return_false, .get_features = _get_features,
.destroy = _destroy, .destroy = _destroy,
}, },
}, },
.triplets = eap_sim_file_triplets_create(TRIPLET_FILE), .triplets = eap_sim_file_triplets_create(TRIPLET_FILE),
); );
this->provider = eap_sim_file_provider_create(this->triplets); this->provider = eap_sim_file_provider_create(this->triplets);
if (!this->provider)
{
this->triplets->destroy(this->triplets);
free(this);
return NULL;
}
this->card = eap_sim_file_card_create(this->triplets); this->card = eap_sim_file_card_create(this->triplets);
mgr = lib->get(lib, "sim-manager");
if (mgr)
{
mgr->add_card(mgr, &this->card->card);
mgr->add_provider(mgr, &this->provider->provider);
}
return &this->public.plugin; return &this->public.plugin;
} }