7 files changed, 316 insertions, 127 deletions

diff --git a/src/gnunet_chat_context.c b/src/gnunet_chat_context.c
index a4f3db0..be3dd4a 100644
--- a/src/gnunet_chat_context.c
+++ b/src/gnunet_chat_context.c
@@ -57,6 +57,9 @@ context_create_from_room (struct GNUNET_CHAT_Handle *handle,
       8, GNUNET_NO
   );
 
+  context->query_open = NULL;
+  context->query_commit = NULL;
+
   return context;
 }
 
@@ -88,6 +91,9 @@ context_create_from_contact (struct GNUNET_CHAT_Handle *handle,
       8, GNUNET_NO
   );
 
+  context->query_open = NULL;
+  context->query_commit = NULL;
+
   return context;
 }
 
@@ -100,6 +106,12 @@ context_destroy (struct GNUNET_CHAT_Context *context)
                 (context->invites) &&
                 (context->files));
 
+  if (context->query_open)
+    GNUNET_NAMESTORE_cancel(context->query_open);
+
+  if (context->query_commit)
+    GNUNET_NAMESTORE_cancel(context->query_commit);
+
   GNUNET_CONTAINER_multishortmap_iterate(
       context->timestamps, it_destroy_context_timestamps, NULL
   );
@@ -269,76 +281,19 @@ context_write_records (struct GNUNET_CHAT_Context *context)
       context->room
   );
 
-  struct GNUNET_TIME_Absolute expiration = GNUNET_TIME_absolute_get_forever_();
-
-  struct GNUNET_MESSENGER_RoomEntryRecord room;
-  GNUNET_CRYPTO_get_peer_identity(context->handle->cfg, &(room.door));
-
-  GNUNET_memcpy(
-      &(room.key),
-      hash,
-      sizeof(room.key)
-  );
-
-  const char *nick = context->nick;
-  const char *topic = context->topic;
-
-  if (topic)
-  {
-    struct GNUNET_HashCode topic_hash;
-    GNUNET_CRYPTO_hash(topic, strlen(topic), &topic_hash);
-
-    if (0 != GNUNET_CRYPTO_hash_cmp(&topic_hash, hash))
-      topic = NULL;
-  }
-
-  unsigned int count = 1;
-
-  struct GNUNET_GNSRECORD_Data data [3];
-  data[0].record_type = GNUNET_GNSRECORD_TYPE_MESSENGER_ROOM_ENTRY;
-  data[0].data = &room;
-  data[0].data_size = sizeof(room);
-  data[0].expiration_time = expiration.abs_value_us;
-  data[0].flags = GNUNET_GNSRECORD_RF_PRIVATE;
-
-  if (nick)
-  {
-    data[count].record_type = GNUNET_GNSRECORD_TYPE_NICK;
-    data[count].data = nick;
-    data[count].data_size = strlen(nick);
-    data[count].expiration_time = expiration.abs_value_us;
-    data[count].flags = (
-        GNUNET_GNSRECORD_RF_PRIVATE |
-        GNUNET_GNSRECORD_RF_SUPPLEMENTAL
-    );
-
-    count++;
-  }
-
-  if (topic)
-  {
-    data[count].record_type = GNUNET_DNSPARSER_TYPE_TXT;
-    data[count].data = topic;
-    data[count].data_size = strlen(topic);
-    data[count].expiration_time = expiration.abs_value_us;
-    data[count].flags = (
-        GNUNET_GNSRECORD_RF_PRIVATE |
-        GNUNET_GNSRECORD_RF_SUPPLEMENTAL
-    );
-
-    count++;
-  }
-
   char *label;
   util_get_context_label(context->type, hash, &label);
 
-  GNUNET_NAMESTORE_records_store(
+  if (context->query_open)
+    GNUNET_NAMESTORE_cancel(context->query_open);
+
+  context->query_open = GNUNET_NAMESTORE_records_open(
       context->handle->namestore,
       zone,
       label,
-      count,
-      data,
-      cont_context_write_records,
+      error_context_open_records,
+      context,
+      monitor_context_open_records,
       context
   );
 
@@ -363,35 +318,19 @@ context_delete_records (struct GNUNET_CHAT_Context *context)
       context->room
   );
 
-  const char *type_string = "chat";
-
-  switch (context->type)
-  {
-    case GNUNET_CHAT_CONTEXT_TYPE_CONTACT:
-      type_string = "contact";
-      break;
-    case GNUNET_CHAT_CONTEXT_TYPE_GROUP:
-      type_string = "group";
-      break;
-    default:
-      break;
-  }
-
   char *label;
-  GNUNET_asprintf (
-      &label,
-      "%s_%s",
-      type_string,
-      GNUNET_h2s(hash)
-  );
+  util_get_context_label(context->type, hash, &label);
 
-  GNUNET_NAMESTORE_records_store(
+  if (context->query_open)
+    GNUNET_NAMESTORE_cancel(context->query_open);
+
+  context->query_open = GNUNET_NAMESTORE_records_open(
       context->handle->namestore,
       zone,
       label,
-      0,
-      NULL,
-      cont_context_write_records,
+      error_context_open_records,
+      context,
+      monitor_context_delete_records,
       context
   );
 
diff --git a/src/gnunet_chat_context.h b/src/gnunet_chat_context.h
index 37d9bc8..f2e41d0 100644
--- a/src/gnunet_chat_context.h
+++ b/src/gnunet_chat_context.h
@@ -56,6 +56,9 @@ struct GNUNET_CHAT_Context
   void *user_pointer;
 
   struct GNUNET_CONTAINER_MultiShortmap *member_pointers;
+
+  struct GNUNET_NAMESTORE_QueueEntry *query_open;
+  struct GNUNET_NAMESTORE_QueueEntry *query_commit;
 };
 
 struct GNUNET_CHAT_Context*
diff --git a/src/gnunet_chat_context_intern.c b/src/gnunet_chat_context_intern.c
index c4a3d5b..af1e2cc 100644
--- a/src/gnunet_chat_context_intern.c
+++ b/src/gnunet_chat_context_intern.c
@@ -64,17 +64,161 @@ it_destroy_context_invites (GNUNET_UNUSED void *cls,
 }
 
 void
-cont_context_write_records (void *cls,
-                            GNUNET_UNUSED int32_t success,
-                            const char *emsg)
+cont_context_commit_records (void *cls,
+                             GNUNET_UNUSED int32_t success,
+                             const char *emsg)
 {
   struct GNUNET_CHAT_Context *context = cls;
 
-  if (emsg)
-    handle_send_internal_message(
-        context->handle,
-        context,
-        GNUNET_CHAT_FLAG_WARNING,
-        emsg
+  GNUNET_assert(context);
+
+  context->query_commit = NULL;
+
+  if ((!emsg) || (!(context->handle)))
+    return;
+
+  handle_send_internal_message(
+      context->handle,
+      context,
+      GNUNET_CHAT_FLAG_WARNING,
+      emsg
+  );
+}
+
+void
+error_context_open_records (void *cls)
+{
+  struct GNUNET_CHAT_Context *context = cls;
+
+  GNUNET_assert(context);
+
+  context->query_open = NULL;
+
+  if (!(context->handle))
+    return;
+
+  handle_send_internal_message(
+      context->handle,
+      context,
+      GNUNET_CHAT_FLAG_WARNING,
+      _("Namestore busy!")
+  );
+}
+
+void
+monitor_context_open_records (void *cls,
+                              const struct GNUNET_IDENTITY_PrivateKey *zone,
+                              const char *label,
+                              GNUNET_UNUSED unsigned int rd_count,
+                              GNUNET_UNUSED const struct GNUNET_GNSRECORD_Data *rd)
+{
+  struct GNUNET_CHAT_Context *context = cls;
+
+  GNUNET_assert((context) && (context->handle));
+
+  context->query_open = NULL;
+
+  const struct GNUNET_HashCode *hash = GNUNET_MESSENGER_room_get_key(
+      context->room
+  );
+
+  struct GNUNET_MESSENGER_RoomEntryRecord room;
+  GNUNET_CRYPTO_get_peer_identity(context->handle->cfg, &(room.door));
+
+  GNUNET_memcpy(
+      &(room.key),
+      hash,
+      sizeof(room.key)
+  );
+
+  struct GNUNET_TIME_Absolute expiration = GNUNET_TIME_absolute_get_forever_();
+
+  const char *nick = context->nick;
+  const char *topic = context->topic;
+
+  if (topic)
+  {
+    struct GNUNET_HashCode topic_hash;
+    GNUNET_CRYPTO_hash(topic, strlen(topic), &topic_hash);
+
+    if (0 != GNUNET_CRYPTO_hash_cmp(&topic_hash, hash))
+      topic = NULL;
+  }
+
+  unsigned int count = 1;
+
+  struct GNUNET_GNSRECORD_Data data [3];
+  data[0].record_type = GNUNET_GNSRECORD_TYPE_MESSENGER_ROOM_ENTRY;
+  data[0].data = &room;
+  data[0].data_size = sizeof(room);
+  data[0].expiration_time = expiration.abs_value_us;
+  data[0].flags = GNUNET_GNSRECORD_RF_PRIVATE;
+
+  if (nick)
+  {
+    data[count].record_type = GNUNET_GNSRECORD_TYPE_NICK;
+    data[count].data = nick;
+    data[count].data_size = strlen(nick);
+    data[count].expiration_time = expiration.abs_value_us;
+    data[count].flags = (
+      GNUNET_GNSRECORD_RF_PRIVATE |
+      GNUNET_GNSRECORD_RF_SUPPLEMENTAL
     );
+
+    count++;
+  }
+
+  if (topic)
+  {
+    data[count].record_type = GNUNET_DNSPARSER_TYPE_TXT;
+    data[count].data = topic;
+    data[count].data_size = strlen(topic);
+    data[count].expiration_time = expiration.abs_value_us;
+    data[count].flags = (
+      GNUNET_GNSRECORD_RF_PRIVATE |
+      GNUNET_GNSRECORD_RF_SUPPLEMENTAL
+    );
+
+    count++;
+  }
+
+  if (context->query_commit)
+    GNUNET_NAMESTORE_cancel(context->query_commit);
+
+  context->query_commit = GNUNET_NAMESTORE_records_commit(
+      context->handle->namestore,
+      zone,
+      label,
+      count,
+      data,
+      cont_context_commit_records,
+      context
+  );
+}
+
+void
+monitor_context_delete_records (void *cls,
+                                const struct GNUNET_IDENTITY_PrivateKey *zone,
+                                const char *label,
+                                GNUNET_UNUSED unsigned int rd_count,
+                                GNUNET_UNUSED const struct GNUNET_GNSRECORD_Data *rd)
+{
+  struct GNUNET_CHAT_Context *context = cls;
+
+  GNUNET_assert((context) && (context->handle));
+
+  context->query_open = NULL;
+
+  if (context->query_commit)
+    GNUNET_NAMESTORE_cancel(context->query_commit);
+
+  context->query_commit = GNUNET_NAMESTORE_records_commit(
+      context->handle->namestore,
+      zone,
+      label,
+      0,
+      NULL,
+      cont_context_commit_records,
+      context
+  );
 }
diff --git a/src/gnunet_chat_lib.c b/src/gnunet_chat_lib.c
index e11c92d..6f53819 100644
--- a/src/gnunet_chat_lib.c
+++ b/src/gnunet_chat_lib.c
@@ -569,6 +569,13 @@ GNUNET_CHAT_contact_set_name (struct GNUNET_CHAT_Contact *contact,
 
   if (contact->context->room)
     context_write_records(contact->context);
+
+  handle_send_internal_message(
+      contact->handle,
+      contact->context,
+      GNUNET_CHAT_FLAG_UPDATE,
+      NULL
+  );
 }
 
 
@@ -684,7 +691,16 @@ GNUNET_CHAT_group_set_name (struct GNUNET_CHAT_Group *group,
     return;
 
   context_update_nick(group->context, name);
-  context_write_records(group->context);
+
+  if (group->context->room)
+    context_write_records(group->context);
+
+  handle_send_internal_message(
+      group->handle,
+      group->context,
+      GNUNET_CHAT_FLAG_UPDATE,
+      NULL
+  );
 }
 
 
diff --git a/src/gnunet_chat_lobby.c b/src/gnunet_chat_lobby.c
index 23c6d32..385fae8 100644
--- a/src/gnunet_chat_lobby.c
+++ b/src/gnunet_chat_lobby.c
@@ -41,6 +41,9 @@ lobby_create (struct GNUNET_CHAT_Handle *handle)
   lobby->op_create = NULL;
   lobby->op_delete = NULL;
 
+  lobby->query_open = NULL;
+  lobby->query_commit = NULL;
+
   lobby->expiration = GNUNET_TIME_absolute_get_forever_();
   lobby->callback = NULL;
   lobby->cls = NULL;
@@ -59,6 +62,12 @@ lobby_destroy (struct GNUNET_CHAT_Lobby *lobby)
   if (lobby->op_delete)
     GNUNET_IDENTITY_cancel(lobby->op_delete);
 
+  if (lobby->query_open)
+    GNUNET_NAMESTORE_cancel(lobby->query_open);
+
+  if (lobby->query_commit)
+    GNUNET_NAMESTORE_cancel(lobby->query_commit);
+
   if (lobby->uri)
     uri_destroy(lobby->uri);
 
diff --git a/src/gnunet_chat_lobby.h b/src/gnunet_chat_lobby.h
index e913134..6248a05 100644
--- a/src/gnunet_chat_lobby.h
+++ b/src/gnunet_chat_lobby.h
@@ -46,6 +46,9 @@ struct GNUNET_CHAT_Lobby
   struct GNUNET_IDENTITY_Operation *op_create;
   struct GNUNET_IDENTITY_Operation *op_delete;
 
+  struct GNUNET_NAMESTORE_QueueEntry *query_open;
+  struct GNUNET_NAMESTORE_QueueEntry *query_commit;
+
   struct GNUNET_TIME_Absolute expiration;
   GNUNET_CHAT_LobbyCallback callback;
   void *cls;
diff --git a/src/gnunet_chat_lobby_intern.c b/src/gnunet_chat_lobby_intern.c
index 31d1673..c66800c 100644
--- a/src/gnunet_chat_lobby_intern.c
+++ b/src/gnunet_chat_lobby_intern.c
@@ -25,21 +25,28 @@
 #include "gnunet_chat_context.h"
 
 void
-cont_lobby_write_records (void *cls,
-                          GNUNET_UNUSED int32_t success,
-                          const char *emsg)
+cont_lobby_commit_records (void *cls,
+                           GNUNET_UNUSED int32_t success,
+                           const char *emsg)
 {
   struct GNUNET_CHAT_Lobby *lobby = cls;
 
+  GNUNET_assert((lobby) &&
+                (lobby->handle) &&
+                (lobby->context));
+
+  lobby->query_commit = NULL;
+
   if (!emsg)
     goto call_cb;
 
-  handle_send_internal_message(
-      lobby->handle,
-      lobby->context,
-      GNUNET_CHAT_FLAG_WARNING,
-      emsg
-  );
+  if (lobby->handle)
+    handle_send_internal_message(
+        lobby->handle,
+        lobby->context,
+        GNUNET_CHAT_FLAG_WARNING,
+        emsg
+    );
 
   if (lobby->uri)
     uri_destroy(lobby->uri);
@@ -52,40 +59,41 @@ call_cb:
 }
 
 void
-cont_lobby_identity_delete (void *cls,
-                            const char *emsg)
+error_lobby_open_records (void *cls)
 {
   struct GNUNET_CHAT_Lobby *lobby = cls;
 
-  if (!emsg)
+  GNUNET_assert((lobby) &&
+                (lobby->handle) &&
+                (lobby->context));
+
+  lobby->query_open = NULL;
+
+  if (!(lobby->handle))
     return;
 
   handle_send_internal_message(
       lobby->handle,
       lobby->context,
       GNUNET_CHAT_FLAG_WARNING,
-      emsg
+      _("Namestore busy!")
   );
 }
 
 void
-cont_lobby_identity_create (void *cls,
+monitor_lobby_open_records (void *cls,
                             const struct GNUNET_IDENTITY_PrivateKey *zone,
-                            const char *emsg)
+                            const char *label,
+                            GNUNET_UNUSED unsigned int rd_count,
+                            GNUNET_UNUSED const struct GNUNET_GNSRECORD_Data *rd)
 {
   struct GNUNET_CHAT_Lobby *lobby = cls;
 
-  if (emsg)
-  {
-    handle_send_internal_message(
-        lobby->handle,
-        lobby->context,
-        GNUNET_CHAT_FLAG_WARNING,
-        emsg
-    );
+  GNUNET_assert((lobby) &&
+                (lobby->handle) &&
+                (lobby->context));
 
-    return;
-  }
+  lobby->query_open = NULL;
 
   const struct GNUNET_HashCode *key = GNUNET_MESSENGER_room_get_key(
       lobby->context->room
@@ -102,6 +110,73 @@ cont_lobby_identity_create (void *cls,
   data[0].expiration_time = lobby->expiration.abs_value_us;
   data[0].flags = GNUNET_GNSRECORD_RF_NONE;
 
+  lobby->query_commit = GNUNET_NAMESTORE_records_commit(
+      lobby->handle->namestore,
+      zone,
+      label,
+      1,
+      data,
+      cont_lobby_commit_records,
+      lobby
+  );
+}
+
+void
+cont_lobby_identity_delete (void *cls,
+                            const char *emsg)
+{
+  struct GNUNET_CHAT_Lobby *lobby = cls;
+
+  GNUNET_assert((lobby) &&
+                (lobby->handle) &&
+                (lobby->context));
+
+  lobby->op_delete = NULL;
+
+  if ((!emsg) || (!(lobby->handle)))
+    return;
+
+  handle_send_internal_message(
+      lobby->handle,
+      lobby->context,
+      GNUNET_CHAT_FLAG_WARNING,
+      emsg
+  );
+}
+
+void
+cont_lobby_identity_create (void *cls,
+                            const struct GNUNET_IDENTITY_PrivateKey *zone,
+                            const char *emsg)
+{
+  struct GNUNET_CHAT_Lobby *lobby = cls;
+
+  GNUNET_assert((lobby) &&
+                (lobby->handle) &&
+                (lobby->context));
+
+  const struct GNUNET_HashCode *key;
+
+  lobby->op_create = NULL;
+
+  if (!emsg)
+    goto continue_with_lobby;
+
+  if (lobby->handle)
+    handle_send_internal_message(
+        lobby->handle,
+        lobby->context,
+        GNUNET_CHAT_FLAG_WARNING,
+        emsg
+    );
+
+  return;
+
+continue_with_lobby:
+  key = GNUNET_MESSENGER_room_get_key(
+      lobby->context->room
+  );
+
   if (lobby->uri)
     uri_destroy(lobby->uri);
 
@@ -114,13 +189,13 @@ cont_lobby_identity_create (void *cls,
   lobby->uri = uri_create(&public_zone, label);
   GNUNET_free(label);
 
-  GNUNET_NAMESTORE_records_store(
+  lobby->query_open = GNUNET_NAMESTORE_records_open(
       lobby->handle->namestore,
       zone,
       lobby->uri->label,
-      1,
-      data,
-      cont_lobby_write_records,
+      error_lobby_open_records,
+      lobby,
+      monitor_lobby_open_records,
       lobby
   );