Added a dedicated sender flush method, delay sender destruction until users gone

diff --git a/src/libcharon/daemon.c b/src/libcharon/daemon.c
index 3fb49d475e71a1222f20f55fc4f8298a976875f5..f2c054a125b98d48829f309553bd555ca2c94a9b 100644 (file)
--- a/src/libcharon/daemon.c
+++ b/src/libcharon/daemon.c
@@ -109,8 +109,11 @@ static void destroy(private_daemon_t *this)
        {
                this->public.traps->flush(this->public.traps);
        }
+       if (this->public.sender)
+       {
+               this->public.sender->flush(this->public.sender);
+       }
        DESTROY_IF(this->public.receiver);
-       DESTROY_IF(this->public.sender);
 #ifdef ME
        DESTROY_IF(this->public.connect_manager);
        DESTROY_IF(this->public.mediation_manager);
@@ -129,6 +132,7 @@ static void destroy(private_daemon_t *this)
        DESTROY_IF(this->public.controller);
        DESTROY_IF(this->public.eap);
        DESTROY_IF(this->public.backends);
+       DESTROY_IF(this->public.sender);
        DESTROY_IF(this->public.socket);
 
        /* rehook library logging, shutdown logging */

diff --git a/src/libcharon/network/sender.c b/src/libcharon/network/sender.c
index 4df930b15fdf4a6f96eb37a595091087fc223533..6d5ad8f2a92aa33c5f56c4a160470e979995ec22 100644 (file)
--- a/src/libcharon/network/sender.c
+++ b/src/libcharon/network/sender.c
@@ -149,7 +149,7 @@ static job_requeue_t send_packets(private_sender_t * this)
        return JOB_REQUEUE_DIRECT;
 }
 
-METHOD(sender_t, destroy, void,
+METHOD(sender_t, flush, void,
        private_sender_t *this)
 {
        /* send all packets in the queue */
@@ -159,8 +159,13 @@ METHOD(sender_t, destroy, void,
                this->sent->wait(this->sent, this->mutex);
        }
        this->mutex->unlock(this->mutex);
+}
+
+METHOD(sender_t, destroy, void,
+       private_sender_t *this)
+{
        this->job->cancel(this->job);
-       this->list->destroy(this->list);
+       this->list->destroy_offset(this->list, offsetof(packet_t, destroy));
        this->got->destroy(this->got);
        this->sent->destroy(this->sent);
        this->mutex->destroy(this->mutex);
@@ -177,6 +182,7 @@ sender_t * sender_create()
        INIT(this,
                .public = {
                        .send = _send_,
+                       .flush = _flush,
                        .destroy = _destroy,
                },
                .list = linked_list_create(),

diff --git a/src/libcharon/network/sender.h b/src/libcharon/network/sender.h
index f77fadab2da53b2e6194cc60d2086fdb26245e1b..6ee0704357d30d34639885b46295b5eb7365a4e7 100644 (file)
--- a/src/libcharon/network/sender.h
+++ b/src/libcharon/network/sender.h
@@ -43,6 +43,13 @@ struct sender_t {
         */
        void (*send) (sender_t *this, packet_t *packet);
 
+       /**
+        * Enforce a flush of the send queue.
+        *
+        * This function blocks until all queued packets have been sent.
+        */
+       void (*flush)(sender_t *this);
+
        /**
         * Destroys a sender object.
         */