ike: Keep track of send keepalive jobs to avoid scheduling more than one per IKE_SA

diff --git a/src/libcharon/processing/jobs/send_keepalive_job.c b/src/libcharon/processing/jobs/send_keepalive_job.c
index 3e347767927cce8b99226e5efb889f2922a94059..e06eae3d3d19b0ae4041b8feb5674178e153f08b 100644 (file)
--- a/src/libcharon/processing/jobs/send_keepalive_job.c
+++ b/src/libcharon/processing/jobs/send_keepalive_job.c
@@ -54,7 +54,7 @@ METHOD(job_t, execute, job_requeue_t,
                                                                                          this->ike_sa_id);
        if (ike_sa)
        {
-               ike_sa->send_keepalive(ike_sa);
+               ike_sa->send_keepalive(ike_sa, TRUE);
                charon->ike_sa_manager->checkin(charon->ike_sa_manager, ike_sa);
        }
        return JOB_REQUEUE_NONE;

diff --git a/src/libcharon/sa/ike_sa.c b/src/libcharon/sa/ike_sa.c
index 3632d62a81608d15c1322ef63970f926e5e05a95..afd6fdf2aa9c06bf74de47640337e032967e60a1 100644 (file)
--- a/src/libcharon/sa/ike_sa.c
+++ b/src/libcharon/sa/ike_sa.c
@@ -238,6 +238,11 @@ struct private_ike_sa_t {
         */
        u_int32_t keepalive_interval;
 
+       /**
+        * The schedueld keep alive job, if any
+        */
+       send_keepalive_job_t *keepalive_job;
+
        /**
         * interval for retries during initiation (e.g. if DNS resolution failed),
         * 0 to disable (default)
@@ -482,11 +487,14 @@ METHOD(ike_sa_t, set_message_id, void,
 }
 
 METHOD(ike_sa_t, send_keepalive, void,
-       private_ike_sa_t *this)
+       private_ike_sa_t *this, bool scheduled)
 {
-       send_keepalive_job_t *job;
        time_t last_out, now, diff;
 
+       if (scheduled)
+       {
+               this->keepalive_job = NULL;
+       }
        if (!this->keepalive_interval || this->state == IKE_PASSIVE)
        {       /* keepalives disabled either by configuration or for passive IKE_SAs */
                return;
@@ -517,9 +525,12 @@ METHOD(ike_sa_t, send_keepalive, void,
                charon->sender->send_no_marker(charon->sender, packet);
                diff = 0;
        }
-       job = send_keepalive_job_create(this->ike_sa_id);
-       lib->scheduler->schedule_job(lib->scheduler, (job_t*)job,
-                                                                this->keepalive_interval - diff);
+       if (!this->keepalive_job)
+       {
+               this->keepalive_job = send_keepalive_job_create(this->ike_sa_id);
+               lib->scheduler->schedule_job(lib->scheduler, (job_t*)this->keepalive_job,
+                                                                        this->keepalive_interval - diff);
+       }
 }
 
 METHOD(ike_sa_t, get_ike_cfg, ike_cfg_t*,
@@ -566,7 +577,7 @@ METHOD(ike_sa_t, set_condition, void,
                                case COND_NAT_HERE:
                                        DBG1(DBG_IKE, "local host is behind NAT, sending keep alives");
                                        this->conditions |= COND_NAT_ANY;
-                                       send_keepalive(this);
+                                       send_keepalive(this, FALSE);
                                        break;
                                case COND_NAT_THERE:
                                        DBG1(DBG_IKE, "remote host is behind NAT");
@@ -594,7 +605,7 @@ METHOD(ike_sa_t, set_condition, void,
                                                                  has_condition(this, COND_NAT_FAKE));
                                        break;
                                case COND_STALE:
-                                       send_keepalive(this);
+                                       send_keepalive(this, FALSE);
                                        break;
                                default:
                                        break;
@@ -755,7 +766,7 @@ METHOD(ike_sa_t, set_state, void,
        }
        if (keepalives)
        {
-               send_keepalive(this);
+               send_keepalive(this, FALSE);
        }
 }
 
@@ -2329,7 +2340,7 @@ METHOD(ike_sa_t, inherit_post, void,
        this->conditions = other->conditions;
        if (this->conditions & COND_NAT_HERE)
        {
-               send_keepalive(this);
+               send_keepalive(this, FALSE);
        }
 
 #ifdef ME

diff --git a/src/libcharon/sa/ike_sa.h b/src/libcharon/sa/ike_sa.h
index 9dbc805c9a0b1b3f4d777a430af7b6041935ef75..e15ac2e38697d44ab80f203339c4e1efdce14e86 100644 (file)
--- a/src/libcharon/sa/ike_sa.h
+++ b/src/libcharon/sa/ike_sa.h
@@ -837,8 +837,10 @@ struct ike_sa_t {
         *
         * To refresh NAT tables in a NAT router between the peers, periodic empty
         * UDP packets are sent if no other traffic was sent.
+        *
+        * @param scheduled             if this is a scheduled keepalive
         */
-       void (*send_keepalive) (ike_sa_t *this);
+       void (*send_keepalive) (ike_sa_t *this, bool scheduled);
 
        /**
         * Get the keying material of this IKE_SA.