Cleanup namestore operations

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

3 files changed, 43 insertions, 4 deletions

diff --git a/src/gnunet_chat_context.c b/src/gnunet_chat_context.c
index e0d7082..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
   );
@@ -272,7 +284,10 @@ context_write_records (struct GNUNET_CHAT_Context *context)
   char *label;
   util_get_context_label(context->type, hash, &label);
 
-  GNUNET_NAMESTORE_records_open(
+  if (context->query_open)
+    GNUNET_NAMESTORE_cancel(context->query_open);
+
+  context->query_open = GNUNET_NAMESTORE_records_open(
       context->handle->namestore,
       zone,
       label,
@@ -306,7 +321,10 @@ context_delete_records (struct GNUNET_CHAT_Context *context)
   char *label;
   util_get_context_label(context->type, hash, &label);
 
-  GNUNET_NAMESTORE_records_open(
+  if (context->query_open)
+    GNUNET_NAMESTORE_cancel(context->query_open);
+
+  context->query_open = GNUNET_NAMESTORE_records_open(
       context->handle->namestore,
       zone,
       label,
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 79c09a2..af1e2cc 100644
--- a/src/gnunet_chat_context_intern.c
+++ b/src/gnunet_chat_context_intern.c
@@ -70,6 +70,10 @@ cont_context_commit_records (void *cls,
 {
   struct GNUNET_CHAT_Context *context = cls;
 
+  GNUNET_assert(context);
+
+  context->query_commit = NULL;
+
   if ((!emsg) || (!(context->handle)))
     return;
 
@@ -86,6 +90,10 @@ error_context_open_records (void *cls)
 {
   struct GNUNET_CHAT_Context *context = cls;
 
+  GNUNET_assert(context);
+
+  context->query_open = NULL;
+
   if (!(context->handle))
     return;
 
@@ -108,6 +116,8 @@ monitor_context_open_records (void *cls,
 
   GNUNET_assert((context) && (context->handle));
 
+  context->query_open = NULL;
+
   const struct GNUNET_HashCode *hash = GNUNET_MESSENGER_room_get_key(
       context->room
   );
@@ -172,7 +182,10 @@ monitor_context_open_records (void *cls,
     count++;
   }
 
-  GNUNET_NAMESTORE_records_commit(
+  if (context->query_commit)
+    GNUNET_NAMESTORE_cancel(context->query_commit);
+
+  context->query_commit = GNUNET_NAMESTORE_records_commit(
       context->handle->namestore,
       zone,
       label,
@@ -194,7 +207,12 @@ monitor_context_delete_records (void *cls,
 
   GNUNET_assert((context) && (context->handle));
 
-  GNUNET_NAMESTORE_records_commit(
+  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,