1 files changed, 42 insertions, 34 deletions

diff --git a/src/rps/test_rps.conf b/src/rps/test_rps.conf
index 0b49b4e76..84e0e5049 100644
--- a/src/rps/test_rps.conf
+++ b/src/rps/test_rps.conf
@@ -1,12 +1,13 @@
 [rps]
 #PREFIX = valgrind --leak-check=full --show-leak-kinds=all --log-file=/tmp/rps/valgrind!gnunet-service-rps!%p
-#BINARY = gnunet-service-rps
-UNIXPATH = /tmp/gnunet-service-rps.sock
+#PREFIX = valgrind --log-file=/tmp/rps/valgrind!gnunet-service-rps!%p
+#PREFIX = valgrind 
+UNIXPATH = $GNUNET_TMP/gnunet-service-rps.sock
 HOME = $SERVICEHOME
 # PORT = 2106
 #@UNIXONLY@ PORT = 2087
-FORCESTART = YES
-AUTOSTART = NO
+IMMEDIATE_START = YES
+START_ON_DEMAND = NO
 NOARMBIND = YES
 #OPTIONS=-l /tmp/rps_profiler_logs/rps-[]-%Y-%m-%d.log
 
@@ -21,19 +22,26 @@ 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
 
-# SETUP_TIMEOUT = 2 m
+#OVERLAY_TOPOLOGY = RANDOM
+#OVERLAY_RANDOM_LINKS = 25
+
+#OVERLAY_TOPOLOGY = SMALL_WORLD
+#OVERLAY_RANDOM_LINKS = 25
+
+SETUP_TIMEOUT = 2 m
 
 [nse]
 WORKBITS = 0
@@ -41,12 +49,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,52 +81,51 @@ 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
 
 #[arm]
 #GLOBAL_POSTFIX=-l /tmp/rps_profiler_logs/other-[]-%Y-%m-%d.log
 
 #[statistics]
-#FORCESTART = NO
-#AUTOSTART = NO
+#IMMEDIATE_START = NO
+#START_ON_DEMAND = NO
 
 [peerinfo]
 NO_IO = YES
 
 [hostlist]
-FORCESTART = NO
-AUTOSTART = NO
+IMMEDIATE_START = NO
+START_ON_DEMAND = NO
 
 [zonemaster]
-FORCESTART = NO
-AUTOSTART = NO
+IMMEDIATE_START = NO
+START_ON_DEMAND = NO
 
 [namecache]
-FORCESTART = NO
-AUTOSTART = NO
+IMMEDIATE_START = NO
+START_ON_DEMAND = NO
 
 [namestore]
-FORCESTART = NO
-AUTOSTART = NO
+IMMEDIATE_START = NO
+START_ON_DEMAND = NO
 
 [topology]
-FORCESTART = NO
-AUTOSTART = NO
+IMMEDIATE_START = NO
+START_ON_DEMAND = NO
 
 [vpn]
-FORCESTART = NO
-AUTOSTART = NO
+IMMEDIATE_START = NO
+START_ON_DEMAND = NO
 
 [revocation]
-FORCESTART = NO
-AUTOSTART = NO
+IMMEDIATE_START = NO
+START_ON_DEMAND = NO
 
 [gns]
-FORCESTART = NO
-AUTOSTART = NO
+IMMEDIATE_START = NO
+START_ON_DEMAND = NO
 
 [fs]
-FORCESTART = NO
-AUTOSTART = NO
-
+IMMEDIATE_START = NO
+START_ON_DEMAND = NO