1 files changed, 72 insertions, 43 deletions

diff --git a/src/service/messenger/gnunet-service-messenger_message_handle.c b/src/service/messenger/gnunet-service-messenger_message_handle.c
index 06b987657..77466b599 100644
--- a/src/service/messenger/gnunet-service-messenger_message_handle.c
+++ b/src/service/messenger/gnunet-service-messenger_message_handle.c
@@ -1,6 +1,6 @@
 /*
    This file is part of GNUnet.
-   Copyright (C) 2020--2022 GNUnet e.V.
+   Copyright (C) 2020--2023 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
@@ -27,109 +27,133 @@
 #include "gnunet-service-messenger_message_handle.h"
 
 static void
-handle_session_switch (struct GNUNET_MESSENGER_MemberSession *session,
-                       const struct GNUNET_MESSENGER_Message *message,
-                       const struct GNUNET_HashCode *hash)
+handle_member_session_switch (struct GNUNET_MESSENGER_MemberSession *session,
+                              const struct GNUNET_MESSENGER_Message *message,
+                              const struct GNUNET_HashCode *hash)
 {
-  struct GNUNET_MESSENGER_MemberSession *next = switch_member_session(session, message, hash);
+  struct GNUNET_MESSENGER_MemberSession *next = switch_member_session (session,
+                                                                       message,
+                                                                       hash);
 
   if (next != session)
-    add_member_session(next->member, next);
+    add_member_session (next->member, next);
 }
 
+
 void
 handle_message_join (struct GNUNET_MESSENGER_SrvRoom *room,
-                     struct GNUNET_MESSENGER_MemberSession *session,
+                     struct GNUNET_MESSENGER_SenderSession *session,
                      const struct GNUNET_MESSENGER_Message *message,
                      const struct GNUNET_HashCode *hash)
 {
-  GNUNET_log(GNUNET_ERROR_TYPE_INFO, "Member (%s) joins room (%s).\n",
-             GNUNET_sh2s (&(message->header.sender_id)), GNUNET_h2s(get_srv_room_key(room)));
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Member (%s) joins room (%s).\n",
+              GNUNET_sh2s (&(message->header.sender_id)), GNUNET_h2s (
+                get_srv_room_key (room)));
 
-  if (GNUNET_OK != reset_member_session(session, hash))
-    GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Resetting member session failed!\n");
+  if (GNUNET_OK != reset_member_session (session->member, hash))
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Resetting member session failed!\n");
 
   solve_srv_room_member_collisions (
-      room,
-      &(message->body.join.key),
-      &(message->header.sender_id),
-      GNUNET_TIME_absolute_ntoh(message->header.timestamp)
-  );
+    room,
+    &(message->body.join.key),
+    &(message->header.sender_id),
+    GNUNET_TIME_absolute_ntoh (message->header.timestamp)
+    );
 }
 
+
 void
 handle_message_leave (struct GNUNET_MESSENGER_SrvRoom *room,
-                      struct GNUNET_MESSENGER_MemberSession *session,
+                      struct GNUNET_MESSENGER_SenderSession *session,
                       const struct GNUNET_MESSENGER_Message *message,
                       const struct GNUNET_HashCode *hash)
 {
-  GNUNET_log(GNUNET_ERROR_TYPE_INFO, "Member (%s) leaves room (%s).\n",
-             GNUNET_sh2s (&(message->header.sender_id)), GNUNET_h2s(get_srv_room_key(room)));
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Member (%s) leaves room (%s).\n",
+              GNUNET_sh2s (&(message->header.sender_id)), GNUNET_h2s (
+                get_srv_room_key (room)));
 
-  close_member_session(session);
+  close_member_session (session->member);
 }
 
+
 void
 handle_message_name (struct GNUNET_MESSENGER_SrvRoom *room,
-                     struct GNUNET_MESSENGER_MemberSession *session,
+                     struct GNUNET_MESSENGER_SenderSession *session,
                      const struct GNUNET_MESSENGER_Message *message,
                      const struct GNUNET_HashCode *hash)
 {
-  struct GNUNET_MESSENGER_Contact *contact = get_member_session_contact(session);
+  struct GNUNET_MESSENGER_Contact *contact = get_member_session_contact (
+    session->member);
 
-  if (!contact)
+  if (! contact)
     return;
 
   set_contact_name (contact, message->body.name.name);
 }
 
+
 void
 handle_message_key (struct GNUNET_MESSENGER_SrvRoom *room,
-                    struct GNUNET_MESSENGER_MemberSession *session,
+                    struct GNUNET_MESSENGER_SenderSession *session,
                     const struct GNUNET_MESSENGER_Message *message,
                     const struct GNUNET_HashCode *hash)
 {
-  handle_session_switch (session, message, hash);
+  handle_member_session_switch (session->member, message, hash);
 }
 
+
 void
 handle_message_peer (struct GNUNET_MESSENGER_SrvRoom *room,
-                     struct GNUNET_MESSENGER_MemberSession *session,
+                     struct GNUNET_MESSENGER_SenderSession *session,
                      const struct GNUNET_MESSENGER_Message *message,
                      const struct GNUNET_HashCode *hash)
 {
-  if (GNUNET_NO == contains_list_tunnels (&(room->basement), &(message->body.peer.peer)))
-    add_to_list_tunnels (&(room->basement), &(message->body.peer.peer));
+  struct GNUNET_MESSENGER_PeerStore *store = get_srv_room_peer_store (room);
+
+  if (0 == GNUNET_memcmp (session->peer, &(message->body.peer.peer)))
+    update_store_peer (store, &(message->body.peer.peer));
+
+  if (GNUNET_NO == contains_list_tunnels (&(room->basement),
+                                          &(message->body.peer.peer)))
+    add_to_list_tunnels (&(room->basement), &(message->body.peer.peer), hash);
 
   if (room->peer_message)
     rebuild_srv_room_basement_structure (room);
 }
 
+
 void
 handle_message_id (struct GNUNET_MESSENGER_SrvRoom *room,
-                   struct GNUNET_MESSENGER_MemberSession *session,
+                   struct GNUNET_MESSENGER_SenderSession *session,
                    const struct GNUNET_MESSENGER_Message *message,
                    const struct GNUNET_HashCode *hash)
 {
-  handle_session_switch (session, message, hash);
+  handle_member_session_switch (session->member, message, hash);
 
   solve_srv_room_member_collisions (
-      room,
-      get_member_session_public_key(session),
-      &(message->body.id.id),
-      GNUNET_TIME_absolute_ntoh(message->header.timestamp)
-  );
+    room,
+    get_member_session_public_key (session->member),
+    &(message->body.id.id),
+    GNUNET_TIME_absolute_ntoh (message->header.timestamp)
+    );
 }
 
+
 void
 handle_message_miss (struct GNUNET_MESSENGER_SrvRoom *room,
-                     struct GNUNET_MESSENGER_MemberSession *session,
+                     struct GNUNET_MESSENGER_SenderSession *session,
                      const struct GNUNET_MESSENGER_Message *message,
                      const struct GNUNET_HashCode *hash)
 {
-  struct GNUNET_MESSENGER_ListTunnel *element = find_list_tunnels (&(room->basement), &(message->body.peer.peer), NULL);
+  struct GNUNET_MESSENGER_PeerStore *store = get_srv_room_peer_store (room);
 
-  if (!element)
+  if (0 == GNUNET_memcmp (session->peer, &(message->body.miss.peer)))
+    remove_store_peer (store, &(message->body.miss.peer));
+
+  struct GNUNET_MESSENGER_ListTunnel *element = find_list_tunnels (
+    &(room->basement), &(message->body.miss.peer), NULL);
+
+  if (! element)
     return;
 
   remove_from_list_tunnels (&(room->basement), element);
@@ -138,17 +162,22 @@ handle_message_miss (struct GNUNET_MESSENGER_SrvRoom *room,
     rebuild_srv_room_basement_structure (room);
 }
 
+
 void
 handle_message_delete (struct GNUNET_MESSENGER_SrvRoom *room,
-                       struct GNUNET_MESSENGER_MemberSession *session,
+                       struct GNUNET_MESSENGER_SenderSession *session,
                        const struct GNUNET_MESSENGER_Message *message,
                        const struct GNUNET_HashCode *hash)
 {
-  struct GNUNET_TIME_Relative delay = GNUNET_TIME_relative_ntoh (message->body.deletion.delay);
-  struct GNUNET_TIME_Absolute action = GNUNET_TIME_absolute_ntoh (message->header.timestamp);
+  struct GNUNET_TIME_Relative delay = GNUNET_TIME_relative_ntoh (
+    message->body.deletion.delay);
+  struct GNUNET_TIME_Absolute action = GNUNET_TIME_absolute_ntoh (
+    message->header.timestamp);
 
   action = GNUNET_TIME_absolute_add (action, delay);
-  delay = GNUNET_TIME_absolute_get_difference (GNUNET_TIME_absolute_get (), action);
+  delay = GNUNET_TIME_absolute_get_difference (GNUNET_TIME_absolute_get (),
+                                               action);
 
-  delete_srv_room_message (room, session, &(message->body.deletion.hash), delay);
+  delete_srv_room_message (room, session->member,
+                           &(message->body.deletion.hash), delay);
 }