gnunet-svn
[Top][All Lists]
Advanced

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

[GNUnet-SVN] r35295 - in gnunet/src: include rps


From: gnunet
Subject: [GNUnet-SVN] r35295 - in gnunet/src: include rps
Date: Sun, 22 Feb 2015 19:48:00 +0100

Author: ch3
Date: 2015-02-22 19:47:59 +0100 (Sun, 22 Feb 2015)
New Revision: 35295

Added:
   gnunet/src/rps/test_rps_malicious_1.c
Modified:
   gnunet/src/include/gnunet_protocols.h
   gnunet/src/include/gnunet_rps_service.h
   gnunet/src/rps/gnunet-service-rps.c
   gnunet/src/rps/rps.h
   gnunet/src/rps/rps_api.c
Log:
baseline for test with malicious peers

Modified: gnunet/src/include/gnunet_protocols.h
===================================================================
--- gnunet/src/include/gnunet_protocols.h       2015-02-21 20:43:27 UTC (rev 
35294)
+++ gnunet/src/include/gnunet_protocols.h       2015-02-22 18:47:59 UTC (rev 
35295)
@@ -2671,7 +2671,14 @@
  */
 #define GNUNET_MESSAGE_TYPE_RPS_CS_SEED         955
 
+#if ENABLE_MALICIOUS
+/**
+ * Turn RPS service malicious
+ */
+#define GNUNET_MESSAGE_TYPE_RPS_ACT_MALICIOUS   956
 
+#endif
+
 
/*******************************************************************************/
 
 /**

Modified: gnunet/src/include/gnunet_rps_service.h
===================================================================
--- gnunet/src/include/gnunet_rps_service.h     2015-02-21 20:43:27 UTC (rev 
35294)
+++ gnunet/src/include/gnunet_rps_service.h     2015-02-22 18:47:59 UTC (rev 
35295)
@@ -105,7 +105,31 @@
   void
 GNUNET_RPS_request_cancel (struct GNUNET_RPS_Request_Handle *rh);
 
+
+#if ENABLE_MALICIOUS
 /**
+ * Turn RPS service to act malicious.
+ *
+ * @param h handle to the rps service
+ * @param type which type of malicious peer to turn to.
+ *             0 Don't act malicious at all
+ *             1 Try to maximise representation
+ *             2 Try to partition the network
+ *               (isolate one peer from the rest)
+ * @param n number of @a ids
+ * @param ids the ids of the malicious peers
+ *            if @type is 2 the last id is the id of the
+ *            peer to be isolated from the rest
+ */
+  void
+GNUNET_RPS_act_malicious (struct GNUNET_RPS_Handle *h,
+                          uint32_t type,
+                          uint32_t num_peers,
+                          const struct GNUNET_PeerIdentity *ids);
+#endif
+
+
+/**
  * Disconnect from the rps service
  *
  * @param h the handle to the rps service

Modified: gnunet/src/rps/gnunet-service-rps.c
===================================================================
--- gnunet/src/rps/gnunet-service-rps.c 2015-02-21 20:43:27 UTC (rev 35294)
+++ gnunet/src/rps/gnunet-service-rps.c 2015-02-22 18:47:59 UTC (rev 35295)
@@ -1205,6 +1205,7 @@
   return GNUNET_OK;
 }
 
+
 /**
  * Handle PULL REPLY message from another peer.
  *
@@ -1218,9 +1219,9 @@
  */
   static int
 handle_peer_pull_reply (void *cls,
-    struct GNUNET_CADET_Channel *channel,
-    void **channel_ctx,
-    const struct GNUNET_MessageHeader *msg)
+                        struct GNUNET_CADET_Channel *channel,
+                        void **channel_ctx,
+                        const struct GNUNET_MessageHeader *msg)
 {
   LOG (GNUNET_ERROR_TYPE_DEBUG, "PULL REPLY received\n");
 
@@ -1293,7 +1294,60 @@
 }
 
 
+#if ENABLE_MALICIOUS
 /**
+ * Turn RPS service to act malicious.
+ *
+ * @param cls Closure
+ * @param channel The channel the PUSH was received over
+ * @param channel_ctx The context associated with this channel
+ * @param msg The message header
+ */
+  static int
+handle_peer_act_malicious (void *cls,
+                           struct GNUNET_CADET_Channel *channel,
+                           void **channel_ctx,
+                           const struct GNUNET_MessageHeader *msg)
+{
+  LOG (GNUNET_ERROR_TYPE_DEBUG, "PULL REPLY received\n");
+
+  /* Check for protocol violation */
+  //if (sizeof (struct GNUNET_RPS_P2P_PullReplyMessage) > ntohs (msg->size))
+  //{
+  //  GNUNET_break_op (0);
+  //  return GNUNET_SYSERR;
+  //}
+  //in_msg = (struct GNUNET_RPS_P2P_PullReplyMessage *) msg;
+  //if ((ntohs (msg->size) - sizeof (struct GNUNET_RPS_P2P_PullReplyMessage)) /
+  //    sizeof (struct GNUNET_PeerIdentity) != ntohl (in_msg->num_peers))
+  //{
+  //  LOG (GNUNET_ERROR_TYPE_ERROR,
+  //      "message says it sends %" PRIu64 " peers, have space for %i peers\n",
+  //      ntohl (in_msg->num_peers),
+  //      (ntohs (msg->size) - sizeof (struct 
GNUNET_RPS_P2P_PullReplyMessage)) /
+  //          sizeof (struct GNUNET_PeerIdentity));
+  //  GNUNET_break_op (0);
+  //  return GNUNET_SYSERR;
+  //}
+
+  //sender = (struct GNUNET_PeerIdentity *) GNUNET_CADET_channel_get_info (
+  //    (struct GNUNET_CADET_Channel *) channel, GNUNET_CADET_OPTION_PEER);
+  //     // Guess simply casting isn't the nicest way...
+  //     // FIXME wait for cadet to change this function
+  //sender_ctx = get_peer_ctx (peer_map, sender);
+
+  //if (GNUNET_YES == get_peer_flag (sender_ctx, PULL_REPLY_PENDING))
+  //{
+  //  GNUNET_break_op (0);
+  //  return GNUNET_OK;
+  //}
+
+  /* Do actual logic */
+}
+#endif
+
+
+/**
  * Send out PUSHes and PULLs.
  *
  * This is executed regylary.
@@ -1648,11 +1702,11 @@
  */
 static void
 shutdown_task (void *cls,
-              const struct GNUNET_SCHEDULER_TaskContext *tc)
+                    const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   LOG (GNUNET_ERROR_TYPE_DEBUG, "RPS is going down\n");
 
-  if ( NULL != do_round_task )
+  if (NULL != do_round_task)
   {
     GNUNET_SCHEDULER_cancel (do_round_task);
     do_round_task = NULL;
@@ -1884,6 +1938,9 @@
     {&handle_peer_pull_request, GNUNET_MESSAGE_TYPE_RPS_PP_PULL_REQUEST,
       sizeof (struct GNUNET_MessageHeader)},
     {&handle_peer_pull_reply  , GNUNET_MESSAGE_TYPE_RPS_PP_PULL_REPLY  , 0},
+    #if ENABLE_MALICIOUS
+    {&handle_peer_act_malicious, GNUNET_MESSAGE_TYPE_RPS_ACT_MALICIOUS , 0},
+    #endif
     {NULL, 0, 0}
   };
 

Modified: gnunet/src/rps/rps.h
===================================================================
--- gnunet/src/rps/rps.h        2015-02-21 20:43:27 UTC (rev 35294)
+++ gnunet/src/rps/rps.h        2015-02-22 18:47:59 UTC (rev 35295)
@@ -96,7 +96,7 @@
   /**
    * Identifyer of the message.
    */
-  uint64_t n;
+  uint64_t n GNUNET_PACKED;
 
   /**
    * Number of random peer replied
@@ -107,7 +107,7 @@
 };
 
 /**
- * Message from client to service with seed of peers
+ * Message from client to service with seed of peers.
  */
 struct GNUNET_RPS_CS_SeedMessage
 {
@@ -119,9 +119,36 @@
   /**
    * Number of peers
    */
-  uint64_t num_peers;
+  uint64_t num_peers GNUNET_PACKED;
 
   /* Followed by num_peers * GNUNET_PeerIdentity */
 };
 
+/**
+ * Message from client to service to turn service malicious.
+ */
+struct GNUNET_RPS_CS_ActMaliciousMessage
+{
+  /**
+   * Header including size and type in NBO
+   */
+  struct GNUNET_MessageHeader header;
+
+  /**
+   * Type of malicious behaviour.
+   *
+   * 0 No malicious bahaviour at all
+   * 1 Try to maximise representation
+   * 2 Try to partition the network
+   */
+  uint32_t type GNUNET_PACKED;
+
+  /**
+   * Number of peers
+   */
+  uint64_t num_peers GNUNET_PACKED;
+
+  /* Followed by num_peers * GNUNET_PeerIdentity */
+};
+
 GNUNET_NETWORK_STRUCT_END

Modified: gnunet/src/rps/rps_api.c
===================================================================
--- gnunet/src/rps/rps_api.c    2015-02-21 20:43:27 UTC (rev 35294)
+++ gnunet/src/rps/rps_api.c    2015-02-22 18:47:59 UTC (rev 35295)
@@ -235,7 +235,8 @@
  * @param ids the ids of the peers seeded
  */
   void
-GNUNET_RPS_seed_ids (struct GNUNET_RPS_Handle *h, uint32_t n,
+GNUNET_RPS_seed_ids (struct GNUNET_RPS_Handle *h,
+                     uint32_t n,
                      const struct GNUNET_PeerIdentity *ids)
 {
   uint32_t size_needed;
@@ -289,7 +290,32 @@
 }
 
 
+#if ENABLE_MALICIOUS
 /**
+ * Turn RPS service to act malicious.
+ *
+ * @param h handle to the rps service
+ * @param type which type of malicious peer to turn to.
+ *             0 Don't act malicious at all
+ *             1 Try to maximise representation
+ *             2 Try to partition the network
+ *               (isolate one peer from the rest)
+ * @param n number of @a ids
+ * @param ids the ids of the malicious peers
+ *            if @type is 2 the last id is the id of the
+ *            peer to be isolated from the rest
+ */
+  void
+GNUNET_RPS_act_malicious (struct GNUNET_RPS_Handle *h,
+                          uint32_t type,
+                          uint32_t num_peers,
+                          const struct GNUNET_PeerIdentity *ids)
+{
+}
+#endif
+
+
+/**
  * Cancle an issued request.
  *
  * @param rh request handle of request to cancle

Added: gnunet/src/rps/test_rps_malicious_1.c
===================================================================
--- gnunet/src/rps/test_rps_malicious_1.c                               (rev 0)
+++ gnunet/src/rps/test_rps_malicious_1.c       2015-02-22 18:47:59 UTC (rev 
35295)
@@ -0,0 +1,334 @@
+/*
+     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, 60)
+
+
+/**
+ * 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)
+{
+  struct GNUNET_RPS_Handle *h;
+  uint64_t num_mal_peers;
+
+  num_mal_peers = round (portion * NUM_PEERS);
+
+  h = GNUNET_RPS_connect (cfg);
+  #if ENABLE_MALICIOUS
+  GNUNET_RPS_act_malicious (h, htonl (1), htonl (num_mal_peers), rps_peer_ids);
+  #endif
+  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].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]