1 files changed, 113 insertions, 152 deletions

diff --git a/src/messenger/gnunet-service-messenger_room.h b/src/messenger/gnunet-service-messenger_room.h
index 36c9e8cf5..a40961177 100644
--- a/src/messenger/gnunet-service-messenger_room.h
+++ b/src/messenger/gnunet-service-messenger_room.h
@@ -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
@@ -33,33 +33,29 @@
 #include "gnunet_identity_service.h"
 #include "gnunet_mq_lib.h"
 
-#include "gnunet-service-messenger_contact.h"
-
 #include "gnunet_messenger_service.h"
 #include "gnunet-service-messenger_basement.h"
 #include "gnunet-service-messenger_handle.h"
-#include "gnunet-service-messenger_tunnel.h"
-
 #include "gnunet-service-messenger_list_messages.h"
+
 #include "messenger_api_list_tunnels.h"
 
+#include "gnunet-service-messenger_member_store.h"
 #include "gnunet-service-messenger_message_store.h"
+#include "gnunet-service-messenger_operation_store.h"
 #include "messenger_api_ego.h"
 
-enum GNUNET_MESSENGER_MemberAccess
-{
-  GNUNET_MESSENGER_MEMBER_ALLOWED = 1,
-  GNUNET_MESSENGER_MEMBER_BLOCKED = 1,
+#define GNUNET_MESSENGER_IDLE_DELAY GNUNET_TIME_relative_multiply \
+  (GNUNET_TIME_relative_get_second_ (), 5)
 
-  GNUNET_MESSENGER_MEMBER_UNKNOWN = 0
-};
+#define GNUNET_MESSENGER_REQUEST_DELAY GNUNET_TIME_relative_multiply \
+  (GNUNET_TIME_relative_get_minute_ (), 5)
 
-struct GNUNET_MESSENGER_MemberInfo
-{
-  enum GNUNET_MESSENGER_MemberAccess access;
+#define GNUNET_MESSENGER_MERGE_DELAY GNUNET_TIME_relative_multiply \
+  (GNUNET_TIME_relative_get_second_ (), 30)
 
-  struct GNUNET_MESSENGER_ListMessages session_messages;
-};
+struct GNUNET_MESSENGER_SrvTunnel;
+struct GNUNET_MESSENGER_MemberSession;
 
 struct GNUNET_MESSENGER_SrvRoom
 {
@@ -70,11 +66,10 @@ struct GNUNET_MESSENGER_SrvRoom
   struct GNUNET_HashCode key;
 
   struct GNUNET_CONTAINER_MultiPeerMap *tunnels;
-  struct GNUNET_CONTAINER_MultiShortmap *members;
-  struct GNUNET_CONTAINER_MultiShortmap *member_infos;
 
-  struct GNUNET_MESSENGER_MessageStore store;
-  struct GNUNET_CONTAINER_MultiHashMap *requested;
+  struct GNUNET_MESSENGER_MemberStore member_store;
+  struct GNUNET_MESSENGER_MessageStore message_store;
+  struct GNUNET_MESSENGER_OperationStore operation_store;
 
   struct GNUNET_MESSENGER_ListTunnels basement;
   struct GNUNET_MESSENGER_ListMessages last_messages;
@@ -83,15 +78,13 @@ struct GNUNET_MESSENGER_SrvRoom
 
   struct GNUNET_MESSENGER_ListMessages handling;
   struct GNUNET_SCHEDULER_Task *idle;
-
-  int strict_access;
 };
 
 /**
  * Creates and allocates a new room for a <i>handle</i> with a given <i>key</i>.
  *
- * @param handle Handle
- * @param key Key of room
+ * @param[in/out] handle Handle
+ * @param[in] key Key of room
  * @return New room
  */
 struct GNUNET_MESSENGER_SrvRoom*
@@ -100,58 +93,42 @@ create_room (struct GNUNET_MESSENGER_SrvHandle *handle, const struct GNUNET_Hash
 /**
  * Destroys a room and frees its memory fully.
  *
- * @param room Room
+ * @param[in/out] room Room
  */
 void
 destroy_room (struct GNUNET_MESSENGER_SrvRoom *room);
 
 /**
- * Returns the contact of a member in a <i>room</i> identified by a given <i>id</i>. If the <i>room</i>
- * does not contain a member with the given <i>id</i>, NULL gets returned.
- *
- * @param room Room
- * @param id Member id
- * @return Contact or NULL
- */
-struct GNUNET_MESSENGER_SrvContact*
-get_room_contact (struct GNUNET_MESSENGER_SrvRoom *room, const struct GNUNET_ShortHashCode *id);
-
-/**
- * Adds a contact from the service to a <i>room</i> under a specific <i>id</i> with a given public key.
+ * Returns the used member store of a given <i>room</i>.
  *
- * @param room Room
- * @param id Member id
- * @param pubkey Public key of EGO
+ * @param[in/out] room Room
+ * @return Member store
  */
-void
-add_room_contact (struct GNUNET_MESSENGER_SrvRoom *room, const struct GNUNET_ShortHashCode *id,
-                  const struct GNUNET_IDENTITY_PublicKey *pubkey);
+struct GNUNET_MESSENGER_MemberStore*
+get_room_member_store (struct GNUNET_MESSENGER_SrvRoom *room);
 
 /**
- * Returns the member information of a member in a <i>room</i> identified by a given <i>id</i>. If the <i>room</i>
- * does not contain a member with the given <i>id</i>, NULL gets returned.
+ * Returns the used message store of a given <i>room</i>.
  *
- * @param room Room
- * @param id Member id
- * @return Member information or NULL
+ * @param[in/out] room Room
+ * @return Message store
  */
-struct GNUNET_MESSENGER_MemberInfo*
-get_room_member_info (struct GNUNET_MESSENGER_SrvRoom *room, const struct GNUNET_ShortHashCode *id);
+struct GNUNET_MESSENGER_MessageStore*
+get_room_message_store (struct GNUNET_MESSENGER_SrvRoom *room);
 
 /**
- * Tries to generate and allocate a new unique member id checking all current members for possible
- * duplicates. If the function fails, NULL gets returned.
+ * Returns the used operation store of a given <i>room</i>.
  *
- * @param room Room
- * @return New member id or NULL
+ * @param[in/out] room Room
+ * @return Operation store
  */
-struct GNUNET_ShortHashCode*
-generate_room_member_id (const struct GNUNET_MESSENGER_SrvRoom *room);
+struct GNUNET_MESSENGER_OperationStore*
+get_room_operation_store (struct GNUNET_MESSENGER_SrvRoom *room);
 
 /**
  * Returns the member id of the member representing the handle currently hosting this <i>room</i>.
  *
- * @param room Room
+ * @param[in] room Room
  * @return Host member id or NULL
  */
 const struct GNUNET_ShortHashCode*
@@ -160,8 +137,8 @@ get_room_host_id (const struct GNUNET_MESSENGER_SrvRoom *room);
 /**
  * Changes the member id of the member representing the handle currently hosting this <i>room</i>.
  *
- * @param room Room
- * @param unique_id Unique member id
+ * @param[in/out] room Room
+ * @param[in] unique_id Unique member id
  */
 void
 change_room_host_id (struct GNUNET_MESSENGER_SrvRoom *room, const struct GNUNET_ShortHashCode *unique_id);
@@ -172,11 +149,11 @@ change_room_host_id (struct GNUNET_MESSENGER_SrvRoom *room, const struct GNUNET_
  *
  * Calling this method should result in joining a room and sending a peer message as well for this peer.
  *
- * If the function returns GNUNET_YES the port for this room is guranteed to be open for incoming connections.
+ * If the function returns #GNUNET_YES the port for this room is guranteed to be open for incoming connections.
  *
- * @param room Room
- * @param handle Handle
- * @return GNUNET_YES on success, GNUNET_NO on failure.
+ * @param[in/out] room Room
+ * @param[in/out] handle Handle
+ * @return #GNUNET_YES on success, #GNUNET_NO on failure.
  */
 int
 open_room (struct GNUNET_MESSENGER_SrvRoom *room, struct GNUNET_MESSENGER_SrvHandle *handle);
@@ -186,45 +163,34 @@ open_room (struct GNUNET_MESSENGER_SrvRoom *room, struct GNUNET_MESSENGER_SrvHan
  * a peer identity of a hosting peer. During the connection the handle will join the room as a member, waiting for
  * an info message from the selected host.
  *
- * @param room Room
- * @param handle Handle
- * @param door Peer identity
- * @return GNUNET_YES on success, GNUNET_NO on failure.
+ * @param[in/out] room Room
+ * @param[in/out] handle Handle
+ * @param[in] door Peer identity
+ * @return #GNUNET_YES on success, #GNUNET_NO on failure.
  */
 int
-entry_room_at (struct GNUNET_MESSENGER_SrvRoom *room, struct GNUNET_MESSENGER_SrvHandle *handle,
+enter_room_at (struct GNUNET_MESSENGER_SrvRoom *room, struct GNUNET_MESSENGER_SrvHandle *handle,
                const struct GNUNET_PeerIdentity *door);
 
 /**
- * Returns a tunnel granting a direct connection to a specific member in a <i>room</i>. The member gets identified
- * by an <i>id</i>. If no tunnel has been linked to the selected id, NULL gets returned.
- *
- * @param room Room
- * @param contact_id Member id
- * @return Tunnel to the member or NULL
- */
-struct GNUNET_MESSENGER_SrvTunnel*
-find_room_tunnel_to (struct GNUNET_MESSENGER_SrvRoom *room, const struct GNUNET_ShortHashCode *contact_id);
-
-/**
  * Packs a <i>message</i> depending on the selected <i>mode</i> into a newly allocated envelope. It will set the
  * timestamp of the message, the sender id and the previous messages hash automatically before packing. The message
  * will be signed by the handles EGO.
  *
  * If the optional <i>hash</i> parameter is a valid pointer, its value will be overriden by the signed messages hash.
  *
- * If <i>mode</i> is set to GNUNET_MESSENGER_PACK_MODE_ENVELOPE, the function returns a valid envelope to send
+ * If <i>mode</i> is set to #GNUNET_MESSENGER_PACK_MODE_ENVELOPE, the function returns a valid envelope to send
  * through a message queue, otherwise NULL.
  *
- * @param room Room
- * @param handle Handle
- * @param message Message
+ * @param[in] room Room
+ * @param[in] handle Handle
+ * @param[in/out] message Message
  * @param[out] hash Hash of message
- * @param mode Packing mode
+ * @param[in] mode Packing mode
  * @return New envelope or NULL
  */
 struct GNUNET_MQ_Envelope*
-pack_room_message (struct GNUNET_MESSENGER_SrvRoom *room, struct GNUNET_MESSENGER_SrvHandle *handle,
+pack_room_message (const struct GNUNET_MESSENGER_SrvRoom *room, const struct GNUNET_MESSENGER_SrvHandle *handle,
                    struct GNUNET_MESSENGER_Message *message, struct GNUNET_HashCode *hash, int mode);
 
 /**
@@ -234,59 +200,69 @@ pack_room_message (struct GNUNET_MESSENGER_SrvRoom *room, struct GNUNET_MESSENGE
  * The function handles packing the message automatically and will call linked message-events locally even if
  * the message won't be sent to another peer.
  *
- * @param room Room
- * @param handle Handle
- * @param message Message
- * @param[out] hash Hash of message
+ * The function returns #GNUNET_YES on success, #GNUNET_NO if message is null and
+ * #GNUNET_SYSERR if the message was known already.
+ *
+ * @param[in/out] room Room
+ * @param[in/out] handle Handle
+ * @param[in/out] message Message
+ * @return #GNUNET_YES on success, #GNUNET_NO or #GNUNET_SYSERR otherwise.
  */
-void
+int
 send_room_message (struct GNUNET_MESSENGER_SrvRoom *room, struct GNUNET_MESSENGER_SrvHandle *handle,
-                   struct GNUNET_MESSENGER_Message *message, struct GNUNET_HashCode *hash);
+                   struct GNUNET_MESSENGER_Message *message);
 
 /**
- * Sends a <i>message</i> from a given <i>handle</i> into a <i>room</i> excluding one specific <i>tunnel</i>.
- * The <i>hash</i> parameter will be updated with the hash-value resulting from the sent message.
- *
- * The function handles packing the message automatically and will call linked message-events locally even if
- * the message won't be sent to another peer.
+ * Forwards a <i>message</i> with a given <i>hash</i> to a specific <i>tunnel</i> inside of a <i>room</i>.
  *
- * @param room Room
- * @param handle Handle
- * @param message Message
- * @param[out] hash Hash of message
- * @param tunnel Tunnel
+ * @param[in/out] room Room
+ * @param[in/out] tunnel Tunnel
+ * @param[in/out] message Message
+ * @param[in] hash Hash of message
  */
 void
-send_room_message_ext (struct GNUNET_MESSENGER_SrvRoom *room, struct GNUNET_MESSENGER_SrvHandle *handle,
-                       struct GNUNET_MESSENGER_Message *message, struct GNUNET_HashCode *hash,
-                       struct GNUNET_MESSENGER_SrvTunnel *tunnel);
+forward_room_message (struct GNUNET_MESSENGER_SrvRoom *room, struct GNUNET_MESSENGER_SrvTunnel *tunnel,
+                      struct GNUNET_MESSENGER_Message *message, const struct GNUNET_HashCode *hash);
 
 /**
- * Forwards a <i>message</i> with a given <i>hash</i> to a specific <i>tunnel</i> inside of a <i>room</i>.
+ * Checks the current state of opening a given <i>room</i> from this peer and re-publishes it
+ * if necessary to a selected <i>tunnel</i> or to all connected tunnels if necessary or if the
+ * selected tunnel is NULL.
  *
- * @param room Room
- * @param tunnel Tunnel
- * @param message Message
- * @param hash Hash of message
+ * @param[in/out] room Room
+ * @param[in/out] tunnel Tunnel
  */
 void
-forward_room_message (struct GNUNET_MESSENGER_SrvRoom *room, struct GNUNET_MESSENGER_SrvTunnel *tunnel,
-                      const struct GNUNET_MESSENGER_Message *message, const struct GNUNET_HashCode *hash);
+check_room_peer_status (struct GNUNET_MESSENGER_SrvRoom *room, struct GNUNET_MESSENGER_SrvTunnel *tunnel);
 
 /**
  * Reduces all current forks inside of the message history of a <i>room</i> to one remaining last message
  * by merging them down. All merge messages will be sent from a given <i>handle</i>.
  *
- * @param room Room
- * @param handle Handle
+ * @param[in/out] room Room
+ * @param[in/out] handle Handle
  */
 void
 merge_room_last_messages (struct GNUNET_MESSENGER_SrvRoom *room, struct GNUNET_MESSENGER_SrvHandle *handle);
 
 /**
+ * Deletes a message from the <i>room</i> with a given <i>hash</i> in a specific <i>delay</i> if
+ * the provided member by its session is permitted to do so.
+ *
+ * @param[in/out] room Room
+ * @param[in/out] session Member session
+ * @param[in] hash Hash of message
+ * @param[in] delay Delay of deletion
+ * @return #GNUNET_YES on success, #GNUNET_NO if permission gets denied, #GNUNET_SYSERR on operation failure
+ */
+int
+delete_room_message (struct GNUNET_MESSENGER_SrvRoom *room, struct GNUNET_MESSENGER_MemberSession *session,
+                     const struct GNUNET_HashCode *hash, const struct GNUNET_TIME_Relative delay);
+
+/**
  * Returns the CADET handle from a rooms service.
  *
- * @param room Room
+ * @param[in/out] room Room
  * @return CADET handle
  */
 struct GNUNET_CADET_Handle*
@@ -295,26 +271,26 @@ get_room_cadet (struct GNUNET_MESSENGER_SrvRoom *room);
 /**
  * Returns the shared secret you need to access a <i>room</i>.
  *
- * @param room Room
+ * @param[in] room Room
  * @return Shared secret
  */
-struct GNUNET_HashCode*
-get_room_key (struct GNUNET_MESSENGER_SrvRoom *room);
+const struct GNUNET_HashCode*
+get_room_key (const struct GNUNET_MESSENGER_SrvRoom *room);
 
 /**
  * Returns a tunnel inside of a <i>room</i> leading towards a given <i>peer</i> if such a tunnel exists,
  * otherwise NULL.
  *
- * @param room Room
- * @param peer Peer identity
+ * @param[in] room Room
+ * @param[in] peer Peer identity
  * @return Tunnel or NULL
  */
 const struct GNUNET_MESSENGER_SrvTunnel*
-get_room_tunnel (struct GNUNET_MESSENGER_SrvRoom *room, const struct GNUNET_PeerIdentity *peer);
+get_room_tunnel (const struct GNUNET_MESSENGER_SrvRoom *room, const struct GNUNET_PeerIdentity *peer);
 
 /**
  * Returns a message from a <i>room</i> identified by a given <i>hash</i>. If no matching message is
- * found and <i>request</i> is set to GNUNET_YES, the <i>handle</i> will request the missing message
+ * found and <i>request</i> is set to #GNUNET_YES, the <i>handle</i> will request the missing message
  * automatically.
  *
  * The function uses the optimized check for a message via its hash from the message store.
@@ -323,10 +299,10 @@ get_room_tunnel (struct GNUNET_MESSENGER_SrvRoom *room, const struct GNUNET_Peer
  * If a message is missing independent of the following request, NULL gets returned instead of the
  * matching message.
  *
- * @param room Room
- * @param handle Handle
- * @param hash Hash of message
- * @param request Flag to request a message
+ * @param[in/out] room Room
+ * @param[in/out] handle Handle
+ * @param[in] hash Hash of message
+ * @param[in] request Flag to request a message
  * @return Message or NULL
  */
 const struct GNUNET_MESSENGER_Message*
@@ -334,45 +310,30 @@ get_room_message (struct GNUNET_MESSENGER_SrvRoom *room, struct GNUNET_MESSENGER
                   const struct GNUNET_HashCode *hash, int request);
 
 /**
- * Updates the last messages of a <i>room</i> by replacing them if the previous hash of a given <i>message</i>
- * matches with one of the latest messages.
- *
- * @param room Room
- * @param message Message
- * @param hash Hash of message
- */
-void
-update_room_last_messages (struct GNUNET_MESSENGER_SrvRoom *room, const struct GNUNET_MESSENGER_Message *message,
-                           const struct GNUNET_HashCode *hash);
-
-/**
- * Changes an id of a current member from an old id to a new one and adds optionally the <i>hash</i> of an
- * id message to the members information.
+ * Rebuilds the decentralized structure for a <i>room</i> by ensuring all required connections are made
+ * depending on the amount of peers and this peers index in the list of them.
  *
- * @param room Room
- * @param old_id Old member id
- * @param new_id New member id
- * @param hash Hash of id message
+ * @param[in/out] room Room
  */
 void
-switch_room_member_id (struct GNUNET_MESSENGER_SrvRoom *room, const struct GNUNET_ShortHashCode *old_id,
-                       const struct GNUNET_ShortHashCode *new_id, const struct GNUNET_HashCode *hash);
+rebuild_room_basement_structure (struct GNUNET_MESSENGER_SrvRoom *room);
 
 /**
- * Rebuilds the decentralized structure for a <i>room</i> by ensuring all required connections are made
- * depending on the amount of peers and this peers index in the list of them.
+ * Loads the local configuration for a given <i>room</i> of a service which contains the last messages hash
+ * and the ruleset for general access of new members.
  *
- * @param room Room
+ * @param[out] room Room
  */
 void
-rebuild_room_basement_structure (struct GNUNET_MESSENGER_SrvRoom *room);
+load_room (struct GNUNET_MESSENGER_SrvRoom *room);
 
 /**
- * Handles all queued up messages of a room to handle in correct order.
+ * Saves the configuration for a given <i>room</i> of a service which contains the last messages hash
+ * and the ruleset for general access of new members locally.
  *
- * @param room Room
+ * @param[in] room Room
  */
 void
-handle_room_messages (struct GNUNET_MESSENGER_SrvRoom *room);
+save_room (struct GNUNET_MESSENGER_SrvRoom *room);
 
 #endif //GNUNET_SERVICE_MESSENGER_ROOM_H