[GNUnet-SVN] r29329 - in gnunet: . src/testbed

[gnunet]

Author: harsha
Date: 2013-09-16 17:51:11 +0200 (Mon, 16 Sep 2013)
New Revision: 29329

Added:
   gnunet/src/testbed/test_testbed_api_barriers.conf.in
Removed:
   gnunet/src/testbed/test_testbed_api_barriers.conf
Modified:
   gnunet/configure.ac
Log:
- generate test_testbed_api_barriers.conf


Modified: gnunet/configure.ac
===================================================================
--- gnunet/configure.ac 2013-09-16 15:13:52 UTC (rev 29328)
+++ gnunet/configure.ac 2013-09-16 15:51:11 UTC (rev 29329)
@@ -1345,6 +1345,7 @@
 src/template/Makefile
 src/testbed/Makefile
 src/testbed/testbed.conf
+src/testbed/test_testbed_api_barriers.conf
 src/testing/Makefile
 src/topology/Makefile
 src/transport/Makefile

Deleted: gnunet/src/testbed/test_testbed_api_barriers.conf
===================================================================
--- gnunet/src/testbed/test_testbed_api_barriers.conf   2013-09-16 15:13:52 UTC 
(rev 29328)
+++ gnunet/src/testbed/test_testbed_api_barriers.conf   2013-09-16 15:51:11 UTC 
(rev 29329)
@@ -1,85 +0,0 @@
-[testbed]
-AUTOSTART = NO
-PORT = 12113
-ACCEPT_FROM = 127.0.0.1;
-HOSTNAME = localhost
-TOPOLOGY = RANDOM
-#PREFIX = xterm -geometry 100x85 -T peer1 -e libtool --mode=execute gdb --args
-
-[arm]
-DEFAULTSERVICES = core transport test-barriers
-PORT = 12366
-
-[test-barriers]
-AUTOSTART = YES
-PORT = 12114                    #not really used
-BINARY = gnunet-service-test-barriers
-
-[fs]
-AUTOSTART = NO
-
-[resolver]
-AUTOSTART = NO
-
-[mesh]
-AUTOSTART = NO
-
-[dht]
-AUTOSTART = NO
-
-[dhtcache]
-QUOTA = 1 MB
-DATABASE = heap
-
-[transport]
-PLUGINS = udp
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-NEIGHBOUR_LIMIT = 50
-PORT = 12365
-
-[ats]
-WAN_QUOTA_OUT = 3932160
-WAN_QUOTA_IN = 3932160
-
-[core]
-PORT = 12092
-AUTOSTART = YES
-USE_EPHEMERAL_KEYS = NO
-
-[transport-udp]
-TIMEOUT = 300 s
-PORT = 12368
-
-[gnunetd]
-HOSTKEY = $SERVICEHOME/.hostkey
-
-[PATHS]
-SERVICEHOME = /tmp/test-testbed/
-
-[dns]
-AUTOSTART = NO
-
-[nse]
-AUTOSTART = NO
-
-[vpn]
-AUTOSTART = NO
-
-[nat]
-RETURN_LOCAL_ADDRESSES = YES
-
-[gns-helper-service-w32]
-AUTOSTART = NO
-
-[consensus]
-AUTOSTART = NO
-
-[gns]
-AUTOSTART = NO
-
-[statistics]
-AUTOSTART = NO
-
-[peerinfo]
-NO_IO = YES

Added: gnunet/src/testbed/test_testbed_api_barriers.conf.in
===================================================================
--- gnunet/src/testbed/test_testbed_api_barriers.conf.in                        
        (rev 0)
+++ gnunet/src/testbed/test_testbed_api_barriers.conf.in        2013-09-16 
15:51:11 UTC (rev 29329)
@@ -0,0 +1,85 @@
+[testbed]
+AUTOSTART = NO
+PORT = 12113
+ACCEPT_FROM = 127.0.0.1;
+HOSTNAME = localhost
+TOPOLOGY = RANDOM
+#PREFIX = xterm -geometry 100x85 -T peer1 -e libtool --mode=execute gdb --args
+
+[arm]
+DEFAULTSERVICES = core transport test-barriers
+PORT = 12366
+
+[test-barriers]
+AUTOSTART = YES
+PORT = 12114                    #not really used
+BINARY = @abs_srcdir@/gnunet-service-test-barriers
+
+[fs]
+AUTOSTART = NO
+
+[resolver]
+AUTOSTART = NO
+
+[mesh]
+AUTOSTART = NO
+
+[dht]
+AUTOSTART = NO
+
+[dhtcache]
+QUOTA = 1 MB
+DATABASE = heap
+
+[transport]
+PLUGINS = udp
+ACCEPT_FROM6 = ::1;
+ACCEPT_FROM = 127.0.0.1;
+NEIGHBOUR_LIMIT = 50
+PORT = 12365
+
+[ats]
+WAN_QUOTA_OUT = 3932160
+WAN_QUOTA_IN = 3932160
+
+[core]
+PORT = 12092
+AUTOSTART = YES
+USE_EPHEMERAL_KEYS = NO
+
+[transport-udp]
+TIMEOUT = 300 s
+PORT = 12368
+
+[gnunetd]
+HOSTKEY = $SERVICEHOME/.hostkey
+
+[PATHS]
+SERVICEHOME = /tmp/test-testbed/
+
+[dns]
+AUTOSTART = NO
+
+[nse]
+AUTOSTART = NO
+
+[vpn]
+AUTOSTART = NO
+
+[nat]
+RETURN_LOCAL_ADDRESSES = YES
+
+[gns-helper-service-w32]
+AUTOSTART = NO
+
+[consensus]
+AUTOSTART = NO
+
+[gns]
+AUTOSTART = NO
+
+[statistics]
+AUTOSTART = NO
+
+[peerinfo]
+NO_IO = YES