-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, 76 insertions, 56 deletions

diff --git a/src/messenger/gnunet-messenger.c b/src/messenger/gnunet-messenger.c
index 579e5c3ad..737bb83c8 100644
--- a/src/messenger/gnunet-messenger.c
+++ b/src/messenger/gnunet-messenger.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
@@ -34,29 +34,38 @@ struct GNUNET_MESSENGER_Handle *messenger;
 /**
  * Function called whenever a message is received or sent.
  *
- * @param cls Closure
- * @param room Room
- * @param message Message
- * @param hash Hash of message
+ * @param[in/out] cls Closure
+ * @param[in] room Room
+ * @param[in] sender Sender of message
+ * @param[in] message Message
+ * @param[in] hash Hash of message
+ * @param[in] flags Flags of message
  */
 void
-on_message (void *cls, const struct GNUNET_MESSENGER_Room *room, const struct GNUNET_MESSENGER_Message *message,
-            const struct GNUNET_HashCode *hash)
+on_message (void *cls, struct GNUNET_MESSENGER_Room *room, const struct GNUNET_MESSENGER_Contact *sender,
+            const struct GNUNET_MESSENGER_Message *message, const struct GNUNET_HashCode *hash,
+            enum GNUNET_MESSENGER_MessageFlags flags)
 {
-  struct GNUNET_MESSENGER_Contact *sender = GNUNET_MESSENGER_get_member (room, &(message->header.sender_id));
-
   const char *sender_name = GNUNET_MESSENGER_contact_get_name (sender);
 
   if (!sender_name)
     sender_name = "anonymous";
 
+  printf ("[%s] ", GNUNET_sh2s(&(message->header.sender_id)));
+
+  if (flags & GNUNET_MESSENGER_FLAG_PRIVATE)
+    printf ("*");
+
   switch (message->header.kind)
   {
   case GNUNET_MESSENGER_KIND_JOIN:
     {
-      printf ("* '%s' joined the room! [ %u %u %u %u ]\n", sender_name, message->body.join.key.ecdsa_key.q_y[0],
-              message->body.join.key.ecdsa_key.q_y[1], message->body.join.key.ecdsa_key.q_y[2],
-              message->body.join.key.ecdsa_key.q_y[3]);
+      printf ("* '%s' joined the room!\n", sender_name);
+      break;
+    }
+  case GNUNET_MESSENGER_KIND_NAME:
+    {
+      printf ("* '%s' gets renamed to '%s'\n", sender_name, message->body.name.name);
       break;
     }
   case GNUNET_MESSENGER_KIND_LEAVE:
@@ -76,6 +85,7 @@ on_message (void *cls, const struct GNUNET_MESSENGER_Room *room, const struct GN
     }
   default:
     {
+      printf ("~ message: %s\n", GNUNET_MESSENGER_name_of_kind(message->header.kind));
       break;
     }
   }
@@ -86,7 +96,7 @@ struct GNUNET_SCHEDULER_Task *read_task;
 /**
  * Task to shut down this application.
  *
- * @param cls Closure
+ * @param[in/out] cls Closure
  */
 static void
 shutdown_hook (void *cls)
@@ -108,10 +118,24 @@ listen_stdio (void *cls);
 
 #define MAX_BUFFER_SIZE 60000
 
+static int
+iterate_send_private_message (void *cls, struct GNUNET_MESSENGER_Room *room,
+                              const struct GNUNET_MESSENGER_Contact *contact)
+{
+  struct GNUNET_MESSENGER_Message *message = cls;
+
+  if (GNUNET_MESSENGER_contact_get_key(contact))
+    GNUNET_MESSENGER_send_message (room, message, contact);
+
+  return GNUNET_YES;
+}
+
+int private_mode;
+
 /**
  * Task run in stdio mode, after some data is available at stdin.
  *
- * @param cls Closure
+ * @param[in/out] cls Closure
  */
 static void
 read_stdio (void *cls)
@@ -140,7 +164,10 @@ read_stdio (void *cls)
   message.header.kind = GNUNET_MESSENGER_KIND_TEXT;
   message.body.text.text = buffer;
 
-  GNUNET_MESSENGER_send_message (room, &message);
+  if (GNUNET_YES == private_mode)
+    GNUNET_MESSENGER_iterate_members(room, iterate_send_private_message, &message);
+  else
+    GNUNET_MESSENGER_send_message (room, &message, NULL);
 
   read_task = GNUNET_SCHEDULER_add_now (listen_stdio, cls);
 }
@@ -148,7 +175,7 @@ read_stdio (void *cls)
 /**
  * Wait for input on STDIO and send it out over the #ch.
  *
- * @param cls Closure
+ * @param[in/out] cls Closure
  */
 static void
 listen_stdio (void *cls)
@@ -160,10 +187,8 @@ listen_stdio (void *cls)
   GNUNET_NETWORK_fdset_set_native (rs, 0);
 
   read_task = GNUNET_SCHEDULER_add_select (GNUNET_SCHEDULER_PRIORITY_DEFAULT,
-  GNUNET_TIME_UNIT_FOREVER_REL,
-                                           rs,
-                                           NULL,
-                                           &read_stdio, cls);
+                                           GNUNET_TIME_UNIT_FOREVER_REL, rs,
+                                           NULL, &read_stdio, cls);
 
   GNUNET_NETWORK_fdset_destroy (rs);
 }
@@ -171,7 +196,7 @@ listen_stdio (void *cls)
 /**
  * Initial task to startup application.
  *
- * @param cls Closure
+ * @param[in/out] cls Closure
  */
 static void
 idle (void *cls)
@@ -192,8 +217,8 @@ struct GNUNET_SCHEDULER_Task *shutdown_task;
 /**
  * Function called when an identity is retrieved.
  *
- * @param cls Closure
- * @param handle Handle of messenger service
+ * @param[in/out] cls Closure
+ * @param[in/out] handle Handle of messenger service
  */
 static void
 on_identity (void *cls, struct GNUNET_MESSENGER_Handle *handle)
@@ -230,7 +255,7 @@ on_identity (void *cls, struct GNUNET_MESSENGER_Handle *handle)
   {
     printf ("* You try to entry a room...\n");
 
-    room = GNUNET_MESSENGER_entry_room (messenger, door, &key);
+    room = GNUNET_MESSENGER_enter_room (messenger, door, &key);
   }
   else
   {
@@ -246,17 +271,26 @@ on_identity (void *cls, struct GNUNET_MESSENGER_Handle *handle)
   if (!room)
     GNUNET_SCHEDULER_shutdown ();
   else
+  {
+    struct GNUNET_MESSENGER_Message message;
+    message.header.kind = GNUNET_MESSENGER_KIND_NAME;
+    message.body.name.name = GNUNET_strdup(name);
+
+    GNUNET_MESSENGER_send_message (room, &message, NULL);
+    GNUNET_free(message.body.name.name);
+
     GNUNET_SCHEDULER_add_delayed_with_priority (GNUNET_TIME_relative_get_zero_ (), GNUNET_SCHEDULER_PRIORITY_IDLE, idle,
                                                 room);
+  }
 }
 
 /**
  * Main function that will be run by the scheduler.
  *
- * @param cls closure
- * @param args remaining command-line arguments
- * @param cfgfile name of the configuration file used (for saving, can be NULL!)
- * @param cfg configuration
+ * @param[in/out] cls closure
+ * @param[in] args remaining command-line arguments
+ * @param[in] cfgfile name of the configuration file used (for saving, can be NULL!)
+ * @param[in] cfg configuration
  */
 static void
 run (void *cls, char *const*args, const char *cfgfile, const struct GNUNET_CONFIGURATION_Handle *cfg)
@@ -269,38 +303,24 @@ run (void *cls, char *const*args, const char *cfgfile, const struct GNUNET_CONFI
 /**
  * The main function to obtain messenger information.
  *
- * @param argc number of arguments from the command line
- * @param argv command line arguments
- * @return 0 ok, 1 on error
+ * @param[in] argc number of arguments from the command line
+ * @param[in] argv command line arguments
+ * @return #EXIT_SUCCESS ok, #EXIT_FAILURE on error
  */
 int
 main (int argc, char **argv)
 {
   const char *description = "Open and connect to rooms using the MESSENGER to chat.";
 
-  struct GNUNET_GETOPT_CommandLineOption options[] = {
-    GNUNET_GETOPT_option_string ('d',
-                                 "door",
-                                 "PEERIDENTITY",
-                                 "peer identity to entry into the room",
-                                 &door_id),
-    GNUNET_GETOPT_option_string ('e',
-                                 "ego",
-                                 "IDENTITY",
-                                 "identity to use for messaging",
-                                 &ego_name),
-    GNUNET_GETOPT_option_string ('r',
-                                 "room",
-                                 "ROOMKEY",
-                                 "key of the room to connect to",
-                                 &room_key),
-    GNUNET_GETOPT_OPTION_END };
-
-  return (GNUNET_OK == GNUNET_PROGRAM_run (argc,
-                                           argv,
-                                           "gnunet-messenger\0",
-                                           gettext_noop(description),
-                                           options,
-                                           &run,
-                                           NULL) ? EXIT_SUCCESS : EXIT_FAILURE);
+  struct GNUNET_GETOPT_CommandLineOption options[] =
+  {
+    GNUNET_GETOPT_option_string ('d', "door", "PEERIDENTITY", "peer identity to entry into the room", &door_id),
+    GNUNET_GETOPT_option_string ('e', "ego", "IDENTITY", "identity to use for messaging", &ego_name),
+    GNUNET_GETOPT_option_string ('r', "room", "ROOMKEY", "key of the room to connect to", &room_key),
+    GNUNET_GETOPT_option_flag ('p', "private", "flag to enable private mode", &private_mode),
+    GNUNET_GETOPT_OPTION_END
+  };
+
+  return (GNUNET_OK == GNUNET_PROGRAM_run (argc, argv, "gnunet-messenger\0", gettext_noop(description), options, &run,
+  NULL) ? EXIT_SUCCESS : EXIT_FAILURE);
 }