make namestore API less brittle/sublte to use

6 files changed, 167 insertions, 30 deletions

diff --git a/src/conversation/gnunet-conversation-gtk_contacts.c b/src/conversation/gnunet-conversation-gtk_contacts.c
index e9010c7d..302c28ba 100644
--- a/src/conversation/gnunet-conversation-gtk_contacts.c
+++ b/src/conversation/gnunet-conversation-gtk_contacts.c
@@ -172,13 +172,6 @@ display_record (void *cls,
   gboolean is_public;
   char *value;
 
-  if (NULL == zone_key)
-  {
-    /* disconnect, clear (and possibly freeze) view */
-    gtk_list_store_clear (contacts_liststore);
-    gtk_widget_hide (contacts_treeview);
-    return;
-  }
   do_display = FALSE;
   value = NULL;
   for (i = 0; i < rd_len; i++)
@@ -290,6 +283,20 @@ unfreeze_view (void *cls)
 
 
 /**
+ * Function called once the monitor has disconnected from the
+ * database.
+ *
+ * @param cls closure
+ */
+static void
+freeze_view (void *cls)
+{
+  gtk_list_store_clear (contacts_liststore);
+  gtk_widget_hide (contacts_treeview);
+}
+
+
+/**
  * A different zone was selected in the zone toggle bar.  Load the
  * appropriate zone.
  *
@@ -322,7 +329,10 @@ gnunet_conversation_gtk_contacts_zone_combobox_changed_cb (GtkComboBox *widget,
   zone_mon = GNUNET_NAMESTORE_zone_monitor_start (GCG_get_configuration (),
                                                   temp_zone_pkey,
                                                   GNUNET_YES,
+                                                  &freeze_view,
+                                                  NULL,
                                                   &display_record,
+                                                  NULL,
                                                   &unfreeze_view,
                                                   NULL);
 }
@@ -451,4 +461,3 @@ GCG_CONTACTS_shutdown ()
 }
 
 /* end of gnunet-conversation-gtk_contacts.c */
-
diff --git a/src/conversation/gnunet-conversation-gtk_get_label.c b/src/conversation/gnunet-conversation-gtk_get_label.c
index 949975c0..5bdf83d3 100644
--- a/src/conversation/gnunet-conversation-gtk_get_label.c
+++ b/src/conversation/gnunet-conversation-gtk_get_label.c
@@ -45,6 +45,17 @@ static char *target;
 
 
 /**
+ * Called on error communicating with the namestore.
+ */
+static void
+handle_error (void *cls)
+{
+  qe = NULL;
+  GCG_log (_("Error communicating with namestore!\n"));
+}
+
+
+/**
  * Process a record that was stored in the namestore.
  *
  * @param cls closure, NULL
@@ -123,6 +134,8 @@ gnunet_conversation_gtk_enter_label_entry_changed_cb (GtkEditable *editable,
   qe = GNUNET_NAMESTORE_records_lookup (GCG_IMPORT_get_namestore (),
                                         pkey,
                                         label,
+                                        &handle_error,
+                                        builder,
                                         &handle_existing_records,
                                         builder);
 }
diff --git a/src/conversation/gnunet-conversation-gtk_import.c b/src/conversation/gnunet-conversation-gtk_import.c
index e8e1eede..199ed9e2 100644
--- a/src/conversation/gnunet-conversation-gtk_import.c
+++ b/src/conversation/gnunet-conversation-gtk_import.c
@@ -251,13 +251,27 @@ add_phone_handle_existing_records (void *cls,
   add_phone_qe = GNUNET_NAMESTORE_records_store (ns,
                                                  zone,
                                                  label,
-                                                 rd_count + 1, rd_new,
+                                                 rd_count + 1,
+                                                 rd_new,
                                                  &add_phone_continuation,
                                                  NULL);
 }
 
 
 /**
+ * Called on error communicating with the namestore.
+ */
+static void
+handle_add_error (void *cls)
+{
+  add_phone_qe = NULL;
+  GCG_log (_("Error communicating with namestore!\n"));
+  GNUNET_free (phone_label);
+  phone_label = NULL;
+}
+
+
+/**
  * Add the data from #my_rd under the #phone_label to the namestore.
  */
 static void
@@ -273,6 +287,8 @@ add_phone ()
   add_phone_qe = GNUNET_NAMESTORE_records_lookup (ns,
                                                   &zone_pkey,
                                                   phone_label,
+                                                  &handle_add_error,
+                                                  NULL,
                                                   &add_phone_handle_existing_records,
                                                   NULL);
 }
@@ -409,6 +425,19 @@ remove_phone_handle_existing_records (void *cls,
 
 
 /**
+ * Called on error communicating with the namestore.
+ */
+static void
+handle_remove_error (void *cls)
+{
+  remove_phone_qe = NULL;
+  GCG_log (_("Error communicating with namestore!\n"));
+  if (GNUNET_YES == in_shutdown)
+    finish_shutdown ();
+}
+
+
+/**
  * Remove previously added phone address from namestore.
  */
 void
@@ -420,6 +449,8 @@ GSC_remove_phone ()
   remove_phone_qe = GNUNET_NAMESTORE_records_lookup (ns,
                                                      &zone_pkey,
                                                      phone_label,
+                                                     &handle_remove_error,
+                                                     NULL,
                                                      &remove_phone_handle_existing_records,
                                                      NULL);
   GNUNET_free (phone_label);
@@ -492,4 +523,3 @@ GCG_IMPORT_shutdown ()
 
 
 /* end of gnunet-conversation-gtk_import.c */
-
diff --git a/src/conversation/gnunet-conversation-gtk_phone.c b/src/conversation/gnunet-conversation-gtk_phone.c
index 7291fbf7..b6844a84 100644
--- a/src/conversation/gnunet-conversation-gtk_phone.c
+++ b/src/conversation/gnunet-conversation-gtk_phone.c
@@ -876,14 +876,25 @@ handle_reverse_lookup_result (void *cls,
   struct IncomingCall *ic = cls;
 
   ic->qe = NULL;
-  if (NULL == label)
-    return;
   GNUNET_free (ic->caller_id_str);
   ic->caller_id_str = GNUNET_strdup (label);
 }
 
 
 /**
+ * Failed to talk to namestore.
+ */
+static void
+handle_reverse_error (void *cls)
+{
+  struct IncomingCall *ic = cls;
+
+  ic->qe = NULL;
+  GCG_log (_("Error communicating with namestore!\n"));
+}
+
+
+/**
  * Function called with an event emitted by a phone.
  *
  * @param cls closure
@@ -917,6 +928,8 @@ phone_event_handler (void *cls,
     ic->qe = GNUNET_NAMESTORE_zone_to_name (GCG_IMPORT_get_namestore (),
                                             GNUNET_IDENTITY_ego_get_private_key (my_zone),
                                             &ic->caller_id,
+                                            &handle_reverse_error,
+                                            ic,
                                             &handle_reverse_lookup_result,
                                             ic);
     ic->caller_num = caller_num_gen++;
diff --git a/src/fs/gnunet-fs-gtk.c b/src/fs/gnunet-fs-gtk.c
index c00a764f..cbbc1984 100644
--- a/src/fs/gnunet-fs-gtk.c
+++ b/src/fs/gnunet-fs-gtk.c
@@ -562,6 +562,24 @@ service_status_change (void *cls,
 }
 
 
+static void
+monitor_zone_error (void *cls)
+{
+  GtkListStore *ls;
+
+  ls = GTK_LIST_STORE (GNUNET_FS_GTK_get_main_window_object ("namespace_label_liststore"));
+  gtk_list_store_clear (ls);
+  gtk_widget_hide (GTK_WIDGET (GNUNET_FS_GTK_get_main_window_object ("main_window_search_namespace_combobox")));
+}
+
+
+static void
+monitor_zone_sync (void *cls)
+{
+  gtk_widget_show (GTK_WIDGET (GNUNET_FS_GTK_get_main_window_object ("main_window_search_namespace_combobox")));
+}
+
+
 /**
  * Process a record that was stored in the namestore in the
  * "sks_zone".  Adds (or removes) the respective label to the
@@ -588,11 +606,6 @@ monitor_zone_records (void *cls,
   gchar *label_gnu;
 
   ls = GTK_LIST_STORE (GNUNET_FS_GTK_get_main_window_object ("namespace_label_liststore"));
-  if (NULL == zone)
-  {
-    gtk_list_store_clear (ls);
-    return;
-  }
   label_gnu = g_strdup_printf ("%s.%s",
                                label,
                                "gnu");
@@ -660,8 +673,11 @@ handle_sks_zone_identity (void *cls,
   main_context.zm = GNUNET_NAMESTORE_zone_monitor_start (main_context.cfg,
                                                          main_context.sks_zone,
                                                          GNUNET_YES,
+                                                         &monitor_zone_error,
+                                                         NULL,
                                                          &monitor_zone_records,
                                                          NULL,
+                                                         &monitor_zone_sync,
                                                          NULL);
 }
 
diff --git a/src/namestore/gnunet-namestore-gtk.c b/src/namestore/gnunet-namestore-gtk.c
index 2258b5bc..60ab84d5 100644
--- a/src/namestore/gnunet-namestore-gtk.c
+++ b/src/namestore/gnunet-namestore-gtk.c
@@ -902,12 +902,6 @@ handle_records_for_merge (void *cls,
 {
   struct MoveOperationContext *moc = cls;
 
-  if (NULL == label)
-  {
-    moc->it = NULL;
-    merge_with_existing_records (moc, 0, NULL);
-    return;
-  }
   if (0 != strcmp (label,
                    moc->edc->name))
   {
@@ -921,6 +915,40 @@ handle_records_for_merge (void *cls,
 
 
 /**
+ * Error communicating with database, complain to user.
+ *
+ * @param cls the `struct MoveOperationContext`
+ */
+static void
+handle_records_for_merge_error (void *cls)
+{
+  struct MoveOperationContext *moc = cls;
+  struct GNUNET_GTK_NAMESTORE_PluginEnvironment *edc = moc->edc;
+
+  show_error_message (_("Failed to communicate with database"),
+                      _("Check that your peer is configured correctly."));
+  GNUNET_free (moc->data);
+  GNUNET_free (moc);
+  free_edit_dialog_context (edc);
+}
+
+
+/**
+ * Finished zone iteration.  Proceed.
+ *
+ * @param cls the `struct MoveOperationContext`
+ */
+static void
+handle_records_for_merge_end (void *cls)
+{
+  struct MoveOperationContext *moc = cls;
+
+  moc->it = NULL;
+  merge_with_existing_records (moc, 0, NULL);
+}
+
+
+/**
  * The edit dialog completed; update the namestore and the
  * view based on the new values in @a edc.
  *
@@ -1069,8 +1097,12 @@ edit_dialog_continuation (struct GNUNET_GTK_NAMESTORE_PluginEnvironment *edc,
       GNUNET_CONTAINER_DLL_insert (moc_head, moc_tail, moc);
       moc->it = GNUNET_NAMESTORE_zone_iteration_start (namestore,
                                                        pk,
+                                                       &handle_records_for_merge_error,
+                                                       moc,
                                                        &handle_records_for_merge,
-                                               moc);
+                                                       moc,
+                                                       &handle_records_for_merge_end,
+                                                       moc);
       /* zone changed, remove record from old zone, add to new zone! */
       if (GNUNET_YES == edc->old_record_in_namestore)
       {
@@ -2237,6 +2269,33 @@ zone_sync_proc (void *cls)
 
 
 /**
+ * Function called once our model is again inconsistent with
+ * the current zone.  Hides the view.
+ *
+ * @param cls NULL
+ */
+static void
+zone_iteration_error (void *cls)
+{
+  clear_zone_view ();
+  gtk_widget_hide (GTK_WIDGET (get_object ("gnunet_namestore_gtk_pseu_hbox")));
+#if HAVE_QRENCODE_H
+  setup_qrcode ();
+  gtk_widget_hide (GTK_WIDGET (get_object ("gnunet_namestore_gtk_qr_image")));
+  gtk_widget_hide (GTK_WIDGET (get_object ("gnunet_namestore_gtk_qr_saveas_button")));
+  gtk_widget_hide (GTK_WIDGET (get_object ("gnunet_namestore_gtk_qr_vseparator")));
+#else
+  gtk_widget_show (GTK_WIDGET (get_object ("gnunet_namestore_gtk_qr_image")));
+  gtk_widget_show (GTK_WIDGET (get_object ("gnunet_namestore_gtk_qr_saveas_button")));
+  gtk_widget_show (GTK_WIDGET (get_object ("gnunet_namestore_gtk_qr_vseparator")));
+#endif
+  gtk_widget_show (GTK_WIDGET (get_object ("gnunet_namestore_gtk_status_label")));
+  gtk_widget_hide (GTK_WIDGET (get_object ("gnunet_namestore_gtk_scrolledwindow")));
+  gtk_widget_hide (GTK_WIDGET (get_object ("gnunet_namestore_gtk_zone_combobox")));
+}
+
+
+/**
  * Function called for each record in the current zone.  Update the
  * widgets accordingly.
  *
@@ -2272,12 +2331,6 @@ zone_iteration_proc (void *cls,
   GtkTreeIter sel_iter;
   GtkTreePath *sel_path;
 
-  if ((NULL == zone_key) && (NULL == name))
-  {
-    /* disconnect from namestore, clear view */
-    clear_zone_view ();
-    return;
-  }
   if ( (GNUNET_SYSERR == GNUNET_DNSPARSER_check_label (name)) &&
        (0 != strcmp (name, GNUNET_GNS_MASTERZONE_STR)) )
   {
@@ -2553,7 +2606,10 @@ load_zone (const char *name,
 #endif
   zmon = GNUNET_NAMESTORE_zone_monitor_start (cfg, pkey,
                                               GNUNET_YES,
+                                              &zone_iteration_error,
+                                              NULL,
                                               &zone_iteration_proc,
+                                              NULL,
                                               &zone_sync_proc,
                                               NULL);
 }