-rps _peers: add disable option to peer storage

2 files changed, 25 insertions, 2 deletions

diff --git a/src/rps/gnunet-service-rps_peers.c b/src/rps/gnunet-service-rps_peers.c
index d52a6cfd5..2b5f39857 100644
--- a/src/rps/gnunet-service-rps_peers.c
+++ b/src/rps/gnunet-service-rps_peers.c
@@ -782,10 +782,26 @@ store_valid_peers ()
 {
   struct GNUNET_DISK_FileHandle *fh;
   uint32_t number_written_peers;
+  int ret;
+
+  if (0 == strncmp ("DISABLE", filename_valid_peers, 7))
+  {
+    return;
+  }
 
-  if (GNUNET_OK !=
-      GNUNET_DISK_directory_create_for_file (filename_valid_peers))
+  ret = GNUNET_DISK_directory_create_for_file (filename_valid_peers);
+  if (GNUNET_SYSERR == ret)
+  {
+    LOG (GNUNET_ERROR_TYPE_WARNING,
+        "Not able to create directory for file `%s'\n",
+        filename_valid_peers);
+    GNUNET_break (0);
+  }
+  else if (GNUNET_NO == ret)
   {
+    LOG (GNUNET_ERROR_TYPE_WARNING,
+        "Directory for file `%s' exists but is not writable for us\n",
+        filename_valid_peers);
     GNUNET_break (0);
   }
   fh = GNUNET_DISK_file_open (filename_valid_peers,
@@ -872,6 +888,11 @@ restore_valid_peers ()
   const char *str_repr;
   const struct GNUNET_PeerIdentity *peer;
 
+  if (0 == strncmp ("DISABLE", filename_valid_peers, 7))
+  {
+    return;
+  }
+
   if (GNUNET_OK != GNUNET_DISK_file_test (filename_valid_peers))
   {
     return;
diff --git a/src/rps/rps.conf.in b/src/rps/rps.conf.in
index 0b4aa0838..046a8b5d9 100644
--- a/src/rps/rps.conf.in
+++ b/src/rps/rps.conf.in
@@ -16,6 +16,8 @@ ROUNDINTERVAL = 30 s
 
 # This is the file in which valid peers are stored
 FILENAME_VALID_PEERS = $GNUNET_DATA_HOME/rps/valid_peers.txt
+# Disable storage of valid peers
+#FILENAME_VALID_PEERS = DISABLE
 
 # This is the 'estimate' in the beginning.
 # This determines the size of the peers we keep in memory