1 files changed, 52 insertions, 110 deletions

diff --git a/src/messenger/gnunet-service-messenger_service.h b/src/messenger/gnunet-service-messenger_service.h
index 246c74771..aa43fa457 100644
--- a/src/messenger/gnunet-service-messenger_service.h
+++ b/src/messenger/gnunet-service-messenger_service.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,13 +33,14 @@
 #include "gnunet_disk_lib.h"
 #include "gnunet_identity_service.h"
 
-#include "messenger_api_ego.h"
-
+#include "gnunet-service-messenger_ego_store.h"
 #include "gnunet-service-messenger_list_handles.h"
 
-#include "gnunet-service-messenger_contact.h"
+#include "messenger_api_contact_store.h"
 #include "gnunet-service-messenger_room.h"
 
+#include "gnunet-service-messenger_member_session.h"
+
 struct GNUNET_MESSENGER_Service
 {
   const struct GNUNET_CONFIGURATION_Handle *config;
@@ -50,21 +51,20 @@ struct GNUNET_MESSENGER_Service
   char *dir;
 
   struct GNUNET_CADET_Handle *cadet;
-  struct GNUNET_IDENTITY_Handle *identity;
 
-  struct GNUNET_CONTAINER_MultiHashMap *egos;
+  struct GNUNET_MESSENGER_EgoStore ego_store;
+  struct GNUNET_MESSENGER_ContactStore contact_store;
 
   struct GNUNET_MESSENGER_ListHandles handles;
 
-  struct GNUNET_CONTAINER_MultiHashMap *contacts;
   struct GNUNET_CONTAINER_MultiHashMap *rooms;
 };
 
 /**
  * Creates and allocates a new service using a given <i>config</i> and a GNUnet service handle.
  *
- * @param config Configuration
- * @param service_handle GNUnet service handle
+ * @param[in] config Configuration
+ * @param[in/out] service_handle GNUnet service handle
  * @return New service
  */
 struct GNUNET_MESSENGER_Service*
@@ -73,39 +73,34 @@ create_service (const struct GNUNET_CONFIGURATION_Handle *config, struct GNUNET_
 /**
  * Destroys a <i>service</i> and frees its memory fully.
  *
- * @param service Service
+ * @param[in/out] service Service
  */
 void
 destroy_service (struct GNUNET_MESSENGER_Service *service);
 
 /**
- * Lookups an EGO which was registered to a <i>service</i> under
- * a specific <i>identifier</i>.
+ * Returns the used EGO-store of a given <i>service</i>.
  *
- * @param service Service
- * @param identifier Identifier string
- * @return EGO or NULL
+ * @param[in/out] service Service
+ * @return EGO-store
  */
-struct GNUNET_MESSENGER_Ego*
-lookup_service_ego (struct GNUNET_MESSENGER_Service *service, const char *identifier);
+struct GNUNET_MESSENGER_EgoStore*
+get_service_ego_store (struct GNUNET_MESSENGER_Service *service);
 
 /**
- * Updates the registration of an EGO to a <i>service</i> under
- * a specific <i>identifier</i> with a new <i>key</i>.
+ * Returns the used contact store of a given <i>service</i>.
  *
- * @param service Service
- * @param identifier Identifier string
- * @param key Private EGO key
+ * @param[in/out] service Service
+ * @return Contact store
  */
-void
-update_service_ego (struct GNUNET_MESSENGER_Service *service, const char *identifier,
-                    const struct GNUNET_IDENTITY_PrivateKey* key);
+struct GNUNET_MESSENGER_ContactStore*
+get_service_contact_store (struct GNUNET_MESSENGER_Service *service);
 
 /**
  * Creates and adds a new handle to a <i>service</i> using a given message queue.
  *
- * @param service Service
- * @param mq Message queue
+ * @param[in/out] service Service
+ * @param[in/out] mq Message queue
  * @return New handle
  */
 struct GNUNET_MESSENGER_SrvHandle*
@@ -114,77 +109,42 @@ add_service_handle (struct GNUNET_MESSENGER_Service *service, struct GNUNET_MQ_H
 /**
  * Removes a <i>handle</i> from a <i>service</i> and destroys it.
  *
- * @param service Service
- * @param handle Handle
+ * @param[in/out] service Service
+ * @param[in/out] handle Handle
  */
 void
 remove_service_handle (struct GNUNET_MESSENGER_Service *service, struct GNUNET_MESSENGER_SrvHandle *handle);
 
 /**
  * Tries to write the peer identity of the peer running a <i>service</i> on to the <i>peer</i>
- * parameter. The functions returns GNUNET_OK on success, otherwise GNUNET_SYSERR.
+ * parameter. The functions returns #GNUNET_OK on success, otherwise #GNUNET_SYSERR.
  *
- * @param service Service
+ * @param[in] service Service
  * @param[out] peer Peer identity
- * @return GNUNET_OK on success, otherwise GNUNET_SYSERR
+ * @return #GNUNET_OK on success, otherwise #GNUNET_SYSERR
  */
 int
 get_service_peer_identity (const struct GNUNET_MESSENGER_Service *service, struct GNUNET_PeerIdentity *peer);
 
 /**
- * Returns a contact of a <i>service</i> identified by a given public key. If no matching contact exists,
- * it will tried to create one with the specific public key. If the function still fails to do so,
- * NULL gets returned.
- *
- * @param service Service
- * @param pubkey Public key of EGO
- * @return Contact
- */
-struct GNUNET_MESSENGER_SrvContact*
-get_service_contact_by_pubkey (struct GNUNET_MESSENGER_Service *service, const struct GNUNET_IDENTITY_PublicKey *pubkey);
-
-/**
- * Changes the public key for a <i>contact</i> known to a <i>service</i> to a specific public key and
- * updates local map entries to access the contact by its updated key.
- *
- * @param service Service
- * @param contact Contact
- * @param pubkey Public key of EGO
- */
-void
-swap_service_contact_by_pubkey (struct GNUNET_MESSENGER_Service *service, struct GNUNET_MESSENGER_SrvContact *contact,
-                                const struct GNUNET_IDENTITY_PublicKey *pubkey);
-
-/**
- * Tries to generate and allocate a new unique member id for a given room of a service identified by its <i>key</i>.
- * If the generation fails caused by too many tries of duplicates, it returns NULL.
- *
- * @param service Service
- * @param key Key of room
- * @return Newly generated member id or NULL
- */
-struct GNUNET_ShortHashCode*
-generate_service_new_member_id (struct GNUNET_MESSENGER_Service *service, const struct GNUNET_HashCode *key);
-
-/**
  * Returns the room identified by a given <i>key</i> for a <i>service</i>. If the service doesn't know any room
  * using the given key, NULL gets returned.
  *
- * @param service Service
- * @param key Key of room
+ * @param[in] service Service
+ * @param[in] key Key of room
  * @return Room or NULL
  */
 struct GNUNET_MESSENGER_SrvRoom*
-get_service_room (struct GNUNET_MESSENGER_Service *service, const struct GNUNET_HashCode *key);
+get_service_room (const struct GNUNET_MESSENGER_Service *service, const struct GNUNET_HashCode *key);
 
 /**
  * Tries to open a room using a given <i>key</i> for a <i>service</i> by a specific <i>handle</i>. The room will be
- * created if necessary. If the function is successful, it returns GNUNET_YES, otherwise GNUNET_NO.
+ * created if necessary. If the function is successful, it returns #GNUNET_YES, otherwise #GNUNET_NO.
  *
- * @param service Service
- * @param handle Handle
- * @param key Key of room
- * @return GNUNET_YES on success, otherwise GNUNET_NO
+ * @param[in/out] service Service
+ * @param[in/out] handle Handle
+ * @param[in] key Key of room
+ * @return #GNUNET_YES on success, otherwise #GNUNET_NO
  */
 int
 open_service_room (struct GNUNET_MESSENGER_Service *service, struct GNUNET_MESSENGER_SrvHandle *handle,
@@ -192,16 +152,16 @@ open_service_room (struct GNUNET_MESSENGER_Service *service, struct GNUNET_MESSE
 
 /**
  * Tries to enter a room using a given <i>key</i> for a <i>service</i> by a specific <i>handle</i>. The room will
- * be created if necessary. If the function is successful, it returns GNUNET_YES, otherwise GNUNET_NO.
+ * be created if necessary. If the function is successful, it returns #GNUNET_YES, otherwise #GNUNET_NO.
  *
  * The room will be entered through the peer identitied by the peer identity provided as <i>door</i> parameter and
  * a new connection will be made.
  *
- * @param service Service
- * @param handle Handle
- * @param door Peer identity
- * @param key Key of room
- * @return GNUNET_YES on success, otherwise GNUNET_NO
+ * @param[in/out] service Service
+ * @param[in/out] handle Handle
+ * @param[in] door Peer identity
+ * @param[in] key Key of room
+ * @return #GNUNET_YES on success, otherwise #GNUNET_NO
  */
 int
 entry_service_room (struct GNUNET_MESSENGER_Service *service, struct GNUNET_MESSENGER_SrvHandle *handle,
@@ -209,51 +169,33 @@ entry_service_room (struct GNUNET_MESSENGER_Service *service, struct GNUNET_MESS
 
 /**
  * Tries to close a room using a given <i>key</i> for a <i>service</i> by a specific <i>handle</i>. The room will
- * be created if necessary. If the function is successful, it returns GNUNET_YES, otherwise GNUNET_NO.
+ * be created if necessary. If the function is successful, it returns #GNUNET_YES, otherwise #GNUNET_NO.
  *
  * If the specific handle is currently the host of the room for this service, a new handle which is a member will
  * take its place. Otherwise the room will be destroyed for this service.
  *
- * @param service Service
- * @param handle Handle
- * @param key Key of room
- * @return GNUNET_YES on success, otherwise GNUNET_NO
+ * @param[in/out] service Service
+ * @param[in/out] handle Handle
+ * @param[in] key Key of room
+ * @return #GNUNET_YES on success, otherwise #GNUNET_NO
  */
 int
 close_service_room (struct GNUNET_MESSENGER_Service *service, struct GNUNET_MESSENGER_SrvHandle *handle,
                     const struct GNUNET_HashCode *key);
 
 /**
- * Loads the local configuration for a given <i>room</i> of a <i>service</i> which contains the last messages hash
- * and the ruleset for general access of new members.
- *
- * @param service Service
- * @param room Room
- */
-void
-load_service_room_and_messages (struct GNUNET_MESSENGER_Service *service, struct GNUNET_MESSENGER_SrvRoom *room);
-
-/**
- * Saves the configuration for a given <i>room</i> of a <i>service</i> which contains the last messages hash
- * and the ruleset for general access of new members locally.
- *
- * @param service Service
- * @param room Room
- */
-void
-save_service_room_and_messages (struct GNUNET_MESSENGER_Service *service, struct GNUNET_MESSENGER_SrvRoom *room);
-
-/**
  * Sends a received or sent <i>message</i> with a given <i>hash</i> to each handle of a <i>service</i> which
  * is currently member of a specific <i>room</i> for handling it in the client API.
  *
- * @param service Service
- * @param room Room
- * @param message Message
- * @param hash Hash of message
+ * @param[in/out] service Service
+ * @param[in/out] room Room
+ * @param[in] session Member session
+ * @param[in] message Message
+ * @param[in] hash Hash of message
  */
 void
 handle_service_message (struct GNUNET_MESSENGER_Service *service, struct GNUNET_MESSENGER_SrvRoom *room,
+                        const struct GNUNET_MESSENGER_MemberSession *session,
                         const struct GNUNET_MESSENGER_Message *message, const struct GNUNET_HashCode *hash);
 
 #endif //GNUNET_SERVICE_MESSENGER_SERVICE_H