Added a task stub to create and process IKEv1 informational exchanges

diff --git a/src/libcharon/Makefile.am b/src/libcharon/Makefile.am
index 4e77b4f4f4a5c1a97f9caadb50cafeabf4d3b45e..47c52abaa3bc8724ef76d5ca10e4badcb793c100 100644 (file)
--- a/src/libcharon/Makefile.am
+++ b/src/libcharon/Makefile.am
@@ -98,6 +98,7 @@ sa/tasks/ike_auth_lifetime.c sa/tasks/ike_auth_lifetime.h \
 sa/tasks/ike_vendor.c sa/tasks/ike_vendor.h \
 sa/tasks/ike_vendor_v1.c sa/tasks/ike_vendor_v1.h \
 sa/tasks/main_mode.c sa/tasks/main_mode.h \
+sa/tasks/informational.c sa/tasks/informational.h \
 sa/tasks/xauth.c sa/tasks/xauth.h \
 sa/tasks/quick_mode.c sa/tasks/quick_mode.h \
 sa/tasks/mode_config.c sa/tasks/mode_config.h \

diff --git a/src/libcharon/sa/tasks/informational.c b/src/libcharon/sa/tasks/informational.c
new file mode 100644 (file)
index 0000000..8cbe10e
--- /dev/null
+++ b/src/libcharon/sa/tasks/informational.c
@@ -0,0 +1,119 @@
+/*
+ * Copyright (C) 2011 Martin Willi
+ * Copyright (C) 2011 revosec AG
+ *
+ * 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 "informational.h"
+
+#include <daemon.h>
+
+typedef struct private_informational_t private_informational_t;
+
+/**
+ * Private members of a informational_t task.
+ */
+struct private_informational_t {
+
+       /**
+        * Public methods and task_t interface.
+        */
+       informational_t public;
+
+       /**
+        * Assigned IKE_SA.
+        */
+       ike_sa_t *ike_sa;
+
+       /**
+        * Notify payload to send
+        */
+       notify_payload_t *notify;
+};
+
+METHOD(task_t, build_i, status_t,
+       private_informational_t *this, message_t *message)
+{
+       message->add_payload(message, &this->notify->payload_interface);
+       this->notify = NULL;
+       return SUCCESS;
+}
+
+METHOD(task_t, process_r, status_t,
+       private_informational_t *this, message_t *message)
+{
+       return FAILED;
+}
+
+METHOD(task_t, build_r, status_t,
+       private_informational_t *this, message_t *message)
+{
+       return FAILED;
+}
+
+METHOD(task_t, process_i, status_t,
+       private_informational_t *this, message_t *message)
+{
+       return FAILED;
+}
+
+METHOD(task_t, get_type, task_type_t,
+       private_informational_t *this)
+{
+       return TASK_INFORMATIONAL;
+}
+
+METHOD(task_t, migrate, void,
+       private_informational_t *this, ike_sa_t *ike_sa)
+{
+       this->ike_sa = ike_sa;
+}
+
+METHOD(task_t, destroy, void,
+       private_informational_t *this)
+{
+       DESTROY_IF(this->notify);
+       free(this);
+}
+
+/*
+ * Described in header.
+ */
+informational_t *informational_create(ike_sa_t *ike_sa, notify_payload_t *notify)
+{
+       private_informational_t *this;
+
+       INIT(this,
+               .public = {
+                       .task = {
+                               .get_type = _get_type,
+                               .migrate = _migrate,
+                               .destroy = _destroy,
+                       },
+               },
+               .ike_sa = ike_sa,
+               .notify = notify,
+       );
+
+       if (notify)
+       {
+               this->public.task.build = _build_i;
+               this->public.task.process = _process_i;
+       }
+       else
+       {
+               this->public.task.build = _build_r;
+               this->public.task.process = _process_r;
+       }
+
+       return &this->public;
+}

diff --git a/src/libcharon/sa/tasks/informational.h b/src/libcharon/sa/tasks/informational.h
new file mode 100644 (file)
index 0000000..e9c32f6
--- /dev/null
+++ b/src/libcharon/sa/tasks/informational.h
@@ -0,0 +1,50 @@
+/*
+ * Copyright (C) 2011 Martin Willi
+ * Copyright (C) 2011 revosec AG
+ *
+ * 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.
+ */
+
+/**
+ * @defgroup informational informational
+ * @{ @ingroup tasks
+ */
+
+#ifndef INFORMATIONAL_H_
+#define informational_H_
+
+typedef struct informational_t informational_t;
+
+#include <library.h>
+#include <sa/ike_sa.h>
+#include <sa/tasks/task.h>
+#include <encoding/payloads/notify_payload.h>
+
+/**
+ * IKEv1 informational exchange, negotiates errors.
+ */
+struct informational_t {
+
+       /**
+        * Implements the task_t interface
+        */
+       task_t task;
+};
+
+/**
+ * Create a new informational task.
+ *
+ * @param notify               notify to send as initiator, NULL if responder
+ * @return                             task to handle by the task_manager
+ */
+informational_t *informational_create(ike_sa_t *ike_sa, notify_payload_t *notify);
+
+#endif /** INFORMATIONAL_H_ @}*/

diff --git a/src/libcharon/sa/tasks/task.c b/src/libcharon/sa/tasks/task.c
index ca5ecca739570f56754e3fa98ee6420e40ca988c..f8ff565713de5c65135511ee45b15f2c98d0f354 100644 (file)
--- a/src/libcharon/sa/tasks/task.c
+++ b/src/libcharon/sa/tasks/task.c
@@ -36,6 +36,7 @@ ENUM(task_type_names, TASK_IKE_INIT, TASK_IKE_CERT_POST_V1,
        "CHILD_DELETE",
        "CHILD_REKEY",
        "MAIN_MODE",
+       "INFORMATIONAL",
        "XAUTH",
        "MODE_CONFIG",
        "QUICK_MODE",
@@ -63,6 +64,7 @@ ENUM(task_type_names, TASK_IKE_INIT, TASK_IKE_CERT_POST_V1,
        "CHILD_DELETE",
        "CHILD_REKEY",
        "MAIN_MODE",
+       "INFORMATIONAL",
        "XAUTH",
        "MODE_CONFIG",
        "QUICK_MODE",

diff --git a/src/libcharon/sa/tasks/task.h b/src/libcharon/sa/tasks/task.h
index 7c725944e6912c76b386c2f87759d2b072394a6c..7fa99251fefeb8d4a47c4b0358afa9df7ff2b742 100644 (file)
--- a/src/libcharon/sa/tasks/task.h
+++ b/src/libcharon/sa/tasks/task.h
@@ -71,6 +71,8 @@ enum task_type_t {
        TASK_CHILD_REKEY,
        /** IKEv1 main mode */
        TASK_MAIN_MODE,
+       /** IKEv1 informational exchange */
+       TASK_INFORMATIONAL,
        /** IKEv1 XAUTH authentication */
        TASK_XAUTH,
        /** IKEv1 Mode Config */