X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fdv%2Ftest_transport_dv_data.conf;h=346677a2519a243d765c3c0fb2849fc596327167;hb=37defe2dbd9ea4e5a37710404e8046acbdf4a18e;hp=848f9170a5bd9f01960e5c27823a99d3f33eabe9;hpb=ba0d06c004c19720b3ef999f2a0a2de10182c7ba;p=oweals%2Fgnunet.git

diff --git a/src/dv/test_transport_dv_data.conf b/src/dv/test_transport_dv_data.conf
index 848f9170a..346677a25 100644
--- a/src/dv/test_transport_dv_data.conf
+++ b/src/dv/test_transport_dv_data.conf
@@ -1,72 +1,12 @@
-[PATHS]
-SERVICEHOME = /tmp/test-gnunet-dv-testing/
-DEFAULTCONFIG = test_transport_dv_data.conf
-
-[resolver]
-PORT = 2564
+@INLINE@ template_dv.conf
 
 [transport]
-DEBUG = NO
 PORT = 2565
 PLUGINS = tcp dv
-BLACKLIST_FILE = $SERVICEHOME/blacklist
-#PREFIX = xterm -e xterm -T transport -e gdb --args
-#BINARY = /home/mrwiggles/documents/research/gnunet/gnunet-ng/src/transport/.libs/gnunet-service-transport
-#PREFIX = valgrind --tool=memcheck --log-file=logs%p
-#DEBUG = YES
-
-[arm]
-PORT = 2566
-DEFAULTSERVICES = 
-
-[statistics]
-PORT = 2567
-
-[transport-tcp]
-PORT = 2568
-
-[transport-udp]
-PORT = 2568
-
-[peerinfo]
-PORT = 2569
-#DEBUG = YES
-#PREFIX = xterm -e xterm -T peerinfo -e gdb --args
-#BINARY = /home/mrwiggles/documents/research/gnunet/gnunet-ng/src/peerinfo/.libs/gnunet-service-peerinfo
-#PREFIX = valgrind --tool=memcheck --log-file=peerinfo%p
-
-[core]
-PORT = 2570
-#PREFIX = xterm -e xterm -T CORE -e gdb --args
-#PREFIX = valgrind --tool=memcheck --log-file=logs%p
-#DEBUG = YES
 
 [dv]
 AUTOSTART = YES
-DEBUG = NO
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-BINARY = gnunet-service-dv
-#BINARY = /root/documents/research/gnunet/gnunet-ng/src/dv/.libs/gnunet-service-dv
-#BINARY = /home/mrwiggles/documents/research/gnunet/gnunet-ng/src/dv/.libs/gnunet-service-dv
-#PREFIX = xterm -T dvservice -e gdb --args
-#PREFIX = valgrind --log-file=dv-%p --leak-check=full
-CONFIG = $DEFAULTCONFIG
-HOME = $SERVICEHOME
-HOSTNAME = localhost
-PORT = 2571
-
-[testing]
-NUM_PEERS = 5
-DEBUG = YES
-WEAKRANDOM = YES
-TOPOLOGY = CLIQUE
-CONNECT_TOPOLOGY = RING
-BLACKLIST_TOPOLOGY = RING
-BLACKLIST_TRANSPORTS = tcp
-F2F = YES
-
-[fs]
-AUTOSTART = NO
-
+#PREFIX = valgrind 
 
+[set]
+AUTOSTART = YES