[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r16280 - gnunet/src/hostlist
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r16280 - gnunet/src/hostlist |
|
Date: |
Mon, 1 Aug 2011 15:42:30 +0200 |
Author: grothoff
Date: 2011-08-01 15:42:30 +0200 (Mon, 01 Aug 2011)
New Revision: 16280
Added:
gnunet/src/hostlist/test_hostlist_defaults.conf
Modified:
gnunet/src/hostlist/Makefile.am
gnunet/src/hostlist/learning_data.conf
gnunet/src/hostlist/test_gnunet_daemon_hostlist.conf
gnunet/src/hostlist/test_gnunet_daemon_hostlist_data.conf
gnunet/src/hostlist/test_gnunet_daemon_hostlist_peer1.conf
gnunet/src/hostlist/test_gnunet_daemon_hostlist_peer2.conf
gnunet/src/hostlist/test_learning_adv_peer.conf
gnunet/src/hostlist/test_learning_learn_peer.conf
gnunet/src/hostlist/test_learning_learn_peer2.conf
Log:
optimizing cfg
Modified: gnunet/src/hostlist/Makefile.am
===================================================================
--- gnunet/src/hostlist/Makefile.am 2011-08-01 13:35:31 UTC (rev 16279)
+++ gnunet/src/hostlist/Makefile.am 2011-08-01 13:42:30 UTC (rev 16280)
@@ -66,6 +66,7 @@
$(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 \
Modified: gnunet/src/hostlist/learning_data.conf
===================================================================
--- gnunet/src/hostlist/learning_data.conf 2011-08-01 13:35:31 UTC (rev
16279)
+++ gnunet/src/hostlist/learning_data.conf 2011-08-01 13:42:30 UTC (rev
16280)
@@ -1,34 +1,14 @@
-[PATHS]
-SERVICEHOME = /tmp/test-gnunetd-hostlist/
-DEFAULTCONFIG = /etc/gnunetd.conf
-
address@hidden@ 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 =
+PORT = 23354
+HOSTNAME = localhost
-[testing]
-WEAKRANDOM = YES
+[datastore]
+AUTOSTART = YES
-[mesh]
-AUTOSTART = NO
+[fs]
+AUTOSTART = YES
-
-
-[dns]
-AUTOSTART = NO
-
-
-
-[nse]
-AUTOSTART = NO
-
-
Modified: gnunet/src/hostlist/test_gnunet_daemon_hostlist.conf
===================================================================
--- gnunet/src/hostlist/test_gnunet_daemon_hostlist.conf 2011-08-01
13:35:31 UTC (rev 16279)
+++ gnunet/src/hostlist/test_gnunet_daemon_hostlist.conf 2011-08-01
13:42:30 UTC (rev 16280)
@@ -1,63 +1,8 @@
address@hidden@ test_hostlist_defaults.conf
[PATHS]
-SERVICEHOME = /tmp/test-gnunetd-core-peer-1/
-DEFAULTCONFIG = test_core_api_peer1.conf
+SERVICEHOME = /tmp/test-gnunet-hostlist-peer-1/
-[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
-
[hostlist]
-OPTIONS = -b
-SERVERS = http://localhost:22471/
-HTTP-PROXY =
HTTPPORT = 12471
-[mesh]
-AUTOSTART = NO
+SERVERS = http://localhost:22471/
-
-
-[dns]
-AUTOSTART = NO
-
-
-
-[nse]
-AUTOSTART = NO
-
-
Modified: gnunet/src/hostlist/test_gnunet_daemon_hostlist_data.conf
===================================================================
--- gnunet/src/hostlist/test_gnunet_daemon_hostlist_data.conf 2011-08-01
13:35:31 UTC (rev 16279)
+++ gnunet/src/hostlist/test_gnunet_daemon_hostlist_data.conf 2011-08-01
13:42:30 UTC (rev 16280)
@@ -1,75 +1,29 @@
-[PATHS]
-SERVICEHOME = /tmp/test-gnunet-hostlist/
-DEFAULTCONFIG = /etc/gnunetd.conf
address@hidden@ test_hostlist_defaults.conf
+[transport-tcp]
+PORT = 12968
-[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
-
[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
+[hostlist]
+HTTPPORT = 28080
+SERVERS = http://gnunet.org:8080/
+PORT = 23354
+HOSTNAME = localhost
-[topology]
-#DEBUG = YES
-#PREFIX = valgrind --tool=memcheck
-DEBUG = NO
-
-[fs]
-AUTOSTART = NO
-
-[datastore]
-AUTOSTART = NO
-[mesh]
-AUTOSTART = NO
-
-
-
-[dns]
-AUTOSTART = NO
-
-
-
-[nse]
-AUTOSTART = NO
-
-
Modified: gnunet/src/hostlist/test_gnunet_daemon_hostlist_peer1.conf
===================================================================
--- gnunet/src/hostlist/test_gnunet_daemon_hostlist_peer1.conf 2011-08-01
13:35:31 UTC (rev 16279)
+++ gnunet/src/hostlist/test_gnunet_daemon_hostlist_peer1.conf 2011-08-01
13:42:30 UTC (rev 16280)
@@ -1,3 +1,4 @@
address@hidden@ test_hostlist_defaults.conf
[PATHS]
SERVICEHOME = /tmp/test-gnunet-hostlist-peer-1/
DEFAULTCONFIG = test_gnunet_daemon_hostlist_peer1.conf
@@ -2,18 +3,9 @@
-[resolver]
-PORT = 12964
-UNIXPATH = /tmp/gnunet-p1-service-resolver.sock
+[transport-tcp]
+PORT = 12968
-[transport]
-PORT = 12965
-UNIXPATH = /tmp/gnunet-p1-service-transport.sock
-PLUGINS = tcp
-#DEBUG = YES
-DEBUG = NO
-
[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
@@ -23,58 +15,26 @@
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
+OPTIONS = -b -p
+SERVERS = http://localhost:12981/
-[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
-
-
Modified: gnunet/src/hostlist/test_gnunet_daemon_hostlist_peer2.conf
===================================================================
--- gnunet/src/hostlist/test_gnunet_daemon_hostlist_peer2.conf 2011-08-01
13:35:31 UTC (rev 16279)
+++ gnunet/src/hostlist/test_gnunet_daemon_hostlist_peer2.conf 2011-08-01
13:42:30 UTC (rev 16280)
@@ -1,3 +1,4 @@
address@hidden@ test_hostlist_defaults.conf
[PATHS]
SERVICEHOME = /tmp/test-gnunet-hostlist-peer-2/
DEFAULTCONFIG = test_gnunet_daemon_hostlist_peer2.conf
@@ -2,19 +3,9 @@
-[resolver]
-PORT = 22964
-UNIXPATH = /tmp/gnunet-p2-service-resolver.sock
-DEBUG = NO
+[transport-tcp]
+PORT = 22968
-[transport]
-PORT = 22965
-UNIXPATH = /tmp/gnunet-p2-service-transport.sock
-PLUGINS = tcp
-DEBUG = NO
-
[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
@@ -24,54 +15,25 @@
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
+OPTIONS = -b -p
+SERVERS = http://localhost:12980/
-[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
-
-
Added: gnunet/src/hostlist/test_hostlist_defaults.conf
===================================================================
--- gnunet/src/hostlist/test_hostlist_defaults.conf
(rev 0)
+++ gnunet/src/hostlist/test_hostlist_defaults.conf 2011-08-01 13:42:30 UTC
(rev 16280)
@@ -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
Modified: gnunet/src/hostlist/test_learning_adv_peer.conf
===================================================================
--- gnunet/src/hostlist/test_learning_adv_peer.conf 2011-08-01 13:35:31 UTC
(rev 16279)
+++ gnunet/src/hostlist/test_learning_adv_peer.conf 2011-08-01 13:42:30 UTC
(rev 16280)
@@ -1,3 +1,4 @@
address@hidden@ test_hostlist_defaults.conf
[PATHS]
SERVICEHOME = /tmp/test-gnunet-hostlist-peer-1/
DEFAULTCONFIG = test_learning_adv_peer.conf
@@ -2,26 +3,17 @@
-[resolver]
-PORT = 22964
-UNIXPATH = /tmp/gnunet-hostlist-p2-service-resolver.sock
+[transport-tcp]
+PORT = 22968
-[transport]
-PORT = 22965
-UNIXPATH = /tmp/gnunet-hostlist-p2-service-transport.sock
-PLUGINS = tcp
-#DEBUG = YES
-
[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
@@ -31,47 +23,21 @@
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
+OPTIONS = -p -a
+SERVERS = http://localhost:12981/
+EXTERNAL_DNS_NAME = localhost
-[topology]
-#DEBUG = YES
-#PREFIX = valgrind --tool=memcheck
-
-[fs]
-AUTOSTART = NO
-
-[datastore]
-AUTOSTART = NO
-
[dht]
AUTOSTART = NO
-[mesh]
-AUTOSTART = NO
-
-
-[dns]
-AUTOSTART = NO
-
-
-
-[nse]
-AUTOSTART = NO
-
-
Modified: gnunet/src/hostlist/test_learning_learn_peer.conf
===================================================================
--- gnunet/src/hostlist/test_learning_learn_peer.conf 2011-08-01 13:35:31 UTC
(rev 16279)
+++ gnunet/src/hostlist/test_learning_learn_peer.conf 2011-08-01 13:42:30 UTC
(rev 16280)
@@ -1,3 +1,4 @@
address@hidden@ test_hostlist_defaults.conf
[PATHS]
SERVICEHOME = /tmp/test-gnunet-hostlist-peer-2/
DEFAULTCONFIG = test_learning_learn_peer.conf
@@ -2,26 +3,17 @@
-[resolver]
-PORT = 12964
-UNIXPATH = /tmp/gnunet-hostlist-p1-service-resolver.sock
+[transport-tcp]
+PORT = 12968
-[transport]
-PORT = 12965
-UNIXPATH = /tmp/gnunet-hostlist-p1-service-transport.sock
-PLUGINS = tcp
-#DEBUG = YES
-
[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
@@ -31,47 +23,20 @@
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
+OPTIONS = -b -e
+SERVERS = http://localhost:12981/
-[topology]
-#DEBUG = YES
-#PREFIX = valgrind --tool=memcheck
-
-[fs]
-AUTOSTART = NO
-
-[datastore]
-AUTOSTART = NO
-
[dht]
AUTOSTART = NO
-[mesh]
-AUTOSTART = NO
-
-
-[dns]
-AUTOSTART = NO
-
-
-
-[nse]
-AUTOSTART = NO
-
-
Modified: gnunet/src/hostlist/test_learning_learn_peer2.conf
===================================================================
--- gnunet/src/hostlist/test_learning_learn_peer2.conf 2011-08-01 13:35:31 UTC
(rev 16279)
+++ gnunet/src/hostlist/test_learning_learn_peer2.conf 2011-08-01 13:42:30 UTC
(rev 16280)
@@ -1,3 +1,4 @@
address@hidden@ test_hostlist_defaults.conf
[PATHS]
SERVICEHOME = /tmp/test-gnunet-hostlist-peer-3/
DEFAULTCONFIG = test_learning_learn_peer2.conf
@@ -2,26 +3,17 @@
-[resolver]
-PORT = 32964
-UNIXPATH = /tmp/gnunet-p3-service-resolver.sock
+[transport-tcp]
+PORT = 32968
-[transport]
-PORT = 32965
-UNIXPATH = /tmp/gnunet-p3-service-transport.sock
-PLUGINS = tcp
-#DEBUG = YES
-
[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
@@ -31,39 +23,17 @@
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
+OPTIONS = -b -e
+SERVERS = http://localhost:12981/
-
-[topology]
-#DEBUG = YES
-#PREFIX = valgrind --tool=memcheck
-[mesh]
-AUTOSTART = NO
-
-
-
-[dns]
-AUTOSTART = NO
-
-
-
-[nse]
-AUTOSTART = NO
-
-
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r16280 - gnunet/src/hostlist,
gnunet <=