gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[GNUnet-SVN] r35470 - gnunet/src/rps


From: gnunet
Subject: [GNUnet-SVN] r35470 - gnunet/src/rps
Date: Thu, 26 Mar 2015 23:04:22 +0100

Author: ch3
Date: 2015-03-26 23:04:21 +0100 (Thu, 26 Mar 2015)
New Revision: 35470

Added:
   gnunet/src/rps/test_rps.c
Removed:
   gnunet/src/rps/test_rps_multipeer.c
Modified:
   gnunet/src/rps/Makefile.am
   gnunet/src/rps/gnunet-service-rps.c
Log:
-unified testing

Modified: gnunet/src/rps/Makefile.am
===================================================================
--- gnunet/src/rps/Makefile.am  2015-03-26 18:30:11 UTC (rev 35469)
+++ gnunet/src/rps/Makefile.am  2015-03-26 22:04:21 UTC (rev 35470)
@@ -76,15 +76,15 @@
 endif
 
 test_rps_multipeer_SOURCES = \
- test_rps_multipeer.c
+ test_rps.c
 test_rps_multipeer_LDADD = $(ld_rps_test_lib)
 
 test_rps_malicious_1_SOURCES = \
-       test_rps_malicious.c
+       test_rps.c
 test_rps_malicious_1_LDADD = $(ld_rps_test_lib)
 
 test_rps_malicious_2_SOURCES = \
-       test_rps_malicious.c
+       test_rps.c
 test_rps_malicious_2_LDADD = $(ld_rps_test_lib)
 
 EXTRA_DIST = \

Modified: gnunet/src/rps/gnunet-service-rps.c
===================================================================
--- gnunet/src/rps/gnunet-service-rps.c 2015-03-26 18:30:11 UTC (rev 35469)
+++ gnunet/src/rps/gnunet-service-rps.c 2015-03-26 22:04:21 UTC (rev 35470)
@@ -1169,7 +1169,7 @@
 void client_respond (void *cls,
     struct GNUNET_PeerIdentity *ids, uint32_t num_peers)
 {
-  LOG (GNUNET_ERROR_TYPE_DEBUG, "sampler returned %" PRIX32 " peers\n", 
num_peers);
+  LOG (GNUNET_ERROR_TYPE_DEBUG, "sampler returned %" PRIu32 " peers\n", 
num_peers);
   struct GNUNET_MQ_Envelope *ev;
   struct GNUNET_RPS_CS_ReplyMessage *out_msg;
   struct GNUNET_SERVER_Client *client;
@@ -1236,7 +1236,7 @@
   for (i = 0 ; i < num_peers ; i++)
     est_request_rate();
 
-  LOG (GNUNET_ERROR_TYPE_DEBUG, "Client requested %" PRIX32 " random 
peer(s).\n", num_peers);
+  LOG (GNUNET_ERROR_TYPE_DEBUG, "Client requested %" PRIu32 " random 
peer(s).\n", num_peers);
 
   RPS_sampler_get_n_rand_peers (client_sampler, client_respond,
                                 client, num_peers, GNUNET_YES);
@@ -1293,7 +1293,7 @@
   for (i = 0 ; i < num_peers ; i++)
   {
     LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "Updating samplers with seed %" PRIX32 ": %s\n",
+         "Updating samplers with seed %" PRIu32 ": %s\n",
          i,
          GNUNET_i2s (&peers[i]));
 
@@ -1479,11 +1479,12 @@
     return GNUNET_OK;
   }
 
-#ifdef ENABLE_MALICIOUS
+
+  #ifdef ENABLE_MALICIOUS
   // We shouldn't even receive pull replies as we're not sending
   if (2 == mal_type)
     return GNUNET_OK;
-#endif /* ENABLE_MALICIOUS */
+  #endif /* ENABLE_MALICIOUS */
 
   /* Do actual logic */
   peers = (struct GNUNET_PeerIdentity *) &msg[1];
@@ -1497,7 +1498,9 @@
       if (GNUNET_NO == GNUNET_CONTAINER_multipeermap_contains (att_peer_set,
                                                                &peers[i])
           && GNUNET_NO == GNUNET_CONTAINER_multipeermap_contains (mal_peer_set,
-                                                                  &peers[i]))
+                                                                  &peers[i])
+          && GNUNET_NO == GNUNET_CRYPTO_cmp_peer_identity (&peers[i],
+                                                           &own_identity))
       {
         tmp_att_peer = GNUNET_new (struct AttackedPeer);
         tmp_att_peer->peer_id = peers[i];
@@ -1736,7 +1739,8 @@
   else if (0 == mal_type)
   { /* Stop acting malicious */
     num_mal_peers = 0;
-    GNUNET_free (mal_peers);
+    if (NULL != mal_peers)
+      GNUNET_free (mal_peers);
 
     /* Substitute do_mal_round () with do_round () */
     GNUNET_SCHEDULER_cancel (do_round_task);

Copied: gnunet/src/rps/test_rps.c (from rev 35469, 
gnunet/src/rps/test_rps_multipeer.c)
===================================================================
--- gnunet/src/rps/test_rps.c                           (rev 0)
+++ gnunet/src/rps/test_rps.c   2015-03-26 22:04:21 UTC (rev 35470)
@@ -0,0 +1,407 @@
+/*
+     This file is part of GNUnet.
+     Copyright (C) 2009, 2012 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 rps/test_rps_multipeer.c
+ * @brief Testcase for the random peer sampling service.  Starts
+ *        a peergroup with a given number of peers, then waits to
+ *        receive size pushes/pulls from each peer.  Expects to wait
+ *        for one message from each peer.
+ */
+#include "platform.h"
+#include "gnunet_testbed_service.h"
+#include "gnunet_rps_service.h"
+
+#include <inttypes.h>
+
+
+/**
+ * How many peers do we start?
+ */
+#define NUM_PEERS 5
+
+/**
+ * How long do we run the test?
+ */
+#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 30)
+
+
+/**
+ * Portion of malicious peers
+ */
+static double portion = .1;
+
+/**
+ * Type of malicious peer to test
+ */
+static unsigned int mal_type = 0;
+
+
+/**
+ * Information we track for each peer.
+ */
+struct RPSPeer
+{
+  /**
+   * Index of the peer.
+   */
+  unsigned int index;
+
+  /**
+   * Handle for RPS connect operation.
+   */
+  struct GNUNET_TESTBED_Operation *op;
+
+  /**
+   * Handle to RPS service.
+   */
+  struct GNUNET_RPS_Handle *rps_handle;
+
+  /**
+   * ID of the peer.
+   */
+  struct GNUNET_PeerIdentity *peer_id;
+};
+
+
+/**
+ * Information for all the peers.
+ */
+static struct RPSPeer rps_peers[NUM_PEERS];
+
+/**
+ * IDs of the peers.
+ */
+static struct GNUNET_PeerIdentity rps_peer_ids[NUM_PEERS];
+
+/**
+ * Return value from 'main'.
+ */
+static int ok;
+
+
+/**
+ * Task run on timeout to shut everything down.
+ */
+static void
+shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+  unsigned int i;
+
+  for (i=0;i<NUM_PEERS;i++)
+    GNUNET_TESTBED_operation_done (rps_peers[i].op);
+  GNUNET_SCHEDULER_shutdown ();
+}
+
+
+/**
+ * Callback to call when network size estimate is updated.
+ *
+ * @param cls closure
+ * @param timestamp server timestamp
+ * @param estimate the value of the current network size estimate
+ * @param std_dev standard deviation (rounded down to nearest integer)
+ *                of the size estimation values seen
+ *
+ */
+static void
+handle_reply (void *cls, uint64_t n, const struct GNUNET_PeerIdentity *peers)
+{
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Got peer %s\n", GNUNET_i2s (peers));
+  
+  ok = 0;
+}
+
+
+/**
+ * (Randomly) request random peers.
+ */
+  void
+request_peers (void *cls,
+               const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+  struct RPSPeer *peer = (struct RPSPeer *) cls;
+  struct GNUNET_RPS_Request_Handle *req_handle;
+
+  req_handle = GNUNET_RPS_request_peers (peer->rps_handle, 1, handle_reply, 
NULL);
+  GNUNET_free (req_handle);
+}
+
+
+/**
+ * Seed peers.
+ */
+  void
+seed_peers (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+  unsigned int amount;
+  struct RPSPeer *peer = (struct RPSPeer *) cls;
+  unsigned int i;
+
+  GNUNET_assert (1 >= portion
+                 && 0 <  portion);
+                
+  amount = round (portion * NUM_PEERS);
+
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Seeding peers:\n");
+  for (i = 0 ; i < amount ; i++)
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Seeding %u. peer: %s\n",
+                i,
+                GNUNET_i2s (&rps_peer_ids[i]));
+
+  GNUNET_RPS_seed_ids (peer->rps_handle, amount, rps_peer_ids);
+}
+
+
+/**
+ * Get the id of peer i.
+ */
+  void
+info_cb (void *cb_cls,
+         struct GNUNET_TESTBED_Operation *op,
+         const struct GNUNET_TESTBED_PeerInformation *pinfo,
+         const char *emsg)
+{
+  unsigned int i = *((unsigned int *) cb_cls);
+
+  if (NULL == pinfo || NULL != emsg)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Got Error: %s\n", emsg);
+    return;
+  }
+
+  GNUNET_free (cb_cls);
+
+  rps_peer_ids[i] = *(pinfo->result.id);
+  rps_peers[i].peer_id = &rps_peer_ids[i];
+
+}
+
+
+/**
+ * Callback to be called when RPS service connect operation is completed
+ *
+ * @param cls the callback closure from functions generating an operation
+ * @param op the operation that has been finished
+ * @param ca_result the RPS service handle returned from rps_connect_adapter
+ * @param emsg error message in case the operation has failed; will be NULL if
+ *          operation has executed successfully.
+ */
+static void
+rps_connect_complete_cb (void *cls,
+                        struct GNUNET_TESTBED_Operation *op,
+                        void *ca_result,
+                        const char *emsg)
+{
+  struct RPSPeer *rps_peer = cls;
+  struct GNUNET_RPS_Handle *rps = ca_result;
+  struct GNUNET_RPS_Request_Handle *req_handle;
+  uint32_t num_mal_peers;
+
+  rps_peer->rps_handle = rps;
+
+  GNUNET_assert (op == rps_peer->op);
+  if (NULL != emsg)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Failed to connect to RPS service: %s\n",
+                emsg);
+    ok = 1;
+    GNUNET_SCHEDULER_shutdown ();
+    return;
+  }
+
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Started client successfully\n");
+
+  #ifdef ENABLE_MALICIOUS
+  if (1 == mal_type
+      || 1 == mal_type)
+  {
+    GNUNET_assert (1 >= portion
+                   && 0 <  portion);
+    num_mal_peers = round (portion * NUM_PEERS);
+
+    if (rps_peer->index >= num_mal_peers)
+    { /* It's useless to ask a malicious peer about a random sample -
+         it's not sampling */
+      req_handle = GNUNET_RPS_request_peers (rps, 1, handle_reply, NULL);
+      GNUNET_free (req_handle);
+    }
+    return;
+  }
+  #endif /* ENABLE_MALICIOUS */
+
+  req_handle = GNUNET_RPS_request_peers (rps, 1, handle_reply, NULL);
+  GNUNET_free (req_handle);
+  GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply 
(GNUNET_TIME_UNIT_SECONDS, 10),
+                                request_peers, rps_peer);
+  GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply 
(GNUNET_TIME_UNIT_SECONDS, 10),
+                                seed_peers, rps_peer);
+  // TODO test seeding > GNUNET_SERVER_MAX_MESSAGE_SIZE peers
+}
+
+
+/**
+ * Adapter function called to establish a connection to
+ * the RPS service.
+ *
+ * @param cls closure
+ * @param cfg configuration of the peer to connect to; will be available until
+ *          GNUNET_TESTBED_operation_done() is called on the operation returned
+ *          from GNUNET_TESTBED_service_connect()
+ * @return service handle to return in 'op_result', NULL on error
+ */
+static void *
+rps_connect_adapter (void *cls,
+                                const struct GNUNET_CONFIGURATION_Handle *cfg)
+{
+  struct GNUNET_RPS_Handle *h;
+  #ifdef ENABLE_MALICIOUS
+  uint32_t num_mal_peers;
+  struct RPSPeer *rps_peer = (struct RPSPeer *) cls;
+  #endif /* ENABLE_MALICIOUS */
+
+  h = GNUNET_RPS_connect (cfg);
+
+  #ifdef ENABLE_MALICIOUS
+  GNUNET_assert (1 >= portion
+                 && 0 <  portion);
+  num_mal_peers = round (portion * NUM_PEERS);
+
+  if (rps_peer->index < num_mal_peers)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "%u. peer [%s] of %" PRIu32 " malicious peers turning 
malicious\n",
+                rps_peer->index,
+                GNUNET_i2s (rps_peer->peer_id),
+                num_mal_peers);
+
+    GNUNET_RPS_act_malicious (h, mal_type, num_mal_peers, rps_peer_ids);
+  }
+  #endif /* ENABLE_MALICIOUS */
+
+  return h;
+}
+
+
+/**
+ * Adapter function called to destroy connection to
+ * RPS service.
+ *
+ * @param cls closure
+ * @param op_result service handle returned from the connect adapter
+ */
+static void
+rps_disconnect_adapter (void *cls,
+                                         void *op_result)
+{
+  struct GNUNET_RPS_Handle *h = op_result;
+  GNUNET_RPS_disconnect (h);
+}
+
+
+/**
+ * Actual "main" function for the testcase.
+ *
+ * @param cls closure
+ * @param h the run handle
+ * @param num_peers number of peers in 'peers'
+ * @param peers handle to peers run in the testbed
+ * @param links_succeeded the number of overlay link connection attempts that
+ *          succeeded
+ * @param links_failed the number of overlay link connection attempts that
+ *          failed
+ */
+static void
+run (void *cls,
+     struct GNUNET_TESTBED_RunHandle *h,
+     unsigned int num_peers,
+     struct GNUNET_TESTBED_Peer **peers,
+     unsigned int links_succeeded,
+     unsigned int links_failed)
+{
+  unsigned int i;
+  unsigned int *tmp_i;
+
+  for (i = 0 ; i < NUM_PEERS ; i++)
+  {
+    tmp_i = GNUNET_new (unsigned int);
+    *tmp_i = i;
+
+    (void) GNUNET_TESTBED_peer_get_information (peers[i],
+                                                GNUNET_TESTBED_PIT_IDENTITY,
+                                                &info_cb,
+                                                tmp_i);
+  }
+
+
+  GNUNET_assert (NUM_PEERS == num_peers);
+  for (i = 0 ; i < num_peers ; i++)
+  {
+    rps_peers[i].index = i;
+    rps_peers[i].op =
+      GNUNET_TESTBED_service_connect (&rps_peers[i],
+                                                                         
peers[i],
+                                                                         "rps",
+                                                                         
&rps_connect_complete_cb,
+                                                                         
&rps_peers[i],
+                                                                         
&rps_connect_adapter,
+                                                                         
&rps_disconnect_adapter,
+                                                                         
&rps_peers[i]);
+  }
+  GNUNET_SCHEDULER_add_delayed (TIMEOUT, &shutdown_task, NULL);
+}
+
+
+/**
+ * Entry point for the testcase, sets up the testbed.
+ *
+ * @param argc unused
+ * @param argv unused
+ * @return 0 on success
+ */
+int
+main (int argc, char *argv[])
+{
+  if (strstr (argv[0], "malicious_1") != NULL)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Malicious type 1\n");
+                mal_type = 1;
+  }
+  else if (strstr (argv[0], "malicious_2") != NULL)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Malicious type 2\n");
+                mal_type = 2;
+  }
+  else
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Type unknown using type 0 - no 
malicious behaviour\n");
+                mal_type = 0;
+  }
+
+  ok = 1;
+  (void) GNUNET_TESTBED_test_run ("test-rps-multipeer",
+                                  "test_rps.conf",
+                                  NUM_PEERS,
+                                  0, NULL, NULL,
+                                  &run, NULL);
+  return ok;
+}
+
+/* end of test_rps_multipeer.c */

Deleted: gnunet/src/rps/test_rps_multipeer.c
===================================================================
--- gnunet/src/rps/test_rps_multipeer.c 2015-03-26 18:30:11 UTC (rev 35469)
+++ gnunet/src/rps/test_rps_multipeer.c 2015-03-26 22:04:21 UTC (rev 35470)
@@ -1,324 +0,0 @@
-/*
-     This file is part of GNUnet.
-     Copyright (C) 2009, 2012 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 rps/test_rps_multipeer.c
- * @brief Testcase for the random peer sampling service.  Starts
- *        a peergroup with a given number of peers, then waits to
- *        receive size pushes/pulls from each peer.  Expects to wait
- *        for one message from each peer.
- */
-#include "platform.h"
-#include "gnunet_testbed_service.h"
-#include "gnunet_rps_service.h"
-#include <time.h>
-
-
-/**
- * How many peers do we start?
- */
-#define NUM_PEERS 5
-
-/**
- * How long do we run the test?
- */
-#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 30)
-
-
-/**
- * Portion of malicious peers
- */
-static double portion = .1;
-
-
-/**
- * Information we track for each peer.
- */
-struct RPSPeer
-{
-  /**
-   * Handle for RPS connect operation.
-   */
-  struct GNUNET_TESTBED_Operation *op;
-
-  /**
-   * Handle to RPS service.
-   */
-  struct GNUNET_RPS_Handle *rps_handle;
-};
-
-
-/**
- * Information for all the peers.
- */
-static struct RPSPeer rps_peers[NUM_PEERS];
-
-/**
- * IDs of the peers.
- */
-static struct GNUNET_PeerIdentity rps_peer_ids[NUM_PEERS];
-
-/**
- * Return value from 'main'.
- */
-static int ok;
-
-
-/**
- * Task run on timeout to shut everything down.
- */
-static void
-shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
-  unsigned int i;
-
-  for (i=0;i<NUM_PEERS;i++)
-    GNUNET_TESTBED_operation_done (rps_peers[i].op);
-  GNUNET_SCHEDULER_shutdown ();
-}
-
-
-/**
- * Callback to call when network size estimate is updated.
- *
- * @param cls closure
- * @param timestamp server timestamp
- * @param estimate the value of the current network size estimate
- * @param std_dev standard deviation (rounded down to nearest integer)
- *                of the size estimation values seen
- *
- */
-static void
-handle_reply (void *cls, uint64_t n, const struct GNUNET_PeerIdentity *peers)
-{
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Got peer %s\n", GNUNET_i2s (peers));
-  
-  ok = 0;
-}
-
-
-/**
- * (Randomly) request random peers.
- */
-  void
-request_peers (void *cls,
-               const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
-  struct RPSPeer *peer = (struct RPSPeer *) cls;
-  struct GNUNET_RPS_Request_Handle *req_handle;
-
-  req_handle = GNUNET_RPS_request_peers (peer->rps_handle, 1, handle_reply, 
NULL);
-  GNUNET_free (req_handle);
-}
-
-
-/**
- * Seed peers.
- */
-  void
-seed_peers (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
-  unsigned int amount;
-  struct RPSPeer *peer = (struct RPSPeer *) cls;
-  unsigned int i;
-
-  GNUNET_assert (1 >= portion
-                 && 0 <  portion);
-                
-  amount = round (portion * NUM_PEERS);
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Seeding peers:\n");
-  for (i = 0 ; i < amount ; i++)
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Seeding %u. peer: %s\n",
-                i,
-                GNUNET_i2s (&rps_peer_ids[i]));
-
-  GNUNET_RPS_seed_ids (peer->rps_handle, amount, rps_peer_ids);
-}
-
-
-/**
- * Get the id of peer i.
- */
-  void
-info_cb (void *cb_cls,
-         struct GNUNET_TESTBED_Operation *op,
-         const struct GNUNET_TESTBED_PeerInformation *pinfo,
-         const char *emsg)
-{
-  unsigned int *i = (unsigned int *) cb_cls;
-
-  if (NULL == pinfo || NULL != emsg)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Got Error: %s\n", emsg);
-    return;
-  }
-
-  rps_peer_ids[*i] = *(pinfo->result.id);
-
-  GNUNET_free (cb_cls);
-}
-
-
-/**
- * Callback to be called when RPS service connect operation is completed
- *
- * @param cls the callback closure from functions generating an operation
- * @param op the operation that has been finished
- * @param ca_result the RPS service handle returned from rps_connect_adapter
- * @param emsg error message in case the operation has failed; will be NULL if
- *          operation has executed successfully.
- */
-static void
-rps_connect_complete_cb (void *cls,
-                        struct GNUNET_TESTBED_Operation *op,
-                        void *ca_result,
-                        const char *emsg)
-{
-  struct RPSPeer *peer = cls;
-  struct GNUNET_RPS_Handle *rps = ca_result;
-  struct GNUNET_RPS_Request_Handle *req_handle;
-
-  peer->rps_handle = rps;
-
-  GNUNET_assert (op == peer->op);
-  if (NULL != emsg)
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                 "Failed to connect to RPS service: %s\n",
-                 emsg);
-      ok = 1;
-      GNUNET_SCHEDULER_shutdown ();
-      return;
-    }
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Started client successfully\n");
-
-  req_handle = GNUNET_RPS_request_peers (rps, 1, handle_reply, NULL);
-  GNUNET_free (req_handle);
-
-  GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply 
(GNUNET_TIME_UNIT_SECONDS, 10),
-                                request_peers, peer);
-  GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply 
(GNUNET_TIME_UNIT_SECONDS, 10),
-                                seed_peers, peer);
-  // TODO test seeding > GNUNET_SERVER_MAX_MESSAGE_SIZE peers
-}
-
-
-/**
- * Adapter function called to establish a connection to
- * the RPS service.
- *
- * @param cls closure
- * @param cfg configuration of the peer to connect to; will be available until
- *          GNUNET_TESTBED_operation_done() is called on the operation returned
- *          from GNUNET_TESTBED_service_connect()
- * @return service handle to return in 'op_result', NULL on error
- */
-static void *
-rps_connect_adapter (void *cls,
-                    const struct GNUNET_CONFIGURATION_Handle *cfg)
-{
-  return GNUNET_RPS_connect (cfg);
-}
-
-
-/**
- * Adapter function called to destroy connection to
- * RPS service.
- *
- * @param cls closure
- * @param op_result service handle returned from the connect adapter
- */
-static void
-rps_disconnect_adapter (void *cls,
-                       void *op_result)
-{
-  struct GNUNET_RPS_Handle *h = op_result;
-  GNUNET_RPS_disconnect (h);
-}
-
-
-/**
- * Actual "main" function for the testcase.
- *
- * @param cls closure
- * @param h the run handle
- * @param num_peers number of peers in 'peers'
- * @param peers handle to peers run in the testbed
- * @param links_succeeded the number of overlay link connection attempts that
- *          succeeded
- * @param links_failed the number of overlay link connection attempts that
- *          failed
- */
-static void
-run (void *cls,
-     struct GNUNET_TESTBED_RunHandle *h,
-     unsigned int num_peers,
-     struct GNUNET_TESTBED_Peer **peers,
-     unsigned int links_succeeded,
-     unsigned int links_failed)
-{
-  unsigned int i;
-  unsigned int *tmp_i;
-
-  for ( i = 0 ; i < NUM_PEERS ; i++ )
-  {
-    tmp_i = GNUNET_new (unsigned int);
-    *tmp_i = i;
-
-    (void) GNUNET_TESTBED_peer_get_information (peers[i],
-                                                GNUNET_TESTBED_PIT_IDENTITY,
-                                                &info_cb, tmp_i);
-  }
-
-  GNUNET_assert (NUM_PEERS == num_peers);
-  for (i=0;i<num_peers;i++)
-    //rps_peers[i].peer_index = i;
-    rps_peers[i].op = GNUNET_TESTBED_service_connect (&rps_peers[i],
-                                                     peers[i],
-                                                     "rps",
-                                                     &rps_connect_complete_cb,
-                                                     &rps_peers[i],
-                                                     &rps_connect_adapter,
-                                                     &rps_disconnect_adapter,
-                                                     &rps_peers[i]);
-  GNUNET_SCHEDULER_add_delayed (TIMEOUT, &shutdown_task, NULL);
-}
-
-
-/**
- * Entry point for the testcase, sets up the testbed.
- *
- * @param argc unused
- * @param argv unused
- * @return 0 on success
- */
-int
-main (int argc, char *argv[])
-{
-  ok = 1;
-  (void) GNUNET_TESTBED_test_run ("test-rps-multipeer",
-                                  "test_rps.conf",
-                                  NUM_PEERS,
-                                  0, NULL, NULL,
-                                  &run, NULL);
-  return ok;
-}
-
-/* end of test_rps_multipeer.c */




reply via email to

[Prev in Thread] Current Thread [Next in Thread]