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

Migrated medcli_listener_t to INIT/METHOD macros.

Browse Source
This commit is contained in:
Tobias Brunner
2011-10-04 11:55:28 +02:00
parent 13e5a32a1e
commit b12734d86a
1 changed files with 20 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/plugins/medcli/medcli_listener.c
+20 -22
View File
@@ -47,7 +47,7 @@ struct private_medcli_listener_t {
}; };
/** /**
* Implementation of bus_listener_t.signal. * Update connection status in the database
*/ */
static void set_state(private_medcli_listener_t *this, char *alias, static void set_state(private_medcli_listener_t *this, char *alias,
mediated_state_t state) mediated_state_t state)
@@ -56,11 +56,9 @@ static void set_state(private_medcli_listener_t *this, char *alias,
"UPDATE Connection SET Status = ? WHERE Alias = ?", "UPDATE Connection SET Status = ? WHERE Alias = ?",
DB_UINT, state, DB_TEXT, alias); DB_UINT, state, DB_TEXT, alias);
} }
/**
* Implementation of listener_t.ike_state_change METHOD(listener_t, ike_state_change, bool,
*/ private_medcli_listener_t *this, ike_sa_t *ike_sa, ike_sa_state_t state)
static bool ike_state_change(private_medcli_listener_t *this,
ike_sa_t *ike_sa, ike_sa_state_t state)
{ {
if (ike_sa) if (ike_sa)
{ {
@@ -78,11 +76,9 @@ static bool ike_state_change(private_medcli_listener_t *this,
return TRUE; return TRUE;
} }
/** METHOD(listener_t, child_state_change, bool,
* Implementation of listener_t.child_state_change private_medcli_listener_t *this, ike_sa_t *ike_sa, child_sa_t *child_sa,
*/ child_sa_state_t state)
static bool child_state_change(private_medcli_listener_t *this,
ike_sa_t *ike_sa, child_sa_t *child_sa, child_sa_state_t state)
{ {
if (ike_sa && child_sa) if (ike_sa && child_sa)
{ {
@@ -101,10 +97,8 @@ static bool child_state_change(private_medcli_listener_t *this,
return TRUE; return TRUE;
} }
/** METHOD(medcli_listener_t, destroy, void,
* Implementation of backend_t.destroy. private_medcli_listener_t *this)
*/
static void destroy(private_medcli_listener_t *this)
{ {
this->db->execute(this->db, NULL, "UPDATE Connection SET Status = ?", this->db->execute(this->db, NULL, "UPDATE Connection SET Status = ?",
DB_UINT, STATE_DOWN); DB_UINT, STATE_DOWN);
@@ -116,15 +110,19 @@ static void destroy(private_medcli_listener_t *this)
*/ */
medcli_listener_t *medcli_listener_create(database_t *db) medcli_listener_t *medcli_listener_create(database_t *db)
{ {
private_medcli_listener_t *this = malloc_thing(private_medcli_listener_t); private_medcli_listener_t *this;
memset(&this->public.listener, 0, sizeof(listener_t)); INIT(this,
.public = {
.listener = {
.ike_state_change = _ike_state_change,
.child_state_change = _child_state_change,
},
.destroy = _destroy,
},
.db = db,
);
this->public.listener.ike_state_change = (void*)ike_state_change;
this->public.listener.child_state_change = (void*)child_state_change;
this->public.destroy = (void (*)(medcli_listener_t*))destroy;
this->db = db;
db->execute(db, NULL, "UPDATE Connection SET Status = ?", db->execute(db, NULL, "UPDATE Connection SET Status = ?",
DB_UINT, STATE_DOWN); DB_UINT, STATE_DOWN);