1 files changed, 43 insertions, 2 deletions

diff --git a/src/service/messenger/messenger_api_room.c b/src/service/messenger/messenger_api_room.c
index e1970b668..e83c9d7d3 100644
--- a/src/service/messenger/messenger_api_room.c
+++ b/src/service/messenger/messenger_api_room.c
@@ -27,10 +27,13 @@
 
 #include "gnunet_common.h"
 #include "gnunet_messenger_service.h"
+
 #include "messenger_api_contact_store.h"
 #include "messenger_api_handle.h"
 #include "messenger_api_message.h"
 #include "messenger_api_message_control.h"
+#include "messenger_api_message_kind.h"
+
 #include <string.h>
 
 struct GNUNET_MESSENGER_Room*
@@ -59,7 +62,10 @@ create_room (struct GNUNET_MESSENGER_Handle *handle,
   room->members = GNUNET_CONTAINER_multishortmap_create (8, GNUNET_NO);
   room->links = GNUNET_CONTAINER_multihashmap_create (8, GNUNET_NO);
 
+  room->subscriptions = GNUNET_CONTAINER_multishortmap_create (8, GNUNET_NO);
+
   init_queue_messages (&(room->queue));
+  room->queue_task = NULL;
 
   room->control = create_message_control (room);
 
@@ -92,6 +98,24 @@ iterate_destroy_link (void *cls,
 }
 
 
+static enum GNUNET_GenericReturnValue
+iterate_destroy_subscription (void *cls,
+                              const struct GNUNET_ShortHashCode *key,
+                              void *value)
+{
+  struct GNUNET_MESSENGER_RoomSubscription *subscription = value;
+
+  if (subscription->task)
+    GNUNET_SCHEDULER_cancel (subscription->task);
+
+  if (subscription->message)
+    destroy_message (subscription->message);
+
+  GNUNET_free (subscription);
+  return GNUNET_YES;
+}
+
+
 void
 destroy_room (struct GNUNET_MESSENGER_Room *room)
 {
@@ -99,9 +123,21 @@ destroy_room (struct GNUNET_MESSENGER_Room *room)
 
   destroy_message_control (room->control);
 
+  if (room->queue_task)
+    GNUNET_SCHEDULER_cancel (room->queue_task);
+
   clear_queue_messages (&(room->queue));
   clear_list_tunnels (&(room->entries));
 
+  if (room->subscriptions)
+  {
+    GNUNET_CONTAINER_multishortmap_iterate (room->subscriptions,
+                                            iterate_destroy_subscription,
+                                            NULL);
+    
+    GNUNET_CONTAINER_multishortmap_destroy (room->subscriptions);
+  }
+
   if (room->messages)
   {
     GNUNET_CONTAINER_multihashmap_iterate (room->messages,
@@ -300,6 +336,7 @@ handle_join_message (struct GNUNET_MESSENGER_Room *room,
                                                           .sender_id),
                                                         entry->sender,
                                                         GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE)))
+
     increase_contact_rc (entry->sender);
 }
 
@@ -393,6 +430,7 @@ handle_id_message (struct GNUNET_MESSENGER_Room *room,
                                                           id.id),
                                                         entry->sender,
                                                         GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE)))
+
     return;
 
   struct GNUNET_HashCode context, next_context;
@@ -574,7 +612,8 @@ read_transcript:
 
   original->recipient = get_store_contact (store,
                                            NULL,
-                                           &(entry->message->body.transcript.key));
+                                           &(entry->message->body.transcript.key
+                                             ));
 
   if (original->message)
   {
@@ -826,12 +865,14 @@ link_room_message (struct GNUNET_MESSENGER_Room *room,
     return;
 
   struct GNUNET_HashCode *value = GNUNET_memdup (other, sizeof(struct
-                                                               GNUNET_HashCode));
+                                                               GNUNET_HashCode))
+  ;
   if (! value)
     return;
 
   if (GNUNET_OK != GNUNET_CONTAINER_multihashmap_put (room->links, hash, value,
                                                       GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE))
+
     GNUNET_free (value);
 }