1 files changed, 46 insertions, 0 deletions

diff --git a/src/setup/gnunet-setup-gns.c b/src/setup/gnunet-setup-gns.c
index 95ca617b..7c0b2f5e 100644
--- a/src/setup/gnunet-setup-gns.c
+++ b/src/setup/gnunet-setup-gns.c
@@ -346,6 +346,16 @@ static struct PseuContext *pc_head;
 static struct PseuContext *pc_tail;
 
 /**
+ * Tail of linked list of active record move operations.
+ */
+static struct EditDialogContext *edc_head;
+
+/**
+ * Tail of linked list of active record move operations.
+ */
+static struct EditDialogContext *edc_tail;
+
+/**
  * Name of our zone as a string.
  */
 static char *zone_as_string;
@@ -664,6 +674,8 @@ free_update_context (struct UpdateContext *uc)
 
   if (NULL != uc->qe)
   {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                _("Setup shutdown before all records could be written. Record lost!\n"));
     GNUNET_NAMESTORE_cancel (uc->qe);
     uc->qe = NULL;
   }
@@ -972,6 +984,8 @@ free_remove_context (struct RemoveContext *rc)
 {
   if (NULL != rc->qe)
   {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                _("Setup shutdown before all records could be written. Record lost!\n"));
     GNUNET_NAMESTORE_cancel (rc->qe);
     rc->qe = NULL;
   }
@@ -1159,6 +1173,9 @@ record_move_finish (void *cls,
   struct EditDialogContext *edc = cls;
   
   edc->qe = NULL;
+  GNUNET_CONTAINER_DLL_remove (edc_head,
+                               edc_tail,
+                               edc);
   if (NULL != emsg)
     show_error_message (_("Failed to move record to target zone"),
                         emsg);
@@ -1190,6 +1207,9 @@ record_move_continuation (void *cls,
   {
     show_error_message (_("Failed to access key for target zone"),
                         emsg);
+    GNUNET_CONTAINER_DLL_remove (edc_head,
+                                 edc_tail,
+                                 edc);
     free_edit_dialog_context (edc);
     return;
   }
@@ -1201,6 +1221,10 @@ record_move_continuation (void *cls,
   {
     /* edit dialog produced invalid value string!? */
     GNUNET_break (0);
+    GNUNET_CONTAINER_DLL_remove (edc_head,
+                                 edc_tail,
+                                 edc);    
+    free_edit_dialog_context (edc);
     return;
   }
   rd.record_type = edc->record_type;
@@ -1334,6 +1358,15 @@ edit_dialog_continuation (struct EditDialogContext *edc,
       edc->rkgc = GNUNET_CRYPTO_rsa_key_create_start (keyfile,
                                                       &record_move_continuation,
                                                       edc);
+      if (NULL == edc->rkgc)
+      {
+        GNUNET_break (0);
+        GNUNET_free (keyfile);
+        break;
+      }
+      GNUNET_CONTAINER_DLL_insert (edc_head,
+                                   edc_tail,
+                                   edc);    
       GNUNET_free (keyfile);
       return;
     }
@@ -2293,6 +2326,8 @@ GNUNET_SETUP_gns_init ()
 void
 GNUNET_SETUP_gns_done ()
 {
+  struct EditDialogContext *edc;
+
   gtk_widget_show (GTK_WIDGET (GNUNET_SETUP_get_object ("GNUNET_setup_gns_status_label")));
   gtk_widget_hide (GTK_WIDGET (GNUNET_SETUP_get_object ("GNUNET_setup_gns_main_scrolledwindow")));
   gtk_tree_store_clear (ts);
@@ -2302,6 +2337,17 @@ GNUNET_SETUP_gns_done ()
     free_update_context (uc_head);
   while (NULL != rc_head)
     free_remove_context (rc_head);
+  while (NULL != (edc = edc_head))
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                _("Setup shutdown before all records could be written. Record lost!\n"));
+    if (NULL != edc->qe)
+      GNUNET_NAMESTORE_cancel (edc->qe);
+    if (NULL != edc->rkgc)
+      GNUNET_CRYPTO_rsa_key_create_stop (edc->rkgc);
+    GNUNET_CONTAINER_DLL_remove (edc_head, edc_tail, edc);
+    free_edit_dialog_context (edc);
+  }
   if (NULL != namestore)
   {
     GNUNET_NAMESTORE_disconnect (namestore);