-cancel manually started probes before stopping FS

3 files changed, 69 insertions, 2 deletions

diff --git a/src/fs/gnunet-fs-gtk.c b/src/fs/gnunet-fs-gtk.c
index ea3397d8..d5974479 100644
--- a/src/fs/gnunet-fs-gtk.c
+++ b/src/fs/gnunet-fs-gtk.c
@@ -230,13 +230,23 @@ GNUNET_GTK_main_window_configure_event_cb (GtkWidget *main_window,
  * @param tc scheduler context, unused
  */
 static void
-shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+shutdown_task (void *cls,
+               const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   struct SearchLookup *sl;
   struct PseuLookupContext *lctx;
+  struct SearchResult *sr;
 
   GNUNET_GTK_tray_icon_destroy ();
-  if (fs != NULL)
+  while (NULL != (sr = pl_head))
+  {
+    GNUNET_FS_probe_stop (sr->probe);
+    sr->probe = NULL;
+    GNUNET_CONTAINER_DLL_remove (pl_head,
+                                 pl_tail,
+                                 sr);
+  }
+  if (NULL != fs)
   {
     GNUNET_FS_stop (fs);
     fs = NULL;
diff --git a/src/fs/gnunet-fs-gtk_event-handler.c b/src/fs/gnunet-fs-gtk_event-handler.c
index 52a12caa..ec1f60ad 100644
--- a/src/fs/gnunet-fs-gtk_event-handler.c
+++ b/src/fs/gnunet-fs-gtk_event-handler.c
@@ -246,6 +246,16 @@ struct PublishEntry
 
 
 /**
+ * Head of search results with a manually-activated probe.
+ */
+struct SearchResult *pl_head;
+
+/**
+ * Tail of search results with a manually-activated probe.
+ */
+struct SearchResult *pl_tail;
+
+/**
  * Head of linked list of tabs for searches.
  */
 static struct SearchTab *search_tab_head;
@@ -1722,7 +1732,13 @@ move_downloads_in_subtree (GtkTreeModel *tm,
         GNUNET_CONTAINER_meta_data_destroy (meta);
       gtk_tree_row_reference_free (sr->rr);
       if (NULL != sr->probe)
+      {
         GNUNET_FS_probe_stop (sr->probe);
+        sr->probe = NULL;
+        GNUNET_CONTAINER_DLL_remove (pl_head,
+                                     pl_tail,
+                                     sr);
+      }
       GNUNET_free (sr);
       /* get ready for removal of the tree */
       gtk_tree_store_set (GTK_TREE_STORE (tm), &child,
@@ -1781,7 +1797,13 @@ free_search_result (struct SearchResult *sr)
     GNUNET_CONTAINER_meta_data_destroy (meta);
   gtk_tree_row_reference_free (sr->rr);
   if (NULL != sr->probe)
+  {
     GNUNET_FS_probe_stop (sr->probe);
+    sr->probe = NULL;
+    GNUNET_CONTAINER_DLL_remove (pl_head,
+                                 pl_tail,
+                                 sr);
+  }
   GNUNET_free (sr);
   move_downloads_in_subtree (tm, &iter);
   GNUNET_FS_GTK_remove_treestore_subtree (GTK_TREE_STORE (tm), &iter);
@@ -2317,11 +2339,16 @@ GNUNET_GTK_add_search_result (struct SearchTab *tab,
   sr = GNUNET_new (struct SearchResult);
   sr->result = result;
   if (NULL == result)
+  {
     sr->probe = GNUNET_FS_probe (GNUNET_FS_GTK_get_fs_handle (),
                                  uri,
                                  meta,
                                  sr,
                                  anonymity);
+    GNUNET_CONTAINER_DLL_insert (pl_head,
+                                 pl_tail,
+                                 sr);
+  }
   sr->tab = tab;
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Allocated a search result SR=%p\n",
@@ -3142,6 +3169,11 @@ setup_download (struct DownloadEntry *de, struct DownloadEntry *pde,
        download in the URI tab */
     de->sr = GNUNET_GTK_add_to_uri_tab (anonymity,
                                         meta, uri);
+    GNUNET_FS_probe_stop (de->sr->probe);
+    de->sr->probe = NULL;
+    GNUNET_CONTAINER_DLL_remove (pl_head,
+                                 pl_tail,
+                                 de->sr);
     de->sr->download = de;
     path = gtk_tree_row_reference_get_path (de->sr->rr);
     if (! gtk_tree_model_get_iter (GTK_TREE_MODEL (de->sr->tab->ts), &iter, path))
diff --git a/src/fs/gnunet-fs-gtk_event-handler.h b/src/fs/gnunet-fs-gtk_event-handler.h
index e0f5d8ed..03a313e3 100644
--- a/src/fs/gnunet-fs-gtk_event-handler.h
+++ b/src/fs/gnunet-fs-gtk_event-handler.h
@@ -187,6 +187,19 @@ struct DownloadEntry
  */
 struct SearchResult
 {
+
+  /**
+   * If this search result has a manually-activated probe,
+   * we keep it in the 'pr_head' list.
+   */
+  struct SearchResult *next;
+
+  /**
+   * If this search result has a manually-activated probe,
+   * we keep it in the 'pr_head' list.
+   */
+  struct SearchResult *prev;
+
   /**
    * Where in the tab is this result?
    */
@@ -218,6 +231,18 @@ struct SearchResult
 
 
 /**
+ * Head of search results with a manually-activated probe.
+ */
+extern struct SearchResult *pl_head;
+
+/**
+ * Tail of search results with a manually-activated probe.
+ */
+extern struct SearchResult *pl_tail;
+
+
+
+/**
  * Setup a new top-level entry in the URI/orphan tab.  If necessary, create
  * the URI tab first.
  *