introduced callback_job:
simple asynchronous method invocation use daemons thread pool for all threads proper cancellation and cleanups cancellation mechanism to dynamically unload multithreaded code unified event_queue and scheduler => scheduler unified job_queue and thread_pool => processor removed job_type_t, not really needed fixes here, there and everywhere
This commit is contained in:
@@ -53,17 +53,17 @@ struct private_rekey_child_sa_job_t {
|
||||
};
|
||||
|
||||
/**
|
||||
* Implementation of job_t.get_type.
|
||||
* Implementation of job_t.destroy.
|
||||
*/
|
||||
static job_type_t get_type(private_rekey_child_sa_job_t *this)
|
||||
static void destroy(private_rekey_child_sa_job_t *this)
|
||||
{
|
||||
return REKEY_CHILD_SA;
|
||||
free(this);
|
||||
}
|
||||
|
||||
/**
|
||||
* Implementation of job_t.execute.
|
||||
*/
|
||||
static status_t execute(private_rekey_child_sa_job_t *this)
|
||||
static void execute(private_rekey_child_sa_job_t *this)
|
||||
{
|
||||
ike_sa_t *ike_sa;
|
||||
|
||||
@@ -73,20 +73,13 @@ static status_t execute(private_rekey_child_sa_job_t *this)
|
||||
{
|
||||
DBG2(DBG_JOB, "CHILD_SA with reqid %d not found for rekeying",
|
||||
this->reqid);
|
||||
return DESTROY_ME;
|
||||
}
|
||||
ike_sa->rekey_child_sa(ike_sa, this->protocol, this->spi);
|
||||
|
||||
charon->ike_sa_manager->checkin(charon->ike_sa_manager, ike_sa);
|
||||
return DESTROY_ME;
|
||||
}
|
||||
|
||||
/**
|
||||
* Implementation of job_t.destroy.
|
||||
*/
|
||||
static void destroy(private_rekey_child_sa_job_t *this)
|
||||
{
|
||||
free(this);
|
||||
else
|
||||
{
|
||||
ike_sa->rekey_child_sa(ike_sa, this->protocol, this->spi);
|
||||
charon->ike_sa_manager->checkin(charon->ike_sa_manager, ike_sa);
|
||||
}
|
||||
destroy(this);
|
||||
}
|
||||
|
||||
/*
|
||||
@@ -99,8 +92,7 @@ rekey_child_sa_job_t *rekey_child_sa_job_create(u_int32_t reqid,
|
||||
private_rekey_child_sa_job_t *this = malloc_thing(private_rekey_child_sa_job_t);
|
||||
|
||||
/* interface functions */
|
||||
this->public.job_interface.get_type = (job_type_t (*) (job_t *)) get_type;
|
||||
this->public.job_interface.execute = (status_t (*) (job_t *)) execute;
|
||||
this->public.job_interface.execute = (void (*) (job_t *)) execute;
|
||||
this->public.job_interface.destroy = (void (*)(job_t*)) destroy;
|
||||
|
||||
/* private variables */
|
||||
@@ -108,5 +100,5 @@ rekey_child_sa_job_t *rekey_child_sa_job_create(u_int32_t reqid,
|
||||
this->protocol = protocol;
|
||||
this->spi = spi;
|
||||
|
||||
return &(this->public);
|
||||
return &this->public;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user