-added core functionality of the messenger service

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

formatting messenger code

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

-completed core functionality of messenger service

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

-code cleanup and reuse

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

+added structure to memberships of rooms

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

-implemented member permission checks and deletion of messages

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

-moved solving requests out of updating last messages (also forward before update)

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

-reduced complexity of permisson check and changed load/save of rooms

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

-added save/load for accessed keys and basement peers of a room

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

-implemented save/load for members with their history and session

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

-abstracted management of egos and contacts

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

-fix warning

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

-abstracted management of members

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

-fixed and adjusted test case

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

-separated handling of direct and anonymous contacts

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

-messenger added member-sessions which fix multiple edge cases, also additional cleanup

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

-updated docs and fixed memory leak

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

-changed info messages and added protocol version exchange

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

-adjusted client api to use contacts from sessions

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

-added more logging and fixed wrong session usage

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

-adjusted comm0 test case and removed adding members from checking messages

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

-fixed test-case for peer exchange

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

-getting multiple peers connected in test-case with cadet

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

-fixed wrong assert and added tunnel version check

-simplified handling and forwarding

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

-fixed merging last messages and cycling info messages

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

-automated adding sessions and members

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

-corrected use of identity keys and signatures

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

-adding local joining on entering external room

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

-fixed test-case comm0

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

-added more test-cases with generic setup

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

-fixed multiple simultaneous channels blocking each other

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

-making test-cases more precise

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

-added check of members in test-cases, reduced merge messages

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

-unified delayed operations: requests, deletions and merges

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

-finished handling of operations

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

-fixed member session historystorage, added request permission check and padding for transmission

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

-improved padding and removed automatic recursive requests

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

-implemented filter for sending messages and added private messages to API level

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

-wrong setups fixed with proper ego lookups

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

-fixed problem with anonymous ego and changed to discrete-level padding

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

-added links to replace deleted messages, added local deletion and fixed anonymous id changing

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

-added session completion and removal through completion process

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

1 files changed, 50 insertions, 58 deletions

diff --git a/src/messenger/gnunet-service-messenger_message_handle.c b/src/messenger/gnunet-service-messenger_message_handle.c
index 1652435c8..c22e51fbf 100644
--- a/src/messenger/gnunet-service-messenger_message_handle.c
+++ b/src/messenger/gnunet-service-messenger_message_handle.c
@@ -1,6 +1,6 @@
 /*
    This file is part of GNUnet.
-   Copyright (C) 2020 GNUnet e.V.
+   Copyright (C) 2020--2021 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
@@ -25,75 +25,59 @@
 
 #include "gnunet-service-messenger_message_handle.h"
 
-void
-handle_message_join (struct GNUNET_MESSENGER_SrvRoom *room, struct GNUNET_MESSENGER_SrvTunnel *tunnel,
-                     struct GNUNET_MESSENGER_Message *message, const struct GNUNET_HashCode *hash)
+static void
+handle_session_switch (struct GNUNET_MESSENGER_MemberSession *session,
+                       const struct GNUNET_MESSENGER_Message *message, const struct GNUNET_HashCode *hash)
 {
-  struct GNUNET_MESSENGER_SrvContact *contact = get_room_contact (room, &(message->header.sender_id));
-
-  if (!contact)
-    add_room_contact (room, &(message->header.sender_id), &(message->body.join.key));
-
-  struct GNUNET_MESSENGER_MemberInfo *info = get_room_member_info (room, &(message->header.sender_id));
-
-  if (!info)
-  {
-    info = GNUNET_new(struct GNUNET_MESSENGER_MemberInfo);
-
-    info->access = GNUNET_MESSENGER_MEMBER_UNKNOWN;
-    init_list_messages (&(info->session_messages));
-  }
-  else
-    clear_list_messages (&(info->session_messages));
+  struct GNUNET_MESSENGER_MemberSession *next = switch_member_session(session, message, hash);
 
-  if (GNUNET_YES == GNUNET_CONTAINER_multishortmap_put (room->member_infos, &(message->header.sender_id), info,
-                                                        GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST))
-    add_to_list_messages (&(info->session_messages), hash);
+  if (next != session)
+    add_member_session(next->member, next);
 }
 
 void
-handle_message_leave (struct GNUNET_MESSENGER_SrvRoom *room, struct GNUNET_MESSENGER_SrvTunnel *tunnel,
-                      struct GNUNET_MESSENGER_Message *message, const struct GNUNET_HashCode *hash)
+handle_message_join (struct GNUNET_MESSENGER_SrvRoom *room, struct GNUNET_MESSENGER_MemberSession *session,
+                     const struct GNUNET_MESSENGER_Message *message, const struct GNUNET_HashCode *hash)
 {
-  struct GNUNET_MESSENGER_MemberInfo *info = get_room_member_info (room, &(message->header.sender_id));
+  GNUNET_log(GNUNET_ERROR_TYPE_INFO, "Member (%s) joins room (%s).\n",
+             GNUNET_sh2s (&(message->header.sender_id)), GNUNET_h2s(get_room_key(room)));
 
-  if (info)
-    clear_list_messages (&(info->session_messages));
+  if (GNUNET_OK != reset_member_session(session, hash))
+    GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Resetting member session failed!\n");
 }
 
 void
-handle_message_name (struct GNUNET_MESSENGER_SrvRoom *room, struct GNUNET_MESSENGER_SrvTunnel *tunnel,
-                     struct GNUNET_MESSENGER_Message *message, const struct GNUNET_HashCode *hash)
+handle_message_leave (struct GNUNET_MESSENGER_SrvRoom *room, struct GNUNET_MESSENGER_MemberSession *session,
+                      const struct GNUNET_MESSENGER_Message *message, const struct GNUNET_HashCode *hash)
 {
-  struct GNUNET_MESSENGER_SrvContact *contact = get_room_contact (room, &(message->header.sender_id));
+  GNUNET_log(GNUNET_ERROR_TYPE_INFO, "Member (%s) leaves room (%s).\n",
+             GNUNET_sh2s (&(message->header.sender_id)), GNUNET_h2s(get_room_key(room)));
 
-  if (contact)
-    set_contact_name (contact, message->body.name.name);
-
-  struct GNUNET_MESSENGER_MemberInfo *info = get_room_member_info (room, &(message->header.sender_id));
-
-  if (info)
-    add_to_list_messages (&(info->session_messages), hash);
+  close_member_session(session);
 }
 
 void
-handle_message_key (struct GNUNET_MESSENGER_SrvRoom *room, struct GNUNET_MESSENGER_SrvTunnel *tunnel,
-                    struct GNUNET_MESSENGER_Message *message, const struct GNUNET_HashCode *hash)
+handle_message_name (struct GNUNET_MESSENGER_SrvRoom *room, struct GNUNET_MESSENGER_MemberSession *session,
+                     const struct GNUNET_MESSENGER_Message *message, const struct GNUNET_HashCode *hash)
 {
-  struct GNUNET_MESSENGER_SrvContact *contact = get_room_contact (room, &(message->header.sender_id));
+  struct GNUNET_MESSENGER_Contact *contact = get_member_session_contact(session);
 
-  if (contact)
-    swap_service_contact_by_pubkey (room->service, contact, &(message->body.key.key));
+  if (!contact)
+    return;
 
-  struct GNUNET_MESSENGER_MemberInfo *info = get_room_member_info (room, &(message->header.sender_id));
+  set_contact_name (contact, message->body.name.name);
+}
 
-  if (info)
-    add_to_list_messages (&(info->session_messages), hash);
+void
+handle_message_key (struct GNUNET_MESSENGER_SrvRoom *room, struct GNUNET_MESSENGER_MemberSession *session,
+                    const struct GNUNET_MESSENGER_Message *message, const struct GNUNET_HashCode *hash)
+{
+  handle_session_switch (session, message, hash);
 }
 
 void
-handle_message_peer (struct GNUNET_MESSENGER_SrvRoom *room, struct GNUNET_MESSENGER_SrvTunnel *tunnel,
-                     struct GNUNET_MESSENGER_Message *message, const struct GNUNET_HashCode *hash)
+handle_message_peer (struct GNUNET_MESSENGER_SrvRoom *room, struct GNUNET_MESSENGER_MemberSession *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));
@@ -103,20 +87,15 @@ handle_message_peer (struct GNUNET_MESSENGER_SrvRoom *room, struct GNUNET_MESSEN
 }
 
 void
-handle_message_id (struct GNUNET_MESSENGER_SrvRoom *room, struct GNUNET_MESSENGER_SrvTunnel *tunnel,
-                   struct GNUNET_MESSENGER_Message *message, const struct GNUNET_HashCode *hash)
+handle_message_id (struct GNUNET_MESSENGER_SrvRoom *room, struct GNUNET_MESSENGER_MemberSession *session,
+                   const struct GNUNET_MESSENGER_Message *message, const struct GNUNET_HashCode *hash)
 {
-  struct GNUNET_MESSENGER_MemberInfo *info = get_room_member_info (room, &(message->header.sender_id));
-
-  if (info)
-    add_to_list_messages (&(info->session_messages), hash);
-
-  switch_room_member_id (room, &(message->header.sender_id), &(message->body.id.id), hash);
+  handle_session_switch (session, message, hash);
 }
 
 void
-handle_message_miss (struct GNUNET_MESSENGER_SrvRoom *room, struct GNUNET_MESSENGER_SrvTunnel *tunnel,
-                     struct GNUNET_MESSENGER_Message *message, const struct GNUNET_HashCode *hash)
+handle_message_miss (struct GNUNET_MESSENGER_SrvRoom *room, struct GNUNET_MESSENGER_MemberSession *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);
 
@@ -128,3 +107,16 @@ handle_message_miss (struct GNUNET_MESSENGER_SrvRoom *room, struct GNUNET_MESSEN
   if (room->peer_message)
     rebuild_room_basement_structure (room);
 }
+
+void
+handle_message_delete (struct GNUNET_MESSENGER_SrvRoom *room, struct GNUNET_MESSENGER_MemberSession *session,
+                       const struct GNUNET_MESSENGER_Message *message, const struct GNUNET_HashCode *hash)
+{
+  struct GNUNET_TIME_Relative delay = GNUNET_TIME_relative_ntoh (message->body.delete.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);
+
+  delete_room_message (room, session, &(message->body.delete.hash), delay);
+}