diff options
-rw-r--r-- | src/cadet/cadet.conf.in | 1 | ||||
-rw-r--r-- | src/cadet/test_cadet.conf | 46 |
2 files changed, 1 insertions, 46 deletions
diff --git a/src/cadet/cadet.conf.in b/src/cadet/cadet.conf.in index be5ad8bcc..3bc5f652c 100644 --- a/src/cadet/cadet.conf.in +++ b/src/cadet/cadet.conf.in | |||
@@ -1,4 +1,5 @@ | |||
1 | [cadet] | 1 | [cadet] |
2 | PREFIX = valgrind | ||
2 | FORCESTART = YES | 3 | FORCESTART = YES |
3 | AUTOSTART = @AUTOSTART@ | 4 | AUTOSTART = @AUTOSTART@ |
4 | @JAVAPORT@PORT = 2096 | 5 | @JAVAPORT@PORT = 2096 |
diff --git a/src/cadet/test_cadet.conf b/src/cadet/test_cadet.conf index 78620993e..eb0e78b14 100644 --- a/src/cadet/test_cadet.conf +++ b/src/cadet/test_cadet.conf | |||
@@ -1,23 +1,14 @@ | |||
1 | [testbed] | 1 | [testbed] |
2 | AUTOSTART = NO | ||
3 | PORT = 12113 | 2 | PORT = 12113 |
4 | ACCEPT_FROM = 127.0.0.1; | 3 | ACCEPT_FROM = 127.0.0.1; |
5 | HOSTNAME = localhost | 4 | HOSTNAME = localhost |
6 | OVERLAY_TOPOLOGY = LINE | 5 | OVERLAY_TOPOLOGY = LINE |
7 | #PREFIX = xterm -geometry 100x85 -T peer1 -e libtool --mode=execute gdb --args | 6 | #PREFIX = xterm -geometry 100x85 -T peer1 -e libtool --mode=execute gdb --args |
8 | 7 | ||
9 | [fs] | ||
10 | AUTOSTART = NO | ||
11 | FORCESTART = NO | ||
12 | |||
13 | [resolver] | ||
14 | AUTOSTART = NO | ||
15 | |||
16 | [cadet] | 8 | [cadet] |
17 | #BINARY = gnunet-service-cadet-enc | 9 | #BINARY = gnunet-service-cadet-enc |
18 | #PREFIX = valgrind --leak-check=full | 10 | #PREFIX = valgrind --leak-check=full |
19 | #PREFIX = xterm -geometry 100x85 -T peer1 -e gdb --args | 11 | #PREFIX = xterm -geometry 100x85 -T peer1 -e gdb --args |
20 | AUTOSTART = NO | ||
21 | ACCEPT_FROM = 127.0.0.1; | 12 | ACCEPT_FROM = 127.0.0.1; |
22 | REFRESH_CONNECTION_TIME = 333 ms | 13 | REFRESH_CONNECTION_TIME = 333 ms |
23 | ID_ANNOUNCE_TIME = 5 s | 14 | ID_ANNOUNCE_TIME = 5 s |
@@ -31,7 +22,6 @@ DISABLE_TRY_CONNECT = YES | |||
31 | REKEY_PERIOD = 2 s | 22 | REKEY_PERIOD = 2 s |
32 | 23 | ||
33 | [dht] | 24 | [dht] |
34 | AUTOSTART = NO | ||
35 | DISABLE_TRY_CONNECT = YES | 25 | DISABLE_TRY_CONNECT = YES |
36 | FORCE_NSE = 3 | 26 | FORCE_NSE = 3 |
37 | 27 | ||
@@ -70,52 +60,16 @@ BLUETOOTH_QUOTA_IN = unlimited | |||
70 | BLUETOOTH_QUOTA_OUT = unlimited | 60 | BLUETOOTH_QUOTA_OUT = unlimited |
71 | 61 | ||
72 | [core] | 62 | [core] |
73 | PORT = 12092 | ||
74 | AUTOSTART = YES | ||
75 | USE_EPHEMERAL_KEYS = NO | 63 | USE_EPHEMERAL_KEYS = NO |
76 | 64 | ||
77 | [arm] | ||
78 | PORT = 12366 | ||
79 | |||
80 | [transport-udp] | ||
81 | TIMEOUT = 300 s | ||
82 | PORT = 12368 | ||
83 | |||
84 | [gnunetd] | ||
85 | HOSTKEY = $GNUNET_TEST_HOME/.hostkey | ||
86 | |||
87 | [PATHS] | 65 | [PATHS] |
88 | GNUNET_TEST_HOME = /tmp/test-cadet/ | 66 | GNUNET_TEST_HOME = /tmp/test-cadet/ |
89 | 67 | ||
90 | [dns] | ||
91 | AUTOSTART = NO | ||
92 | |||
93 | [nse] | ||
94 | AUTOSTART = NO | ||
95 | |||
96 | [vpn] | ||
97 | AUTOSTART = NO | ||
98 | |||
99 | [nat] | 68 | [nat] |
100 | RETURN_LOCAL_ADDRESSES = YES | 69 | RETURN_LOCAL_ADDRESSES = YES |
101 | DISABLEV6 = YES | 70 | DISABLEV6 = YES |
102 | USE_LOCALADDR = YES | 71 | USE_LOCALADDR = YES |
103 | 72 | ||
104 | [gns-helper-service-w32] | ||
105 | AUTOSTART = NO | ||
106 | |||
107 | [consensus] | ||
108 | AUTOSTART = NO | ||
109 | |||
110 | [gns] | ||
111 | AUTOSTART = NO | ||
112 | |||
113 | [statistics] | ||
114 | AUTOSTART = NO | ||
115 | |||
116 | [peerinfo] | 73 | [peerinfo] |
117 | NO_IO = YES | 74 | NO_IO = YES |
118 | 75 | ||
119 | [set] | ||
120 | AUTOSTART = NO | ||
121 | FORCESTART = NO | ||