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

Migrated medcli_creds_t to INIT/METHOD macros.

Browse Source
This commit is contained in:
Tobias Brunner
2011-10-04 12:08:40 +02:00
parent d4b989068c
commit 3c6f06a7d4
1 changed files with 42 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/plugins/medcli/medcli_creds.c
+42 -52
View File
@@ -49,11 +49,8 @@ typedef struct {
private_key_t *current; private_key_t *current;
} private_enumerator_t; } private_enumerator_t;
/** METHOD(enumerator_t, private_enumerator_enumerate, bool,
* Implementation of private_enumerator_t.public.enumerate private_enumerator_t *this, private_key_t **key)
*/
static bool private_enumerator_enumerate(private_enumerator_t *this,
private_key_t **key)
{ {
chunk_t chunk; chunk_t chunk;
@@ -73,21 +70,16 @@ static bool private_enumerator_enumerate(private_enumerator_t *this,
return FALSE; return FALSE;
} }
/** METHOD(enumerator_t, private_enumerator_destroy, void,
* Implementation of private_enumerator_t.public.destroy private_enumerator_t *this)
*/
static void private_enumerator_destroy(private_enumerator_t *this)
{ {
DESTROY_IF(this->current); DESTROY_IF(this->current);
this->inner->destroy(this->inner); this->inner->destroy(this->inner);
free(this); free(this);
} }
/** METHOD(credential_set_t, create_private_enumerator, enumerator_t*,
* Implementation of credential_set_t.create_private_enumerator. private_medcli_creds_t *this, key_type_t type, identification_t *id)
*/
static enumerator_t* create_private_enumerator(private_medcli_creds_t *this,
key_type_t type, identification_t *id)
{ {
private_enumerator_t *e; private_enumerator_t *e;
@@ -98,10 +90,12 @@ static enumerator_t* create_private_enumerator(private_medcli_creds_t *this,
return NULL; return NULL;
} }
e = malloc_thing(private_enumerator_t); INIT(e,
e->current = NULL; .public = {
e->public.enumerate = (void*)private_enumerator_enumerate; .enumerate = (void*)_private_enumerator_enumerate,
e->public.destroy = (void*)private_enumerator_destroy; .destroy = _private_enumerator_destroy,
},
);
e->inner = this->db->query(this->db, e->inner = this->db->query(this->db,
"SELECT PrivateKey FROM ClientConfig WHERE KeyId = ?", "SELECT PrivateKey FROM ClientConfig WHERE KeyId = ?",
DB_BLOB, id->get_encoding(id), DB_BLOB, id->get_encoding(id),
@@ -128,11 +122,8 @@ typedef struct {
key_type_t type; key_type_t type;
} cert_enumerator_t; } cert_enumerator_t;
/** METHOD(enumerator_t, cert_enumerator_enumerate, bool,
* Implementation of cert_enumerator_t.public.enumerate cert_enumerator_t *this, certificate_t **cert)
*/
static bool cert_enumerator_enumerate(cert_enumerator_t *this,
certificate_t **cert)
{ {
public_key_t *public; public_key_t *public;
chunk_t chunk; chunk_t chunk;
@@ -167,22 +158,17 @@ static bool cert_enumerator_enumerate(cert_enumerator_t *this,
return FALSE; return FALSE;
} }
/** METHOD(enumerator_t, cert_enumerator_destroy, void,
* Implementation of cert_enumerator_t.public.destroy cert_enumerator_t *this)
*/
static void cert_enumerator_destroy(cert_enumerator_t *this)
{ {
DESTROY_IF(this->current); DESTROY_IF(this->current);
this->inner->destroy(this->inner); this->inner->destroy(this->inner);
free(this); free(this);
} }
/** METHOD(credential_set_t, create_cert_enumerator, enumerator_t*,
* Implementation of credential_set_t.create_cert_enumerator. private_medcli_creds_t *this, certificate_type_t cert, key_type_t key,
*/ identification_t *id, bool trusted)
static enumerator_t* create_cert_enumerator(private_medcli_creds_t *this,
certificate_type_t cert, key_type_t key,
identification_t *id, bool trusted)
{ {
cert_enumerator_t *e; cert_enumerator_t *e;
@@ -192,11 +178,13 @@ static enumerator_t* create_cert_enumerator(private_medcli_creds_t *this,
return NULL; return NULL;
} }
e = malloc_thing(cert_enumerator_t); INIT(e,
e->current = NULL; .public = {
e->type = key; .enumerate = (void*)_cert_enumerator_enumerate,
e->public.enumerate = (void*)cert_enumerator_enumerate; .destroy = _cert_enumerator_destroy,
e->public.destroy = (void*)cert_enumerator_destroy; },
.type = key,
);
e->inner = this->db->query(this->db, e->inner = this->db->query(this->db,
"SELECT PublicKey FROM ClientConfig WHERE KeyId = ? UNION " "SELECT PublicKey FROM ClientConfig WHERE KeyId = ? UNION "
"SELECT PublicKey FROM MediationServerConfig WHERE KeyId = ? UNION " "SELECT PublicKey FROM MediationServerConfig WHERE KeyId = ? UNION "
@@ -213,10 +201,8 @@ static enumerator_t* create_cert_enumerator(private_medcli_creds_t *this,
return &e->public; return &e->public;
} }
/** METHOD(medcli_creds_t, destroy, void,
* Implementation of backend_t.destroy. private_medcli_creds_t *this)
*/
static void destroy(private_medcli_creds_t *this)
{ {
free(this); free(this);
} }
@@ -226,17 +212,21 @@ static void destroy(private_medcli_creds_t *this)
*/ */
medcli_creds_t *medcli_creds_create(database_t *db) medcli_creds_t *medcli_creds_create(database_t *db)
{ {
private_medcli_creds_t *this = malloc_thing(private_medcli_creds_t); private_medcli_creds_t *this;
this->public.set.create_private_enumerator = (void*)create_private_enumerator; INIT(this,
this->public.set.create_cert_enumerator = (void*)create_cert_enumerator; .public = {
this->public.set.create_shared_enumerator = (void*)return_null; .set = {
this->public.set.create_cdp_enumerator = (void*)return_null; .create_private_enumerator = _create_private_enumerator,
this->public.set.cache_cert = (void*)nop; .create_cert_enumerator = _create_cert_enumerator,
.create_shared_enumerator = (void*)return_null,
this->public.destroy = (void (*)(medcli_creds_t*))destroy; .create_cdp_enumerator = (void*)return_null,
.cache_cert = (void*)nop,
this->db = db; },
.destroy = _destroy,
},
.db = db,
);
return &this->public; return &this->public;
} }