1 files changed, 78 insertions, 5 deletions

diff --git a/src/libcharon/sa/task_manager.h b/src/libcharon/sa/task_manager.h
index 5bc6c80c4..c649cf78e 100644
--- a/src/libcharon/sa/task_manager.h
+++ b/src/libcharon/sa/task_manager.h
@@ -29,7 +29,7 @@ typedef enum task_queue_t task_queue_t;
 #include <library.h>
 #include <encoding/message.h>
 #include <sa/ike_sa.h>
-#include <sa/tasks/task.h>
+#include <sa/task.h>
 
 /**
  * First retransmit timeout in seconds.
@@ -125,6 +125,69 @@ struct task_manager_t {
 	void (*queue_task) (task_manager_t *this, task_t *task);
 
 	/**
+	 * Queue IKE_SA establishing tasks.
+	 */
+	void (*queue_ike)(task_manager_t *this);
+
+	/**
+	 * Queue IKE_SA rekey tasks.
+	 */
+	void (*queue_ike_rekey)(task_manager_t *this);
+
+	/**
+	 * Queue IKE_SA reauth tasks.
+	 */
+	void (*queue_ike_reauth)(task_manager_t *this);
+
+	/**
+	 * Queue MOBIKE task
+	 *
+	 * @param roam			TRUE to switch to new address
+	 * @param address		TRUE to include address list update
+	 */
+	void (*queue_mobike)(task_manager_t *this, bool roam, bool address);
+
+	/**
+	 * Queue IKE_SA delete tasks.
+	 */
+	void (*queue_ike_delete)(task_manager_t *this);
+
+	/**
+	 * Queue CHILD_SA establishing tasks.
+	 *
+	 * @param cfg			CHILD_SA config to establish
+	 * @param reqid			reqid to use for CHILD_SA
+	 * @param tsi			initiator traffic selector, if packet-triggered
+	 * @param tsr			responder traffic selector, if packet-triggered
+	 */
+	void (*queue_child)(task_manager_t *this, child_cfg_t *cfg, u_int32_t reqid,
+						traffic_selector_t *tsi, traffic_selector_t *tsr);
+
+	/**
+	 * Queue CHILD_SA rekeying tasks.
+	 *
+	 * @param protocol		CHILD_SA protocol, AH|ESP
+	 * @param spi			CHILD_SA SPI to rekey
+	 */
+	void (*queue_child_rekey)(task_manager_t *this, protocol_id_t protocol,
+							  u_int32_t spi);
+
+	/**
+	 * Queue CHILD_SA delete tasks.
+	 *
+	 * @param protocol		CHILD_SA protocol, AH|ESP
+	 * @param spi			CHILD_SA SPI to rekey
+	 * @param expired		TRUE if SA already expired
+	 */
+	void (*queue_child_delete)(task_manager_t *this, protocol_id_t protocol,
+							   u_int32_t spi, bool expired);
+
+	/**
+	 * Queue liveness checking tasks.
+	 */
+	void (*queue_dpd)(task_manager_t *this);
+
+	/**
 	 * Retransmit a request if it hasn't been acknowledged yet.
 	 *
 	 * A return value of INVALID_STATE means that the message was already
@@ -166,9 +229,11 @@ struct task_manager_t {
 	 * resets the message IDs and resets all active tasks using the migrate()
 	 * method.
 	 * Use a value of UINT_MAX to keep the current message ID.
+	 * For IKEv1, the arguments do not set the message ID, but the DPD sequence
+	 * number counters.
 	 *
-	 * @param initiate		message ID to initiate exchanges (send)
-	 * @param respond		message ID to respond to exchanges (expect)
+	 * @param initiate		message ID / DPD seq to initiate exchanges (send)
+	 * @param respond		message ID / DPD seq to respond to exchanges (expect)
 	 */
 	void (*reset) (task_manager_t *this, u_int32_t initiate, u_int32_t respond);
 
@@ -189,15 +254,23 @@ struct task_manager_t {
 											task_queue_t queue);
 
 	/**
+	 * Flush a queue, cancelling all tasks.
+	 *
+	 * @param queue			queue to flush
+	 */
+	void (*flush_queue)(task_manager_t *this, task_queue_t queue);
+
+	/**
 	 * Destroy the task_manager_t.
 	 */
 	void (*destroy) (task_manager_t *this);
 };
 
 /**
- * Create an instance of the task manager.
+ * Create a task manager instance for the correct IKE version.
  *
- * @param ike_sa		IKE_SA to manage.
+ * @param ike_sa			IKE_SA to create a task manager for
+ * @return					task manager implementation for IKE version
  */
 task_manager_t *task_manager_create(ike_sa_t *ike_sa);