From 6798d86cdb2acf242635f8bf32057bd1f7530a07 Mon Sep 17 00:00:00 2001
From: "Nathan S. Evans" <evans@in.tum.de>
Date: Fri, 29 Jan 2010 11:03:22 +0000
Subject: maybe this will fix buildbot errors...

---
 src/transport/test_transport_api.c          |  4 ++--
 src/transport/test_transport_api_data.conf  | 25 ++++++++++++++-----------
 src/transport/test_transport_api_peer1.conf | 11 +++++++----
 src/transport/test_transport_api_peer2.conf | 11 +++++++----
 4 files changed, 30 insertions(+), 21 deletions(-)

(limited to 'src')

diff --git a/src/transport/test_transport_api.c b/src/transport/test_transport_api.c
index f32feca26..3a902a677 100644
--- a/src/transport/test_transport_api.c
+++ b/src/transport/test_transport_api.c
@@ -31,13 +31,13 @@
 #include "gnunet_transport_service.h"
 #include "transport.h"
 
-#define VERBOSE GNUNET_YES
+#define VERBOSE GNUNET_NO
 
 #define VERBOSE_ARM GNUNET_NO
 
 #define START_ARM GNUNET_YES
 
-#define VERBOSE_TRANSPORT GNUNET_YES
+#define VERBOSE_TRANSPORT GNUNET_NO
 
 /**
  * How long until we give up on transmitting the message?
diff --git a/src/transport/test_transport_api_data.conf b/src/transport/test_transport_api_data.conf
index fbc7a0d26..968717185 100644
--- a/src/transport/test_transport_api_data.conf
+++ b/src/transport/test_transport_api_data.conf
@@ -1,3 +1,6 @@
+[transport-udp]
+PORT = 2094
+
 [fs]
 ALLOW_SHUTDOWN = YES
 ACCEPT_FROM6 = ::1;
@@ -57,9 +60,9 @@ HOSTNAME = localhost
 PORT = 2092
 
 [transport]
-# PREFIX = xterm -e xterm -T transport -e gdb --args
-PLUGINS = tcp
-DEBUG = YES
+plugins = udp
+DEBUG = NO
+PREFIX = 
 ALLOW_SHUTDOWN = YES
 ACCEPT_FROM6 = ::1;
 ACCEPT_FROM = 127.0.0.1;
@@ -68,7 +71,7 @@ BINARY = gnunet-service-transport
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 2365
+PORT = 2091
 
 [peerinfo]
 TRUST = $SERVICEHOME/data/credit/
@@ -80,7 +83,7 @@ BINARY = gnunet-service-peerinfo
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 2369
+PORT = 2090
 
 [resolver]
 ALLOW_SHUTDOWN = YES
@@ -90,7 +93,7 @@ BINARY = gnunet-service-resolver
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 2364
+PORT = 2089
 
 [statistics]
 ALLOW_SHUTDOWN = YES
@@ -100,7 +103,7 @@ BINARY = gnunet-service-statistics
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 2367
+PORT = 2088
 
 [arm]
 DEFAULTSERVICES = resolver transport core
@@ -111,20 +114,20 @@ BINARY = gnunet-service-arm
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 2366
+PORT = 2087
 
 [transport-tcp]
 ALLOW_SHUTDOWN = NO
 TIMEOUT = 300000
-PORT = 2368
+PORT = 2094
 
 [TESTING]
-WEAKRANDOM = YES
+WEAKRANDOM = NO
 
 [gnunetd]
 HOSTKEY = $SERVICEHOME/.hostkey
 
 [PATHS]
 DEFAULTCONFIG = /etc/gnunetd.conf
-SERVICEHOME = /tmp/test-gnunetd-transport-master/
+SERVICEHOME = /var/lib/gnunet/
 
diff --git a/src/transport/test_transport_api_peer1.conf b/src/transport/test_transport_api_peer1.conf
index 7f6ef9585..fa57f2a76 100644
--- a/src/transport/test_transport_api_peer1.conf
+++ b/src/transport/test_transport_api_peer1.conf
@@ -1,3 +1,6 @@
+[transport-udp]
+PORT = 12368
+
 [fs]
 ALLOW_SHUTDOWN = YES
 ACCEPT_FROM6 = ::1;
@@ -57,14 +60,14 @@ HOSTNAME = localhost
 PORT = 2092
 
 [transport]
-#PREFIX = xterm -e xterm -T transport -e gdb --args
-PLUGINS = tcp
-DEBUG = YES
+PREFIX = 
+DEBUG = NO
+PLUGINS = udp
 ALLOW_SHUTDOWN = YES
 ACCEPT_FROM6 = ::1;
 ACCEPT_FROM = 127.0.0.1;
 NEIGHBOUR_LIMIT = 50
-BINARY = gnunet-service-transport
+BINARY = /usr/local/bin/gnunet-service-transport
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
diff --git a/src/transport/test_transport_api_peer2.conf b/src/transport/test_transport_api_peer2.conf
index 12034d397..d510e828f 100644
--- a/src/transport/test_transport_api_peer2.conf
+++ b/src/transport/test_transport_api_peer2.conf
@@ -1,3 +1,6 @@
+[transport-udp]
+PORT = 22368
+
 [fs]
 ALLOW_SHUTDOWN = YES
 ACCEPT_FROM6 = ::1;
@@ -57,14 +60,14 @@ HOSTNAME = localhost
 PORT = 2092
 
 [transport]
-# PREFIX = xterm -e xterm -T transport -e gdb --args
-PLUGINS = tcp
-DEBUG = YES
+PREFIX = 
+DEBUG = NO
+PLUGINS = udp
 ALLOW_SHUTDOWN = YES
 ACCEPT_FROM6 = ::1;
 ACCEPT_FROM = 127.0.0.1;
 NEIGHBOUR_LIMIT = 50
-BINARY = gnunet-service-transport
+BINARY = /usr/local/bin/gnunet-service-transport
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-- 
cgit v1.2.3