diff options
-rw-r--r-- | configure.ac | 2 | ||||
-rw-r--r-- | src/arm/arm.conf.in | 2 | ||||
-rw-r--r-- | src/fs/fs.conf.in | 3 | ||||
-rw-r--r-- | src/fs/gnunet-download.c | 2 |
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) | |||
1060 | AM_CONDITIONAL([ENABLE_MONKEY], [test "x$enable_monkey" = "xyes"]) | 1060 | AM_CONDITIONAL([ENABLE_MONKEY], [test "x$enable_monkey" = "xyes"]) |
1061 | if test "x$enable_monkey" = "xyes" | 1061 | if test "x$enable_monkey" = "xyes" |
1062 | then | 1062 | then |
1063 | MONKEYPREFIX="monkey" | 1063 | MONKEYPREFIX="pathologist -d $(eval echo ${datarootdir}/gnunet/gnunet.sqlite) -p 30 --" |
1064 | else | 1064 | else |
1065 | MONKEYPREFIX="" | 1065 | MONKEYPREFIX="" |
1066 | fi | 1066 | 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 | |||
17 | # logging with a new log file each day. Note that only the last 3 | 17 | # logging with a new log file each day. Note that only the last 3 |
18 | # log files are preserved. | 18 | # log files are preserved. |
19 | # GLOBAL_POSTFIX = -l $SERVICEHOME/{}-%Y-%m-%d.log | 19 | # GLOBAL_POSTFIX = -l $SERVICEHOME/{}-%Y-%m-%d.log |
20 | # GLOBAL_PREFIX = | 20 | GLOBAL_PREFIX = @MONKEYPREFIX@ |
21 | # USERNAME = | 21 | # USERNAME = |
22 | # MAXBUF = | 22 | # MAXBUF = |
23 | # TIMEOUT = | 23 | # 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 | |||
47 | # For how many neighbouring peers should we allocate hash maps? | 47 | # For how many neighbouring peers should we allocate hash maps? |
48 | EXPECTED_NEIGHBOUR_COUNT = 128 | 48 | EXPECTED_NEIGHBOUR_COUNT = 128 |
49 | 49 | ||
50 | # Enable monkey? | ||
51 | # PREFIX = @MONKEYPREFIX@ | ||
52 | |||
53 | # Disable anonymous file-sharing (but keep non-anonymous transfers)? | 50 | # Disable anonymous file-sharing (but keep non-anonymous transfers)? |
54 | # This option is mostly for testing. | 51 | # This option is mostly for testing. |
55 | DISABLE_ANON_TRANSFER = NO | 52 | 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, | |||
121 | * for this operation; should be set to NULL for | 121 | * for this operation; should be set to NULL for |
122 | * SUSPEND and STOPPED events). The value returned | 122 | * SUSPEND and STOPPED events). The value returned |
123 | * will be passed to future callbacks in the respective | 123 | * will be passed to future callbacks in the respective |
124 | * field in the GNUNET_FS_ProgressInfo struct. | 124 | * field in the `struct GNUNET_FS_ProgressInfo` |
125 | */ | 125 | */ |
126 | static void * | 126 | static void * |
127 | progress_cb (void *cls, const struct GNUNET_FS_ProgressInfo *info) | 127 | progress_cb (void *cls, const struct GNUNET_FS_ProgressInfo *info) |