1 files changed, 159 insertions, 45 deletions

diff --git a/src/fs/gnunet-fs-gtk_main-window-search.c b/src/fs/gnunet-fs-gtk_main-window-search.c
index 6b621a1a..3296151d 100644
--- a/src/fs/gnunet-fs-gtk_main-window-search.c
+++ b/src/fs/gnunet-fs-gtk_main-window-search.c
@@ -29,9 +29,120 @@
 
 
 /**
+ * How long until we decide a SKS namespace GNS lookup has failed?
+ */
+#define LOOKUP_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MINUTES, 2)
+
+/**
  * Start a search.
  *
- * @param builder the main window context
+ * @param uri uri to search for, freed in this function
+ * @param anonymity_level degree of anonymity to apply for the search
+ */
+static void
+search_for_uri (struct GNUNET_FS_Uri *uri,
+                guint anonymity_level)
+{
+  /* start search */
+  GNUNET_FS_search_start (GNUNET_FS_GTK_get_fs_handle (), 
+                          uri, anonymity_level,
+                          GNUNET_FS_SEARCH_OPTION_NONE, NULL);
+  GNUNET_FS_uri_destroy (uri);
+}
+
+
+
+
+/**
+ * Abort the given search lookup.
+ *
+ * @param sl lookup to abort.
+ */
+void
+abort_search_lookup (struct SearchLookup *sl)
+{
+  struct GNUNET_GTK_MainWindowContext *main_ctx = GNUNET_FS_GTK_get_main_context ();
+
+  GNUNET_CONTAINER_DLL_remove (main_ctx->sl_head,
+                               main_ctx->sl_tail,
+                               sl);
+  if (GNUNET_SCHEDULER_NO_TASK != sl->timeout_task)
+  {
+    GNUNET_SCHEDULER_cancel (sl->timeout_task);
+    sl->timeout_task = GNUNET_SCHEDULER_NO_TASK;
+  }
+  if (NULL != sl->gns)
+  {
+    GNUNET_GNS_lookup_cancel (sl->gns);
+    sl->gns = NULL;
+  }
+  g_free (sl->keywords);
+  GNUNET_free (sl);                            
+}
+
+
+/**
+ * Task run when the GNS timeout during the resolution of
+ * the GNS namespace times out.
+ *
+ * @param cls the 'struct SearchLookup'
+ * @param tc scheduler context
+ */
+static void
+timeout_search_lookup (void *cls,
+                       const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+  struct SearchLookup *sl = cls;
+
+  sl->timeout_task = GNUNET_SCHEDULER_NO_TASK;
+  GNUNET_log (GNUNET_ERROR_TYPE_ERROR, 
+              _("Failed to resolve namespace in time\n"));
+  abort_search_lookup (sl);
+}
+
+
+
+/**
+ * Iterator called on obtained result for a GNS lookup for
+ * the public key of a namespace identifier.
+ *
+ * @param cls closure
+ * @param rd_count number of records in @a rd
+ * @param rd the records in reply
+ */
+static void
+handle_gns_result (void *cls,
+                   uint32_t rd_count,
+                   const struct GNUNET_NAMESTORE_RecordData *rd)
+{
+  struct SearchLookup *sl = cls;
+  unsigned int i;
+  struct GNUNET_FS_Uri *uri;
+
+  sl->gns = NULL;
+  for (i=0;i<rd_count;i++)
+    {
+      if (GNUNET_NAMESTORE_TYPE_PKEY != rd[i].record_type)
+        continue;
+      if (sizeof (struct GNUNET_CRYPTO_EccPublicKey) != rd[i].data_size)
+      {
+        GNUNET_break_op (0);
+        continue;
+      }
+      uri = GNUNET_FS_uri_sks_create (rd[i].data, sl->keywords);
+      search_for_uri (uri, sl->anonymity_level);
+      abort_search_lookup (sl);
+      return;      
+    }
+  GNUNET_log (GNUNET_ERROR_TYPE_ERROR, 
+              _("Failed to resolve namespace in time\n"));
+  abort_search_lookup (sl);
+}
+
+/**
+ * Start a search.
+ *
+ * @param main_ctx the main window context
  */
 static void
 start_search (struct GNUNET_GTK_MainWindowContext *main_ctx)
@@ -39,8 +150,11 @@ start_search (struct GNUNET_GTK_MainWindowContext *main_ctx)
   guint anonymity_level;
   gchar *keywords;
   gchar *mime_keyword;
-  struct GNUNET_CRYPTO_EccPublicKey *nsid;
+  const char *nsid;
   struct GNUNET_FS_Uri *uri;
+  struct GNUNET_CRYPTO_EccPublicKey pub_sks_zone;
+  struct SearchLookup *sl;
+  char *emsg;
 
   /* get anonymity level */
   if (!GNUNET_GTK_get_selected_anonymity_level
@@ -73,28 +187,17 @@ start_search (struct GNUNET_GTK_MainWindowContext *main_ctx)
       mime_keyword = NULL;
     }
   }
-
-  /* get selected namespace */
   {
-    GtkTreeRowReference *ref;
-    GtkTreeIter iter;
-
-    nsid = NULL;    
-    ref = main_ctx->selected_ns_row;
-    if (NULL != ref)
-    {
-      GtkTreePath *namespace_treepath;
-      GtkTreeModel *namespace_model;
-      
-      namespace_model = gtk_tree_row_reference_get_model (ref);
-      namespace_treepath = gtk_tree_row_reference_get_path (ref);
-      if ( (NULL != namespace_treepath) &&
-           (gtk_tree_model_get_iter (namespace_model, &iter, namespace_treepath)))
-        gtk_tree_model_get (namespace_model, &iter,
-                            GNUNET_GTK_FS_MAIN_WINDOW_SEARCH_MIME_MC_TYPE,
-                            &nsid,
-                            -1);
-    }
+    GtkComboBox *namespace_box;
+    
+    namespace_box = GTK_COMBO_BOX (GNUNET_FS_GTK_get_main_window_object ("main_window_search_namespace_combobox"));
+    nsid = gtk_entry_get_text (GTK_ENTRY (gtk_bin_get_child (GTK_BIN (namespace_box))));
+    if ( (NULL != nsid) &&
+         ( (0 == strcasecmp (nsid,
+                             "<none>")) ||
+           (0 == strcasecmp (nsid,
+                             _("<none>"))) ) )
+      nsid = NULL;
   }
    
   /* get keywords and compose keyword string */
@@ -117,31 +220,41 @@ start_search (struct GNUNET_GTK_MainWindowContext *main_ctx)
 
   /* build KSK/SKS URI */
   if (NULL != nsid)
-  {
-    uri = GNUNET_FS_uri_sks_create (nsid, keywords);
-    GNUNET_assert (uri != NULL);
+  {    
+    sl = GNUNET_new (struct SearchLookup);
+    sl->keywords = keywords;
+    sl->anonymity_level = anonymity_level;
+    sl->timeout_task = GNUNET_SCHEDULER_add_delayed (LOOKUP_TIMEOUT,
+                                                     &timeout_search_lookup, sl);
+    GNUNET_CRYPTO_ecc_key_get_public (main_ctx->sks_zone,
+                                      &pub_sks_zone);
+    sl->gns = GNUNET_GNS_lookup (main_ctx->gns,
+                                 nsid,
+                                 &pub_sks_zone,
+                                 GNUNET_NAMESTORE_TYPE_PKEY,
+                                 GNUNET_NO,
+                                 NULL /* no shortening */,
+                                 &handle_gns_result,
+                                 sl);
+    GNUNET_CONTAINER_DLL_insert (main_ctx->sl_head,
+                                 main_ctx->sl_tail,
+                                 sl);
+    return;
   }
-  else
-  {
-    char *emsg = NULL;
 
-    uri = GNUNET_FS_uri_ksk_create (keywords, &emsg);
-    if (NULL == uri)
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR, _("Invalid keyword string `%s': %s"),
-                  keywords, emsg);
-      g_free (keywords);
-      GNUNET_free_non_null (emsg);
-      return;
-    }
-  }
+  emsg = NULL;
+  uri = GNUNET_FS_uri_ksk_create (keywords, &emsg);
+  if (NULL == uri)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, 
+                _("Invalid keyword string `%s': %s"),
+                keywords, emsg);
+    g_free (keywords);
+    GNUNET_free_non_null (emsg);
+    return;
+  }  
   g_free (keywords);
-
-  /* start search */
-  GNUNET_FS_search_start (GNUNET_FS_GTK_get_fs_handle (), 
-                          uri, anonymity_level,
-                          GNUNET_FS_SEARCH_OPTION_NONE, NULL);
-  GNUNET_FS_uri_destroy (uri);
+  search_for_uri (uri, anonymity_level);
 }
 
 
@@ -156,6 +269,7 @@ main_window_search_button_clicked_cb (GtkButton * button,
                                       gpointer user_data)
 {
   struct GNUNET_GTK_MainWindowContext *main_ctx = user_data;
+
   start_search (main_ctx);
 }