Add a global return_success() method implementation

diff --git a/src/libcharon/sa/ikev2/tasks/ike_dpd.c b/src/libcharon/sa/ikev2/tasks/ike_dpd.c
index 28ccc2e..7a33f79 100644 (file)
--- a/src/libcharon/sa/ikev2/tasks/ike_dpd.c
+++ b/src/libcharon/sa/ikev2/tasks/ike_dpd.c
@@ -37,12 +37,6 @@ METHOD(task_t, return_need_more, status_t,
        return NEED_MORE;
 }
 
-METHOD(task_t, return_success, status_t,
-       private_ike_dpd_t *this, message_t *message)
-{
-       return SUCCESS;
-}
-
 METHOD(task_t, get_type, task_type_t,
        private_ike_dpd_t *this)
 {
@@ -82,11 +76,11 @@ ike_dpd_t *ike_dpd_create(bool initiator)
        if (initiator)
        {
                this->public.task.build = _return_need_more;
-               this->public.task.process = _return_success;
+               this->public.task.process = (void*)return_success;
        }
        else
        {
-               this->public.task.build = _return_success;
+               this->public.task.build = (void*)return_success;
                this->public.task.process = _return_need_more;
        }
 

diff --git a/src/libstrongswan/utils/utils.c b/src/libstrongswan/utils/utils.c
index fc2fe4a..0850df9 100644 (file)
--- a/src/libstrongswan/utils/utils.c
+++ b/src/libstrongswan/utils/utils.c
@@ -387,6 +387,14 @@ status_t return_failed()
 }
 
 /**
+ * returns SUCCESS
+ */
+status_t return_success()
+{
+       return SUCCESS;
+}
+
+/**
  * nop operation
  */
 void nop()

diff --git a/src/libstrongswan/utils/utils.h b/src/libstrongswan/utils/utils.h
index 7b1beb9..6c24a26 100644 (file)
--- a/src/libstrongswan/utils/utils.h
+++ b/src/libstrongswan/utils/utils.h
@@ -496,6 +496,11 @@ bool return_false();
 status_t return_failed();
 
 /**
+ * returns SUCCESS
+ */
+status_t return_success();
+
+/**
  * Write a 16-bit host order value in network order to an unaligned address.
  *
  * @param host         host order 16-bit value