1 files changed, 16 insertions, 73 deletions

diff --git a/src/messenger/gnunet-service-messenger_message_send.c b/src/messenger/gnunet-service-messenger_message_send.c
index 86cf9b888..59bbaea8d 100644
--- a/src/messenger/gnunet-service-messenger_message_send.c
+++ b/src/messenger/gnunet-service-messenger_message_send.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
@@ -24,95 +24,38 @@
  */
 
 #include "gnunet-service-messenger_message_send.h"
-#include "gnunet-service-messenger_message_handle.h"
 
-void
-send_message_info (struct GNUNET_MESSENGER_SrvRoom *room, struct GNUNET_MESSENGER_SrvHandle *handle,
-                   struct GNUNET_MESSENGER_SrvTunnel *tunnel, struct GNUNET_MESSENGER_Message *message,
-                   const struct GNUNET_HashCode *hash)
-{
-  if (!tunnel->contact_id)
-  {
-    tunnel->contact_id = GNUNET_new(struct GNUNET_ShortHashCode);
-
-    GNUNET_memcpy(tunnel->contact_id, &(message->body.info.unique_id), sizeof(struct GNUNET_ShortHashCode));
-  }
-  else
-  {
-    disconnect_tunnel (tunnel);
-  }
-}
+#include "gnunet-service-messenger_member.h"
+#include "gnunet-service-messenger_member_session.h"
+#include "gnunet-service-messenger_operation.h"
 
 void
 send_message_join (struct GNUNET_MESSENGER_SrvRoom *room, struct GNUNET_MESSENGER_SrvHandle *handle,
-                   struct GNUNET_MESSENGER_SrvTunnel *tunnel, struct GNUNET_MESSENGER_Message *message,
-                   const struct GNUNET_HashCode *hash)
-{
-  handle_message_join (room, tunnel, message, hash);
-
-  if (room->peer_message)
-  {
-    const struct GNUNET_MESSENGER_Message *peer_message = get_room_message (room, handle, room->peer_message,
-                                                                            GNUNET_NO);
-
-    if ((peer_message) && (tunnel))
-    {
-      forward_tunnel_message (tunnel, peer_message, room->peer_message);
-    }
-  }
-}
-
-void
-send_message_leave (struct GNUNET_MESSENGER_SrvRoom *room, struct GNUNET_MESSENGER_SrvHandle *handle,
-                    struct GNUNET_MESSENGER_SrvTunnel *tunnel, struct GNUNET_MESSENGER_Message *message,
-                    const struct GNUNET_HashCode *hash)
-{
-  handle_message_leave (room, tunnel, message, hash);
-}
-
-void
-send_message_name (struct GNUNET_MESSENGER_SrvRoom *room, struct GNUNET_MESSENGER_SrvHandle *handle,
-                   struct GNUNET_MESSENGER_SrvTunnel *tunnel, struct GNUNET_MESSENGER_Message *message,
-                   const struct GNUNET_HashCode *hash)
+                   const struct GNUNET_MESSENGER_Message *message, const struct GNUNET_HashCode *hash)
 {
-  handle_message_name (room, tunnel, message, hash);
-}
-
-void
-send_message_key (struct GNUNET_MESSENGER_SrvRoom *room, struct GNUNET_MESSENGER_SrvHandle *handle,
-                  struct GNUNET_MESSENGER_SrvTunnel *tunnel, struct GNUNET_MESSENGER_Message *message,
-                  const struct GNUNET_HashCode *hash)
-{
-  handle_message_key (room, tunnel, message, hash);
+  check_room_peer_status(room, NULL);
 }
 
 void
 send_message_peer (struct GNUNET_MESSENGER_SrvRoom *room, struct GNUNET_MESSENGER_SrvHandle *handle,
-                   struct GNUNET_MESSENGER_SrvTunnel *tunnel, struct GNUNET_MESSENGER_Message *message,
-                   const struct GNUNET_HashCode *hash)
+                   const struct GNUNET_MESSENGER_Message *message, const struct GNUNET_HashCode *hash)
 {
   if (!room->peer_message)
-  {
     room->peer_message = GNUNET_new(struct GNUNET_HashCode);
-  }
 
   GNUNET_memcpy(room->peer_message, hash, sizeof(struct GNUNET_HashCode));
-
-  handle_message_peer (room, tunnel, message, hash);
 }
 
 void
-send_message_id (struct GNUNET_MESSENGER_SrvRoom *room, struct GNUNET_MESSENGER_SrvHandle *handle,
-                 struct GNUNET_MESSENGER_SrvTunnel *tunnel, struct GNUNET_MESSENGER_Message *message,
-                 const struct GNUNET_HashCode *hash)
+send_message_request (struct GNUNET_MESSENGER_SrvRoom *room, struct GNUNET_MESSENGER_SrvHandle *handle,
+                      const struct GNUNET_MESSENGER_Message *message, const struct GNUNET_HashCode *hash)
 {
-  handle_message_id (room, tunnel, message, hash);
-}
+  struct GNUNET_MESSENGER_OperationStore *operation_store = get_room_operation_store(room);
 
-void
-send_message_miss (struct GNUNET_MESSENGER_SrvRoom *room, struct GNUNET_MESSENGER_SrvHandle *handle,
-                   struct GNUNET_MESSENGER_SrvTunnel *tunnel, struct GNUNET_MESSENGER_Message *message,
-                   const struct GNUNET_HashCode *hash)
-{
-  handle_message_miss (room, tunnel, message, hash);
+  use_store_operation(
+      operation_store,
+      &(message->body.request.hash),
+      GNUNET_MESSENGER_OP_REQUEST,
+      GNUNET_MESSENGER_REQUEST_DELAY
+  );
 }