From f07a80d192330751c12eb9f0f23b8205246ea26a Mon Sep 17 00:00:00 2001 From: Jan Hutter Date: Thu, 17 Nov 2005 12:49:56 +0000 Subject: [PATCH] - added destroy_all to job_t --- Source/charon/jobs/incoming_packet_job.c | 16 ++++++++++++++++ Source/charon/jobs/initiate_ike_sa_job.c | 3 ++- Source/charon/jobs/job.c | 1 + Source/charon/jobs/job.h | 8 ++++++++ 4 files changed, 27 insertions(+), 1 deletion(-) diff --git a/Source/charon/jobs/incoming_packet_job.c b/Source/charon/jobs/incoming_packet_job.c index c7758fa..fe311d2 100644 --- a/Source/charon/jobs/incoming_packet_job.c +++ b/Source/charon/jobs/incoming_packet_job.c @@ -68,6 +68,21 @@ static status_t get_packet(private_incoming_packet_job_t *this,packet_t **packet } + +/** + * Implements job_t's and destroy_all function. + * See #job_t.destroy_all description. + */ +static status_t destroy_all(private_incoming_packet_job_t *this) +{ + if (this->packet != NULL) + { + this->packet->destroy(this->packet); + } + allocator_free(this); + return SUCCESS; +} + /** * Implements job_t's and incoming_packet_job_t's destroy function. * See #job_t.destroy or #incoming_packet_job_t.destroy for description. @@ -93,6 +108,7 @@ incoming_packet_job_t *incoming_packet_job_create(packet_t *packet) /* interface functions */ this->public.job_interface.get_type = (job_type_t (*) (job_t *)) get_type; + this->public.job_interface.destroy_all = (status_t (*) (job_t *)) destroy_all; this->public.job_interface.destroy = destroy; /* public functions */ diff --git a/Source/charon/jobs/initiate_ike_sa_job.c b/Source/charon/jobs/initiate_ike_sa_job.c index d14de48..0bf0cca 100644 --- a/Source/charon/jobs/initiate_ike_sa_job.c +++ b/Source/charon/jobs/initiate_ike_sa_job.c @@ -64,7 +64,6 @@ static char * get_configuration_name(private_initiate_ike_sa_job_t *this) return this->configuration_name; } - /** * Implements job_t's and initiate_ike_sa_job_t's destroy function. * See #job_t.destroy or #initiate_ike_sa_job_t.destroy for description. @@ -91,6 +90,8 @@ initiate_ike_sa_job_t *initiate_ike_sa_job_create(char *configuration_name) /* interface functions */ this->public.job_interface.get_type = (job_type_t (*) (job_t *)) get_type; + /* same as destroy */ + this->public.job_interface.destroy_all = (status_t (*) (job_t *)) destroy; this->public.job_interface.destroy = destroy; /* public functions */ diff --git a/Source/charon/jobs/job.c b/Source/charon/jobs/job.c index 2188003..a7df3ec 100644 --- a/Source/charon/jobs/job.c +++ b/Source/charon/jobs/job.c @@ -20,6 +20,7 @@ * for more details. */ + #include "job.h" diff --git a/Source/charon/jobs/job.h b/Source/charon/jobs/job.h index ae2d271..2563390 100644 --- a/Source/charon/jobs/job.h +++ b/Source/charon/jobs/job.h @@ -72,6 +72,14 @@ struct job_s{ job_type_t (*get_type) (job_t *this); /** + * @brief Destroys a job_t object and all assigned data! + * + * @param job_t calling object + * @returns SUCCESS if succeeded, FAILED otherwise + */ + status_t (*destroy_all) (job_t *job); + + /** * @brief Destroys a job_t object * * @param job_t calling object -- 2.7.4