[GNUnet-SVN] r14810 - gnunet/src/transport

[gnunet]

Author: wachs
Date: 2011-04-01 08:51:58 +0200 (Fri, 01 Apr 2011)
New Revision: 14810

Added:
   gnunet/src/transport/test_transport_ats.conf
Removed:
   gnunet/src/transport/test_transport_ats_peer1.conf
   gnunet/src/transport/test_transport_ats_peer2.conf
Modified:
   gnunet/src/transport/test_transport_ats.c
Log:
missing conf


Modified: gnunet/src/transport/test_transport_ats.c
===================================================================
--- gnunet/src/transport/test_transport_ats.c   2011-03-31 22:56:34 UTC (rev 
14809)
+++ gnunet/src/transport/test_transport_ats.c   2011-04-01 06:51:58 UTC (rev 
14810)
@@ -30,8 +30,8 @@
 #define NUM_PEERS 11
 #define MEASUREMENTS 5
 
-#define DELAY GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 30)
-#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 10)
+#define DELAY GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 300)
+#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 300)
 
 
 static int ok;

Added: gnunet/src/transport/test_transport_ats.conf
===================================================================
--- gnunet/src/transport/test_transport_ats.conf                                
(rev 0)
+++ gnunet/src/transport/test_transport_ats.conf        2011-04-01 06:51:58 UTC 
(rev 14810)
@@ -0,0 +1,44 @@
+[PATHS]
+SERVICEHOME = /tmp/test-gnunet-testing/
+DEFAULTCONFIG = test_testing_data.conf
+
+[resolver]
+PORT = 2564
+
+[transport]
+PORT = 2565
+PLUGINS = tcp
+#DEBUG = NO
+#PREFIX = xterm -e xterm -T transport -e gdb -x cmd --args
+#PREFIX = valgrind --tool=memcheck --log-file=logs%p
+
+[arm]
+PORT = 2566
+DEFAULTSERVICES = core
+
+[statistics]
+PORT = 2567
+
+[transport-tcp]
+PORT = 2568
+
+[peerinfo]
+PORT = 2569
+
+[core]
+PORT = 2570
+
+[testing]
+WEAKRANDOM = YES
+HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
+
+[fs]
+AUTOSTART = NO
+
+[datastore]
+AUTOSTART = NO
+
+[dht]
+AUTOSTART = NO
+
+

Deleted: gnunet/src/transport/test_transport_ats_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_ats_peer1.conf  2011-03-31 22:56:34 UTC 
(rev 14809)
+++ gnunet/src/transport/test_transport_ats_peer1.conf  2011-04-01 06:51:58 UTC 
(rev 14810)
@@ -1,117 +0,0 @@
-[transport-tcp]
-DISABLEV6 = YES
-PORT = 12368
-BINDTO = 127.0.0.1
-BEHIND_NAT = NO
-ALLOW_NAT = NO
-ENABLE_UPNP = NO
-INTERNAL_ADDRESS = 127.0.0.1
-EXTERNAL_ADDRESS = 127.0.0.1
-
-[transport-unix]
-PORT = 4368
-
-[fs]
-AUTOSTART = NO
-
-[datastore]
-AUTOSTART = NO
-
-[core]
-AUTOSTART = NO
-
-[hostlist]
-HTTP-PROXY = 
-SERVERS = http://gnunet.org:8080/
-OPTIONS = -b
-BINARY = gnunet-daemon-hostlist
-CONFIG = $DEFAULTCONFIG
-HOME = $SERVICEHOME
-HOSTNAME = localhost
-HTTPPORT = 8080
-
-[topology]
-BINARY = gnunet-daemon-topology
-CONFIG = $DEFAULTCONFIG
-FRIENDS = $SERVICEHOME/friends
-TARGET-CONNECTION-COUNT = 16
-AUTOCONNECT = YES
-FRIENDS-ONLY = NO
-MINIMUM-FRIENDS = 0
-
-[transport]
-PLUGINS = tcp unix
-DEBUG = NO
-#PREFIX = xterm -T transport2 -e gdb --command=cmd --args
-#PREFIX = valgrind --tool=memcheck --leak-check=full --log-file=transport%p
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-NEIGHBOUR_LIMIT = 50
-BINARY = gnunet-service-transport
-#BINARY = 
/home/mrwiggles/documents/research/gnunet/gnunet-ng/src/transport/.libs/gnunet-service-transport
-CONFIG = $DEFAULTCONFIG
-HOME = $SERVICEHOME
-HOSTNAME = localhost
-PORT = 12365
-UNIXPATH = /tmp/gnunet-p1-service-transport.sock
-
-[peerinfo]
-TRUST = $SERVICEHOME/data/credit/
-HOSTS = $SERVICEHOME/data/hosts/
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-BINARY = gnunet-service-peerinfo
-CONFIG = $DEFAULTCONFIG
-HOME = $SERVICEHOME
-HOSTNAME = localhost
-PORT = 12369
-UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock
-
-[resolver]
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-BINARY = gnunet-service-resolver
-CONFIG = $DEFAULTCONFIG
-HOME = $SERVICEHOME
-HOSTNAME = localhost
-PORT = 1236
-UNIXPATH = /tmp/gnunet-p1-service-resolver.sock
-
-[statistics]
-AUTOSTART = YES
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-BINARY = gnunet-service-statistics
-CONFIG = $DEFAULTCONFIG
-HOME = $SERVICEHOME
-HOSTNAME = localhost
-PORT = 12367
-UNIXPATH = /tmp/gnunet-p1-service-statistics.sock
-DEBUG = YES
-
-[arm]
-DEFAULTSERVICES = transport
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-BINARY = gnunet-service-arm
-CONFIG = $DEFAULTCONFIG
-HOME = $SERVICEHOME
-HOSTNAME = localhost
-PORT = 12366
-UNIXPATH = /tmp/gnunet-p1-service-arm.sock
-
-[TESTING]
-WEAKRANDOM = YES
-
-[gnunetd]
-HOSTKEY = $SERVICEHOME/.hostkey
-
-[PATHS]
-#DEFAULTCONFIG = test_transport_api_tcp_peer1.conf
-SERVICEHOME = /tmp/test-gnunetd-transport-peer-1/
-
-
-[dht]
-AUTOSTART = NO
-
-

Deleted: gnunet/src/transport/test_transport_ats_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_ats_peer2.conf  2011-03-31 22:56:34 UTC 
(rev 14809)
+++ gnunet/src/transport/test_transport_ats_peer2.conf  2011-04-01 06:51:58 UTC 
(rev 14810)
@@ -1,117 +0,0 @@
-[transport-tcp]
-DISABLEV6 = YES
-PORT = 0
-BINDTO = 127.0.0.1
-BEHIND_NAT = NO
-ALLOW_NAT = NO
-ENABLE_UPNP = NO
-EXTERNAL_ADDRESS = 127.0.0.1
-INTERNAL_ADDRESS = 127.0.0.1
-
-[transport-unix]
-PORT = 5368
-
-[core]
-AUTOSTART = NO
-
-[fs]
-AUTOSTART = NO
-
-[datastore]
-AUTOSTART = NO
-
-[hostlist]
-HTTP-PROXY = 
-SERVERS = http://gnunet.org:8080/
-OPTIONS = -b
-BINARY = gnunet-daemon-hostlist
-CONFIG = $DEFAULTCONFIG
-HOME = $SERVICEHOME
-HOSTNAME = localhost
-HTTPPORT = 8080
-
-[topology]
-BINARY = gnunet-daemon-topology
-CONFIG = $DEFAULTCONFIG
-FRIENDS = $SERVICEHOME/friends
-TARGET-CONNECTION-COUNT = 16
-AUTOCONNECT = YES
-FRIENDS-ONLY = NO
-MINIMUM-FRIENDS = 0
-
-[transport]
-PLUGINS = tcp unix
-DEBUG = NO
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-NEIGHBOUR_LIMIT = 50
-#BINARY = 
/home/mrwiggles/documents/research/gnunet/gnunet-ng/src/transport/.libs/gnunet-service-transport
-BINARY = gnunet-service-transport
-CONFIG = $DEFAULTCONFIG
-HOME = $SERVICEHOME
-HOSTNAME = localhost
-PORT = 22365
-UNIXPATH = /tmp/gnunet-p2-service-transport.sock
-#PREFIX = valgrind --tool=callgrind
-#PREFIX = xterm -T transport2 -e gdb --command=cmd --args
-#PREFIX = valgrind --leak-check=full
-
-[peerinfo]
-TRUST = $SERVICEHOME/data/credit/
-HOSTS = $SERVICEHOME/data/hosts/
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-BINARY = gnunet-service-peerinfo
-CONFIG = $DEFAULTCONFIG
-HOME = $SERVICEHOME
-HOSTNAME = localhost
-PORT = 22369
-UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock
-
-[resolver]
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-BINARY = gnunet-service-resolver
-CONFIG = $DEFAULTCONFIG
-HOME = $SERVICEHOME
-HOSTNAME = localhost
-PORT = 22364
-UNIXPATH = /tmp/gnunet-p2-service-resolver.sock
-
-[statistics]
-AUTOSTART = YES
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-BINARY = gnunet-service-statistics
-CONFIG = $DEFAULTCONFIG
-HOME = $SERVICEHOME
-HOSTNAME = localhost
-PORT = 22367
-UNIXPATH = /tmp/gnunet-p2-service-statistics.sock
-
-[arm]
-DEFAULTSERVICES = transport
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-BINARY = gnunet-service-arm
-CONFIG = $DEFAULTCONFIG
-HOME = $SERVICEHOME
-HOSTNAME = localhost
-PORT = 22366
-UNIXPATH = /tmp/gnunet-p2-service-arm.sock
-
-[TESTING]
-WEAKRANDOM = YES
-
-[gnunetd]
-HOSTKEY = $SERVICEHOME/.hostkey
-
-[PATHS]
-#DEFAULTCONFIG = test_transport_api_tcp_peer2.conf
-SERVICEHOME = /tmp/test-gnunetd-transport-peer-2/
-
-
-[dht]
-AUTOSTART = NO
-
-