aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorNathan S. Evans <evans@in.tum.de>2010-01-29 11:03:22 +0000
committerNathan S. Evans <evans@in.tum.de>2010-01-29 11:03:22 +0000
commit6798d86cdb2acf242635f8bf32057bd1f7530a07 (patch)
tree93a0513ba695407d17083896cbfaacdfee5a31b8 /src
parent54cb7c9534aee0f3e8b7115a863baaf5de5d870d (diff)
downloadgnunet-6798d86cdb2acf242635f8bf32057bd1f7530a07.tar.gz
gnunet-6798d86cdb2acf242635f8bf32057bd1f7530a07.zip
maybe this will fix buildbot errors...
Diffstat (limited to 'src')
-rw-r--r--src/transport/test_transport_api.c4
-rw-r--r--src/transport/test_transport_api_data.conf25
-rw-r--r--src/transport/test_transport_api_peer1.conf11
-rw-r--r--src/transport/test_transport_api_peer2.conf11
4 files changed, 30 insertions, 21 deletions
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 @@
31#include "gnunet_transport_service.h" 31#include "gnunet_transport_service.h"
32#include "transport.h" 32#include "transport.h"
33 33
34#define VERBOSE GNUNET_YES 34#define VERBOSE GNUNET_NO
35 35
36#define VERBOSE_ARM GNUNET_NO 36#define VERBOSE_ARM GNUNET_NO
37 37
38#define START_ARM GNUNET_YES 38#define START_ARM GNUNET_YES
39 39
40#define VERBOSE_TRANSPORT GNUNET_YES 40#define VERBOSE_TRANSPORT GNUNET_NO
41 41
42/** 42/**
43 * How long until we give up on transmitting the message? 43 * 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 @@
1[transport-udp]
2PORT = 2094
3
1[fs] 4[fs]
2ALLOW_SHUTDOWN = YES 5ALLOW_SHUTDOWN = YES
3ACCEPT_FROM6 = ::1; 6ACCEPT_FROM6 = ::1;
@@ -57,9 +60,9 @@ HOSTNAME = localhost
57PORT = 2092 60PORT = 2092
58 61
59[transport] 62[transport]
60# PREFIX = xterm -e xterm -T transport -e gdb --args 63plugins = udp
61PLUGINS = tcp 64DEBUG = NO
62DEBUG = YES 65PREFIX =
63ALLOW_SHUTDOWN = YES 66ALLOW_SHUTDOWN = YES
64ACCEPT_FROM6 = ::1; 67ACCEPT_FROM6 = ::1;
65ACCEPT_FROM = 127.0.0.1; 68ACCEPT_FROM = 127.0.0.1;
@@ -68,7 +71,7 @@ BINARY = gnunet-service-transport
68CONFIG = $DEFAULTCONFIG 71CONFIG = $DEFAULTCONFIG
69HOME = $SERVICEHOME 72HOME = $SERVICEHOME
70HOSTNAME = localhost 73HOSTNAME = localhost
71PORT = 2365 74PORT = 2091
72 75
73[peerinfo] 76[peerinfo]
74TRUST = $SERVICEHOME/data/credit/ 77TRUST = $SERVICEHOME/data/credit/
@@ -80,7 +83,7 @@ BINARY = gnunet-service-peerinfo
80CONFIG = $DEFAULTCONFIG 83CONFIG = $DEFAULTCONFIG
81HOME = $SERVICEHOME 84HOME = $SERVICEHOME
82HOSTNAME = localhost 85HOSTNAME = localhost
83PORT = 2369 86PORT = 2090
84 87
85[resolver] 88[resolver]
86ALLOW_SHUTDOWN = YES 89ALLOW_SHUTDOWN = YES
@@ -90,7 +93,7 @@ BINARY = gnunet-service-resolver
90CONFIG = $DEFAULTCONFIG 93CONFIG = $DEFAULTCONFIG
91HOME = $SERVICEHOME 94HOME = $SERVICEHOME
92HOSTNAME = localhost 95HOSTNAME = localhost
93PORT = 2364 96PORT = 2089
94 97
95[statistics] 98[statistics]
96ALLOW_SHUTDOWN = YES 99ALLOW_SHUTDOWN = YES
@@ -100,7 +103,7 @@ BINARY = gnunet-service-statistics
100CONFIG = $DEFAULTCONFIG 103CONFIG = $DEFAULTCONFIG
101HOME = $SERVICEHOME 104HOME = $SERVICEHOME
102HOSTNAME = localhost 105HOSTNAME = localhost
103PORT = 2367 106PORT = 2088
104 107
105[arm] 108[arm]
106DEFAULTSERVICES = resolver transport core 109DEFAULTSERVICES = resolver transport core
@@ -111,20 +114,20 @@ BINARY = gnunet-service-arm
111CONFIG = $DEFAULTCONFIG 114CONFIG = $DEFAULTCONFIG
112HOME = $SERVICEHOME 115HOME = $SERVICEHOME
113HOSTNAME = localhost 116HOSTNAME = localhost
114PORT = 2366 117PORT = 2087
115 118
116[transport-tcp] 119[transport-tcp]
117ALLOW_SHUTDOWN = NO 120ALLOW_SHUTDOWN = NO
118TIMEOUT = 300000 121TIMEOUT = 300000
119PORT = 2368 122PORT = 2094
120 123
121[TESTING] 124[TESTING]
122WEAKRANDOM = YES 125WEAKRANDOM = NO
123 126
124[gnunetd] 127[gnunetd]
125HOSTKEY = $SERVICEHOME/.hostkey 128HOSTKEY = $SERVICEHOME/.hostkey
126 129
127[PATHS] 130[PATHS]
128DEFAULTCONFIG = /etc/gnunetd.conf 131DEFAULTCONFIG = /etc/gnunetd.conf
129SERVICEHOME = /tmp/test-gnunetd-transport-master/ 132SERVICEHOME = /var/lib/gnunet/
130 133
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 @@
1[transport-udp]
2PORT = 12368
3
1[fs] 4[fs]
2ALLOW_SHUTDOWN = YES 5ALLOW_SHUTDOWN = YES
3ACCEPT_FROM6 = ::1; 6ACCEPT_FROM6 = ::1;
@@ -57,14 +60,14 @@ HOSTNAME = localhost
57PORT = 2092 60PORT = 2092
58 61
59[transport] 62[transport]
60#PREFIX = xterm -e xterm -T transport -e gdb --args 63PREFIX =
61PLUGINS = tcp 64DEBUG = NO
62DEBUG = YES 65PLUGINS = udp
63ALLOW_SHUTDOWN = YES 66ALLOW_SHUTDOWN = YES
64ACCEPT_FROM6 = ::1; 67ACCEPT_FROM6 = ::1;
65ACCEPT_FROM = 127.0.0.1; 68ACCEPT_FROM = 127.0.0.1;
66NEIGHBOUR_LIMIT = 50 69NEIGHBOUR_LIMIT = 50
67BINARY = gnunet-service-transport 70BINARY = /usr/local/bin/gnunet-service-transport
68CONFIG = $DEFAULTCONFIG 71CONFIG = $DEFAULTCONFIG
69HOME = $SERVICEHOME 72HOME = $SERVICEHOME
70HOSTNAME = localhost 73HOSTNAME = 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 @@
1[transport-udp]
2PORT = 22368
3
1[fs] 4[fs]
2ALLOW_SHUTDOWN = YES 5ALLOW_SHUTDOWN = YES
3ACCEPT_FROM6 = ::1; 6ACCEPT_FROM6 = ::1;
@@ -57,14 +60,14 @@ HOSTNAME = localhost
57PORT = 2092 60PORT = 2092
58 61
59[transport] 62[transport]
60# PREFIX = xterm -e xterm -T transport -e gdb --args 63PREFIX =
61PLUGINS = tcp 64DEBUG = NO
62DEBUG = YES 65PLUGINS = udp
63ALLOW_SHUTDOWN = YES 66ALLOW_SHUTDOWN = YES
64ACCEPT_FROM6 = ::1; 67ACCEPT_FROM6 = ::1;
65ACCEPT_FROM = 127.0.0.1; 68ACCEPT_FROM = 127.0.0.1;
66NEIGHBOUR_LIMIT = 50 69NEIGHBOUR_LIMIT = 50
67BINARY = gnunet-service-transport 70BINARY = /usr/local/bin/gnunet-service-transport
68CONFIG = $DEFAULTCONFIG 71CONFIG = $DEFAULTCONFIG
69HOME = $SERVICEHOME 72HOME = $SERVICEHOME
70HOSTNAME = localhost 73HOSTNAME = localhost