From 003d9c41d5ff799d9472489ba0544bb4a6942c85 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Mon, 1 Aug 2011 13:42:30 +0000 Subject: [PATCH] optimizing cfg --- src/hostlist/Makefile.am | 1 + src/hostlist/learning_data.conf | 34 ++------- src/hostlist/test_gnunet_daemon_hostlist.conf | 61 +--------------- .../test_gnunet_daemon_hostlist_data.conf | 72 ++++--------------- .../test_gnunet_daemon_hostlist_peer1.conf | 68 ++++-------------- .../test_gnunet_daemon_hostlist_peer2.conf | 64 ++++------------- src/hostlist/test_hostlist_defaults.conf | 50 +++++++++++++ src/hostlist/test_learning_adv_peer.conf | 62 ++++------------ src/hostlist/test_learning_learn_peer.conf | 59 ++++----------- src/hostlist/test_learning_learn_peer2.conf | 56 ++++----------- 10 files changed, 140 insertions(+), 387 deletions(-) create mode 100644 src/hostlist/test_hostlist_defaults.conf diff --git a/src/hostlist/Makefile.am b/src/hostlist/Makefile.am index 15c8f86a7..8af1d4a7f 100644 --- a/src/hostlist/Makefile.am +++ b/src/hostlist/Makefile.am @@ -66,6 +66,7 @@ test_gnunet_daemon_hostlist_learning_LDADD = \ $(top_builddir)/src/util/libgnunetutil.la EXTRA_DIST = \ + test_hostlist_defaults.conf \ test_gnunet_daemon_hostlist_data.conf \ test_gnunet_daemon_hostlist_peer1.conf \ test_gnunet_daemon_hostlist_peer2.conf \ diff --git a/src/hostlist/learning_data.conf b/src/hostlist/learning_data.conf index 8a37a8cd9..e3a38972c 100644 --- a/src/hostlist/learning_data.conf +++ b/src/hostlist/learning_data.conf @@ -1,34 +1,14 @@ -[PATHS] -SERVICEHOME = /tmp/test-gnunetd-hostlist/ -DEFAULTCONFIG = /etc/gnunetd.conf - +@INLINE@ test_hostlist_defaults.conf [hostlist] -PORT = 23354 -# port for hostlist http server HTTPPORT = 28080 -HOSTNAME = localhost -HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG -BINARY = gnunet-daemon-hostlist OPTIONS = -b -e SERVERS = http://gnunet.org:8080/ -# proxy for downloading hostlists -HTTP-PROXY = - -[testing] -WEAKRANDOM = YES - -[mesh] -AUTOSTART = NO - - - -[dns] -AUTOSTART = NO - - +PORT = 23354 +HOSTNAME = localhost -[nse] -AUTOSTART = NO +[datastore] +AUTOSTART = YES +[fs] +AUTOSTART = YES diff --git a/src/hostlist/test_gnunet_daemon_hostlist.conf b/src/hostlist/test_gnunet_daemon_hostlist.conf index fe05b4d65..82f768776 100644 --- a/src/hostlist/test_gnunet_daemon_hostlist.conf +++ b/src/hostlist/test_gnunet_daemon_hostlist.conf @@ -1,63 +1,8 @@ +@INLINE@ test_hostlist_defaults.conf [PATHS] -SERVICEHOME = /tmp/test-gnunetd-core-peer-1/ -DEFAULTCONFIG = test_core_api_peer1.conf - -[resolver] -PORT = 12464 -#PREFIX = xterm -T resolver1 -e valgrind --tool=memcheck - -[transport] -PORT = 12465 -PLUGINS = tcp -#PREFIX = xterm -T transport1 -e -#PREFIX = xterm -T transport1 -e gdb -x cmd --args -#PREFIX = xterm -T transport1 -e valgrind --tool=memcheck -#DEBUG = YES - -[arm] -PORT = 12466 -DEFAULTSERVICES = hostlist -#GLOBAL_PREFIX = xterm -e valgrind --tool=memcheck - -[statistics] -PORT = 12467 -#PREFIX = xterm -T statistics1 -e valgrind --tool=memcheck - -[tcp] -PORT = 12468 - -[peerinfo] -PORT = 12469 -#PREFIX = xterm -T peerinfo1 -e valgrind --tool=memcheck -#PREFIX = xterm -T peerinfo1 -e - -[core] -PORT = 12470 -#PREFIX = xterm -T core1 -e valgrind --tool=memcheck -#OPTIONS = -l log-core-1 -#PREFIX = xterm -T core1 -e gdb -x cmd --args -#PREFIX = xterm -T core1 -e -#DEBUG = YES - -[testing] -WEAKRANDOM = YES +SERVICEHOME = /tmp/test-gnunet-hostlist-peer-1/ [hostlist] -OPTIONS = -b -SERVERS = http://localhost:22471/ -HTTP-PROXY = HTTPPORT = 12471 -[mesh] -AUTOSTART = NO - - - -[dns] -AUTOSTART = NO - - - -[nse] -AUTOSTART = NO - +SERVERS = http://localhost:22471/ diff --git a/src/hostlist/test_gnunet_daemon_hostlist_data.conf b/src/hostlist/test_gnunet_daemon_hostlist_data.conf index 507ea0805..74d16be89 100644 --- a/src/hostlist/test_gnunet_daemon_hostlist_data.conf +++ b/src/hostlist/test_gnunet_daemon_hostlist_data.conf @@ -1,75 +1,29 @@ -[PATHS] -SERVICEHOME = /tmp/test-gnunet-hostlist/ -DEFAULTCONFIG = /etc/gnunetd.conf - -[hostlist] -PORT = 23354 -# port for hostlist http server -HTTPPORT = 28080 -HOSTNAME = localhost -HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG -BINARY = gnunet-daemon-hostlist -# consider having "-e" as default as well once implemented -OPTIONS = -b -SERVERS = http://gnunet.org:8080/ -# proxy for downloading hostlists -HTTP-PROXY = - -[resolver] -PORT = 12964 - -[transport] -PORT = 12965 -PLUGINS = tcp -#DEBUG = YES -DEBUG = NO +@INLINE@ test_hostlist_defaults.conf +[transport-tcp] +PORT = 12968 [arm] PORT = 12966 DEFAULTSERVICES = hostlist topology -#GLOBAL_PREFIX = xterm -e gdb -x cmd --args [statistics] PORT = 12967 -[transport-tcp] -PORT = 12968 -DEBUG = NO +[resolver] +PORT = 12964 [peerinfo] PORT = 12969 +[transport] +PORT = 12965 + [core] PORT = 12970 -#DEBUG = YES -#PREFIX = valgrind --tool=memcheck\ -DEBUG = NO - -[testing] -WEAKRANDOM = YES - -[topology] -#DEBUG = YES -#PREFIX = valgrind --tool=memcheck -DEBUG = NO - -[fs] -AUTOSTART = NO - -[datastore] -AUTOSTART = NO -[mesh] -AUTOSTART = NO - - - -[dns] -AUTOSTART = NO - - - -[nse] -AUTOSTART = NO +[hostlist] +HTTPPORT = 28080 +SERVERS = http://gnunet.org:8080/ +PORT = 23354 +HOSTNAME = localhost diff --git a/src/hostlist/test_gnunet_daemon_hostlist_peer1.conf b/src/hostlist/test_gnunet_daemon_hostlist_peer1.conf index dbc4367dc..679da289a 100644 --- a/src/hostlist/test_gnunet_daemon_hostlist_peer1.conf +++ b/src/hostlist/test_gnunet_daemon_hostlist_peer1.conf @@ -1,80 +1,40 @@ +@INLINE@ test_hostlist_defaults.conf [PATHS] SERVICEHOME = /tmp/test-gnunet-hostlist-peer-1/ DEFAULTCONFIG = test_gnunet_daemon_hostlist_peer1.conf -[resolver] -PORT = 12964 -UNIXPATH = /tmp/gnunet-p1-service-resolver.sock - -[transport] -PORT = 12965 -UNIXPATH = /tmp/gnunet-p1-service-transport.sock -PLUGINS = tcp -#DEBUG = YES -DEBUG = NO +[transport-tcp] +PORT = 12968 [arm] PORT = 12966 -UNIXPATH = /tmp/gnunet-p1-service-arm.sock DEFAULTSERVICES = hostlist topology -#GLOBAL_PREFIX = xterm -e gdb -x cmd --args +UNIXPATH = /tmp/gnunet-p1-service-arm.sock [statistics] PORT = 12967 UNIXPATH = /tmp/gnunet-p1-service-statistics.sock -[transport-tcp] -PORT = 12968 -DEBUG = NO +[resolver] +PORT = 12964 +UNIXPATH = /tmp/gnunet-p1-service-resolver.sock [peerinfo] PORT = 12969 UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock +[transport] +PORT = 12965 +UNIXPATH = /tmp/gnunet-p1-service-transport.sock +DEBUG = NO + [core] PORT = 12970 UNIXPATH = /tmp/gnunet-p1-service-core.sock -#DEBUG = YES -#PREFIX = valgrind --tool=memcheck\ -DEBUG = NO - -[testing] -WEAKRANDOM = YES [hostlist] HTTPPORT = 12980 -SERVERS = http://localhost:12981/ -OPTIONS = -b -p HOSTLISTFILE = hostlists_peer1.file -#DEBUG = YES -#BINARY = /home/grothoff/bin/gnunet-daemon-hostlist -DEBUG = NO - -[topology] -#DEBUG = YES -#PREFIX = valgrind --tool=memcheck -DEBUG = NO - -[fs] -AUTOSTART = NO - -[datastore] -AUTOSTART = NO - -[dht] -AUTOSTART = NO - -[mesh] -AUTOSTART = NO - - - -[dns] -AUTOSTART = NO - - - -[nse] -AUTOSTART = NO - +OPTIONS = -b -p +SERVERS = http://localhost:12981/ diff --git a/src/hostlist/test_gnunet_daemon_hostlist_peer2.conf b/src/hostlist/test_gnunet_daemon_hostlist_peer2.conf index befce219b..2b8eb33d0 100644 --- a/src/hostlist/test_gnunet_daemon_hostlist_peer2.conf +++ b/src/hostlist/test_gnunet_daemon_hostlist_peer2.conf @@ -1,77 +1,39 @@ +@INLINE@ test_hostlist_defaults.conf [PATHS] SERVICEHOME = /tmp/test-gnunet-hostlist-peer-2/ DEFAULTCONFIG = test_gnunet_daemon_hostlist_peer2.conf -[resolver] -PORT = 22964 -UNIXPATH = /tmp/gnunet-p2-service-resolver.sock -DEBUG = NO - -[transport] -PORT = 22965 -UNIXPATH = /tmp/gnunet-p2-service-transport.sock -PLUGINS = tcp -DEBUG = NO +[transport-tcp] +PORT = 22968 [arm] PORT = 22966 -UNIXPATH = /tmp/gnunet-p2-service-arm.sock DEFAULTSERVICES = hostlist topology -#GLOBAL_PREFIX = xterm -e gdb -x cmd --args -DEBUG = NO +UNIXPATH = /tmp/gnunet-p2-service-arm.sock [statistics] PORT = 22967 UNIXPATH = /tmp/gnunet-p2-service-statistics.sock -[transport-tcp] -PORT = 22968 -DEBUG = NO +[resolver] +PORT = 22964 +UNIXPATH = /tmp/gnunet-p2-service-resolver.sock [peerinfo] PORT = 22969 UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock +[transport] +PORT = 22965 +UNIXPATH = /tmp/gnunet-p2-service-transport.sock + [core] PORT = 22970 UNIXPATH = /tmp/gnunet-p2-service-core.sock -DEBUG = NO -#PREFIX = valgrind --tool=memcheck - -[testing] -WEAKRANDOM = YES [hostlist] HTTPPORT = 12981 -SERVERS = http://localhost:12980/ -OPTIONS = -b -p -DEBUG = NO HOSTLISTFILE = hostlists_peer2.file -#BINARY = /home/grothoff/bin/gnunet-daemon-hostlist - -[topology] -#DEBUG = YES -#PREFIX = valgrind --tool=memcheck -DEBUG = NO - -[fs] -AUTOSTART = NO - -[datastore] -AUTOSTART = NO - -[dht] -AUTOSTART = NO[mesh] -AUTOSTART = NO - - - -[dns] -AUTOSTART = NO - - - -[nse] -AUTOSTART = NO - +OPTIONS = -b -p +SERVERS = http://localhost:12980/ diff --git a/src/hostlist/test_hostlist_defaults.conf b/src/hostlist/test_hostlist_defaults.conf new file mode 100644 index 000000000..473ac2a95 --- /dev/null +++ b/src/hostlist/test_hostlist_defaults.conf @@ -0,0 +1,50 @@ +[PATHS] +SERVICEHOME = /tmp/test-gnunet-hostlist/ +DEFAULTCONFIG = test_hostlist_default.conf + +[resolver] +PORT = 12464 + +[transport] +PORT = 12465 +PLUGINS = tcp + +[arm] +PORT = 12466 +DEFAULTSERVICES = hostlist + +[statistics] +PORT = 12467 + +[tcp] +PORT = 12468 + +[peerinfo] +PORT = 12469 + +[core] +PORT = 12470 + +[testing] +WEAKRANDOM = YES + +[hostlist] +HTTP-PROXY = + +[mesh] +AUTOSTART = NO + +[dns] +AUTOSTART = NO + +[nse] +AUTOSTART = NO + +[datastore] +AUTOSTART = NO + +[fs] +AUTOSTART = NO + +[dht] +AUTOSTART = NO diff --git a/src/hostlist/test_learning_adv_peer.conf b/src/hostlist/test_learning_adv_peer.conf index f0329d170..73e58a6b7 100644 --- a/src/hostlist/test_learning_adv_peer.conf +++ b/src/hostlist/test_learning_adv_peer.conf @@ -1,77 +1,43 @@ +@INLINE@ test_hostlist_defaults.conf [PATHS] SERVICEHOME = /tmp/test-gnunet-hostlist-peer-1/ DEFAULTCONFIG = test_learning_adv_peer.conf -[resolver] -PORT = 22964 -UNIXPATH = /tmp/gnunet-hostlist-p2-service-resolver.sock - -[transport] -PORT = 22965 -UNIXPATH = /tmp/gnunet-hostlist-p2-service-transport.sock -PLUGINS = tcp -#DEBUG = YES +[transport-tcp] +PORT = 22968 [arm] PORT = 22966 -UNIXPATH = /tmp/gnunet-hostlist-p2-service-arm.sock DEFAULTSERVICES = topology hostlist -#GLOBAL_PREFIX = xterm -e gdb -x cmd --args -DEBUG=YES +UNIXPATH = /tmp/gnunet-hostlist-p2-service-arm.sock [statistics] PORT = 22967 UNIXPATH = /tmp/gnunet-hostlist-p2-service-statistics.sock -HOSTNAME = localhost -[transport-tcp] -PORT = 22968 +[resolver] +PORT = 22964 +UNIXPATH = /tmp/gnunet-hostlist-p2-service-resolver.sock [peerinfo] PORT = 22969 UNIXPATH = /tmp/gnunet-hostlist-p2-service-peerinfo.sock +[transport] +PORT = 22965 +UNIXPATH = /tmp/gnunet-hostlist-p2-service-transport.sock + [core] PORT = 22970 UNIXPATH = /tmp/gnunet-hostlist-p2-service-core.sock -#DEBUG = YES -#PREFIX = valgrind --tool=memcheck - -[testing] -WEAKRANDOM = YES [hostlist] -EXTERNAL_DNS_NAME = localhost HTTPPORT = 12981 -SERVERS = http://localhost:12981/ -OPTIONS = -p -a -#OPTIONS = -b -p -a -#DEBUG = YES HOSTLISTFILE = hostlists_adv_peer.file - -[topology] -#DEBUG = YES -#PREFIX = valgrind --tool=memcheck - -[fs] -AUTOSTART = NO - -[datastore] -AUTOSTART = NO +OPTIONS = -p -a +SERVERS = http://localhost:12981/ +EXTERNAL_DNS_NAME = localhost [dht] AUTOSTART = NO -[mesh] -AUTOSTART = NO - - - -[dns] -AUTOSTART = NO - - - -[nse] -AUTOSTART = NO - diff --git a/src/hostlist/test_learning_learn_peer.conf b/src/hostlist/test_learning_learn_peer.conf index 9f7e5d3da..41966a27c 100644 --- a/src/hostlist/test_learning_learn_peer.conf +++ b/src/hostlist/test_learning_learn_peer.conf @@ -1,77 +1,42 @@ +@INLINE@ test_hostlist_defaults.conf [PATHS] SERVICEHOME = /tmp/test-gnunet-hostlist-peer-2/ DEFAULTCONFIG = test_learning_learn_peer.conf -[resolver] -PORT = 12964 -UNIXPATH = /tmp/gnunet-hostlist-p1-service-resolver.sock - -[transport] -PORT = 12965 -UNIXPATH = /tmp/gnunet-hostlist-p1-service-transport.sock -PLUGINS = tcp -#DEBUG = YES +[transport-tcp] +PORT = 12968 [arm] PORT = 12966 -UNIXPATH = /tmp/gnunet-hostlist-p1-service-arm.sock DEFAULTSERVICES = topology hostlist -#GLOBAL_PREFIX = xterm -e gdb -x cmd --args -#DEBUG=YES +UNIXPATH = /tmp/gnunet-hostlist-p1-service-arm.sock [statistics] PORT = 12967 UNIXPATH = /tmp/gnunet-hostlist-p1-service-statistics.sock -HOSTNAME = localhost -[transport-tcp] -PORT = 12968 +[resolver] +PORT = 12964 +UNIXPATH = /tmp/gnunet-hostlist-p1-service-resolver.sock [peerinfo] PORT = 12969 UNIXPATH = /tmp/gnunet-hostlist-p1-service-peerinfo.sock +[transport] +PORT = 12965 +UNIXPATH = /tmp/gnunet-hostlist-p1-service-transport.sock [core] PORT = 12970 UNIXPATH = /tmp/gnunet-hostlist-p1-service-core.sock -#DEBUG = YES -#PREFIX = valgrind --tool=memcheck - -[testing] -WEAKRANDOM = YES [hostlist] HTTPPORT = 12980 -SERVERS = http://localhost:12981/ -OPTIONS = -b -e -#OPTIONS = -b -p -#DEBUG = YES HOSTLISTFILE = hostlists_learn_peer.file - -[topology] -#DEBUG = YES -#PREFIX = valgrind --tool=memcheck - -[fs] -AUTOSTART = NO - -[datastore] -AUTOSTART = NO +OPTIONS = -b -e +SERVERS = http://localhost:12981/ [dht] AUTOSTART = NO -[mesh] -AUTOSTART = NO - - - -[dns] -AUTOSTART = NO - - - -[nse] -AUTOSTART = NO - diff --git a/src/hostlist/test_learning_learn_peer2.conf b/src/hostlist/test_learning_learn_peer2.conf index 4d2f0d485..4fd54bbc9 100644 --- a/src/hostlist/test_learning_learn_peer2.conf +++ b/src/hostlist/test_learning_learn_peer2.conf @@ -1,69 +1,39 @@ +@INLINE@ test_hostlist_defaults.conf [PATHS] SERVICEHOME = /tmp/test-gnunet-hostlist-peer-3/ DEFAULTCONFIG = test_learning_learn_peer2.conf -[resolver] -PORT = 32964 -UNIXPATH = /tmp/gnunet-p3-service-resolver.sock - -[transport] -PORT = 32965 -UNIXPATH = /tmp/gnunet-p3-service-transport.sock -PLUGINS = tcp -#DEBUG = YES +[transport-tcp] +PORT = 32968 [arm] PORT = 32966 -UNIXPATH = /tmp/gnunet-p3-service-arm.sock DEFAULTSERVICES = topology hostlist -#GLOBAL_PREFIX = xterm -e gdb -x cmd --args -DEBUG=NO +UNIXPATH = /tmp/gnunet-p3-service-arm.sock [statistics] PORT = 32967 UNIXPATH = /tmp/gnunet-p3-service-statistics.sock -HOSTNAME = localhost -[transport-tcp] -PORT = 32968 +[resolver] +PORT = 32964 +UNIXPATH = /tmp/gnunet-p3-service-resolver.sock [peerinfo] PORT = 32969 UNIXPATH = /tmp/gnunet-p3-service-peerinfo.sock +[transport] +PORT = 32965 +UNIXPATH = /tmp/gnunet-p3-service-transport.sock + [core] PORT = 32970 UNIXPATH = /tmp/gnunet-p3-service-core.sock -#DEBUG = YES -#PREFIX = valgrind --tool=memcheck - -[testing] -WEAKRANDOM = YES [hostlist] HTTPPORT = 32980 -SERVERS = http://localhost:12981/ -OPTIONS = -b -e -#OPTIONS = -b -p -#DEBUG = YES HOSTLISTFILE = hostlists_learn_peer2.file -#BINARY = /home/grothoff/bin/gnunet-daemon-hostlist - - -[topology] -#DEBUG = YES -#PREFIX = valgrind --tool=memcheck -[mesh] -AUTOSTART = NO - - - -[dns] -AUTOSTART = NO - - - -[nse] -AUTOSTART = NO - +OPTIONS = -b -e +SERVERS = http://localhost:12981/ -- 2.25.1