[GNUnet-SVN] r27267 - gnunet/src/experimentation

[gnunet]

Author: wachs
Date: 2013-05-23 14:22:08 +0200 (Thu, 23 May 2013)
New Revision: 27267

Added:
   gnunet/src/experimentation/gnunet-daemon-experimentation_capabilites.c
Modified:
   gnunet/src/experimentation/Makefile.am
   gnunet/src/experimentation/gnunet-daemon-experimentation.c
   gnunet/src/experimentation/gnunet-daemon-experimentation.h
   gnunet/src/experimentation/gnunet-daemon-experimentation_nodes.c
Log:
adding capabilities


Modified: gnunet/src/experimentation/Makefile.am
===================================================================
--- gnunet/src/experimentation/Makefile.am      2013-05-23 11:38:57 UTC (rev 
27266)
+++ gnunet/src/experimentation/Makefile.am      2013-05-23 12:22:08 UTC (rev 
27267)
@@ -28,7 +28,9 @@
  gnunet-daemon-experimentation
 
 gnunet_daemon_experimentation_SOURCES = \
- gnunet-daemon-experimentation.c  gnunet-daemon-experimentation_nodes.c
+ gnunet-daemon-experimentation.c \
+ gnunet-daemon-experimentation_capabilites.c \
+ gnunet-daemon-experimentation_nodes.c 
 gnunet_daemon_experimentation_LDADD = \
   $(top_builddir)/src/core/libgnunetcore.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \

Modified: gnunet/src/experimentation/gnunet-daemon-experimentation.c
===================================================================
--- gnunet/src/experimentation/gnunet-daemon-experimentation.c  2013-05-23 
11:38:57 UTC (rev 27266)
+++ gnunet/src/experimentation/gnunet-daemon-experimentation.c  2013-05-23 
12:22:08 UTC (rev 27267)
@@ -33,6 +33,8 @@
 
 struct GNUNET_STATISTICS_Handle *GSE_stats;
 
+struct GNUNET_CONFIGURATION_Handle *GSE_cfg;
+
 /**
  * Task run during shutdown.
  *
@@ -43,7 +45,8 @@
 shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   GNUNET_log (GNUNET_ERROR_TYPE_INFO, _("Experimentation daemon shutting down 
...\n"));
-  GNUNET_EXPERIMENTATION_nodes_stop();
+  GNUNET_EXPERIMENTATION_nodes_stop ();
+  GNUNET_EXPERIMENTATION_capabilities_stop ();
 }
 
 
@@ -62,6 +65,7 @@
 {
        GNUNET_log (GNUNET_ERROR_TYPE_INFO, _("Experimentation daemon starting 
...\n"));
 
+       GSE_cfg = (struct GNUNET_CONFIGURATION_Handle *) cfg;
        GSE_stats = GNUNET_STATISTICS_create ("experimentation", cfg);
        if (NULL == GSE_stats)
        {
@@ -69,7 +73,8 @@
                return;
        }
 
-       GNUNET_EXPERIMENTATION_nodes_start (cfg);
+       GNUNET_EXPERIMENTATION_capabilities_start();
+       GNUNET_EXPERIMENTATION_nodes_start ();
 
   GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, &shutdown_task,
                                 NULL);

Modified: gnunet/src/experimentation/gnunet-daemon-experimentation.h
===================================================================
--- gnunet/src/experimentation/gnunet-daemon-experimentation.h  2013-05-23 
11:38:57 UTC (rev 27266)
+++ gnunet/src/experimentation/gnunet-daemon-experimentation.h  2013-05-23 
12:22:08 UTC (rev 27267)
@@ -38,6 +38,8 @@
 
 extern struct GNUNET_STATISTICS_Handle *GSE_stats;
 
+extern struct GNUNET_CONFIGURATION_Handle *GSE_cfg;
+
 /**
  * A experimentation node
  */
@@ -80,11 +82,9 @@
 
 /**
  * Start the nodes management
- *
- * @param cfg configuration handle
  */
 void
-GNUNET_EXPERIMENTATION_nodes_start (const struct GNUNET_CONFIGURATION_Handle 
*cfg);
+GNUNET_EXPERIMENTATION_nodes_start ();
 
 
 /**
@@ -93,4 +93,18 @@
 void
 GNUNET_EXPERIMENTATION_nodes_stop ();
 
+
+/**
+ * Start the detecting capabilities
+ */
+void
+GNUNET_EXPERIMENTATION_capabilities_start ();
+
+/**
+ * Stop the detecting capabilities
+ */
+void
+GNUNET_EXPERIMENTATION_capabilities_stop ();
+
+
 /* end of gnunet-daemon-experimentation.h */

Added: gnunet/src/experimentation/gnunet-daemon-experimentation_capabilites.c
===================================================================
--- gnunet/src/experimentation/gnunet-daemon-experimentation_capabilites.c      
                        (rev 0)
+++ gnunet/src/experimentation/gnunet-daemon-experimentation_capabilites.c      
2013-05-23 12:22:08 UTC (rev 27267)
@@ -0,0 +1,54 @@
+/*
+     This file is part of GNUnet.
+     (C) 2009 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
+     by the Free Software Foundation; either version 3, or (at your
+     option) any later version.
+
+     GNUnet is distributed in the hope that it will be useful, but
+     WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     General Public License for more details.
+
+     You should have received a copy of the GNU General Public License
+     along with GNUnet; see the file COPYING.  If not, write to the
+     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+     Boston, MA 02111-1307, USA.
+*/
+
+/**
+ * @file experimentation/gnunet-daemon-experimentation_capabilities.c
+ * @brief experimentation daemon: capabilities management
+ * @author Christian Grothoff
+ * @author Matthias Wachs
+ */
+#include "platform.h"
+#include "gnunet_getopt_lib.h"
+#include "gnunet_util_lib.h"
+#include "gnunet_core_service.h"
+#include "gnunet_statistics_service.h"
+#include "gnunet-daemon-experimentation.h"
+
+/**
+ * Start the detecting capabilities
+ *
+ * @param cfg configuration handle
+ */
+void
+GNUNET_EXPERIMENTATION_capabilities_start ()
+{
+
+}
+
+/**
+ * Stop the detecting capabilities
+ */
+void
+GNUNET_EXPERIMENTATION_capabilities_stop ()
+{
+
+}
+
+/* end of gnunet-daemon-experimentation_capabilities.c */

Modified: gnunet/src/experimentation/gnunet-daemon-experimentation_nodes.c
===================================================================
--- gnunet/src/experimentation/gnunet-daemon-experimentation_nodes.c    
2013-05-23 11:38:57 UTC (rev 27266)
+++ gnunet/src/experimentation/gnunet-daemon-experimentation_nodes.c    
2013-05-23 12:22:08 UTC (rev 27267)
@@ -410,10 +410,10 @@
  * @param cfg configuration handle
  */
 void
-GNUNET_EXPERIMENTATION_nodes_start (const struct GNUNET_CONFIGURATION_Handle 
*cfg)
+GNUNET_EXPERIMENTATION_nodes_start ()
 {
        /* Connecting to core service to find partners */
-       ch = GNUNET_CORE_connect (cfg, NULL,
+       ch = GNUNET_CORE_connect (GSE_cfg, NULL,
                                                                                
                                &core_startup_handler,
                                                                                
                                &core_connect_handler,
                                                                                
                                &core_disconnect_handler,