[gnunet] 05/08: MESSENGER: Add more logging to find and fix issues

[gnunet]

This is an automated email from the git hooks/post-receive script.

thejackimonster pushed a commit to branch master
in repository gnunet.

commit 5e3335b690ab53fc1557150201cd60113882c3eb
Author: TheJackiMonster <thejackimonster@gmail.com>
AuthorDate: Mon Jan 22 21:49:49 2024 +0100

    MESSENGER: Add more logging to find and fix issues
    
    Signed-off-by: TheJackiMonster <thejackimonster@gmail.com>
---
 src/service/messenger/gnunet-service-messenger.c   | 12 +++++++++++
 .../messenger/gnunet-service-messenger_room.c      | 23 ++++++++++++++++------
 src/service/messenger/messenger_api_peer_store.c   | 10 +++++++++-
 3 files changed, 38 insertions(+), 7 deletions(-)

diff --git a/src/service/messenger/gnunet-service-messenger.c 
b/src/service/messenger/gnunet-service-messenger.c
index 3f88aff4b..2102a59cc 100644
--- a/src/service/messenger/gnunet-service-messenger.c
+++ b/src/service/messenger/gnunet-service-messenger.c
@@ -361,7 +361,12 @@ callback_found_message (void *cls,
     session.peer = get_store_peer_of (store, message, hash);
 
     if (! session.peer)
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR, 
+                  "Peer session from sender of message (%s) unknown!\n",
+                  GNUNET_h2s (hash));
       return;
+    }
   }
   else
   {
@@ -380,7 +385,12 @@ callback_found_message (void *cls,
     session.member = get_member_session_of (member, message, hash);
 
     if (! session.member)
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR, 
+                  "Member session from sender of message (%s) unknown!\n",
+                  GNUNET_h2s (hash));
       return;
+    }
   }
 
   notify_srv_handle_message (msg_client->handle, room, &session, message,
@@ -396,6 +406,8 @@ handle_get_message (void *cls,
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Requesting message from room: %s\n",
               GNUNET_h2s (&(msg->key)));
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Requested message: %s\n",
+              GNUNET_h2s (&(msg->hash)));
 
   struct GNUNET_MESSENGER_SrvRoom *room = get_service_room (messenger,
                                                             &(msg->key));
diff --git a/src/service/messenger/gnunet-service-messenger_room.c 
b/src/service/messenger/gnunet-service-messenger_room.c
index 61fce26f3..2d898eadd 100644
--- a/src/service/messenger/gnunet-service-messenger_room.c
+++ b/src/service/messenger/gnunet-service-messenger_room.c
@@ -791,6 +791,8 @@ request_room_message_step (struct GNUNET_MESSENGER_SrvRoom 
*room,
                            GNUNET_MESSENGER_MessageRequestCallback callback,
                            void *cls)
 {
+  const struct GNUNET_MESSENGER_Message *message;
+
   struct GNUNET_MESSENGER_MessageStore *message_store =
     get_srv_room_message_store (room);
 
@@ -801,6 +803,10 @@ request_room_message_step (struct GNUNET_MESSENGER_SrvRoom 
*room,
   if (! link)
     goto forward;
 
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+              "Requesting link of message with hash: %s\n",
+              GNUNET_h2s (hash));
+
   enum GNUNET_GenericReturnValue result;
   result = request_room_message_step (room, &(link->first), session,
                                       callback, cls);
@@ -813,16 +819,21 @@ request_room_message_step (struct 
GNUNET_MESSENGER_SrvRoom *room,
     return result;
 
 forward:
-  if (GNUNET_YES != check_member_session_history (session, hash, GNUNET_NO))
-    return GNUNET_YES;
-
-  const struct GNUNET_MESSENGER_Message *message = get_store_message (
-    message_store, hash);
+  message = get_store_message (message_store, hash);
 
   if (! message)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                "Requested message is missing in local storage: %s\n",
+                GNUNET_h2s (hash));
     return GNUNET_NO;
+  }
 
-  if (callback)
+  if (GNUNET_YES != check_member_session_history (session, hash, GNUNET_NO))
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Member is not permitted to request access to message! (%s)\n",
+                GNUNET_sh2s (get_member_session_id (session)));
+  else if (callback)
     callback (cls, room, message, hash);
 
   return GNUNET_YES;
diff --git a/src/service/messenger/messenger_api_peer_store.c 
b/src/service/messenger/messenger_api_peer_store.c
index f9b4867f8..8d8d4dbee 100644
--- a/src/service/messenger/messenger_api_peer_store.c
+++ b/src/service/messenger/messenger_api_peer_store.c
@@ -1,6 +1,6 @@
 /*
    This file is part of GNUnet.
-   Copyright (C) 2023 GNUnet e.V.
+   Copyright (C) 2023--2024 GNUnet e.V.
 
    GNUnet is free software: you can redistribute it and/or modify it
    under the terms of the GNU Affero General Public License as published
@@ -52,6 +52,8 @@ clear_peer_store (struct GNUNET_MESSENGER_PeerStore *store)
 {
   GNUNET_assert ((store) && (store->peers));
 
+  GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Clear peer store\n");
+
   GNUNET_CONTAINER_multishortmap_iterate (store->peers, iterate_destroy_peers,
                                           NULL);
   GNUNET_CONTAINER_multishortmap_destroy (store->peers);
@@ -153,6 +155,9 @@ update_store_peer (struct GNUNET_MESSENGER_PeerStore *store,
   struct GNUNET_ShortHashCode peer_id;
   convert_peer_identity_to_id (peer, &peer_id);
 
+  GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Update peer store entry: %s\n",
+             GNUNET_sh2s (&peer_id));
+
   struct GNUNET_MESSENGER_ClosureFindPeer find;
   find.requested = peer;
   find.match = NULL;
@@ -179,6 +184,9 @@ remove_store_peer (struct GNUNET_MESSENGER_PeerStore *store,
   struct GNUNET_ShortHashCode peer_id;
   convert_peer_identity_to_id (peer, &peer_id);
 
+  GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Remove peer store entry: %s\n",
+             GNUNET_sh2s (&peer_id));
+
   struct GNUNET_MESSENGER_ClosureFindPeer find;
   find.requested = peer;
   find.match = NULL;

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.