introduced an additional bus->signal parameter for signal specific data

added SIG_IKE/SIG_CHD macros for signal emitting
This commit is contained in:
Martin Willi
2008-07-18 15:51:40 +00:00
parent 2f725443e5
commit a4a3e0c7dc
20 changed files with 209 additions and 174 deletions
+4 -3
View File
@@ -51,8 +51,9 @@ struct private_medcli_listener_t {
/**
* Implementation of bus_listener_t.signal.
*/
static bool signal_(private_medcli_listener_t *this, signal_t signal, level_t level,
int thread, ike_sa_t* ike_sa, char *format, va_list args)
static bool signal_(private_medcli_listener_t *this, signal_t signal,
level_t level, int thread, ike_sa_t* ike_sa, void *data,
char *format, va_list args)
{
mediated_state_t state;
@@ -100,7 +101,7 @@ medcli_listener_t *medcli_listener_create(database_t *db)
{
private_medcli_listener_t *this = malloc_thing(private_medcli_listener_t);
this->public.listener.signal = (bool(*)(bus_listener_t*,signal_t,level_t,int,ike_sa_t*,char*,va_list))signal_;
this->public.listener.signal = (bool(*)(bus_listener_t*,signal_t,level_t,int,ike_sa_t*,void*,char*,va_list))signal_;
this->public.destroy = (void (*)(medcli_listener_t*))destroy;
this->db = db;
+1 -1
View File
@@ -360,7 +360,7 @@ static void request_query_config(xmlTextReaderPtr reader, xmlTextWriterPtr write
* callback which logs to a XML writer
*/
static bool xml_callback(xmlTextWriterPtr writer, signal_t signal, level_t level,
ike_sa_t* ike_sa, char* format, va_list args)
ike_sa_t* ike_sa, void *data, char* format, va_list args)
{
if (level <= 1)
{
+3 -2
View File
@@ -54,7 +54,8 @@ struct private_sql_logger_t {
* Implementation of bus_listener_t.signal.
*/
static bool signal_(private_sql_logger_t *this, signal_t signal, level_t level,
int thread, ike_sa_t* ike_sa, char *format, va_list args)
int thread, ike_sa_t* ike_sa, void *data,
char *format, va_list args)
{
if (this->recursive)
{
@@ -133,7 +134,7 @@ sql_logger_t *sql_logger_create(database_t *db)
{
private_sql_logger_t *this = malloc_thing(private_sql_logger_t);
this->public.listener.signal = (bool(*)(bus_listener_t*,signal_t,level_t,int,ike_sa_t*,char*,va_list))signal_;
this->public.listener.signal = (bool(*)(bus_listener_t*,signal_t,level_t,int,ike_sa_t*,void*,char*,va_list))signal_;
this->public.destroy = (void(*)(sql_logger_t*))destroy;
this->db = db;
+1 -1
View File
@@ -56,7 +56,7 @@ struct stroke_log_info_t {
* logging to the stroke interface
*/
static bool stroke_log(stroke_log_info_t *info, signal_t signal, level_t level,
ike_sa_t *ike_sa, char *format, va_list args)
ike_sa_t *ike_sa, void *data, char *format, va_list args)
{
if (level <= info->level)
{