-monkey integration

4 files changed, 3 insertions, 6 deletions

diff --git a/configure.ac b/configure.ac
index 743c6edeb..3e7fd9dba 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1060,7 +1060,7 @@ AC_MSG_RESULT($enable_monkey)
 AM_CONDITIONAL([ENABLE_MONKEY], [test "x$enable_monkey" = "xyes"])
 if test "x$enable_monkey" = "xyes"
 then
-  MONKEYPREFIX="monkey"
+  MONKEYPREFIX="pathologist -d $(eval echo ${datarootdir}/gnunet/gnunet.sqlite) -p 30 --"
 else
   MONKEYPREFIX=""
 fi
diff --git a/src/arm/arm.conf.in b/src/arm/arm.conf.in
index e7620b8ff..b9a33242f 100644
--- a/src/arm/arm.conf.in
+++ b/src/arm/arm.conf.in
@@ -17,7 +17,7 @@ UNIX_MATCH_GID = YES
 # logging with a new log file each day.  Note that only the last 3
 # log files are preserved.
 # GLOBAL_POSTFIX = -l $SERVICEHOME/{}-%Y-%m-%d.log
-# GLOBAL_PREFIX =
+GLOBAL_PREFIX = @MONKEYPREFIX@
 # USERNAME =
 # MAXBUF =
 # TIMEOUT =
diff --git a/src/fs/fs.conf.in b/src/fs/fs.conf.in
index c9748a73a..2375dc7ec 100644
--- a/src/fs/fs.conf.in
+++ b/src/fs/fs.conf.in
@@ -47,9 +47,6 @@ MIN_MIGRATION_DELAY = 100 ms
 # For how many neighbouring peers should we allocate hash maps?
 EXPECTED_NEIGHBOUR_COUNT = 128
 
-# Enable monkey?
-# PREFIX = @MONKEYPREFIX@
-
 # Disable anonymous file-sharing (but keep non-anonymous transfers)?
 # This option is mostly for testing.
 DISABLE_ANON_TRANSFER = NO
diff --git a/src/fs/gnunet-download.c b/src/fs/gnunet-download.c
index 30081f0b4..5001d4c34 100644
--- a/src/fs/gnunet-download.c
+++ b/src/fs/gnunet-download.c
@@ -121,7 +121,7 @@ display_bar (unsigned long long x,
  *         for this operation; should be set to NULL for
  *         SUSPEND and STOPPED events).  The value returned
  *         will be passed to future callbacks in the respective
- *         field in the GNUNET_FS_ProgressInfo struct.
+ *         field in the `struct GNUNET_FS_ProgressInfo`
  */
 static void *
 progress_cb (void *cls, const struct GNUNET_FS_ProgressInfo *info)