3 files changed, 31 insertions, 15 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
 
diff --git a/src/util/disk.c b/src/util/disk.c
index 31e8f12c6..e0227be70 100644
--- a/src/util/disk.c
+++ b/src/util/disk.c
@@ -830,6 +830,12 @@ GNUNET_DISK_directory_create_for_file (const char *filename)
     errno = EINVAL;
     return GNUNET_SYSERR;
   }
+  if (0 == ACCESS (rdir, W_OK))
+  {
+    GNUNET_free (rdir);
+    return GNUNET_OK;
+  }
+
   len = strlen (rdir);
   while ((len > 0) && (rdir[len] != DIR_SEPARATOR))
     len--;
@@ -1686,16 +1692,19 @@ GNUNET_DISK_file_open (const char *fn,
     return NULL;
   }
   if (flags & GNUNET_DISK_OPEN_FAILIFEXISTS)
-    oflags |= (O_CREAT | O_EXCL);
+      oflags |= (O_CREAT | O_EXCL);
   if (flags & GNUNET_DISK_OPEN_TRUNCATE)
     oflags |= O_TRUNC;
   if (flags & GNUNET_DISK_OPEN_APPEND)
     oflags |= O_APPEND;
-  if (flags & GNUNET_DISK_OPEN_CREATE)
-  {
-    (void) GNUNET_DISK_directory_create_for_file (expfn);
-    oflags |= O_CREAT;
-    mode = translate_unix_perms (perm);
+  if(GNUNET_NO == GNUNET_DISK_file_test(fn))
+   {
+      if (flags & GNUNET_DISK_OPEN_CREATE )
+        {
+          (void) GNUNET_DISK_directory_create_for_file (expfn);
+          oflags |= O_CREAT;
+          mode = translate_unix_perms (perm);
+        }
   }
 
   fd = open (expfn, oflags