fixing Mantis 1299

2 files changed, 52 insertions, 9 deletions

diff --git a/src/plugins/daemon/Makefile.am b/src/plugins/daemon/Makefile.am
index 57697a65..e2379ff5 100644
--- a/src/plugins/daemon/Makefile.am
+++ b/src/plugins/daemon/Makefile.am
@@ -14,6 +14,7 @@ libgnunetgtkmodule_daemon_la_SOURCES = \
 libgnunetgtkmodule_daemon_la_LIBADD = \
          @GTK_LIBS@ @GNUNETGTK_LIBS@ \
   $(top_builddir)/src/common/libgnunetgtk_common.la \
+  -lgnunetstats_api \
   -lgnunetutil \
   -lgnunetgetoption_api 
 libgnunetgtkmodule_daemon_la_LDFLAGS = \
diff --git a/src/plugins/daemon/daemon.c b/src/plugins/daemon/daemon.c
index a8bc1cf8..cf8b4f43 100644
--- a/src/plugins/daemon/daemon.c
+++ b/src/plugins/daemon/daemon.c
@@ -1,6 +1,6 @@
 /*
      This file is part of GNUnet.
-     (C) 2005, 2006 Christian Grothoff (and other contributing authors)
+     (C) 2005, 2006, 2007 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
@@ -28,6 +28,7 @@
 #include "gnunetgtk_common.h"
 #include <GNUnet/gnunet_directories.h>
 #include <GNUnet/gnunet_getoption_lib.h>
+#include <GNUnet/gnunet_stats_lib.h>
 #include <GNUnet/gnunet_util.h>
 #include <gtk/gtk.h>
 
@@ -225,15 +226,56 @@ 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)
 {
+  static int did_warn;
   int ret;
+  unsigned long long value;
+  struct GNUNET_ClientServerConnection *sock;
 
   if (GNUNET_OK == GNUNET_test_daemon_running (ectx, cfg))
-    ret = 1;
+    {      
+      ret = 1;
+      value = 0;
+      sock = GNUNET_client_connection_create (ectx, cfg);
+      if ( (sock == NULL) ||
+           (GNUNET_OK !=
+            GNUNET_STATS_get_statistics (ectx, sock, &statsProcessor, &value)) ) 
+        {
+          GNUNET_GTK_add_log_entry (_("WARNING: Failed to obtain connection statistics from gnunetd.\n"));
+        }
+      else 
+        {
+          if (value == 0) 
+            {
+              GNUNET_GTK_add_log_entry (_("WARNING: We are currently disconnected from the P2P network!\n"));
+              did_warn = 1;
+            }
+          else if (did_warn) 
+            {
+              did_warn = 0;
+              GNUNET_GTK_add_log_entry (_("We are now connected to the P2P network.\n"));
+            }
+        }
+      GNUNET_client_connection_destroy (sock);
+     }
   else
-    ret = 0;
+    {
+      ret = 0;
+    }
   GNUNET_GTK_save_call (&doUpdateMenus, &ret);
 }
 
@@ -258,7 +300,7 @@ on_startDaemon_clicked_daemon (GtkWidget * widget, gpointer data)
     }
   else
     {
-      GNUNET_GTK_add_log_entry (_("Launching gnunetd..."));
+      GNUNET_GTK_add_log_entry (_("Launching gnunetd...\n"));
       chooser
         = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
                                 "gnunetdconfigFileChooserButton");
@@ -266,11 +308,11 @@ on_startDaemon_clicked_daemon (GtkWidget * widget, gpointer data)
       GNUNET_GE_BREAK (ectx, fn != NULL);
       if (GNUNET_SYSERR != GNUNET_daemon_start (ectx, cfg, fn, GNUNET_YES))
         {
-          GNUNET_GTK_add_log_entry (_("Launched gnunetd"));
+          GNUNET_GTK_add_log_entry (_("Launched gnunetd\n"));
         }
       else
         {
-          GNUNET_GTK_add_log_entry (_("Launching gnunetd failed"));
+          GNUNET_GTK_add_log_entry (_("Launching gnunetd failed\n"));
         }
       if (fn != NULL)
         g_free (fn);
@@ -302,13 +344,13 @@ on_stopDaemon_clicked_daemon (GtkWidget * widget, gpointer data)
             (NULL,
              GTK_DIALOG_MODAL,
              GTK_MESSAGE_ERROR,
-             GTK_BUTTONS_CLOSE, _("Error requesting shutdown of gnunetd."));
+             GTK_BUTTONS_CLOSE, _("Error requesting shutdown of gnunetd.\n"));
           gtk_dialog_run (GTK_DIALOG (dialog));
           gtk_widget_destroy (dialog);
         }
       else
         {
-          GNUNET_GTK_add_log_entry (_("Terminating gnunetd..."));
+          GNUNET_GTK_add_log_entry (_("Terminating gnunetd...\n"));
         }
       GNUNET_client_connection_destroy (sock);
     }
@@ -370,7 +412,7 @@ init_daemon (struct GNUNET_GE_Context *e, struct GNUNET_GC_Configuration *c)
   else
     {
       GNUNET_GTK_add_log_entry (_
-                                ("Configuration file for GNUnet daemon `%s' does not exist! Run `gnunet-setup -d'."),
+                                ("Configuration file for GNUnet daemon `%s' does not exist! Run `gnunet-setup -d'.\n"),
                                 daemon_config);
     }
   GNUNET_free (daemon_config);