5 files changed, 24 insertions, 7 deletions

diff --git a/src/cli/messenger/gnunet-messenger.c b/src/cli/messenger/gnunet-messenger.c
index e3c10d509..6bff0b25d 100644
--- a/src/cli/messenger/gnunet-messenger.c
+++ b/src/cli/messenger/gnunet-messenger.c
@@ -23,11 +23,12 @@
  * @brief Print information about messenger groups.
  */
 
-#include "platform.h"
 #include <stdio.h>
+#include <unistd.h>
 
-#include "gnunet_util_lib.h"
+#include "gnunet_identity_service.h"
 #include "gnunet_messenger_service.h"
+#include "gnunet_util_lib.h"
 
 const struct GNUNET_CONFIGURATION_Handle *config;
 struct GNUNET_MESSENGER_Handle *messenger;
diff --git a/src/service/messenger/gnunet-service-messenger_handle.c b/src/service/messenger/gnunet-service-messenger_handle.c
index 2d4b836b4..ca9dcfb15 100644
--- a/src/service/messenger/gnunet-service-messenger_handle.c
+++ b/src/service/messenger/gnunet-service-messenger_handle.c
@@ -450,8 +450,8 @@ notify_srv_handle_message (struct GNUNET_MESSENGER_SrvHandle *handle,
   }
   else
   {
-    const struct GNUNET_CRYPTO_PublicKey *pubkey = get_contact_key (
-      session->member->contact);
+    const struct GNUNET_CRYPTO_PublicKey *pubkey;
+    pubkey = get_member_session_public_key (session->member);
     GNUNET_CRYPTO_hash (pubkey, sizeof(*pubkey), &sender);
 
     context = get_next_member_session_context (session->member);
diff --git a/src/service/messenger/gnunet-service-messenger_member_session.c b/src/service/messenger/gnunet-service-messenger_member_session.c
index 4fa35594e..ed1fd75b7 100644
--- a/src/service/messenger/gnunet-service-messenger_member_session.c
+++ b/src/service/messenger/gnunet-service-messenger_member_session.c
@@ -154,8 +154,6 @@ completion:
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Completed session history (%s)\n",
                 GNUNET_sh2s (get_member_session_id (session)));
 
-    GNUNET_CONTAINER_multihashmap_clear (session->history);
-
     struct GNUNET_MESSENGER_ContactStore *store = get_member_contact_store (
       session->member->store);
 
@@ -418,7 +416,15 @@ verify_member_session_as_sender (const struct
   GNUNET_assert ((session) && (message) && (hash));
 
   if (GNUNET_YES == is_member_session_completed (session))
-    return GNUNET_SYSERR;
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Check message (%s) using history!\n",
+                GNUNET_h2s (hash));
+
+    if (GNUNET_YES == check_member_session_history (session, hash, GNUNET_YES))
+      return GNUNET_OK;
+    else
+      return GNUNET_SYSERR;
+  }
 
   if (0 != GNUNET_memcmp (get_member_session_id (session),
                           &(message->header.sender_id)))
diff --git a/src/service/messenger/gnunet-service-messenger_room.c b/src/service/messenger/gnunet-service-messenger_room.c
index db2a158c7..570d2f990 100644
--- a/src/service/messenger/gnunet-service-messenger_room.c
+++ b/src/service/messenger/gnunet-service-messenger_room.c
@@ -1116,6 +1116,11 @@ handle_room_messages (struct GNUNET_MESSENGER_SrvRoom *room)
     get_srv_room_member_store (room);
   struct GNUNET_MESSENGER_PeerStore *peer_store = get_srv_room_peer_store (
     room);
+  
+  const struct GNUNET_HashCode *key = get_srv_room_key (room);
+  
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Handling room messages: %s\n", GNUNET_h2s (key));
 
   while (room->handling.head)
   {
diff --git a/src/service/messenger/gnunet-service-messenger_service.c b/src/service/messenger/gnunet-service-messenger_service.c
index 39ec0611e..11656d6b7 100644
--- a/src/service/messenger/gnunet-service-messenger_service.c
+++ b/src/service/messenger/gnunet-service-messenger_service.c
@@ -445,6 +445,11 @@ handle_service_message (struct GNUNET_MESSENGER_Service *service,
 {
   GNUNET_assert ((service) && (room) && (session) && (message) && (hash));
 
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Notify active clients about message: %s (%s)\n",
+              GNUNET_h2s (hash), GNUNET_MESSENGER_name_of_kind (
+                message->header.kind));
+
   struct GNUNET_MESSENGER_ListHandle *element = service->handles.head;
 
   while (element)