1 files changed, 312 insertions, 17 deletions

diff --git a/src/fs/gnunet-fs-gtk_main-window-search.c b/src/fs/gnunet-fs-gtk_main-window-search.c
index 37bf81b1..4ba47f4c 100644
--- a/src/fs/gnunet-fs-gtk_main-window-search.c
+++ b/src/fs/gnunet-fs-gtk_main-window-search.c
@@ -307,28 +307,212 @@ abort_pseu_lookup (struct PseuLookupContext *lctx)
 {
   struct GNUNET_GTK_MainWindowContext *main_ctx = lctx->main_ctx;
 
+  if (NULL != lctx->progress_dialog_builder)
+  {
+    gtk_widget_destroy (lctx->progress_dialog);
+    g_object_unref (G_OBJECT (lctx->progress_dialog_builder));  
+    lctx->progress_dialog_builder = NULL;
+  }
+  if (NULL != lctx->nick_dialog_builder)
+  {
+    gtk_widget_destroy (lctx->nick_dialog);
+    g_object_unref (G_OBJECT (lctx->nick_dialog_builder));  
+    lctx->nick_dialog_builder = NULL;
+  }
+
   if (NULL != lctx->lr)
   {
     GNUNET_GNS_lookup_cancel (lctx->lr);
     lctx->lr = NULL;
   }
+  if (NULL != lctx->qe)
+  {
+    GNUNET_NAMESTORE_cancel (lctx->qe);
+    lctx->qe = NULL;
+  }
+  if (NULL != lctx->namestore)
+  {
+    GNUNET_NAMESTORE_disconnect (lctx->namestore);
+    lctx->namestore = NULL;
+  }
   GNUNET_CONTAINER_DLL_remove (main_ctx->lctx_head,
                                main_ctx->lctx_tail,
                                lctx);
+  GNUNET_free_non_null (lctx->nick);
   GNUNET_free (lctx);
 }
 
 
 /**
+ * Continuation called to notify client about result of the
+ * operation.
+ *
+ * @param cls closure
+ * @param success #GNUNET_SYSERR on failure (including timeout/queue drop/failure to validate)
+ *                #GNUNET_NO if content was already there or not found
+ *                #GNUNET_YES (or other positive value) on success
+ * @param emsg NULL on success, otherwise an error message
+ */
+static void
+store_continuation (void *cls,
+                    int32_t success,
+                    const char *emsg)
+{
+  struct PseuLookupContext *lctx = cls;
+
+  lctx->qe = NULL;
+  if (NULL != emsg)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                _("Failed to save record: %s\n"),
+                emsg);
+    gdk_beep ();
+  }
+  abort_pseu_lookup (lctx);
+}
+
+
+/**
+ * Save the namespace under the given nickname.
+ *
+ * @param lctx namespace request we are processing
+ * @param nick nickname to store the namespace under
+ */
+static void
+save_pseudonym_with_nick (struct PseuLookupContext *lctx,
+                          const char *nick)
+{
+  struct GNUNET_NAMESTORE_RecordData rd;
+  struct GNUNET_GTK_MainWindowContext *main_ctx;
+
+  GNUNET_break (NULL == lctx->nick);
+  lctx->nick = GNUNET_strdup (nick);
+  /* again, show progress indicator, this should be fast though... */
+  lctx->progress_dialog_builder
+    = GNUNET_GTK_get_new_builder 
+    ("gnunet_fs_gtk_pseu_progress_dialog.glade", 
+     lctx);
+  lctx->progress_dialog 
+    = GTK_WIDGET (gtk_builder_get_object 
+                  (lctx->progress_dialog_builder,
+                   "GNUNET_FS_GTK_pseu_progress_dialog"));
+  /* show the window */
+  gtk_window_present (GTK_WINDOW (lctx->progress_dialog));
+  memset (&rd, 0, sizeof (rd));
+  rd.data_size = sizeof (struct GNUNET_CRYPTO_EccPublicKey);
+  rd.data = &lctx->pkey;
+  rd.flags = GNUNET_NAMESTORE_RF_PRIVATE;
+  rd.expiration_time = GNUNET_TIME_UNIT_FOREVER_ABS.abs_value_us;
+  rd.record_type = GNUNET_NAMESTORE_TYPE_PKEY;
+  main_ctx = GNUNET_FS_GTK_get_main_context ();
+  lctx->namestore = GNUNET_NAMESTORE_connect (main_ctx->cfg);
+  GNUNET_assert (NULL != lctx->namestore);
+  lctx->qe = GNUNET_NAMESTORE_records_store (lctx->namestore,
+                                             main_ctx->sks_zone,
+                                             nick,
+                                             1, &rd,
+                                             &store_continuation, lctx);
+}
+
+
+/**
+ * User clicked on the 'execute' button in nickname dialog.
+ * Store the selected namespace in the "sks-fs" zone under
+ * the given nickname.
+ *
+ * @param button the "execute" button
+ * @param user_data the `struct PseuLookupContext`
+ */
+void
+GNUNET_GTK_enter_nick_window_execute_button_clicked_cb (GtkButton * button, 
+                                                        gpointer user_data)
+{
+  struct PseuLookupContext *lctx = user_data;
+  GtkEntry *entry;
+  const char *nick;
+  
+  entry = GTK_ENTRY (gtk_builder_get_object 
+                     (lctx->nick_dialog_builder,
+                      "GNUNET_GTK_enter_nick_window_nick_entry"));
+  nick = gtk_entry_get_text (entry);
+  if ( (NULL == nick) ||
+       (0 == strlen (nick) ))
+  {
+    GNUNET_break (0);
+    abort_pseu_lookup (lctx);
+    return;
+  }
+  save_pseudonym_with_nick (lctx, nick);
+  gtk_widget_destroy (lctx->nick_dialog);
+  g_object_unref (G_OBJECT (lctx->nick_dialog_builder));  
+  lctx->nick_dialog_builder = NULL;  
+}
+
+
+/**
+ * User edited the nickname.  Update sensitivity of the execute button.
+ *
+ * @param widget the entry that was changed
+ * @param user_data the `struct PseuLookupContext`
+ */
+void
+GNUNET_GTK_enter_nick_window_nick_entry_changed_cb (GtkWidget *widget, 
+                                                    gpointer user_data)
+{
+  struct PseuLookupContext *lctx = user_data;
+  const gchar *new_text;
+  GtkButton * button;
+
+  new_text = gtk_entry_get_text (GTK_ENTRY (widget));
+  button = GTK_BUTTON (gtk_builder_get_object (lctx->nick_dialog_builder,
+                                               "GNUNET_GTK_enter_nick_window_execute_button"));
+  gtk_widget_set_sensitive (GTK_WIDGET (button),
+                            (GNUNET_OK == GNUNET_DNSPARSER_check_label (new_text)) ? TRUE : FALSE);
+}
+
+
+/**
+ * User clicked on the 'cancel' button in nickname dialog.
+ * Abort the operation.
+ *
+ * @param button the "cancel" button
+ * @param user_data the `struct PseuLookupContext`
+ */
+void
+GNUNET_GTK_enter_nick_window_cancel_button_clicked_cb (GtkButton * button, 
+                                                       gpointer user_data)
+{
+  struct PseuLookupContext *lctx = user_data;
+
+  abort_pseu_lookup (lctx);
+}
+
+
+/**
+ * Run the dialog asking the user to specify a nickname for
+ * the namespace.
+ *
+ * @param lctx namespace request we are processing
+ */
+static void
+ask_for_nickname (struct PseuLookupContext *lctx)
+{
+  /* setup the dialog and get the widgets we need most */
+  lctx->nick_dialog_builder = GNUNET_GTK_get_new_builder ("gnunet_fs_gtk_enter_nick_dialog.glade",
+                                                          lctx);
+  lctx->progress_dialog = GTK_WIDGET (gtk_builder_get_object (lctx->progress_dialog_builder,
+                                                              "GNUNET_GTK_enter_nick_window"));
+  /* show the window */
+  gtk_window_present (GTK_WINDOW (lctx->progress_dialog));  
+}
+
+
+/**
  * Iterator called on obtained result for a GNS lookup for
  * the PSEU lookup when "saving" a zone.  The actual saving
  * should already have happened via the shortening of GNS,
  * so we only need to clean up.
  *
- * FIXME: this is a drastic simplification, as shortening
- * may fail (name used, PSEU record not found); in those
- * cases, we should _still_ do something here...
- *
  * @param cls closure with the `struct PseuLookupContext`
  * @param rd_count number of records in @a rd
  * @param rd the records in reply
@@ -339,10 +523,97 @@ lookup_finished (void *cls,
                  const struct GNUNET_NAMESTORE_RecordData *rd)
 {
   struct PseuLookupContext *lctx = cls;
+  unsigned int i;
+  const char *nick;
 
-  /* FIXME: might want to give visual feedback to the user here */
   lctx->lr = NULL;
-  abort_pseu_lookup (lctx);
+  if (NULL != lctx->progress_dialog_builder)
+  {
+    gtk_widget_destroy (lctx->progress_dialog);
+    g_object_unref (G_OBJECT (lctx->progress_dialog_builder));  
+    lctx->progress_dialog_builder = NULL;
+  }
+  for (i=0;i<rd_count;i++)
+  {
+    if (GNUNET_NAMESTORE_TYPE_PSEU == rd[i].record_type)
+    {
+      nick = rd[i].data;
+      if ('\0' != nick[rd[i].data_size - 1])
+      {
+        GNUNET_break (0);
+        continue;
+      }
+      save_pseudonym_with_nick (lctx,
+                                nick);
+      return;
+    }
+  }
+  /* no valid PSEU record found */
+  ask_for_nickname (lctx);
+}
+
+
+/**
+ * User clicked on the 'cancel' button of the progress dialog.
+ * Cancel the operation.
+ *
+ * @param button the cancel button
+ * @param user_data the `struct PseuLookupContext` of our window
+ */
+void
+GNUNET_FS_GTK_pseu_progress_dialog_cancel_button_clicked_cb (GtkButton *button,
+                                                             gpointer user_data)
+{
+  struct PseuLookupContext *lctx = user_data;
+
+  if (NULL != lctx->progress_dialog_builder)
+  {
+    gtk_widget_destroy (lctx->progress_dialog);
+    g_object_unref (G_OBJECT (lctx->progress_dialog_builder));  
+    lctx->progress_dialog_builder = NULL;
+  }
+  if (NULL != lctx->nick)
+    abort_pseu_lookup (lctx);
+  else
+    ask_for_nickname (lctx);
+}
+
+
+/**
+ * User attempted to close the nick dialog.  Refuse.
+ *
+ * @param widget the widget emitting the event
+ * @param event the event
+ * @param cls progress dialog context of our window
+ * @return TRUE to refuse to close
+ */
+gboolean
+GNUNET_GTK_enter_nick_window_delete_event_cb (GtkWidget *widget,
+                                              GdkEvent * event,
+                                              void *cls)
+{
+  /* Don't allow GTK to kill the window, user must click execute or cancel */
+  gdk_beep ();
+  return TRUE;
+}
+
+
+/**
+ * User attempted to close the progress dialog.  Refuse.
+ *
+ * @param widget the widget emitting the event
+ * @param event the event
+ * @param cls progress dialog context of our window
+ * @return TRUE to refuse to close
+ */
+gboolean
+GNUNET_FS_GTK_pseu_progress_dialog_delete_event_cb (GtkWidget *widget,
+                                                    GdkEvent * event,
+                                                    void *cls)
+{
+  /* Don't allow GTK to kill the window, until the search is finished */
+  gdk_beep ();
+  return TRUE;
 }
 
 
@@ -353,7 +624,6 @@ lookup_finished (void *cls,
  * @param button the "save" button
  * @param user_data the main window context builder
  */
-
 void
 GNUNET_FS_GTK_save_button_clicked_cb (GtkButton * button, 
                                       gpointer user_data)
@@ -364,12 +634,20 @@ GNUNET_FS_GTK_save_button_clicked_cb (GtkButton * button,
   struct GNUNET_CRYPTO_EccPublicKey pkey;
   int ret;
   struct PseuLookupContext *lctx;
+  guint anonymity_level;
 
   if (NULL == main_ctx->gns)
   {
     GNUNET_break (0);
     return;
   }
+  /* get anonymity level */
+  if (!GNUNET_GTK_get_selected_anonymity_level
+      (main_ctx->builder, "main_window_search_anonymity_combobox", &anonymity_level))
+  {
+    GNUNET_break (0);
+    return;
+  }
   widget = GTK_COMBO_BOX (GNUNET_FS_GTK_get_main_window_object
                        ("main_window_search_namespace_combobox"));
   text = gtk_entry_get_text (GTK_ENTRY (gtk_bin_get_child (GTK_BIN (widget))));
@@ -380,20 +658,37 @@ GNUNET_FS_GTK_save_button_clicked_cb (GtkButton * button,
     return;
   }
   lctx = GNUNET_new (struct PseuLookupContext);
+  lctx->pkey = pkey;
   lctx->main_ctx = main_ctx;
   GNUNET_CONTAINER_DLL_insert (main_ctx->lctx_head,
                                main_ctx->lctx_tail,
                                lctx);
-  lctx->lr = GNUNET_GNS_lookup (main_ctx->gns,
-                                GNUNET_GNS_MASTERZONE_STR,
-                                &pkey,
-                                GNUNET_NAMESTORE_TYPE_PSEU,
-                                GNUNET_NO,
-                                main_ctx->sks_zone /* FIXME: may want more explicit
-                                                      control than using shortening here */,
-                                &lookup_finished,
-                                lctx);
-  /* give visual feedback that something is happening */
+
+  if (0 == anonymity_level)
+  {
+    /* setup the dialog and get the widgets we need most */
+    lctx->progress_dialog_builder = GNUNET_GTK_get_new_builder ("gnunet_fs_gtk_pseu_progress_dialog.glade", 
+                                                                lctx);
+    lctx->progress_dialog = GTK_WIDGET (gtk_builder_get_object (lctx->progress_dialog_builder,
+                                                                "GNUNET_FS_GTK_pseu_progress_dialog"));
+    /* show the window */
+    gtk_window_present (GTK_WINDOW (lctx->progress_dialog));
+    lctx->lr = GNUNET_GNS_lookup (main_ctx->gns,
+                                  GNUNET_GNS_MASTERZONE_STR,
+                                  &pkey,
+                                  GNUNET_NAMESTORE_TYPE_PSEU,
+                                  GNUNET_NO,
+                                  NULL,
+                                  &lookup_finished,
+                                  lctx);
+  }
+  else
+  {
+    /* anonymous operation; cannot use GNS/DHT, so user
+       must make a suggestion himself */
+    ask_for_nickname (lctx);
+  }
+  /* do not allow save again just yet */
   gtk_widget_set_sensitive (GTK_WIDGET (button),
                             FALSE);
 }