1 files changed, 25 insertions, 14 deletions

diff --git a/src/service/messenger/gnunet-service-messenger_room.h b/src/service/messenger/gnunet-service-messenger_room.h
index fb2a88aea..e3e561d8b 100644
--- a/src/service/messenger/gnunet-service-messenger_room.h
+++ b/src/service/messenger/gnunet-service-messenger_room.h
@@ -1,6 +1,6 @@
 /*
    This file is part of GNUnet.
-   Copyright (C) 2020--2022 GNUnet e.V.
+   Copyright (C) 2020--2023 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
@@ -38,20 +38,20 @@
 #include "gnunet-service-messenger_list_messages.h"
 
 #include "messenger_api_list_tunnels.h"
+#include "messenger_api_peer_store.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"
 
 #define GNUNET_MESSENGER_IDLE_DELAY GNUNET_TIME_relative_multiply \
-  (GNUNET_TIME_relative_get_second_ (), 5)
+          (GNUNET_TIME_relative_get_second_ (), 5)
 
 #define GNUNET_MESSENGER_REQUEST_DELAY GNUNET_TIME_relative_multiply \
-  (GNUNET_TIME_relative_get_minute_ (), 5)
+          (GNUNET_TIME_relative_get_minute_ (), 5)
 
 #define GNUNET_MESSENGER_MERGE_DELAY GNUNET_TIME_relative_multiply \
-  (GNUNET_TIME_relative_get_second_ (), 30)
+          (GNUNET_TIME_relative_get_second_ (), 30)
 
 struct GNUNET_MESSENGER_SrvTunnel;
 struct GNUNET_MESSENGER_MemberSession;
@@ -66,6 +66,7 @@ struct GNUNET_MESSENGER_SrvRoom
 
   struct GNUNET_CONTAINER_MultiPeerMap *tunnels;
 
+  struct GNUNET_MESSENGER_PeerStore peer_store;
   struct GNUNET_MESSENGER_MemberStore member_store;
   struct GNUNET_MESSENGER_MessageStore message_store;
   struct GNUNET_MESSENGER_OperationStore operation_store;
@@ -88,7 +89,7 @@ struct GNUNET_MESSENGER_SrvRoom
  */
 struct GNUNET_MESSENGER_SrvRoom*
 create_srv_room (struct GNUNET_MESSENGER_SrvHandle *handle,
-             const struct GNUNET_HashCode *key);
+                 const struct GNUNET_HashCode *key);
 
 /**
  * Destroys a room and frees its memory fully.
@@ -101,7 +102,16 @@ create_srv_room (struct GNUNET_MESSENGER_SrvHandle *handle,
  */
 void
 destroy_srv_room (struct GNUNET_MESSENGER_SrvRoom *room,
-              int deletion);
+                  int deletion);
+
+/**
+ * Returns the used peer store of a given <i>room</i>.
+ *
+ * @param[in,out] room Room
+ * @return Peer store
+ */
+struct GNUNET_MESSENGER_PeerStore*
+get_srv_room_peer_store (struct GNUNET_MESSENGER_SrvRoom *room);
 
 /**
  * Returns the used member store of a given <i>room</i>.
@@ -297,11 +307,11 @@ get_srv_room_tunnel (const struct GNUNET_MESSENGER_SrvRoom *room,
  * @param[in] hash Hash of message
  */
 typedef void (GNUNET_MESSENGER_MessageRequestCallback) (
-    void *cls,
-    struct GNUNET_MESSENGER_SrvRoom *room,
-    const struct GNUNET_MESSENGER_Message *message,
-    const struct GNUNET_HashCode *hash
-);
+  void *cls,
+  struct GNUNET_MESSENGER_SrvRoom *room,
+  const struct GNUNET_MESSENGER_Message *message,
+  const struct GNUNET_HashCode *hash
+  );
 
 /**
  * Requests a message from a <i>room</i> identified by a given <i>hash</i>. If the message is found,
@@ -323,7 +333,7 @@ request_srv_room_message (struct GNUNET_MESSENGER_SrvRoom *room,
                           const struct GNUNET_HashCode *hash,
                           const struct GNUNET_MESSENGER_MemberSession *session,
                           GNUNET_MESSENGER_MessageRequestCallback callback,
-                          void* cls);
+                          void *cls);
 
 /**
  * Checks for potential collisions with member ids and solves them changing active handles ids if they
@@ -336,7 +346,8 @@ request_srv_room_message (struct GNUNET_MESSENGER_SrvRoom *room,
  */
 void
 solve_srv_room_member_collisions (struct GNUNET_MESSENGER_SrvRoom *room,
-                                  const struct GNUNET_CRYPTO_PublicKey *public_key,
+                                  const struct
+                                  GNUNET_CRYPTO_PublicKey *public_key,
                                   const struct GNUNET_ShortHashCode *member_id,
                                   struct GNUNET_TIME_Absolute timestamp);