1 files changed, 57 insertions, 43 deletions

diff --git a/src/messenger/gnunet-service-messenger_message_handle.h b/src/messenger/gnunet-service-messenger_message_handle.h
index d091e1d11..844142b77 100644
--- a/src/messenger/gnunet-service-messenger_message_handle.h
+++ b/src/messenger/gnunet-service-messenger_message_handle.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
@@ -31,6 +31,7 @@
 
 #include "gnunet-service-messenger_message_kind.h"
 
+#include "gnunet-service-messenger_member_session.h"
 #include "gnunet-service-messenger_tunnel.h"
 #include "messenger_api_message.h"
 
@@ -38,91 +39,104 @@
  * Handles a received or sent join message to make changes of current member information.
  * (add matching member and clear member info)
  *
- * @param room Room of the message
- * @param tunnel Receiving/sending connection (may be NULL)
- * @param message JOIN-Message
- * @param hash Hash of the message
+ * @param[in/out] room Room of the message
+ * @param[in/out] session Member session
+ * @param[in] message JOIN-Message
+ * @param[in] hash Hash of the message
  */
 void
-handle_message_join (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);
 
 /**
  * Handles a received or sent leave message to make changes of current member information.
  * (remove matching member and clear member info)
  *
- * @param room Room of the message
- * @param tunnel Receiving/sending connection (may be NULL)
- * @param message LEAVE-Message
- * @param hash Hash of the message
+ * @param[in/out] room Room of the message
+ * @param[in/out] session Member session
+ * @param[in] message LEAVE-Message
+ * @param[in] hash Hash of the message
  */
 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_leave (struct GNUNET_MESSENGER_SrvRoom *room, struct GNUNET_MESSENGER_MemberSession *session,
+                      const struct GNUNET_MESSENGER_Message *message, const struct GNUNET_HashCode *hash);
 
 /**
  * Handles a received or sent name message to rename a current member.
  * (change name of matching member)
  *
- * @param room Room of the message
- * @param tunnel Receiving/sending connection (may be NULL)
- * @param message NAME-Message
- * @param hash Hash of the message
+ * @param[in/out] room Room of the message
+ * @param[in/out] session Member session
+ * @param[in] message NAME-Message
+ * @param[in] hash Hash of the message
  */
 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_name (struct GNUNET_MESSENGER_SrvRoom *room, struct GNUNET_MESSENGER_MemberSession *session,
+                     const struct GNUNET_MESSENGER_Message *message, const struct GNUNET_HashCode *hash);
 
 /**
  * Handles a received or sent key message to change the key of a member and rearrange the contacts accordingly.
  * (move the member in the contacts and change its key)
  *
- * @param room Room of the message
- * @param tunnel Receiving/sending connection (may be NULL)
- * @param message KEY-Message
- * @param hash Hash of the message
+ * @param[in/out] room Room of the message
+ * @param[in/out] session Member session
+ * @param[in] message KEY-Message
+ * @param[in] hash Hash of the message
  */
 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_key (struct GNUNET_MESSENGER_SrvRoom *room, struct GNUNET_MESSENGER_MemberSession *session,
+                    const struct GNUNET_MESSENGER_Message *message, const struct GNUNET_HashCode *hash);
 
 /**
  * Handles a received or sent peer message to make changes of the basement in the room.
  * (add a new peer to the basement and restructure connections based on updated list of peers)
  *
- * @param room Room of the message
- * @param tunnel Receiving/sending connection (may be NULL)
- * @param message PEER-Message
- * @param hash Hash of the message
+ * @param[in/out] room Room of the message
+ * @param[in/out] session Member session
+ * @param[in] message PEER-Message
+ * @param[in] hash Hash of the message
  */
 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);
 
 /**
  * Handles a received or sent id message to change a members id.
  * (change id of matching member)
  *
- * @param room Room of the message
- * @param tunnel Receiving/sending connection (may be NULL)
- * @param message ID-Message
- * @param hash Hash of the message
+ * @param[in/out] room Room of the message
+ * @param[in/out] session Member session
+ * @param[in] message ID-Message
+ * @param[in] hash Hash of the message
  */
 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);
 
 /**
  * Handles a received or sent miss message to drop a peer from the basement in the room.
  * (remove a peer from the basement and restructure connections based on updated list of peers)
  *
- * @param room Room of the message
- * @param tunnel Receiving/sending connection (may be NULL)
- * @param message MISS-Message
- * @param hash Hash of the message
+ * @param[in/out] room Room of the message
+ * @param[in/out] session Member session
+ * @param[in] message MISS-Message
+ * @param[in] hash Hash of the message
  */
 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);
+
+/**
+ * Handles a received or sent delete message to delete a specific message from the store.
+ * (remove a message from the store of a room under a given delay)
+ *
+ * @param[in/out] room Room of the message
+ * @param[in/out] session Member session
+ * @param[in] message DELETE-Message
+ * @param[in] hash Hash of the message
+ */
+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);
 
 #endif //GNUNET_SERVICE_MESSENGER_MESSAGE_HANDLE_H