fixes

2 files changed, 25 insertions, 6 deletions

diff --git a/src/include/gnunet_stream_lib.h b/src/include/gnunet_stream_lib.h
index 47486d76b..404844bce 100644
--- a/src/include/gnunet_stream_lib.h
+++ b/src/include/gnunet_stream_lib.h
@@ -124,10 +124,9 @@ enum GNUNET_STREAM_Option
     GNUNET_STREAM_OPTION_LISTEN_TIMEOUT,
 
     /**
-     * Option to register a callback when stream listening is
-     * successfull. Takes parameter of the form
-     * GNUNET_STREAM_ListenSuccessCallback. The callback is only called if
-     * listen is successful
+     * Option to register a callback when stream listening is successfull. Takes
+     * parameter of the form GNUNET_STREAM_ListenSuccessCallback. The callback
+     * is only called if listening is successful
      */
     GNUNET_STREAM_OPTION_SIGNAL_LISTEN_SUCCESS,
 
diff --git a/src/stream/stream_api.c b/src/stream/stream_api.c
index b712eb3d8..3abea2a49 100644
--- a/src/stream/stream_api.c
+++ b/src/stream/stream_api.c
@@ -2104,7 +2104,7 @@ server_handle_hello (void *cls,
   GNUNET_assert (socket->tunnel == tunnel);
   LOG_DEBUG ("%s: Received HELLO from %s\n", GNUNET_i2s (&socket->other_peer),
              GNUNET_i2s (&socket->other_peer));
-  switch (socket->status)
+  switch (socket->state)
   {
   case STATE_INIT:
     reply = generate_hello_ack (socket, GNUNET_YES);
@@ -2765,6 +2765,7 @@ tunnel_cleaner (void *cls,
                 void *tunnel_ctx)
 {
   struct GNUNET_STREAM_Socket *socket = tunnel_ctx;
+  struct MessageQueue *head;
 
   GNUNET_assert (tunnel == socket->tunnel);
   GNUNET_break_op(0);
@@ -2789,8 +2790,27 @@ tunnel_cleaner (void *cls,
   {
     GNUNET_SCHEDULER_cancel (socket->data_retransmission_task_id);
     socket->data_retransmission_task_id = GNUNET_SCHEDULER_NO_TASK;
+  }  
+  /* Terminate the control retransmission tasks */
+  if (GNUNET_SCHEDULER_NO_TASK != socket->control_retransmission_task_id)
+  {
+    GNUNET_SCHEDULER_cancel (socket->control_retransmission_task_id);
+    socket->control_retransmission_task_id = GNUNET_SCHEDULER_NO_TASK;
+  }
+  /* Clear Transmit handles */
+  if (NULL != socket->transmit_handle)
+  {
+    GNUNET_MESH_notify_transmit_ready_cancel (socket->transmit_handle);
+    socket->transmit_handle = NULL;
+  }
+  /* Clear existing message queue */
+  while (NULL != (head = socket->queue_head)) {
+    GNUNET_CONTAINER_DLL_remove (socket->queue_head,
+                                 socket->queue_tail,
+                                 head);
+    GNUNET_free (head->message);
+    GNUNET_free (head);
   }
-  /* FIXME: Cancel all other tasks using socket->tunnel */
   socket->tunnel = NULL;
 }