[GNUnet-SVN] r23490 - gnunet/src/transport

[gnunet]

Author: wachs
Date: 2012-08-29 11:14:49 +0200 (Wed, 29 Aug 2012)
New Revision: 23490

Modified:
   gnunet/src/transport/plugin_transport_http_client.c
   gnunet/src/transport/test_plugin_transport.c
Log:
changes


Modified: gnunet/src/transport/plugin_transport_http_client.c
===================================================================
--- gnunet/src/transport/plugin_transport_http_client.c 2012-08-29 09:05:25 UTC 
(rev 23489)
+++ gnunet/src/transport/plugin_transport_http_client.c 2012-08-29 09:14:49 UTC 
(rev 23490)
@@ -480,7 +480,7 @@
   if (s->client_put != NULL)
   {
     GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
-                     "Session %p/connection %p: disconnecting PUT connectionto 
peer `%s'\n",
+                     "Session %p/connection %p: disconnecting PUT connection 
to peer `%s'\n",
                      s, s->client_put, GNUNET_i2s (&s->target));
 
     /* remove curl handle from multi handle */

Modified: gnunet/src/transport/test_plugin_transport.c
===================================================================
--- gnunet/src/transport/test_plugin_transport.c        2012-08-29 09:05:25 UTC 
(rev 23489)
+++ gnunet/src/transport/test_plugin_transport.c        2012-08-29 09:14:49 UTC 
(rev 23490)
@@ -41,7 +41,7 @@
  * How long until we give up on transmitting the message?
  */
 #define WAIT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 5)
-#define TIMEOUT GNUNET_TIME_relative_multiply (WAIT, 3)
+#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 30)
 
 /**
  * Our public key.
@@ -197,6 +197,13 @@
       GNUNET_SCHEDULER_cancel (timeout_wait);
       timeout_wait = GNUNET_SCHEDULER_NO_TASK;
   }
+
+  if (NULL != cls)
+  {
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                _("Test took too long to execute, timeout .... \n"));
+  }
+
   if (NULL != libname)
   {
     if (NULL != api)
@@ -457,7 +464,7 @@
   char *plugin;
   char *sep;
 
-  timeout_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT, end_badly, NULL);
+  timeout_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT, end_badly, &ok);
 
   cfg = c;
   /* parse configuration */