[GNUnet-SVN] [gnunet] branch master updated (8a719470e -> 87fd7ec84)

[gnunet]

This is an automated email from the git hooks/post-receive script.

julius-buenger pushed a change to branch master
in repository gnunet.

    from 8a719470e config file writting silent bugg (when directory doesnt give 
write access) fix
     new a2986dc4a rps profiler: correct help for cli parameter
     new 87fd7ec84 clean config of rps tests/profiler

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 src/rps/gnunet-rps-profiler.c |  2 +-
 src/rps/test_rps.conf         | 23 +++++++++++++++--------
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/src/rps/gnunet-rps-profiler.c b/src/rps/gnunet-rps-profiler.c
index ef67aa949..b43ce2fa2 100644
--- a/src/rps/gnunet-rps-profiler.c
+++ b/src/rps/gnunet-rps-profiler.c
@@ -2691,7 +2691,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/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
 

-- 
To stop receiving notification emails like this one, please contact
address@hidden