6 files changed, 187 insertions, 75 deletions

diff --git a/src/plugins/daemon/daemon.c b/src/plugins/daemon/daemon.c
index 721f28bd..304a6cbb 100644
--- a/src/plugins/daemon/daemon.c
+++ b/src/plugins/daemon/daemon.c
@@ -240,18 +240,6 @@ doUpdateMenus (void *arg)
   return NULL;
 }
 
-static int
-statsProcessor (const char *optName, unsigned long long value, void *data)
-{
-  unsigned long long * ret = data;
-
-  if (0 == strcmp ("# of connected peers",
-                   optName))
-    *ret = value;
-  return GNUNET_OK;
-}
-
-
 static void
 cronCheckDaemon (void *dummy)
 {
diff --git a/src/plugins/fs/fs.c b/src/plugins/fs/fs.c
index 1eda8a50..4fea764b 100644
--- a/src/plugins/fs/fs.c
+++ b/src/plugins/fs/fs.c
@@ -145,7 +145,6 @@ saveEventProcessor (void *cls)
       fs_search_aborted (event->data.SearchAborted.sc.cctx);
       break;
     case GNUNET_FSUI_search_completed:
-      // FIXME...
       fs_search_aborted (event->data.SearchCompleted.sc.cctx);
       break;
     case GNUNET_FSUI_search_suspended:
diff --git a/src/plugins/fs/fs.h b/src/plugins/fs/fs.h
index 9a00a24f..1bfadc42 100644
--- a/src/plugins/fs/fs.h
+++ b/src/plugins/fs/fs.h
@@ -210,6 +210,11 @@ typedef struct SL
   struct GNUNET_FSUI_SearchList *fsui_list;
 
   /**
+   * Maximum runtime for the search.
+   */
+  GNUNET_CronTime max_delay;
+
+  /**
    * Number of results received so far.
    */
   unsigned int resultsReceived;
@@ -224,6 +229,21 @@ typedef struct SL
    */
   unsigned int last_y;
 
+  /**
+   * Did the user just ask to pause the search?
+   */
+  int is_paused;
+
+  /**
+   * Desired anonymity level.
+   */
+  unsigned int anonymityLevel;
+
+  /**
+   * Maximum number of results.
+   */
+  unsigned int max_results;
+
 } SearchList;
 
 
diff --git a/src/plugins/fs/search.c b/src/plugins/fs/search.c
index ea21c639..a78dd430 100644
--- a/src/plugins/fs/search.c
+++ b/src/plugins/fs/search.c
@@ -1,6 +1,6 @@
 /*
      This file is part of GNUnet.
-     (C) 2005, 2006, 2007 Christian Grothoff (and other contributing authors)
+     (C) 2005, 2006, 2007, 2008 Christian Grothoff (and other contributing authors)
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published
@@ -164,6 +164,7 @@ fs_search_result_received (SearchList * searchContext,
   GtkTreeStore *model;
   GtkTreeIter iter;
   enum GNUNET_URITRACK_STATE state;
+  struct GNUNET_ECRS_URI * have;
 
   state = GNUNET_URITRACK_get_state (ectx, cfg, info->uri);
   if ((state & (GNUNET_URITRACK_INSERTED |
@@ -174,6 +175,20 @@ fs_search_result_received (SearchList * searchContext,
                                                               GNUNET_YES)))
     return;
   model = GTK_TREE_STORE (gtk_tree_view_get_model (searchContext->treeview));
+  /* Check that the entry does not already exist (for resume!) */  
+  if (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (model), &iter))
+    {
+      do
+        {
+          have = NULL;
+          gtk_tree_model_get (GTK_TREE_MODEL(model),
+                              &iter, SEARCH_URI, &have, -1);
+          if ( (have != NULL) &&
+               (GNUNET_ECRS_uri_test_equal(have, uri)) )
+            return; /* duplicate */
+        }
+      while (gtk_tree_model_iter_next (GTK_TREE_MODEL(model), &iter));
+    }  
   gtk_tree_store_append (model, &iter, NULL);
   addEntryToSearchTree (searchContext, NULL, info, &iter);
   searchContext->resultsReceived++;
@@ -384,6 +399,28 @@ fs_search_started (struct GNUNET_FSUI_SearchList * fsui_list,
   int col;
   int i;
 
+  /* check that search does not already exist
+     with fsui_list == NULL; 
+     (and if so, hijack!) */
+  list = search_head;
+  while (list != NULL)
+    {
+      if ( (list->fsui_list == NULL) &&
+           (list->uri != NULL) &&
+           (GNUNET_ECRS_uri_test_equal(list->uri,
+                                       uri)) )
+        {
+          list->fsui_list = fsui_list;
+          for (i = 0; i < resultCount; i++)
+            fs_search_result_received (list, &results[i], uri);
+          if (resultCount == 0)  /* otherwise already done! */
+            updateSearchSummary (list);
+          return list;
+        }
+      list = list->next;
+    }
+
+  /* build new entry */
   description = GNUNET_ECRS_uri_to_string (uri);
   if (description == NULL)
     {
@@ -407,6 +444,8 @@ fs_search_started (struct GNUNET_FSUI_SearchList * fsui_list,
   list->uri = GNUNET_ECRS_uri_duplicate (uri);
   list->fsui_list = fsui_list;
   list->next = search_head;
+  list->anonymityLevel = anonymityLevel;
+
   search_head = list;
   list->searchXML
     =
@@ -604,7 +643,12 @@ freeIterSubtree (GtkTreeModel * tree, GtkTreeIter * iter)
 void
 fs_search_aborted (SearchList * list)
 {
-  /* FIXME: show aborted status somehow! */
+  gtk_widget_show(glade_xml_get_widget(list->searchXML,
+                                       "searchResumeButton"));
+  gtk_widget_show(glade_xml_get_widget(list->searchXML,
+                                       "searchAbortButton"));
+  gtk_widget_show(glade_xml_get_widget(list->searchXML,
+                                       "searchPauseButton"));
 }
 
 /**
@@ -622,6 +666,14 @@ fs_search_stopped (SearchList * list)
   int index;
   int i;
 
+  if (list->is_paused == GNUNET_YES)
+    {
+      /* if this was just a request to pause,
+         then simply ignore the FS-stopped event */
+      list->fsui_list = NULL;
+      list->is_paused = GNUNET_NO;
+      return;
+    }
   /* remove from linked list */
   if (search_head == list)
     {
@@ -701,8 +753,6 @@ on_fssearchKeywordComboBoxEntry_changed_fs (gpointer dummy2,
 typedef struct
 {
   unsigned int anonymity;
-  unsigned int max;
-  GNUNET_CronTime delay;
   struct GNUNET_ECRS_URI *uri;
 } FSSS;
 
@@ -710,7 +760,7 @@ static void *
 search_start_helper (void *cls)
 {
   FSSS *fsss = cls;
-  GNUNET_FSUI_search_start (ctx, fsss->anonymity, fsss->max, fsss->delay,
+  GNUNET_FSUI_search_start (ctx, fsss->anonymity,
                             fsss->uri);
   return NULL;
 }
@@ -846,13 +896,7 @@ on_fssearchbutton_clicked_fs (gpointer dummy2, GtkWidget * searchButton)
       list = list->next;
     }
   fsss.anonymity = getSpinButtonValue (GNUNET_GTK_get_main_glade_XML (),
-                                       "searchAnonymitySelectionSpinButton");
-  fsss.max =
-    getSpinButtonValue (GNUNET_GTK_get_main_glade_XML (),
-                        "maxResultsSpinButton");
-  fsss.delay =
-    getSpinButtonValue (GNUNET_GTK_get_main_glade_XML (),
-                        "searchDelaySpinButton") * GNUNET_CRON_SECONDS;
+                                       "searchAnonymitySelectionSpinButton");
   GNUNET_GTK_run_with_save_calls (search_start_helper, &fsss);
   GNUNET_ECRS_uri_destroy (fsss.uri);
 }
@@ -897,7 +941,8 @@ on_closeSearchButton_clicked_fs (GtkWidget * searchPage,
   GNUNET_GE_ASSERT (ectx, list != NULL);
   if (list->fsui_list == NULL)
     {
-      /* open directory - close directly */
+      /* open directory or paused search; 
+         close directly */
       fs_search_stopped (list);
     }
   else
@@ -911,12 +956,70 @@ on_closeSearchButton_clicked_fs (GtkWidget * searchPage,
     }
 }
 
+
+/**
+ * The abort button in the search summary was clicked.
+ */
+void
+on_searchPauseButton_clicked_fs (GtkWidget * searchPage,
+                                 GtkWidget * pauseButton)
+{
+  SearchList *list;
+  struct FCBC fcbc;
+
+  list = search_head;
+  while (list != NULL)
+    {
+      if (list->searchpage == searchPage)
+        break;
+      list = list->next;
+    }
+  GNUNET_GE_ASSERT (ectx, list != NULL);
+  gtk_widget_hide(pauseButton);
+  gtk_widget_show(glade_xml_get_widget(list->searchXML,
+                                       "searchResumeButton"));
+  if (list->fsui_list != NULL)
+    {
+      list->is_paused = GNUNET_YES;
+      fcbc.method = &GNUNET_FSUI_search_stop;
+      fcbc.argument = list->fsui_list;
+      GNUNET_GTK_run_with_save_calls (&fsui_callback, &fcbc);
+    }
+}
+
+/**
+ * The abort button in the search summary was clicked.
+ */
+void
+on_searchResumeButton_clicked_fs (GtkWidget * searchPage,
+                                  GtkWidget * resumeButton)
+{
+  FSSS fsss;
+  SearchList *list;
+
+  list = search_head;
+  while (list != NULL)
+    {
+      if (list->searchpage == searchPage)
+        break;
+      list = list->next;
+    }
+  GNUNET_GE_ASSERT (ectx, list != NULL);
+  gtk_widget_hide(resumeButton);
+  gtk_widget_show(glade_xml_get_widget(list->searchXML,
+                                       "searchPauseButton"));
+  fsss.anonymity = getSpinButtonValue (GNUNET_GTK_get_main_glade_XML (),
+                                       "searchAnonymitySelectionSpinButton");
+  fsss.uri = list->uri;
+  GNUNET_GTK_run_with_save_calls (search_start_helper, &fsss);
+}
+
 /**
  * The abort button was clicked.  Abort the search.
  */
 void
 on_abortSearchButton_clicked_fs (GtkWidget * searchPage,
-                                 GtkWidget * closeButton)
+                                 GtkWidget * abortButton)
 {
   SearchList *list;
   struct FCBC fcbc;
@@ -929,6 +1032,7 @@ on_abortSearchButton_clicked_fs (GtkWidget * searchPage,
       list = list->next;
     }
   GNUNET_GE_ASSERT (ectx, list != NULL);
+  gtk_widget_hide(abortButton);
   if (list->fsui_list != NULL)
     {
       fcbc.method = &GNUNET_FSUI_search_abort;
@@ -1007,4 +1111,5 @@ on_abortSearchSummaryButton_clicked_fs (GtkWidget * treeview,
   GNUNET_GTK_tree_selection_selected_foreach (selection, &abortSearch, NULL);
 }
 
+
 /* end of search.c */
diff --git a/src/plugins/stats/functions.c b/src/plugins/stats/functions.c
index f566f45e..f7faaf0e 100644
--- a/src/plugins/stats/functions.c
+++ b/src/plugins/stats/functions.c
@@ -1,6 +1,6 @@
 /*
      This file is part of GNUnet
-     (C) 2004, 2005, 2006 Christian Grothoff (and other contributing authors)
+     (C) 2004, 2005, 2006, 2008 Christian Grothoff (and other contributing authors)
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published
@@ -39,9 +39,9 @@ static struct GNUNET_Mutex *lock;
 
 static long connectionGoal;
 
-static long long banddown;
+static unsigned long long banddown;
 
-static long long bandup;
+static unsigned long long bandup;
 
 static struct GNUNET_GE_Context *ectx;
 
@@ -50,8 +50,8 @@ static struct GNUNET_GC_Configuration *cfg;
 static struct GNUNET_CronManager *cron;
 
 static int
-getStatValue (long long *value,
-              long long *lvalue,
+getStatValue (unsigned long long *value,
+              unsigned long long *lvalue,
               GNUNET_CronTime * dtime, const char *optName, int monotone)
 {
   unsigned int i;
@@ -120,8 +120,8 @@ updateConnectionGoal (void *unused)
 static int
 getConnectedNodesStat (const void *closure, gfloat ** data)
 {
-  long long val;
-
+  unsigned long long val;
+  
   if (connectionGoal == 0)
     return GNUNET_SYSERR;
   if (GNUNET_OK !=
@@ -134,10 +134,10 @@ getConnectedNodesStat (const void *closure, gfloat ** data)
 static int
 getLoadStat (const void *closure, gfloat ** data)
 {
-  long long valc;
-  long long vali;
-  long long valu;
-  long long vald;
+  unsigned long long valc;
+  unsigned long long vali;
+  unsigned long long valu;
+  unsigned long long vald;
 
   if (GNUNET_OK !=
       getStatValue (&valc, NULL, NULL, "% of allowed cpu load", GNUNET_NO))
@@ -164,8 +164,8 @@ getLoadStat (const void *closure, gfloat ** data)
 static int
 getQuotaStat (const void *closure, gfloat ** data)
 {
-  long long allowed;
-  long long have;
+  unsigned long long allowed;
+  unsigned long long have;
 
   if (GNUNET_OK != getStatValue (&allowed,
                                  NULL, NULL, "# bytes allowed in datastore",
@@ -183,18 +183,18 @@ getQuotaStat (const void *closure, gfloat ** data)
 static int
 getTrafficRecvStats (const void *closure, gfloat ** data)
 {
-  long long total;
-  long long noise;
-  long long content;
-  long long queries;
-  long long hellos;
-  long long rlimit;
-  long long ltotal;
-  long long lnoise;
-  long long lcontent;
-  long long lqueries;
-  long long lhellos;
-  long long lrlimit;
+  unsigned long long total;
+  unsigned long long noise;
+  unsigned long long content;
+  unsigned long long queries;
+  unsigned long long hellos;
+  unsigned long long rlimit;
+  unsigned long long ltotal;
+  unsigned long long lnoise;
+  unsigned long long lcontent;
+  unsigned long long lqueries;
+  unsigned long long lhellos;
+  unsigned long long lrlimit;
   GNUNET_CronTime dtime;
   char *buffer;
 
@@ -272,18 +272,18 @@ getTrafficRecvStats (const void *closure, gfloat ** data)
 static int
 getTrafficSendStats (const void *closure, gfloat ** data)
 {
-  long long total;
-  long long noise;
-  long long content;
-  long long queries;
-  long long hellos;
-  long long slimit;
-  long long ltotal;
-  long long lnoise;
-  long long lcontent;
-  long long lqueries;
-  long long lhellos;
-  long long lslimit;
+  unsigned long long total;
+  unsigned long long noise;
+  unsigned long long content;
+  unsigned long long queries;
+  unsigned long long hellos;
+  unsigned long long slimit;
+  unsigned long long ltotal;
+  unsigned long long lnoise;
+  unsigned long long lcontent;
+  unsigned long long lqueries;
+  unsigned long long lhellos;
+  unsigned long long lslimit;
   GNUNET_CronTime dtime;
   char *buffer;
 
@@ -365,12 +365,12 @@ getEffectivenessStats (const void *closure, gfloat ** data)
   static GNUNET_CronTime last;
   static double lastdata;
   static double lastavg;
-  long long total;
-  long long success;
-  long long local;
-  long long ltotal;
-  long long lsuccess;
-  long long llocal;
+  unsigned long long total;
+  unsigned long long success;
+  unsigned long long local;
+  unsigned long long ltotal;
+  unsigned long long lsuccess;
+  unsigned long long llocal;
   GNUNET_CronTime now;
 
   now = GNUNET_get_time ();
@@ -474,7 +474,7 @@ updateDaemonStatus (void *delta)
 {
   static gboolean once = TRUE;
   static int last_status = -5;
-  long long connected_peers;
+  unsigned long long connected_peers;
   char *label;
   static GtkWidget *statusConnexionsLabel;
   static GtkWidget *statusConnexionsPic;
@@ -522,8 +522,8 @@ updateDaemonStatus (void *delta)
   }
   if (GNUNET_OK == GNUNET_test_daemon_running (ectx, cfg))
     {      
-        if (GNUNET_OK != getStatValue (&connected_peers, (GNUNET_CronTime *) delta,
-                                       NULL, "# of connected peers", GNUNET_NO))
+      if (GNUNET_OK != getStatValue (&connected_peers, (GNUNET_CronTime *) delta,
+                                     NULL, "# of connected peers", GNUNET_NO))
         {
       if (last_status != -1)
         {
diff --git a/src/plugins/stats/functions.h b/src/plugins/stats/functions.h
index 6c3b2c24..6d05ce26 100644
--- a/src/plugins/stats/functions.h
+++ b/src/plugins/stats/functions.h
@@ -27,8 +27,8 @@
 typedef struct
 {
   char *statName;
-  long long value;
-  long long lvalue;
+  unsigned long long value;
+  unsigned long long lvalue;
   GNUNET_CronTime delta;
 } StatPair;