From: Matthias Wachs <wachs@net.in.tum.de>
Date: Fri, 28 May 2010 06:50:45 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: initial-import-from-subversion-38251~21541
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=2ba6cb5934e8f4b09911ca03f989dbda4557ea64;p=oweals%2Fgnunet.git

---

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,
                             const struct GNUNET_PeerIdentity * target,
                             int result)
 {
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Message was sent!\n");
   fail = GNUNET_NO;
   shutdown_clean();
 }
@@ -191,7 +192,7 @@ task_send (void *cls,
   unsigned int len = ntohs(msg->size);
   const char * msgc = (const char *) msg;
 
-  api->send(api->cls,p,msgc, len, 0, TIMEOUT, NULL,NULL, 0, GNUNET_NO, &task_send_cont, NULL);
+  api->send(api->cls, p, msgc, len, 0, TIMEOUT, NULL,NULL, 0, GNUNET_NO, &task_send_cont, NULL);
   sent = GNUNET_YES;
 
 }
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 @@
-[transport-http]
-#PORT = 12368
-DEBUG=YES
-
-
 [fs]
 AUTOSTART = NO
 
@@ -33,6 +28,7 @@ MINIMUM-FRIENDS = 0
 
 [transport]
 PLUGINS = http
+#PLUGINS = tcp http
 DEBUG = YES
 #PREFIX = xterm -T transport2 -e gdb --command=cmd --args
 #PREFIX = valgrind --leak-check=full
@@ -84,9 +80,14 @@ HOME = $SERVICEHOME
 HOSTNAME = localhost
 PORT = 12366
 
+[transport-http]
+PORT = 12389
+DEBUG = YES
+
 [transport-tcp]
-TIMEOUT = 300000
-PORT = 12368
+PORT = 12399
+DEBUG = YES
+
 
 [TESTING]
 WEAKRANDOM = 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
 
 [transport]
 PLUGINS = http
+#PLUGINS = tcp http
 DEBUG = YES
 # PREFIX = 
 ACCEPT_FROM6 = ::1;
@@ -84,9 +85,13 @@ HOME = $SERVICEHOME
 HOSTNAME = localhost
 PORT = 22366
 
+[transport-http]
+PORT = 22389
+DEBUG = YES
+
 [transport-tcp]
-TIMEOUT = 300000
-PORT = 22368
+PORT = 22399
+DEBUG = YES
 
 [TESTING]
 WEAKRANDOM = YES