[GNUnet-SVN] r38250 - gnunet/src/cadet

[gnunet]

Author: bartpolot
Date: 2016-11-04 10:47:30 +0100 (Fri, 04 Nov 2016)
New Revision: 38250

Modified:
   gnunet/src/cadet/gnunet-service-cadet_connection.c
   gnunet/src/cadet/test_cadet.conf
Log:
- avoid connection timeout in valgrind tests

Modified: gnunet/src/cadet/gnunet-service-cadet_connection.c
===================================================================
--- gnunet/src/cadet/gnunet-service-cadet_connection.c  2016-11-04 09:47:28 UTC 
(rev 38249)
+++ gnunet/src/cadet/gnunet-service-cadet_connection.c  2016-11-04 09:47:30 UTC 
(rev 38250)
@@ -1348,9 +1348,9 @@
   *task_id = GNUNET_SCHEDULER_add_delayed (delay,
                                            keepalive_task,
                                            c);
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "next keepalive in %s\n",
-       GNUNET_STRINGS_relative_time_to_string (delay, GNUNET_YES));
+  LOG (GNUNET_ERROR_TYPE_INFO,
+       "next keepalive for %s in in %s\n",
+       GCC_2s (c), GNUNET_STRINGS_relative_time_to_string (delay, GNUNET_YES));
   GCC_check_connections ();
 }
 
@@ -2659,7 +2659,8 @@
     GNUNET_SCHEDULER_shutdown ();
     return;
   }
-  create_connection_time = GNUNET_TIME_UNIT_SECONDS;
+  create_connection_time = GNUNET_TIME_relative_min (GNUNET_TIME_UNIT_SECONDS,
+                                                     refresh_connection_time);
   connections = GNUNET_CONTAINER_multihashmap_create (1024, GNUNET_NO);
 }
 

Modified: gnunet/src/cadet/test_cadet.conf
===================================================================
--- gnunet/src/cadet/test_cadet.conf    2016-11-04 09:47:28 UTC (rev 38249)
+++ gnunet/src/cadet/test_cadet.conf    2016-11-04 09:47:30 UTC (rev 38250)
@@ -7,7 +7,7 @@
 #BINARY = gnunet-service-cadet-enc
 #PREFIX = valgrind --leak-check=full
 #PREFIX = xterm -geometry 100x85 -T peer1 -e gdb --args
-REFRESH_CONNECTION_TIME = 333 ms
+REFRESH_CONNECTION_TIME = 500 ms
 ID_ANNOUNCE_TIME = 5 s
 CONNECT_TIMEOUT = 30 s
 DEFAULT_TTL = 16