Changeset 4659

Timestamp:

11/14/08 15:05:47 (2 months ago)

Author:

martin

Message:

fallback to reauthentication if peer does not support CHILD_SA rekeying

Files:

• trunk/src/charon/sa/tasks/child_rekey.c (modified) (2 diffs)
• trunk/src/charon/sa/tasks/ike_rekey.c (modified) (1 diff)

trunk/src/charon/sa/tasks/child_rekey.c

@@ -24 +24 @@
-#include <sa/tasks/child_delete.h>
-#include <processing/jobs/rekey_child_sa_job.h>
+#include <processing/jobs/rekey_ike_sa_job.h>
-
-
@@ -178 +179 @@
-    u_int32_t spi;
-    child_sa_t *to_delete;
+    iterator_t *iterator;
+    payload_t *payload;
+    
+    /* handle NO_ADDITIONAL_SAS notify */
+    iterator = message->get_payload_iterator(message);
+    while (iterator->iterate(iterator, (void**)&payload))
+    {
+        if (payload->get_type(payload) == NOTIFY)
+        {
+            notify_payload_t *notify = (notify_payload_t*)payload;
+            
+            if (notify->get_notify_type(notify) == NO_ADDITIONAL_SAS)
+            {
+                DBG1(DBG_IKE, "peer seems to not support CHILD_SA rekeying, "
+                     "starting reauthentication");
+                this->child_sa->set_state(this->child_sa, CHILD_INSTALLED);
+                charon->processor->queue_job(charon->processor,
+                        (job_t*)rekey_ike_sa_job_create(
+                                    this->ike_sa->get_id(this->ike_sa), TRUE));
+                iterator->destroy(iterator);
+                return SUCCESS;
+            }
+        }
+    }
+    iterator->destroy(iterator);
-    
-    if (this->child_create->task.process(&this->child_create->task, message) == NEED_MORE)

trunk/src/charon/sa/tasks/ike_rekey.c

@@ -181 +181 @@
-        {
-            notify_payload_t *notify = (notify_payload_t*)payload;
-            notify_type_t type = notify->get_notify_type(notify);
-            
-type
+notify->get_notify_type(notify)
-            {
-                DBG1(DBG_IKE, "peer seems to not support IKE rekeying, "