- added new job type delete_ike_sa_job_t

diff --git a/Source/charon/jobs/delete_ike_sa_job.c b/Source/charon/jobs/delete_ike_sa_job.c
new file mode 100644 (file)
index 0000000..23cae47
--- /dev/null
+++ b/Source/charon/jobs/delete_ike_sa_job.c
@@ -0,0 +1,105 @@
+/**
+ * @file delete_ike_sa_job.h
+ * 
+ * @brief Job of type DELETE_IKE_SA
+ * 
+ */
+
+/*
+ * Copyright (C) 2005 Jan Hutter, Martin Willi
+ * Hochschule fuer Technik Rapperswil
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.  See <http://www.fsf.org/copyleft/gpl.txt>.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * for more details.
+ */
+
+#include "delete_ike_sa_job.h"
+
+#include "../utils/allocator.h"
+
+/**
+ * Private data of an delete_ike_sa_job_t Object
+ * 
+ */
+typedef struct private_delete_ike_sa_job_s private_delete_ike_sa_job_t;
+
+struct private_delete_ike_sa_job_s {
+       /**
+        * public delete_ike_sa_job_t interface
+        */
+       delete_ike_sa_job_t public;
+       
+       /**
+        * ID of the ike_sa to delete
+        */
+       ike_sa_id_t *ike_sa_id;
+};
+
+
+/**
+ * Implements delete_ike_sa_job_t's get_type function.
+ * See #delete_ike_sa_job_t.get_type for description.
+ */
+static job_type_t get_type(private_delete_ike_sa_job_t *this)
+{
+       return DELETE_IKE_SA;
+}
+
+/**
+ * Implements delete_ike_sa_job_t's get_ike_sa_id function.
+ * See #delete_ike_sa_job_t.get_ike_sa_id for description.
+ */
+static ike_sa_id_t * get_ike_sa_id(private_delete_ike_sa_job_t *this)
+{
+       return this->ike_sa_id;
+}
+
+/**
+ * Implements job_t's and delete_ike_sa_job_t's destroy function.
+ * See #job_t.destroy or #delete_ike_sa_job_t.destroy for description.
+ */
+static status_t destroy(job_t *job)
+{
+       private_delete_ike_sa_job_t *this = (private_delete_ike_sa_job_t *) job;
+       this->ike_sa_id->destroy(this->ike_sa_id);
+       allocator_free(this);
+       return SUCCESS;
+}
+
+/*
+ * Described in header
+ */
+delete_ike_sa_job_t *delete_ike_sa_job_create(ike_sa_id_t *ike_sa_id)
+{
+       private_delete_ike_sa_job_t *this = allocator_alloc_thing(private_delete_ike_sa_job_t);
+       if (this == NULL)
+       {
+               return NULL;
+       }
+       
+       /* 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 */
+       this->public.get_ike_sa_id = (ike_sa_id_t * (*)(delete_ike_sa_job_t *)) get_ike_sa_id;
+       this->public.destroy = (status_t (*)(delete_ike_sa_job_t *)) destroy;
+       
+       /* private variables */
+       if (ike_sa_id->clone(ike_sa_id,&(this->ike_sa_id)) != SUCCESS)
+       {
+               allocator_free(this);
+               return NULL;
+       }
+       
+       return &(this->public);
+}

diff --git a/Source/charon/jobs/delete_ike_sa_job.h b/Source/charon/jobs/delete_ike_sa_job.h
new file mode 100644 (file)
index 0000000..16e5b5d
--- /dev/null
+++ b/Source/charon/jobs/delete_ike_sa_job.h
@@ -0,0 +1,74 @@
+/**
+ * @file delete_ike_sa_job.h
+ * 
+ * @brief Job of type DELETE_IKE_SA
+ * 
+ */
+
+/*
+ * Copyright (C) 2005 Jan Hutter, Martin Willi
+ * Hochschule fuer Technik Rapperswil
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.  See <http://www.fsf.org/copyleft/gpl.txt>.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * for more details.
+ */
+ 
+#ifndef DELETE_IKE_SA_JOB_H_
+#define DELETE_IKE_SA_JOB_H_
+
+#include "../types.h"
+#include "../ike_sa_id.h"
+#include "job.h"
+
+
+/**
+ * Object representing an DELETE_IKE_SA Job
+ * 
+ */
+typedef struct delete_ike_sa_job_s delete_ike_sa_job_t;
+
+struct delete_ike_sa_job_s {
+       /**
+        * implements job_t interface
+        */
+       job_t job_interface;
+       
+       /**
+        * @brief Returns the currently set ike_sa_id
+        *      
+        * @warning Returned object is not copied.
+        * 
+        * @param this  calling delete_ike_sa_job_t object
+        * @return              ike_sa_id_t object
+        */
+       ike_sa_id_t * (*get_ike_sa_id) (delete_ike_sa_job_t *this);
+
+       /**
+        * @brief Destroys an delete_ike_sa_job_t object (including assigned data)
+        *
+        * @param this  delete_ike_sa_job_t object to destroy
+        * @return              
+        *                              SUCCESS in any case
+        */
+       status_t (*destroy) (delete_ike_sa_job_t *this);
+};
+
+/**
+ * Creates a job of type DELETE_IKE_SA
+ * 
+ * @param ike_sa_id    id of the IKE_SA to delete
+ * @return
+ *                             - delete_ike_sa_job_t if successfully
+ *                             - NULL if out of ressources
+ */
+delete_ike_sa_job_t *delete_ike_sa_job_create(ike_sa_id_t *ike_sa_id);
+
+
+#endif /*DELETE_IKE_SA_JOB_H_*/

diff --git a/Source/charon/jobs/job.c b/Source/charon/jobs/job.c
index a7df3ec..95b802e 100644 (file)
--- a/Source/charon/jobs/job.c
+++ b/Source/charon/jobs/job.c
@@ -28,5 +28,6 @@ mapping_t job_type_m[] = {
        {INCOMING_PACKET, "INCOMING_PACKET"},
        {RETRANSMIT_REQUEST, "RETRANSMIT_REQUEST"},
        {INITIATE_IKE_SA, "INITIATE_IKE_SA"},
+       {DELETE_IKE_SA, "DELETE_IKE_SA"},
        {MAPPING_END, NULL}
 };

diff --git a/Source/charon/jobs/job.h b/Source/charon/jobs/job.h
index 2563390..84e5ec2 100644 (file)
--- a/Source/charon/jobs/job.h
+++ b/Source/charon/jobs/job.h
@@ -47,7 +47,14 @@ enum job_type_e {
         * 
         * Job is implemented in class type initiate_ike_sa_job_t
         */
-       INITIATE_IKE_SA
+       INITIATE_IKE_SA,
+       /** 
+        * Delete an ike sa
+        * 
+        * Job is implemented in class type delete_ike_sa_job_t
+        */
+       DELETE_IKE_SA
+       
        
        /* more job types have to be inserted here */
 };
@@ -89,6 +96,9 @@ struct job_s{
 };
 
 #include "initiate_ike_sa_job.h"
+#include "delete_ike_sa_job.h"
 #include "incoming_packet_job.h"
 
+
+
 #endif /*JOB_H_*/