Merge branch 'master' of ssh://gnunet.org/gnunet

4 files changed, 41 insertions, 26 deletions

diff --git a/src/rps/gnunet-rps-profiler.c b/src/rps/gnunet-rps-profiler.c
index a0e79e565..16f23e86c 100644
--- a/src/rps/gnunet-rps-profiler.c
+++ b/src/rps/gnunet-rps-profiler.c
@@ -1951,9 +1951,13 @@ static void compute_probabilities (uint32_t peer_idx)
     if ((GNUNET_YES == is_in_view (i, peer_idx)) &&
         (1 <= (0.45 * view_size)))
     {
-      prob_push = 1.0 * binom (0.45 * view_size, 1)
-        /
-        binom (view_size, 0.45 * view_size);
+      if (0 == binom (view_size, 0.45 * view_size)) prob_push = 0;
+      else
+      {
+        prob_push = 1.0 * binom (0.45 * view_size, 1)
+          /
+          binom (view_size, 0.45 * view_size);
+      }
       GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                  "\t\t%" PRIu32 " is in %" PRIu32 "'s view, prob: %f\n",
                  peer_idx,
@@ -2318,6 +2322,7 @@ post_test_shutdown_ready_cb (void *cls,
         rps_peer->index);
     GNUNET_free (stat_cls);
     GNUNET_break (0);
+    return;
   }
 
   if (NULL != rps_peer->stat_op &&
@@ -2494,7 +2499,6 @@ test_run (void *cls,
   struct OpListEntry *entry;
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "RUN was called\n");
-  printf ("test 1\n");
 
   /* Check whether we timed out */
   if (n_peers != num_peers ||
@@ -2578,7 +2582,6 @@ test_run (void *cls,
  *
  * @param argc unused
  * @param argv unused
- * @return 0 on success
  */
 static void
 run (void *cls,
@@ -2635,12 +2638,12 @@ run (void *cls,
   }
 
   /* Compute number of bits for representing largest peer id */
-  for (bits_needed = 1; (bits_needed << 1) < num_peers - 1; bits_needed++)
+  for (bits_needed = 1; (1 << bits_needed) < num_peers; bits_needed++)
     ;
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-            "Need %u bits to represent largest peer id %" PRIu32 "\n",
+            "Need %u bits to represent %" PRIu32 " peers\n",
              bits_needed,
-             num_peers - 1);
+             num_peers);
 
   rps_peers = GNUNET_new_array (num_peers, struct RPSPeer);
   peer_map = GNUNET_CONTAINER_multipeermap_create (num_peers, GNUNET_NO);
@@ -2654,8 +2657,6 @@ run (void *cls,
                                                  with the malicious portion */
 
   ok = 1;
-  GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-              "before _run()\n");
   GNUNET_TESTBED_run (NULL,
                       cfg,
                       num_peers,
@@ -2664,10 +2665,6 @@ run (void *cls,
                       NULL,
                       &test_run,
                       NULL);
-  GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-              "after _run()\n");
-  GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-              "gnunet-rps-profiler returned.\n");
 }
 
 /**
@@ -2691,7 +2688,7 @@ main (int argc, char *argv[])
     GNUNET_GETOPT_option_relative_time ('t',
                                         "timeout",
                                         "TIMEOUT",
-                                        gettext_noop ("timeout for DHT PUT and GET requests (default: 1 min)"),
+                                        gettext_noop ("timeout for the profiling"),
                                         &timeout),
 
     GNUNET_GETOPT_option_uint ('r',
diff --git a/src/rps/gnunet-rps.c b/src/rps/gnunet-rps.c
index e09277589..739f71dac 100644
--- a/src/rps/gnunet-rps.c
+++ b/src/rps/gnunet-rps.c
@@ -155,7 +155,11 @@ run (void *cls,
       (!view_update))
   { /* Request n PeerIDs */
     /* If number was specified use it, else request single peer. */
-    num_peers = (NULL == args[0]) ? 1 : atoi (args[0]);
+    if (NULL == args[0] ||
+        0 == sscanf (args[0], "%lu", &num_peers))
+    {
+      num_peers = 1;
+    }
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
         "Requesting %" PRIu64 " PeerIDs\n", num_peers);
     req_handle = GNUNET_RPS_request_peers (rps_handle, num_peers, reply_handle, NULL);
@@ -163,7 +167,11 @@ run (void *cls,
   } else if (view_update)
   {
     /* Get updates of view */
-    num_view_updates = (NULL == args[0]) ? 0 : atoi (args[0]);
+    if (NULL == args[0] ||
+        0 == sscanf (args[0], "%lu", &num_view_updates))
+    {
+      num_view_updates = 0;
+    }
     GNUNET_RPS_view_request (rps_handle, num_view_updates, view_update_handle, NULL);
     if (0 != num_view_updates)
       GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
diff --git a/src/rps/rps-test_util.c b/src/rps/rps-test_util.c
index 9a1dfe0d8..0ee290e67 100644
--- a/src/rps/rps-test_util.c
+++ b/src/rps/rps-test_util.c
@@ -155,6 +155,9 @@ to_file_raw (const char *file_name, const char *buf, size_t size_buf)
 
     return;
   }
+  if (GNUNET_YES != GNUNET_DISK_file_close (f))
+    LOG (GNUNET_ERROR_TYPE_WARNING,
+         "Unable to close file\n");
 }
 
 void
@@ -384,7 +387,7 @@ store_prefix_file_name (const struct GNUNET_PeerIdentity *peer,
     const char *prefix)
 {
   unsigned int len_file_name;
-  unsigned int out_size;
+  int out_size;
   char *file_name;
   const char *pid_long;
 
diff --git a/src/rps/test_rps.conf b/src/rps/test_rps.conf
index 77a0df2c5..05bb9f444 100644
--- a/src/rps/test_rps.conf
+++ b/src/rps/test_rps.conf
@@ -21,17 +21,24 @@ FILENAME_VALID_PEERS = $GNUNET_DATA_HOME/rps/valid_peers.txt
 # So, 50 is enough for a network of size 50^3 = 125000
 MINSIZE = 4
 
+
+
 [testbed]
 HOSTNAME = localhost
 
-# OPERATION_TIMEOUT = 60 s
-
 # MAX_PARALLEL_TOPOLOGY_CONFIG_OPERATIONS = 100
-OVERLAY_TOPOLOGY = CLIQUE
-#OVERLAY_TOPOLOGY = SMALL_WORLD
-#SCALE_FREE_TOPOLOGY_CAP =
 
-# OVERLAY_RANDOM_LINKS = 25
+#OVERLAY_TOPOLOGY = CLIQUE
+
+OVERLAY_TOPOLOGY = SCALE_FREE
+SCALE_FREE_TOPOLOGY_CAP = 100
+SCALE_FREE_TOPOLOGY_M = 2
+
+#OVERLAY_TOPOLOGY = RANDOM
+#OVERLAY_RANDOM_LINKS = 25
+
+#OVERLAY_TOPOLOGY = SMALL_WORLD
+#OVERLAY_RANDOM_LINKS = 25
 
 SETUP_TIMEOUT = 2 m
 
@@ -41,12 +48,13 @@ WORKBITS = 0
 [nat]
 # Use addresses from the local network interfaces (inluding loopback, but also others)
 USE_LOCALADDR = YES
+ENABLE_UPNP = NO
 
 # Do we use addresses from localhost address ranges? (::1, 127.0.0.0/8)
 RETURN_LOCAL_ADDRESSES = YES
 
 [transport]
-PLUGINS = udp
+PLUGINS = unix
 
 [ats]
 # Network specific inbound/outbound quotas
@@ -72,7 +80,6 @@ BLUETOOTH_QUOTA_OUT = unlimited
 DISABLE_TRY_CONNECT = YES
 
 [cadet]
-DISABLE_TRY_CONNECT = YES
 #OPTIONS=-l /tmp/rps_profiler_logs/cadet-[]-%Y-%m-%d.log
 #PREFIX = valgrind