Give processor_t more control over the lifecycle of a job
[strongswan.git] / src / libcharon / processing / jobs / process_message_job.c
index c5c5f07..71a2cb4 100644 (file)
@@ -42,7 +42,7 @@ METHOD(job_t, destroy, void,
        free(this);
 }
 
-METHOD(job_t, execute, void,
+METHOD(job_t, execute, job_requeue_t,
        private_process_message_job_t *this)
 {
        ike_sa_t *ike_sa;
@@ -59,8 +59,7 @@ METHOD(job_t, execute, void,
                         this->message->get_source(this->message),
                         this->message->get_destination(this->message));
                charon->connect_manager->process_check(charon->connect_manager, this->message);
-               destroy(this);
-               return;
+               return JOB_REQUEUE_NONE;
        }
 #endif /* ME */
 
@@ -81,13 +80,28 @@ METHOD(job_t, execute, void,
                        charon->ike_sa_manager->checkin(charon->ike_sa_manager, ike_sa);
                }
        }
-       destroy(this);
+       return JOB_REQUEUE_NONE;
 }
 
 METHOD(job_t, get_priority, job_priority_t,
        private_process_message_job_t *this)
 {
-       return JOB_PRIO_MEDIUM;
+       switch (this->message->get_exchange_type(this->message))
+       {
+               case IKE_AUTH:
+                       /* IKE auth is rather expensive and often blocking, low priority */
+                       return JOB_PRIO_LOW;
+               case INFORMATIONAL:
+                       /* INFORMATIONALs are inexpensive, for DPD we should have low
+                        * reaction times */
+                       return JOB_PRIO_HIGH;
+               case IKE_SA_INIT:
+               case CREATE_CHILD_SA:
+               default:
+                       /* IKE_SA_INIT is expensive, but we will drop them in the receiver
+                        * if we are overloaded */
+                       return JOB_PRIO_MEDIUM;
+       }
 }
 
 /*