aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMatthias Wachs <wachs@net.in.tum.de>2010-05-28 06:50:45 +0000
committerMatthias Wachs <wachs@net.in.tum.de>2010-05-28 06:50:45 +0000
commit2ba6cb5934e8f4b09911ca03f989dbda4557ea64 (patch)
tree98d3693459c7d74509bf016f169f5cdfc6474e79 /src
parent9eec47e1f2e85bbb9453943716410b59d5bbd34d (diff)
downloadgnunet-2ba6cb5934e8f4b09911ca03f989dbda4557ea64.tar.gz
gnunet-2ba6cb5934e8f4b09911ca03f989dbda4557ea64.zip
Diffstat (limited to 'src')
-rw-r--r--src/transport/test_plugin_transport_http.c3
-rw-r--r--src/transport/test_transport_api_http_peer1.conf15
-rw-r--r--src/transport/test_transport_api_http_peer2.conf9
3 files changed, 17 insertions, 10 deletions
diff --git a/src/transport/test_plugin_transport_http.c b/src/transport/test_plugin_transport_http.c
index d404cb15c..0596f8992 100644
--- a/src/transport/test_plugin_transport_http.c
+++ b/src/transport/test_plugin_transport_http.c
@@ -167,6 +167,7 @@ static void task_send_cont (void *cls,
167 const struct GNUNET_PeerIdentity * target, 167 const struct GNUNET_PeerIdentity * target,
168 int result) 168 int result)
169{ 169{
170 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Message was sent!\n");
170 fail = GNUNET_NO; 171 fail = GNUNET_NO;
171 shutdown_clean(); 172 shutdown_clean();
172} 173}
@@ -191,7 +192,7 @@ task_send (void *cls,
191 unsigned int len = ntohs(msg->size); 192 unsigned int len = ntohs(msg->size);
192 const char * msgc = (const char *) msg; 193 const char * msgc = (const char *) msg;
193 194
194 api->send(api->cls,p,msgc, len, 0, TIMEOUT, NULL,NULL, 0, GNUNET_NO, &task_send_cont, NULL); 195 api->send(api->cls, p, msgc, len, 0, TIMEOUT, NULL,NULL, 0, GNUNET_NO, &task_send_cont, NULL);
195 sent = GNUNET_YES; 196 sent = GNUNET_YES;
196 197
197} 198}
diff --git a/src/transport/test_transport_api_http_peer1.conf b/src/transport/test_transport_api_http_peer1.conf
index 0a1814068..539e9ab6c 100644
--- a/src/transport/test_transport_api_http_peer1.conf
+++ b/src/transport/test_transport_api_http_peer1.conf
@@ -1,8 +1,3 @@
1[transport-http]
2#PORT = 12368
3DEBUG=YES
4
5
6[fs] 1[fs]
7AUTOSTART = NO 2AUTOSTART = NO
8 3
@@ -33,6 +28,7 @@ MINIMUM-FRIENDS = 0
33 28
34[transport] 29[transport]
35PLUGINS = http 30PLUGINS = http
31#PLUGINS = tcp http
36DEBUG = YES 32DEBUG = YES
37#PREFIX = xterm -T transport2 -e gdb --command=cmd --args 33#PREFIX = xterm -T transport2 -e gdb --command=cmd --args
38#PREFIX = valgrind --leak-check=full 34#PREFIX = valgrind --leak-check=full
@@ -84,9 +80,14 @@ HOME = $SERVICEHOME
84HOSTNAME = localhost 80HOSTNAME = localhost
85PORT = 12366 81PORT = 12366
86 82
83[transport-http]
84PORT = 12389
85DEBUG = YES
86
87[transport-tcp] 87[transport-tcp]
88TIMEOUT = 300000 88PORT = 12399
89PORT = 12368 89DEBUG = YES
90
90 91
91[TESTING] 92[TESTING]
92WEAKRANDOM = YES 93WEAKRANDOM = YES
diff --git a/src/transport/test_transport_api_http_peer2.conf b/src/transport/test_transport_api_http_peer2.conf
index 7ccf5984d..1cbe8cae0 100644
--- a/src/transport/test_transport_api_http_peer2.conf
+++ b/src/transport/test_transport_api_http_peer2.conf
@@ -32,6 +32,7 @@ MINIMUM-FRIENDS = 0
32 32
33[transport] 33[transport]
34PLUGINS = http 34PLUGINS = http
35#PLUGINS = tcp http
35DEBUG = YES 36DEBUG = YES
36# PREFIX = 37# PREFIX =
37ACCEPT_FROM6 = ::1; 38ACCEPT_FROM6 = ::1;
@@ -84,9 +85,13 @@ HOME = $SERVICEHOME
84HOSTNAME = localhost 85HOSTNAME = localhost
85PORT = 22366 86PORT = 22366
86 87
88[transport-http]
89PORT = 22389
90DEBUG = YES
91
87[transport-tcp] 92[transport-tcp]
88TIMEOUT = 300000 93PORT = 22399
89PORT = 22368 94DEBUG = YES
90 95
91[TESTING] 96[TESTING]
92WEAKRANDOM = YES 97WEAKRANDOM = YES