Fixed problems loading configurations but still inconsistencies

Signed-off-by: TheJackiMonster <thejackimonster@gmail.com>

1 files changed, 12 insertions, 122 deletions

diff --git a/src/gnunet_chat_handle_intern.c b/src/gnunet_chat_handle_intern.c
index d804545..70e4da4 100644
--- a/src/gnunet_chat_handle_intern.c
+++ b/src/gnunet_chat_handle_intern.c
@@ -217,7 +217,10 @@ intern_provide_contact_for_member(struct GNUNET_CHAT_Handle *handle,
   if (contact)
   {
     if ((context) && (NULL == contact->context))
+    {
       contact->context = context;
+      context->contact = member;
+    }
 
     return GNUNET_OK;
   }
@@ -227,13 +230,19 @@ intern_provide_contact_for_member(struct GNUNET_CHAT_Handle *handle,
   );
 
   if (context)
+  {
     contact->context = context;
+    context->contact = member;
+  }
 
   if (GNUNET_OK == GNUNET_CONTAINER_multishortmap_put(
       handle->contacts, &shorthash, contact,
     GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST))
     return GNUNET_OK;
 
+  if (context)
+    context->contact = NULL;
+
   contact_destroy(contact);
   return GNUNET_SYSERR;
 }
@@ -257,7 +266,7 @@ check_handle_room_members (void* cls,
       GNUNET_MESSENGER_contact_get_key(member)
   );
 
-  if (0 == GNUNET_memcmp(member_key, check->ignore_key))
+  if ((member_key) && (0 == GNUNET_memcmp(member_key, check->ignore_key)))
     return GNUNET_YES;
 
   if (check->contact)
@@ -271,94 +280,6 @@ check_handle_room_members (void* cls,
 }
 
 int
-request_handle_context_by_room (struct GNUNET_CHAT_Handle *handle,
-                                struct GNUNET_MESSENGER_Room *room)
-{
-  GNUNET_assert((handle) &&
-                (handle->contexts) &&
-                (room));
-
-  const struct GNUNET_HashCode *key = GNUNET_MESSENGER_room_get_key(room);
-
-  struct GNUNET_CHAT_Context *context = GNUNET_CONTAINER_multihashmap_get(
-      handle->contexts, key
-  );
-
-  struct GNUNET_CHAT_CheckHandleRoomMembers check;
-
-  if ((context) && (GNUNET_CHAT_CONTEXT_TYPE_UNKNOWN == context->type))
-    goto check_context_type;
-  else if (context)
-    return GNUNET_OK;
-
-  context = context_create_from_room(handle, room);
-  context_load_config(context);
-
-  if (GNUNET_OK != GNUNET_CONTAINER_multihashmap_put(
-      handle->contexts, key, context,
-      GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST))
-  {
-    context_destroy(context);
-    return GNUNET_SYSERR;
-  }
-
-check_context_type:
-  check.ignore_key = GNUNET_MESSENGER_get_key(handle->messenger);
-  check.contact = NULL;
-
-  const int checks = GNUNET_MESSENGER_iterate_members(
-      room, check_handle_room_members, &check
-  );
-
-  if ((check.contact) &&
-      (GNUNET_OK == intern_provide_contact_for_member(handle,
-                                                      check.contact,
-                                                      context)))
-    context->type = GNUNET_CHAT_CONTEXT_TYPE_CONTACT;
-  else if (checks >= 2)
-  {
-    context->type = GNUNET_CHAT_CONTEXT_TYPE_GROUP;
-
-    struct GNUNET_CHAT_Group *group = group_create_from_context(
-      handle, context
-    );
-
-    group_load_config(group);
-
-    if (group->topic)
-      group_publish(group);
-
-    if (GNUNET_OK == GNUNET_CONTAINER_multihashmap_put(
-      handle->groups, key, group,
-      GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST))
-      return GNUNET_OK;
-
-    group_destroy(group);
-
-    GNUNET_CONTAINER_multihashmap_remove(handle->contexts, key, context);
-    context_destroy(context);
-    return GNUNET_SYSERR;
-  }
-
-  return GNUNET_OK;
-}
-
-int
-find_handle_rooms (void *cls,
-                   struct GNUNET_MESSENGER_Room *room,
-                   GNUNET_UNUSED const struct GNUNET_MESSENGER_Contact *member)
-{
-  struct GNUNET_CHAT_Handle *handle = cls;
-
-  GNUNET_assert((handle) && (room));
-
-  if (GNUNET_OK != request_handle_context_by_room(handle, room))
-    return GNUNET_NO;
-
-  return GNUNET_YES;
-}
-
-int
 scan_handle_room_members (void* cls,
                           GNUNET_UNUSED struct GNUNET_MESSENGER_Room *room,
                           const struct GNUNET_MESSENGER_Contact *member)
@@ -371,30 +292,6 @@ scan_handle_room_members (void* cls,
     return GNUNET_NO;
 }
 
-int
-scan_handle_rooms (void *cls,
-                   struct GNUNET_MESSENGER_Room *room,
-                   GNUNET_UNUSED const struct GNUNET_MESSENGER_Contact *member)
-{
-  struct GNUNET_CHAT_Handle *handle = cls;
-
-  GNUNET_assert((handle) &&
-                (handle->groups) &&
-                (room));
-
-  const struct GNUNET_HashCode *key = GNUNET_MESSENGER_room_get_key(room);
-
-  struct GNUNET_CHAT_Group *group = GNUNET_CONTAINER_multihashmap_get(
-      handle->groups, key
-  );
-
-  if (!group)
-    return GNUNET_YES;
-
-  GNUNET_MESSENGER_iterate_members(room, scan_handle_room_members, handle);
-  return GNUNET_YES;
-}
-
 void
 on_handle_identity(void *cls,
                    GNUNET_UNUSED struct GNUNET_MESSENGER_Handle *messenger)
@@ -414,14 +311,7 @@ on_handle_identity(void *cls,
     return;
 
   GNUNET_assert(handle->messenger);
-
-  GNUNET_MESSENGER_find_rooms(
-      handle->messenger, NULL, find_handle_rooms, handle
-  );
-
-  GNUNET_MESSENGER_find_rooms(
-      handle->messenger, NULL, scan_handle_rooms, handle
-  );
+  context_scan_configs(handle);
 
   if (!handle->msg_cb)
     return;
@@ -449,7 +339,7 @@ on_handle_message (void *cls,
                 (msg) &&
                 (hash));
 
-  if ((GNUNET_OK != request_handle_context_by_room(handle, room)) ||
+  if ((GNUNET_OK != handle_request_context_by_room(handle, room)) ||
       (GNUNET_OK != intern_provide_contact_for_member(handle, sender, NULL)))
     return;