sharpetronics/strongswan
1
0
Fork 0
mirror of https://github.com/strongswan/strongswan.git synced 2025-11-27 00:00:29 -05:00
Code Issues Projects Releases Wiki Activity

Migrated sql_cred_t to INIT/METHOD macros.

Browse Source
This commit is contained in:
Tobias Brunner 2010-11-30 16:12:08 +01:00
parent 75827463fa
commit ece5d52e38
1 changed files with 60 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

137
src/libcharon/plugins/sql/sql_cred.c
View File

@ -49,11 +49,8 @@ typedef struct {
private_key_t *current;
} private_enumerator_t;
/**
* Implementation of private_enumerator_t.public.enumerate
*/
static bool private_enumerator_enumerate(private_enumerator_t *this,
private_key_t **key)
METHOD(enumerator_t, private_enumerator_enumerate, bool,
private_enumerator_t *this, private_key_t **key)
{
chunk_t blob;
int type;
@ -74,29 +71,25 @@ static bool private_enumerator_enumerate(private_enumerator_t *this,
return FALSE;
}
/**
* Implementation of private_enumerator_t.public.destroy
*/
static void private_enumerator_destroy(private_enumerator_t *this)
METHOD(enumerator_t, private_enumerator_destroy, void,
private_enumerator_t *this)
{
DESTROY_IF(this->current);
this->inner->destroy(this->inner);
free(this);
}
/**
* Implementation of credential_set_t.create_private_enumerator.
*/
static enumerator_t* create_private_enumerator(private_sql_cred_t *this,
key_type_t type,
identification_t *id)
METHOD(credential_set_t, create_private_enumerator, enumerator_t*,
private_sql_cred_t *this, key_type_t type, identification_t *id)
{
private_enumerator_t *e;
e = malloc_thing(private_enumerator_t);
e->current = NULL;
e->public.enumerate = (void*)private_enumerator_enumerate;
e->public.destroy = (void*)private_enumerator_destroy;
INIT(e,
.public = {
.enumerate = (void*)_private_enumerator_enumerate,
.destroy = _private_enumerator_destroy,
},
);
if (id && id->get_type(id) != ID_ANY)
{
e->inner = this->db->query(this->db,
@ -135,11 +128,8 @@ typedef struct {
certificate_t *current;
} cert_enumerator_t;
/**
* Implementation of cert_enumerator_t.public.enumerate
*/
static bool cert_enumerator_enumerate(cert_enumerator_t *this,
certificate_t **cert)
METHOD(enumerator_t, cert_enumerator_enumerate, bool,
cert_enumerator_t *this, certificate_t **cert)
{
chunk_t blob;
int type;
@ -160,29 +150,26 @@ static bool cert_enumerator_enumerate(cert_enumerator_t *this,
return FALSE;
}
/**
* Implementation of cert_enumerator_t.public.destroy
*/
static void cert_enumerator_destroy(cert_enumerator_t *this)
METHOD(enumerator_t, cert_enumerator_destroy, void,
cert_enumerator_t *this)
{
DESTROY_IF(this->current);
this->inner->destroy(this->inner);
free(this);
}
/**
* Implementation of credential_set_t.create_cert_enumerator.
*/
static enumerator_t* create_cert_enumerator(private_sql_cred_t *this,
certificate_type_t cert, key_type_t key,
identification_t *id, bool trusted)
METHOD(credential_set_t, create_cert_enumerator, enumerator_t*,
private_sql_cred_t *this, certificate_type_t cert, key_type_t key,
identification_t *id, bool trusted)
{
cert_enumerator_t *e;
e = malloc_thing(cert_enumerator_t);
e->current = NULL;
e->public.enumerate = (void*)cert_enumerator_enumerate;
e->public.destroy = (void*)cert_enumerator_destroy;
INIT(e,
.public = {
.enumerate = (void*)_cert_enumerator_enumerate,
.destroy = _cert_enumerator_destroy,
},
);
if (id && id->get_type(id) != ID_ANY)
{
e->inner = this->db->query(this->db,
@ -229,12 +216,9 @@ typedef struct {
shared_key_t *current;
} shared_enumerator_t;
/**
* Implementation of shared_enumerator_t.public.enumerate
*/
static bool shared_enumerator_enumerate(shared_enumerator_t *this,
shared_key_t **shared,
id_match_t *me, id_match_t *other)
METHOD(enumerator_t, shared_enumerator_enumerate, bool,
shared_enumerator_t *this, shared_key_t **shared,
id_match_t *me, id_match_t *other)
{
chunk_t blob;
int type;
@ -261,31 +245,28 @@ static bool shared_enumerator_enumerate(shared_enumerator_t *this,
return FALSE;
}
/**
* Implementation of shared_enumerator_t.public.destroy
*/
static void shared_enumerator_destroy(shared_enumerator_t *this)
METHOD(enumerator_t, shared_enumerator_destroy, void,
shared_enumerator_t *this)
{
DESTROY_IF(this->current);
this->inner->destroy(this->inner);
free(this);
}
/**
* Implementation of credential_set_t.create_shared_enumerator.
*/
static enumerator_t* create_shared_enumerator(private_sql_cred_t *this,
shared_key_type_t type,
identification_t *me, identification_t *other)
METHOD(credential_set_t, create_shared_enumerator, enumerator_t*,
private_sql_cred_t *this, shared_key_type_t type,
identification_t *me, identification_t *other)
{
shared_enumerator_t *e;
e = malloc_thing(shared_enumerator_t);
e->me = me;
e->other = other;
e->current = NULL;
e->public.enumerate = (void*)shared_enumerator_enumerate;
e->public.destroy = (void*)shared_enumerator_destroy;
INIT(e,
.public = {
.enumerate = (void*)_shared_enumerator_enumerate,
.destroy = _shared_enumerator_destroy,
},
.me = me,
.other = other,
);
if (!me && !other)
{
e->inner = this->db->query(this->db,
@ -329,36 +310,38 @@ static enumerator_t* create_shared_enumerator(private_sql_cred_t *this,
return &e->public;
}
/**
* Implementation of credential_set_t.cache_cert.
*/
static void cache_cert(private_sql_cred_t *this, certificate_t *cert)
METHOD(credential_set_t, cache_cert, void,
private_sql_cred_t *this, certificate_t *cert)
{
/* TODO: implement CRL caching to database */
}
/**
* Implementation of sql_cred_t.destroy.
*/
static void destroy(private_sql_cred_t *this)
METHOD(sql_cred_t, destroy, void,
private_sql_cred_t *this)
{
free(this);
}
/**
* Described in header.
*/
sql_cred_t *sql_cred_create(database_t *db)
{
private_sql_cred_t *this = malloc_thing(private_sql_cred_t);
private_sql_cred_t *this;
this->public.set.create_private_enumerator = (void*)create_private_enumerator;
this->public.set.create_cert_enumerator = (void*)create_cert_enumerator;
this->public.set.create_shared_enumerator = (void*)create_shared_enumerator;
this->public.set.create_cdp_enumerator = (void*)return_null;
this->public.set.cache_cert = (void*)cache_cert;
this->public.destroy = (void(*)(sql_cred_t*))destroy;
this->db = db;
INIT(this,
.public = {
.set = {
.create_private_enumerator = _create_private_enumerator,
.create_cert_enumerator = _create_cert_enumerator,
.create_shared_enumerator = _create_shared_enumerator,
.create_cdp_enumerator = (void*)return_null,
.cache_cert = _cache_cert,
},
.destroy = _destroy,
},
.db = db,
);
return &this->public;
}