diff options
author | TheJackiMonster <thejackimonster@gmail.com> | 2024-01-22 21:49:49 +0100 |
---|---|---|
committer | TheJackiMonster <thejackimonster@gmail.com> | 2024-01-22 21:49:49 +0100 |
commit | 5e3335b690ab53fc1557150201cd60113882c3eb (patch) | |
tree | 10efb5acb6dd70f27c7e3d11ca4da78faef1456d /src | |
parent | d5867952c794056daabff4ae4f0b2d3e8f862fcf (diff) | |
download | gnunet-5e3335b690ab53fc1557150201cd60113882c3eb.tar.gz gnunet-5e3335b690ab53fc1557150201cd60113882c3eb.zip |
MESSENGER: Add more logging to find and fix issues
Signed-off-by: TheJackiMonster <thejackimonster@gmail.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/service/messenger/gnunet-service-messenger.c | 12 | ||||
-rw-r--r-- | src/service/messenger/gnunet-service-messenger_room.c | 23 | ||||
-rw-r--r-- | 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, | |||
361 | session.peer = get_store_peer_of (store, message, hash); | 361 | session.peer = get_store_peer_of (store, message, hash); |
362 | 362 | ||
363 | if (! session.peer) | 363 | if (! session.peer) |
364 | { | ||
365 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | ||
366 | "Peer session from sender of message (%s) unknown!\n", | ||
367 | GNUNET_h2s (hash)); | ||
364 | return; | 368 | return; |
369 | } | ||
365 | } | 370 | } |
366 | else | 371 | else |
367 | { | 372 | { |
@@ -380,7 +385,12 @@ callback_found_message (void *cls, | |||
380 | session.member = get_member_session_of (member, message, hash); | 385 | session.member = get_member_session_of (member, message, hash); |
381 | 386 | ||
382 | if (! session.member) | 387 | if (! session.member) |
388 | { | ||
389 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | ||
390 | "Member session from sender of message (%s) unknown!\n", | ||
391 | GNUNET_h2s (hash)); | ||
383 | return; | 392 | return; |
393 | } | ||
384 | } | 394 | } |
385 | 395 | ||
386 | notify_srv_handle_message (msg_client->handle, room, &session, message, | 396 | notify_srv_handle_message (msg_client->handle, room, &session, message, |
@@ -396,6 +406,8 @@ handle_get_message (void *cls, | |||
396 | 406 | ||
397 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Requesting message from room: %s\n", | 407 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Requesting message from room: %s\n", |
398 | GNUNET_h2s (&(msg->key))); | 408 | GNUNET_h2s (&(msg->key))); |
409 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Requested message: %s\n", | ||
410 | GNUNET_h2s (&(msg->hash))); | ||
399 | 411 | ||
400 | struct GNUNET_MESSENGER_SrvRoom *room = get_service_room (messenger, | 412 | struct GNUNET_MESSENGER_SrvRoom *room = get_service_room (messenger, |
401 | &(msg->key)); | 413 | &(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, | |||
791 | GNUNET_MESSENGER_MessageRequestCallback callback, | 791 | GNUNET_MESSENGER_MessageRequestCallback callback, |
792 | void *cls) | 792 | void *cls) |
793 | { | 793 | { |
794 | const struct GNUNET_MESSENGER_Message *message; | ||
795 | |||
794 | struct GNUNET_MESSENGER_MessageStore *message_store = | 796 | struct GNUNET_MESSENGER_MessageStore *message_store = |
795 | get_srv_room_message_store (room); | 797 | get_srv_room_message_store (room); |
796 | 798 | ||
@@ -801,6 +803,10 @@ request_room_message_step (struct GNUNET_MESSENGER_SrvRoom *room, | |||
801 | if (! link) | 803 | if (! link) |
802 | goto forward; | 804 | goto forward; |
803 | 805 | ||
806 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, | ||
807 | "Requesting link of message with hash: %s\n", | ||
808 | GNUNET_h2s (hash)); | ||
809 | |||
804 | enum GNUNET_GenericReturnValue result; | 810 | enum GNUNET_GenericReturnValue result; |
805 | result = request_room_message_step (room, &(link->first), session, | 811 | result = request_room_message_step (room, &(link->first), session, |
806 | callback, cls); | 812 | callback, cls); |
@@ -813,16 +819,21 @@ request_room_message_step (struct GNUNET_MESSENGER_SrvRoom *room, | |||
813 | return result; | 819 | return result; |
814 | 820 | ||
815 | forward: | 821 | forward: |
816 | if (GNUNET_YES != check_member_session_history (session, hash, GNUNET_NO)) | 822 | message = get_store_message (message_store, hash); |
817 | return GNUNET_YES; | ||
818 | |||
819 | const struct GNUNET_MESSENGER_Message *message = get_store_message ( | ||
820 | message_store, hash); | ||
821 | 823 | ||
822 | if (! message) | 824 | if (! message) |
825 | { | ||
826 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, | ||
827 | "Requested message is missing in local storage: %s\n", | ||
828 | GNUNET_h2s (hash)); | ||
823 | return GNUNET_NO; | 829 | return GNUNET_NO; |
830 | } | ||
824 | 831 | ||
825 | if (callback) | 832 | if (GNUNET_YES != check_member_session_history (session, hash, GNUNET_NO)) |
833 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | ||
834 | "Member is not permitted to request access to message! (%s)\n", | ||
835 | GNUNET_sh2s (get_member_session_id (session))); | ||
836 | else if (callback) | ||
826 | callback (cls, room, message, hash); | 837 | callback (cls, room, message, hash); |
827 | 838 | ||
828 | return GNUNET_YES; | 839 | 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 @@ | |||
1 | /* | 1 | /* |
2 | This file is part of GNUnet. | 2 | This file is part of GNUnet. |
3 | Copyright (C) 2023 GNUnet e.V. | 3 | Copyright (C) 2023--2024 GNUnet e.V. |
4 | 4 | ||
5 | GNUnet is free software: you can redistribute it and/or modify it | 5 | GNUnet is free software: you can redistribute it and/or modify it |
6 | under the terms of the GNU Affero General Public License as published | 6 | under the terms of the GNU Affero General Public License as published |
@@ -52,6 +52,8 @@ clear_peer_store (struct GNUNET_MESSENGER_PeerStore *store) | |||
52 | { | 52 | { |
53 | GNUNET_assert ((store) && (store->peers)); | 53 | GNUNET_assert ((store) && (store->peers)); |
54 | 54 | ||
55 | GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Clear peer store\n"); | ||
56 | |||
55 | GNUNET_CONTAINER_multishortmap_iterate (store->peers, iterate_destroy_peers, | 57 | GNUNET_CONTAINER_multishortmap_iterate (store->peers, iterate_destroy_peers, |
56 | NULL); | 58 | NULL); |
57 | GNUNET_CONTAINER_multishortmap_destroy (store->peers); | 59 | GNUNET_CONTAINER_multishortmap_destroy (store->peers); |
@@ -153,6 +155,9 @@ update_store_peer (struct GNUNET_MESSENGER_PeerStore *store, | |||
153 | struct GNUNET_ShortHashCode peer_id; | 155 | struct GNUNET_ShortHashCode peer_id; |
154 | convert_peer_identity_to_id (peer, &peer_id); | 156 | convert_peer_identity_to_id (peer, &peer_id); |
155 | 157 | ||
158 | GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Update peer store entry: %s\n", | ||
159 | GNUNET_sh2s (&peer_id)); | ||
160 | |||
156 | struct GNUNET_MESSENGER_ClosureFindPeer find; | 161 | struct GNUNET_MESSENGER_ClosureFindPeer find; |
157 | find.requested = peer; | 162 | find.requested = peer; |
158 | find.match = NULL; | 163 | find.match = NULL; |
@@ -179,6 +184,9 @@ remove_store_peer (struct GNUNET_MESSENGER_PeerStore *store, | |||
179 | struct GNUNET_ShortHashCode peer_id; | 184 | struct GNUNET_ShortHashCode peer_id; |
180 | convert_peer_identity_to_id (peer, &peer_id); | 185 | convert_peer_identity_to_id (peer, &peer_id); |
181 | 186 | ||
187 | GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Remove peer store entry: %s\n", | ||
188 | GNUNET_sh2s (&peer_id)); | ||
189 | |||
182 | struct GNUNET_MESSENGER_ClosureFindPeer find; | 190 | struct GNUNET_MESSENGER_ClosureFindPeer find; |
183 | find.requested = peer; | 191 | find.requested = peer; |
184 | find.match = NULL; | 192 | find.match = NULL; |