diff options
author | Nathan S. Evans <evans@in.tum.de> | 2010-01-29 11:03:22 +0000 |
---|---|---|
committer | Nathan S. Evans <evans@in.tum.de> | 2010-01-29 11:03:22 +0000 |
commit | 6798d86cdb2acf242635f8bf32057bd1f7530a07 (patch) | |
tree | 93a0513ba695407d17083896cbfaacdfee5a31b8 /src | |
parent | 54cb7c9534aee0f3e8b7115a863baaf5de5d870d (diff) | |
download | gnunet-6798d86cdb2acf242635f8bf32057bd1f7530a07.tar.gz gnunet-6798d86cdb2acf242635f8bf32057bd1f7530a07.zip |
maybe this will fix buildbot errors...
Diffstat (limited to 'src')
-rw-r--r-- | src/transport/test_transport_api.c | 4 | ||||
-rw-r--r-- | src/transport/test_transport_api_data.conf | 25 | ||||
-rw-r--r-- | src/transport/test_transport_api_peer1.conf | 11 | ||||
-rw-r--r-- | src/transport/test_transport_api_peer2.conf | 11 |
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] | ||
2 | PORT = 2094 | ||
3 | |||
1 | [fs] | 4 | [fs] |
2 | ALLOW_SHUTDOWN = YES | 5 | ALLOW_SHUTDOWN = YES |
3 | ACCEPT_FROM6 = ::1; | 6 | ACCEPT_FROM6 = ::1; |
@@ -57,9 +60,9 @@ HOSTNAME = localhost | |||
57 | PORT = 2092 | 60 | PORT = 2092 |
58 | 61 | ||
59 | [transport] | 62 | [transport] |
60 | # PREFIX = xterm -e xterm -T transport -e gdb --args | 63 | plugins = udp |
61 | PLUGINS = tcp | 64 | DEBUG = NO |
62 | DEBUG = YES | 65 | PREFIX = |
63 | ALLOW_SHUTDOWN = YES | 66 | ALLOW_SHUTDOWN = YES |
64 | ACCEPT_FROM6 = ::1; | 67 | ACCEPT_FROM6 = ::1; |
65 | ACCEPT_FROM = 127.0.0.1; | 68 | ACCEPT_FROM = 127.0.0.1; |
@@ -68,7 +71,7 @@ BINARY = gnunet-service-transport | |||
68 | CONFIG = $DEFAULTCONFIG | 71 | CONFIG = $DEFAULTCONFIG |
69 | HOME = $SERVICEHOME | 72 | HOME = $SERVICEHOME |
70 | HOSTNAME = localhost | 73 | HOSTNAME = localhost |
71 | PORT = 2365 | 74 | PORT = 2091 |
72 | 75 | ||
73 | [peerinfo] | 76 | [peerinfo] |
74 | TRUST = $SERVICEHOME/data/credit/ | 77 | TRUST = $SERVICEHOME/data/credit/ |
@@ -80,7 +83,7 @@ BINARY = gnunet-service-peerinfo | |||
80 | CONFIG = $DEFAULTCONFIG | 83 | CONFIG = $DEFAULTCONFIG |
81 | HOME = $SERVICEHOME | 84 | HOME = $SERVICEHOME |
82 | HOSTNAME = localhost | 85 | HOSTNAME = localhost |
83 | PORT = 2369 | 86 | PORT = 2090 |
84 | 87 | ||
85 | [resolver] | 88 | [resolver] |
86 | ALLOW_SHUTDOWN = YES | 89 | ALLOW_SHUTDOWN = YES |
@@ -90,7 +93,7 @@ BINARY = gnunet-service-resolver | |||
90 | CONFIG = $DEFAULTCONFIG | 93 | CONFIG = $DEFAULTCONFIG |
91 | HOME = $SERVICEHOME | 94 | HOME = $SERVICEHOME |
92 | HOSTNAME = localhost | 95 | HOSTNAME = localhost |
93 | PORT = 2364 | 96 | PORT = 2089 |
94 | 97 | ||
95 | [statistics] | 98 | [statistics] |
96 | ALLOW_SHUTDOWN = YES | 99 | ALLOW_SHUTDOWN = YES |
@@ -100,7 +103,7 @@ BINARY = gnunet-service-statistics | |||
100 | CONFIG = $DEFAULTCONFIG | 103 | CONFIG = $DEFAULTCONFIG |
101 | HOME = $SERVICEHOME | 104 | HOME = $SERVICEHOME |
102 | HOSTNAME = localhost | 105 | HOSTNAME = localhost |
103 | PORT = 2367 | 106 | PORT = 2088 |
104 | 107 | ||
105 | [arm] | 108 | [arm] |
106 | DEFAULTSERVICES = resolver transport core | 109 | DEFAULTSERVICES = resolver transport core |
@@ -111,20 +114,20 @@ BINARY = gnunet-service-arm | |||
111 | CONFIG = $DEFAULTCONFIG | 114 | CONFIG = $DEFAULTCONFIG |
112 | HOME = $SERVICEHOME | 115 | HOME = $SERVICEHOME |
113 | HOSTNAME = localhost | 116 | HOSTNAME = localhost |
114 | PORT = 2366 | 117 | PORT = 2087 |
115 | 118 | ||
116 | [transport-tcp] | 119 | [transport-tcp] |
117 | ALLOW_SHUTDOWN = NO | 120 | ALLOW_SHUTDOWN = NO |
118 | TIMEOUT = 300000 | 121 | TIMEOUT = 300000 |
119 | PORT = 2368 | 122 | PORT = 2094 |
120 | 123 | ||
121 | [TESTING] | 124 | [TESTING] |
122 | WEAKRANDOM = YES | 125 | WEAKRANDOM = NO |
123 | 126 | ||
124 | [gnunetd] | 127 | [gnunetd] |
125 | HOSTKEY = $SERVICEHOME/.hostkey | 128 | HOSTKEY = $SERVICEHOME/.hostkey |
126 | 129 | ||
127 | [PATHS] | 130 | [PATHS] |
128 | DEFAULTCONFIG = /etc/gnunetd.conf | 131 | DEFAULTCONFIG = /etc/gnunetd.conf |
129 | SERVICEHOME = /tmp/test-gnunetd-transport-master/ | 132 | SERVICEHOME = /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] | ||
2 | PORT = 12368 | ||
3 | |||
1 | [fs] | 4 | [fs] |
2 | ALLOW_SHUTDOWN = YES | 5 | ALLOW_SHUTDOWN = YES |
3 | ACCEPT_FROM6 = ::1; | 6 | ACCEPT_FROM6 = ::1; |
@@ -57,14 +60,14 @@ HOSTNAME = localhost | |||
57 | PORT = 2092 | 60 | PORT = 2092 |
58 | 61 | ||
59 | [transport] | 62 | [transport] |
60 | #PREFIX = xterm -e xterm -T transport -e gdb --args | 63 | PREFIX = |
61 | PLUGINS = tcp | 64 | DEBUG = NO |
62 | DEBUG = YES | 65 | PLUGINS = udp |
63 | ALLOW_SHUTDOWN = YES | 66 | ALLOW_SHUTDOWN = YES |
64 | ACCEPT_FROM6 = ::1; | 67 | ACCEPT_FROM6 = ::1; |
65 | ACCEPT_FROM = 127.0.0.1; | 68 | ACCEPT_FROM = 127.0.0.1; |
66 | NEIGHBOUR_LIMIT = 50 | 69 | NEIGHBOUR_LIMIT = 50 |
67 | BINARY = gnunet-service-transport | 70 | BINARY = /usr/local/bin/gnunet-service-transport |
68 | CONFIG = $DEFAULTCONFIG | 71 | CONFIG = $DEFAULTCONFIG |
69 | HOME = $SERVICEHOME | 72 | HOME = $SERVICEHOME |
70 | HOSTNAME = localhost | 73 | 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 @@ | |||
1 | [transport-udp] | ||
2 | PORT = 22368 | ||
3 | |||
1 | [fs] | 4 | [fs] |
2 | ALLOW_SHUTDOWN = YES | 5 | ALLOW_SHUTDOWN = YES |
3 | ACCEPT_FROM6 = ::1; | 6 | ACCEPT_FROM6 = ::1; |
@@ -57,14 +60,14 @@ HOSTNAME = localhost | |||
57 | PORT = 2092 | 60 | PORT = 2092 |
58 | 61 | ||
59 | [transport] | 62 | [transport] |
60 | # PREFIX = xterm -e xterm -T transport -e gdb --args | 63 | PREFIX = |
61 | PLUGINS = tcp | 64 | DEBUG = NO |
62 | DEBUG = YES | 65 | PLUGINS = udp |
63 | ALLOW_SHUTDOWN = YES | 66 | ALLOW_SHUTDOWN = YES |
64 | ACCEPT_FROM6 = ::1; | 67 | ACCEPT_FROM6 = ::1; |
65 | ACCEPT_FROM = 127.0.0.1; | 68 | ACCEPT_FROM = 127.0.0.1; |
66 | NEIGHBOUR_LIMIT = 50 | 69 | NEIGHBOUR_LIMIT = 50 |
67 | BINARY = gnunet-service-transport | 70 | BINARY = /usr/local/bin/gnunet-service-transport |
68 | CONFIG = $DEFAULTCONFIG | 71 | CONFIG = $DEFAULTCONFIG |
69 | HOME = $SERVICEHOME | 72 | HOME = $SERVICEHOME |
70 | HOSTNAME = localhost | 73 | HOSTNAME = localhost |