issuer

9 files changed, 181 insertions, 14 deletions

diff --git a/src/experimentation/Makefile.am b/src/experimentation/Makefile.am
index 8252e74cb..2521e48ba 100644
--- a/src/experimentation/Makefile.am
+++ b/src/experimentation/Makefile.am
@@ -34,8 +34,9 @@ libexec_PROGRAMS = \
 
 gnunet_daemon_experimentation_SOURCES = \
  gnunet-daemon-experimentation.c \
- gnunet-daemon-experimentation_capabilites.c \
- gnunet-daemon-experimentation_nodes.c 
+ gnunet-daemon-experimentation_capabilities.c \
+ gnunet-daemon-experimentation_nodes.c \
+ gnunet-daemon-experimentation_experiments.c
 gnunet_daemon_experimentation_LDADD = \
   $(top_builddir)/src/core/libgnunetcore.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
diff --git a/src/experimentation/experimentation.conf.in b/src/experimentation/experimentation.conf.in
index 058dac035..6597dd0c1 100644
--- a/src/experimentation/experimentation.conf.in
+++ b/src/experimentation/experimentation.conf.in
@@ -9,3 +9,4 @@ ACCEPT_FROM6 = ::1;
 UNIXPATH = /tmp/gnunet-daemon-experimentation.sock
 UNIX_MATCH_UID = YES
 UNIX_MATCH_GID = YES
+ISSUERS = TFRM29O2RQNKLVBQIGODJ6GD58LSQ2NM9TNFBC6N48BRJHQO38Q73N2OM3V4CLKDM6CILQV4CU8PMJDRG0FNB0PDI057DBRANMLPLRG
\ No newline at end of file
diff --git a/src/experimentation/gnunet-daemon-experimentation.c b/src/experimentation/gnunet-daemon-experimentation.c
index 824eab580..78177f59c 100644
--- a/src/experimentation/gnunet-daemon-experimentation.c
+++ b/src/experimentation/gnunet-daemon-experimentation.c
@@ -46,6 +46,7 @@ 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_experiments_stop ();
   GNUNET_EXPERIMENTATION_capabilities_stop ();
 }
 
@@ -73,12 +74,16 @@ run (void *cls, char *const *args, const char *cfgfile,
                 return;
         }
 
-        GNUNET_EXPERIMENTATION_capabilities_start();
+        GNUNET_EXPERIMENTATION_capabilities_start ();
+        if (GNUNET_SYSERR == GNUNET_EXPERIMENTATION_experiments_start ())
+        {
+          GNUNET_SCHEDULER_add_now (&shutdown_task, NULL);
+          return;
+        }
         GNUNET_EXPERIMENTATION_nodes_start ();
 
   GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, &shutdown_task,
                                 NULL);
-
 }
 
 
diff --git a/src/experimentation/gnunet-daemon-experimentation.h b/src/experimentation/gnunet-daemon-experimentation.h
index 81d70f668..d7508f9fc 100644
--- a/src/experimentation/gnunet-daemon-experimentation.h
+++ b/src/experimentation/gnunet-daemon-experimentation.h
@@ -120,6 +120,14 @@ GNUNET_EXPERIMENTATION_nodes_start ();
 void
 GNUNET_EXPERIMENTATION_nodes_stop ();
 
+/**
+ * Are the capabilities provided?
+ *
+ * @param have bitstring containing the provided capabilities
+ * @param have bitstring containing the desired capabilities
+ */
+int
+GNUNET_EXPERIMENTATION_capabilities_have (uint32_t have, uint32_t desired);
 
 /**
  * Start the detecting capabilities
@@ -134,4 +142,28 @@ void
 GNUNET_EXPERIMENTATION_capabilities_stop ();
 
 
+/**
+ * Start experiments management
+ *
+ * @return GNUNET_YES or GNUNET_NO
+ */
+int
+GNUNET_EXPERIMENTATION_experiments_issuer_accepted (struct GNUNET_PeerIdentity *issuer_ID);
+
+
+/**
+ * Start experiments management
+ *
+ * @return GNUNET_OK on success, GNUNET_SYSERR on error
+ */
+int
+GNUNET_EXPERIMENTATION_experiments_start ();
+
+/**
+ * Stop experiments management
+ */
+void
+GNUNET_EXPERIMENTATION_experiments_stop ();
+
+
 /* end of gnunet-daemon-experimentation.h */
diff --git a/src/experimentation/gnunet-daemon-experimentation_capabilites.c b/src/experimentation/gnunet-daemon-experimentation_capabilities.c
index e77dbfab7..74220435a 100644
--- a/src/experimentation/gnunet-daemon-experimentation_capabilites.c
+++ b/src/experimentation/gnunet-daemon-experimentation_capabilities.c
@@ -65,11 +65,16 @@ GNUNET_EXPERIMENTATION_capability_to_str (uint32_t cap)
 
 }
 
-
-uint32_t
-GNUNET_EXPERIMENTATION_capabilities_have (uint32_t cap)
+/**
+ * Are the capabilities provided?
+ *
+ * @param have bitstring containing the provided capabilities
+ * @param have bitstring containing the desired capabilities
+ */
+int
+GNUNET_EXPERIMENTATION_capabilities_have (uint32_t have, uint32_t desired)
 {
-        if (cap == (cap & GSE_node_capabilities))
+        if (desired == (desired & have))
                 return GNUNET_YES;
         else
                 return GNUNET_NO;
@@ -132,7 +137,7 @@ GNUNET_EXPERIMENTATION_capabilities_start ()
   {
                 index = 1;
                 index = index << c1;
-                if (GNUNET_YES == GNUNET_EXPERIMENTATION_capabilities_have (index))
+                if (GNUNET_YES == GNUNET_EXPERIMENTATION_capabilities_have (GSE_node_capabilities, index))
                 {
                         GNUNET_log (GNUNET_ERROR_TYPE_INFO, "We have `%s'\n",
                                         GNUNET_EXPERIMENTATION_capability_to_str(index));
diff --git a/src/experimentation/gnunet-daemon-experimentation_experiments.c b/src/experimentation/gnunet-daemon-experimentation_experiments.c
new file mode 100644
index 000000000..9740e1f77
--- /dev/null
+++ b/src/experimentation/gnunet-daemon-experimentation_experiments.c
@@ -0,0 +1,108 @@
+/*
+     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_experiments.c
+ * @brief experimentation daemon: experiment 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"
+
+struct GNUNET_CONTAINER_MultiHashMap *issuer;
+
+/**
+ * Is peer a valid issuer
+ *
+ * @return GNUNET_YES or GNUNET_NO
+ */
+int
+GNUNET_EXPERIMENTATION_experiments_issuer_accepted (struct GNUNET_PeerIdentity *issuer_ID)
+{
+        if (GNUNET_CONTAINER_multihashmap_contains (issuer, &issuer_ID->hashPubKey))
+                return GNUNET_YES;
+        else
+                return GNUNET_NO;
+}
+
+
+/**
+ * Start experiments management
+ */
+int
+GNUNET_EXPERIMENTATION_experiments_start ()
+{
+        char *issuers;
+        char *pos;
+        struct GNUNET_PeerIdentity issuer_ID;
+
+        /* Load valid issuer */
+        if (GNUNET_SYSERR == GNUNET_CONFIGURATION_get_value_string (GSE_cfg, "EXPERIMENTATION", "ISSUERS", &issuers))
+        {
+                        GNUNET_log (GNUNET_ERROR_TYPE_ERROR, _("No valid experiment issuers configured! Set value to peer id of issuer! Exit...\n"));
+                        return GNUNET_SYSERR;
+        }
+
+        issuer = GNUNET_CONTAINER_multihashmap_create (10, GNUNET_NO);
+
+  for (pos = strtok (issuers, " "); pos != NULL; pos = strtok (NULL, " "))
+  {
+
+                if (GNUNET_SYSERR == GNUNET_CRYPTO_hash_from_string (pos, &issuer_ID.hashPubKey))
+                {
+                        GNUNET_log (GNUNET_ERROR_TYPE_ERROR, _("Invalid value `%s'\n"), pos);
+                }
+                else
+                {
+                                GNUNET_log (GNUNET_ERROR_TYPE_INFO, "`%s' is a valid issuer \n", GNUNET_i2s (&issuer_ID));
+                                GNUNET_CONTAINER_multihashmap_put (issuer, &issuer_ID.hashPubKey,
+                                                NULL, GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST);
+                }
+  }
+  GNUNET_free (issuers);
+
+  if (0 == GNUNET_CONTAINER_multihashmap_size (issuer))
+  {
+                GNUNET_log (GNUNET_ERROR_TYPE_ERROR, _("No valid experiment issuers configured! Set value to peer id of issuer! Exit...\n"));
+                GNUNET_EXPERIMENTATION_experiments_stop ();
+                return GNUNET_SYSERR;
+  }
+
+  GNUNET_STATISTICS_set (GSE_stats, "# issuer", GNUNET_CONTAINER_multihashmap_size (issuer), GNUNET_NO);
+        return GNUNET_OK;
+}
+
+/**
+ * Stop experiments management
+ */
+void
+GNUNET_EXPERIMENTATION_experiments_stop ()
+{
+        if (NULL != issuer)
+                GNUNET_CONTAINER_multihashmap_destroy (issuer);
+        issuer = NULL;
+}
+
+/* end of gnunet-daemon-experimentation_experiments.c */
diff --git a/src/experimentation/gnunet-daemon-experimentation_nodes.c b/src/experimentation/gnunet-daemon-experimentation_nodes.c
index cb94ddca0..2ddfb4dcb 100644
--- a/src/experimentation/gnunet-daemon-experimentation_nodes.c
+++ b/src/experimentation/gnunet-daemon-experimentation_nodes.c
@@ -410,8 +410,6 @@ core_receive_handler (void *cls,
 
 /**
  * Start the nodes management
- *
- * @param cfg configuration handle
  */
 void
 GNUNET_EXPERIMENTATION_nodes_start ()
diff --git a/src/experimentation/test_experimentation_clique.c b/src/experimentation/test_experimentation_clique.c
index a71010441..f4a195fb0 100644
--- a/src/experimentation/test_experimentation_clique.c
+++ b/src/experimentation/test_experimentation_clique.c
@@ -85,6 +85,7 @@ struct ExperimentationPeer
   unsigned int active_nodes;
   unsigned int requested_nodes;
   unsigned int inactive_nodes;
+  unsigned int issuer;
 };
 
 
@@ -160,18 +161,23 @@ check_end ()
   unsigned int total_active = 0;
   unsigned int total_inactive = 0;
   unsigned int total_requested = 0;
+  unsigned int issuer = 0;
 
         for (peer = 0; peer < NUM_PEERS; peer++)
         {
                         total_active += ph[peer].active_nodes;
                         total_requested += ph[peer].requested_nodes;
                         total_inactive += ph[peer].inactive_nodes;
+                        if (1 == ph[peer].issuer)
+                                issuer ++;
+
         }
         if (last_value < total_active)
                 fprintf (stderr, ".");
 
         if ((total_active == (NUM_PEERS * (NUM_PEERS -1))) &&
-                 (total_requested == 0) && (total_inactive == 0))
+                 (total_requested == 0) && (total_inactive == 0) &&
+                 (issuer == NUM_PEERS))
         {
                         fprintf (stderr, "\n");
                         GNUNET_log (GNUNET_ERROR_TYPE_INFO, "All %u peers active in a clique\n", NUM_PEERS);
@@ -209,6 +215,11 @@ stat_iterator (void *cls, const char *subsystem, const char *name,
         {
                         peer->requested_nodes = value;
         }
+        if (0 == strcmp (name, "# issuer"))
+        {
+                        peer->issuer = value;
+        }
+
         check_end ();
 
         return GNUNET_OK;
@@ -246,6 +257,9 @@ stat_comp_cb (void *cls, struct GNUNET_TESTBED_Operation *op,
   GNUNET_break (GNUNET_OK == GNUNET_STATISTICS_watch
                 (sh, "experimentation", "# nodes requested",
                  stat_iterator, peer));
+  GNUNET_break (GNUNET_OK == GNUNET_STATISTICS_watch
+                (sh, "experimentation", "# issuer",
+                 stat_iterator, peer));
 }
 
 /**
diff --git a/src/experimentation/test_experimentation_clique.conf b/src/experimentation/test_experimentation_clique.conf
index fc4af4004..8380a31f8 100644
--- a/src/experimentation/test_experimentation_clique.conf
+++ b/src/experimentation/test_experimentation_clique.conf
@@ -17,7 +17,9 @@ AUTOSTART = NO
 AUTOSTART = NO
 
 [dht]
-AUTOSTART = NO
+AUTOSTART = YES
+DISABLE_TRY_CONNECT = NO
+
 
 [block]
 plugins = dht test
@@ -35,6 +37,7 @@ PORT = 12365
 
 [experimentation]
 #PREFIX = valgrind --leak-check=full
+ISSUERS = TFRM29O2RQNKLVBQIGODJ6GD58LSQ2NM9TNFBC6N48BRJHQO38Q73N2OM3V4CLKDM6CILQV4CU8PMJDRG0FNB0PDI057DBRANMLPLRG
 
 [ats]
 WAN_QUOTA_OUT = 3932160
@@ -46,7 +49,7 @@ AUTOSTART = YES
 USE_EPHEMERAL_KEYS = NO
 
 [arm]
-DEFAULTSERVICES = core transport experimentation
+DEFAULTSERVICES = core transport experimentation dht
 PORT = 12366
 
 [transport-udp]