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

Migrated medcli_config_t to INIT/METHOD macros.

Browse Source
This commit is contained in:
Tobias Brunner
2011-10-04 12:02:29 +02:00
parent b12734d86a
commit d4b989068c
1 changed files with 39 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/plugins/medcli/medcli_config.c
+39 -45
View File
@@ -88,10 +88,8 @@ static traffic_selector_t *ts_from_string(char *str)
return traffic_selector_create_dynamic(0, 0, 65535); return traffic_selector_create_dynamic(0, 0, 65535);
} }
/** METHOD(backend_t, get_peer_cfg_by_name, peer_cfg_t*,
* implements backend_t.get_peer_cfg_by_name. private_medcli_config_t *this, char *name)
*/
static peer_cfg_t *get_peer_cfg_by_name(private_medcli_config_t *this, char *name)
{ {
enumerator_t *e; enumerator_t *e;
peer_cfg_t *peer_cfg, *med_cfg; peer_cfg_t *peer_cfg, *med_cfg;
@@ -192,11 +190,8 @@ static peer_cfg_t *get_peer_cfg_by_name(private_medcli_config_t *this, char *nam
return peer_cfg; return peer_cfg;
} }
/** METHOD(backend_t, create_ike_cfg_enumerator, enumerator_t*,
* Implementation of backend_t.create_ike_cfg_enumerator. private_medcli_config_t *this, host_t *me, host_t *other)
*/
static enumerator_t* create_ike_cfg_enumerator(private_medcli_config_t *this,
host_t *me, host_t *other)
{ {
return enumerator_create_single(this->ike, NULL); return enumerator_create_single(this->ike, NULL);
} }
@@ -216,10 +211,8 @@ typedef struct {
int dpd; int dpd;
} peer_enumerator_t; } peer_enumerator_t;
/** METHOD(enumerator_t, peer_enumerator_enumerate, bool,
* Implementation of peer_enumerator_t.public.enumerate peer_enumerator_t *this, peer_cfg_t **cfg)
*/
static bool peer_enumerator_enumerate(peer_enumerator_t *this, peer_cfg_t **cfg)
{ {
char *name, *local_net, *remote_net; char *name, *local_net, *remote_net;
chunk_t me, other; chunk_t me, other;
@@ -271,31 +264,29 @@ static bool peer_enumerator_enumerate(peer_enumerator_t *this, peer_cfg_t **cfg)
return TRUE; return TRUE;
} }
/** METHOD(enumerator_t, peer_enumerator_destroy, void,
* Implementation of peer_enumerator_t.public.destroy peer_enumerator_t *this)
*/
static void peer_enumerator_destroy(peer_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(backend_t, create_peer_cfg_enumerator, enumerator_t*,
* Implementation of backend_t.create_peer_cfg_enumerator. private_medcli_config_t *this, identification_t *me,
*/ identification_t *other)
static enumerator_t* create_peer_cfg_enumerator(private_medcli_config_t *this,
identification_t *me,
identification_t *other)
{ {
peer_enumerator_t *e = malloc_thing(peer_enumerator_t); peer_enumerator_t *e;
e->current = NULL; INIT(e,
e->ike = this->ike; .public = {
e->rekey = this->rekey; .enumerate = (void*)_peer_enumerator_enumerate,
e->dpd = this->dpd; .destroy = _peer_enumerator_destroy,
e->public.enumerate = (void*)peer_enumerator_enumerate; },
e->public.destroy = (void*)peer_enumerator_destroy; .ike = this->ike,
.rekey = this->rekey,
.dpd = this->dpd,
);
/* filter on IDs: NULL or ANY or matching KEY_ID */ /* filter on IDs: NULL or ANY or matching KEY_ID */
e->inner = this->db->query(this->db, e->inner = this->db->query(this->db,
@@ -374,10 +365,8 @@ static void schedule_autoinit(private_medcli_config_t *this)
} }
} }
/** METHOD(medcli_config_t, destroy, void,
* Implementation of medcli_config_t.destroy. private_medcli_config_t *this)
*/
static void destroy(private_medcli_config_t *this)
{ {
this->ike->destroy(this->ike); this->ike->destroy(this->ike);
free(this); free(this);
@@ -388,18 +377,23 @@ static void destroy(private_medcli_config_t *this)
*/ */
medcli_config_t *medcli_config_create(database_t *db) medcli_config_t *medcli_config_create(database_t *db)
{ {
private_medcli_config_t *this = malloc_thing(private_medcli_config_t); private_medcli_config_t *this;
this->public.backend.create_peer_cfg_enumerator = (enumerator_t*(*)(backend_t*, identification_t *me, identification_t *other))create_peer_cfg_enumerator; INIT(this,
this->public.backend.create_ike_cfg_enumerator = (enumerator_t*(*)(backend_t*, host_t *me, host_t *other))create_ike_cfg_enumerator; .public = {
this->public.backend.get_peer_cfg_by_name = (peer_cfg_t* (*)(backend_t*,char*))get_peer_cfg_by_name; .backend = {
this->public.destroy = (void(*)(medcli_config_t*))destroy; .create_peer_cfg_enumerator = _create_peer_cfg_enumerator,
.create_ike_cfg_enumerator = _create_ike_cfg_enumerator,
this->db = db; .get_peer_cfg_by_name = _get_peer_cfg_by_name,
this->rekey = lib->settings->get_time(lib->settings, "medcli.rekey", 1200); },
this->dpd = lib->settings->get_time(lib->settings, "medcli.dpd", 300); .destroy = _destroy,
this->ike = ike_cfg_create(FALSE, FALSE, },
"0.0.0.0", IKEV2_UDP_PORT, "0.0.0.0", IKEV2_UDP_PORT); .db = db,
.rekey = lib->settings->get_time(lib->settings, "medcli.rekey", 1200),
.dpd = lib->settings->get_time(lib->settings, "medcli.dpd", 300),
.ike = ike_cfg_create(FALSE, FALSE, "0.0.0.0", IKEV2_UDP_PORT,
"0.0.0.0", IKEV2_UDP_PORT),
);
this->ike->add_proposal(this->ike, proposal_create_default(PROTO_IKE)); this->ike->add_proposal(this->ike, proposal_create_default(PROTO_IKE));
schedule_autoinit(this); schedule_autoinit(this);