Merge branch 'ikev1-clean' into ikev1-master

[people/ms/strongswan.git] / src / libcharon / sa / ikev2 / tasks / ike_mobike.c

diff --git a/src/libcharon/sa/tasks/ike_mobike.c b/src/libcharon/sa/ikev2/tasks/ike_mobike.c
similarity index 99%
rename from src/libcharon/sa/tasks/ike_mobike.c
rename to src/libcharon/sa/ikev2/tasks/ike_mobike.c
index 1402b2e44d58ffc982b1cf5f61bacac35e85a8ab..377714023c63e1addad5594fdfe109798bb277c1 100644 (file)
--- a/src/libcharon/sa/tasks/ike_mobike.c
+++ b/src/libcharon/sa/ikev2/tasks/ike_mobike.c
@@ -20,7 +20,7 @@
 
 #include <hydra.h>
 #include <daemon.h>
-#include <sa/tasks/ike_natd.h>
+#include <sa/ikev2/tasks/ike_natd.h>
 #include <encoding/payloads/notify_payload.h>
 
 #define COOKIE2_SIZE 16
@@ -54,7 +54,7 @@ struct private_ike_mobike_t {
        chunk_t cookie2;
 
        /**
-        * NAT discovery reusing the IKE_NATD task
+        * NAT discovery reusing the TASK_IKE_NATD task
         */
        ike_natd_t *natd;
 
@@ -584,7 +584,7 @@ METHOD(ike_mobike_t, is_probing, bool,
 METHOD(task_t, get_type, task_type_t,
           private_ike_mobike_t *this)
 {
-       return IKE_MOBIKE;
+       return TASK_IKE_MOBIKE;
 }
 
 METHOD(task_t, migrate, void,
@@ -646,4 +646,3 @@ ike_mobike_t *ike_mobike_create(ike_sa_t *ike_sa, bool initiator)
 
        return &this->public;
 }
-