-fix assert

Signed-off-by: TheJackiMonster <thejackimonster@gmail.com>

3 files changed, 15 insertions, 15 deletions

diff --git a/src/service/messenger/gnunet-service-messenger_handle.c b/src/service/messenger/gnunet-service-messenger_handle.c
index c3ae454d3..9cd460fd3 100644
--- a/src/service/messenger/gnunet-service-messenger_handle.c
+++ b/src/service/messenger/gnunet-service-messenger_handle.c
@@ -59,21 +59,21 @@ create_srv_handle (struct GNUNET_MESSENGER_Service *service,
 
 
 static enum GNUNET_GenericReturnValue
-iterate_free_values (void *cls,
+iterate_close_rooms (void *cls,
                      const struct GNUNET_HashCode *key,
                      void *value)
 {
-  GNUNET_free (value);
+  struct GNUNET_MESSENGER_SrvHandle *handle = cls;
+  close_service_room (handle->service, handle, key);
   return GNUNET_YES;
 }
 
 static enum GNUNET_GenericReturnValue
-iterate_close_rooms (void *cls,
+iterate_free_values (void *cls,
                      const struct GNUNET_HashCode *key,
                      void *value)
 {
-  struct GNUNET_MESSENGER_SrvHandle *handle = cls;
-  close_service_room (handle->service, handle, key);
+  GNUNET_free (value);
   return GNUNET_YES;
 }
 
@@ -82,6 +82,9 @@ destroy_srv_handle (struct GNUNET_MESSENGER_SrvHandle *handle)
 {
   GNUNET_assert (handle);
 
+  GNUNET_CONTAINER_multihashmap_iterate (handle->routing,
+                                         iterate_close_rooms, handle);
+
   if (handle->notify)
     GNUNET_SCHEDULER_cancel (handle->notify);
 
@@ -90,12 +93,6 @@ destroy_srv_handle (struct GNUNET_MESSENGER_SrvHandle *handle)
   GNUNET_CONTAINER_multihashmap_iterate (handle->member_ids,
                                          iterate_free_values, NULL);
 
-  GNUNET_CONTAINER_multihashmap_clear (handle->next_ids);
-  GNUNET_CONTAINER_multihashmap_clear (handle->member_ids);
-
-  GNUNET_CONTAINER_multihashmap_iterate (handle->routing,
-                                         iterate_close_rooms, handle);
-
   GNUNET_CONTAINER_multihashmap_destroy (handle->next_ids);
   GNUNET_CONTAINER_multihashmap_destroy (handle->member_ids);
   GNUNET_CONTAINER_multihashmap_destroy (handle->routing);
diff --git a/src/service/messenger/gnunet-service-messenger_list_handles.c b/src/service/messenger/gnunet-service-messenger_list_handles.c
index 5ee6cc159..62427ecde 100644
--- a/src/service/messenger/gnunet-service-messenger_list_handles.c
+++ b/src/service/messenger/gnunet-service-messenger_list_handles.c
@@ -105,8 +105,9 @@ find_list_handle_by_member (const struct GNUNET_MESSENGER_ListHandles *handles,
 
   for (element = handles->head; element; element = element->next)
   {
-    if (get_srv_handle_member_id (element->handle, key))
-      handle = element->handle;
+    if (get_srv_handle_member_id ((struct
+        GNUNET_MESSENGER_SrvHandle *) element->handle, key))
+      handle = (struct GNUNET_MESSENGER_SrvHandle *) element->handle;
 
     if ((handle) && (GNUNET_YES == is_srv_handle_routing (handle, key)))
       break;
diff --git a/src/service/messenger/gnunet-service-messenger_service.c b/src/service/messenger/gnunet-service-messenger_service.c
index 4f56cb472..f55a3bb7b 100644
--- a/src/service/messenger/gnunet-service-messenger_service.c
+++ b/src/service/messenger/gnunet-service-messenger_service.c
@@ -385,8 +385,8 @@ close_service_room (struct GNUNET_MESSENGER_Service *service,
   if (! room)
     return GNUNET_NO;
 
-  const struct GNUNET_ShortHashCode *id = get_srv_handle_member_id (handle,
-                                                                    key);
+  struct GNUNET_ShortHashCode *id = (struct GNUNET_ShortHashCode*) (
+      GNUNET_CONTAINER_multihashmap_get (handle->member_ids, key));
 
   GNUNET_assert (id);
 
@@ -394,6 +394,8 @@ close_service_room (struct GNUNET_MESSENGER_Service *service,
                                                           key, id))
     return GNUNET_NO;
 
+  GNUNET_free (id);
+
   struct GNUNET_MESSENGER_SrvHandle *member_handle = (struct
                                                       GNUNET_MESSENGER_SrvHandle
                                                       *)