Remove unused DPD sequence number getter on task manager
authorMartin Willi <martin@revosec.ch>
Tue, 10 Jan 2012 14:44:17 +0000 (15:44 +0100)
committerMartin Willi <martin@revosec.ch>
Tue, 20 Mar 2012 16:31:35 +0000 (17:31 +0100)
src/libcharon/sa/ikev1/task_manager_v1.c
src/libcharon/sa/ikev1/task_manager_v1.h

index 7e1ff61..01427f6 100755 (executable)
@@ -1335,16 +1335,11 @@ METHOD(task_manager_t, queue_child_delete, void,
                                                                                                  spi, FALSE, expired));
 }
 
-METHOD(task_manager_v1_t, get_dpd_seqnr, u_int32_t,
-       private_task_manager_t *this)
-{
-       return this->dpd_send_seqnr++;
-}
-
 METHOD(task_manager_t, queue_dpd, void,
        private_task_manager_t *this)
 {
-       queue_task(this, (task_t*)isakmp_dpd_create(this->ike_sa, NULL, _get_dpd_seqnr(&this->public)));
+       queue_task(this, (task_t*)isakmp_dpd_create(this->ike_sa, NULL,
+                                                                                               this->dpd_send_seqnr++));
 }
 
 METHOD(task_manager_t, adopt_tasks, void,
@@ -1471,7 +1466,6 @@ task_manager_v1_t *task_manager_v1_create(ike_sa_t *ike_sa)
                                .create_task_enumerator = _create_task_enumerator,
                                .destroy = _destroy,
                        },
-                       .get_dpd_seqnr = _get_dpd_seqnr,
                },
                .ike_sa = ike_sa,
                .initiating.type = EXCHANGE_TYPE_UNDEFINED,
index 58b20d0..99cd35e 100755 (executable)
@@ -34,11 +34,6 @@ struct task_manager_v1_t {
         * Implements task_manager_t.
         */
        task_manager_t task_manager;
-
-       /**
-        * Get new sequence number to use for sending DPD request.
-        */
-       u_int32_t (*get_dpd_seqnr) (task_manager_v1_t *this);
 };
 
 /**