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

Migrated eap_manager to INIT/METHOD macros

Browse Source
This commit is contained in:
Andreas Steffen
2010-08-13 15:32:37 +02:00
parent 87799b0c00
commit fe6ae23d1f
1 changed files with 22 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/sa/authenticators/eap/eap_manager.c
+22 -30
View File
@@ -68,12 +68,9 @@ struct private_eap_manager_t {
rwlock_t *lock; rwlock_t *lock;
}; };
/** METHOD(eap_manager_t, add_method, void,
* Implementation of eap_manager_t.add_method. private_eap_manager_t *this, eap_type_t type, u_int32_t vendor,
*/ eap_role_t role, eap_constructor_t constructor)
static void add_method(private_eap_manager_t *this, eap_type_t type,
u_int32_t vendor, eap_role_t role,
eap_constructor_t constructor)
{ {
eap_entry_t *entry = malloc_thing(eap_entry_t); eap_entry_t *entry = malloc_thing(eap_entry_t);
@@ -87,10 +84,8 @@ static void add_method(private_eap_manager_t *this, eap_type_t type,
this->lock->unlock(this->lock); this->lock->unlock(this->lock);
} }
/** METHOD(eap_manager_t, remove_method, void,
* Implementation of eap_manager_t.remove_method. private_eap_manager_t *this, eap_constructor_t constructor)
*/
static void remove_method(private_eap_manager_t *this, eap_constructor_t constructor)
{ {
enumerator_t *enumerator; enumerator_t *enumerator;
eap_entry_t *entry; eap_entry_t *entry;
@@ -109,13 +104,9 @@ static void remove_method(private_eap_manager_t *this, eap_constructor_t constru
this->lock->unlock(this->lock); this->lock->unlock(this->lock);
} }
/** METHOD(eap_manager_t, create_instance, eap_method_t*,
* Implementation of eap_manager_t.create_instance. private_eap_manager_t *this, eap_type_t type, u_int32_t vendor,
*/ eap_role_t role, identification_t *server, identification_t *peer)
static eap_method_t* create_instance(private_eap_manager_t *this,
eap_type_t type, u_int32_t vendor,
eap_role_t role, identification_t *server,
identification_t *peer)
{ {
enumerator_t *enumerator; enumerator_t *enumerator;
eap_entry_t *entry; eap_entry_t *entry;
@@ -140,10 +131,8 @@ static eap_method_t* create_instance(private_eap_manager_t *this,
return method; return method;
} }
/** METHOD(eap_manager_t, destroy, void,
* Implementation of 2008_t.destroy private_eap_manager_t *this)
*/
static void destroy(private_eap_manager_t *this)
{ {
this->methods->destroy_function(this->methods, free); this->methods->destroy_function(this->methods, free);
this->lock->destroy(this->lock); this->lock->destroy(this->lock);
@@ -151,19 +140,22 @@ static void destroy(private_eap_manager_t *this)
} }
/* /*
* see header file * See header
*/ */
eap_manager_t *eap_manager_create() eap_manager_t *eap_manager_create()
{ {
private_eap_manager_t *this = malloc_thing(private_eap_manager_t); private_eap_manager_t *this;
this->public.add_method = (void(*)(eap_manager_t*, eap_type_t type, u_int32_t vendor, eap_role_t role, eap_constructor_t constructor))add_method; INIT(this,
this->public.remove_method = (void(*)(eap_manager_t*, eap_constructor_t constructor))remove_method; .public = {
this->public.create_instance = (eap_method_t*(*)(eap_manager_t*, eap_type_t type, u_int32_t vendor, eap_role_t role, identification_t*,identification_t*))create_instance; .add_method = _add_method,
this->public.destroy = (void(*)(eap_manager_t*))destroy; .remove_method = _remove_method,
.create_instance = _create_instance,
this->methods = linked_list_create(); .destroy = _destroy,
this->lock = rwlock_create(RWLOCK_TYPE_DEFAULT); },
.methods = linked_list_create(),
.lock = rwlock_create(RWLOCK_TYPE_DEFAULT),
);
return &this->public; return &this->public;
} }