- avoid connection timeout in valgrind tests

diff --git a/src/cadet/gnunet-service-cadet_connection.c b/src/cadet/gnunet-service-cadet_connection.c
index dc947998a6426a2286a4b262d548dd3fe89178c1..face765e4fc59d7d4a794409f9ca23246303e882 100644 (file)
--- a/src/cadet/gnunet-service-cadet_connection.c
+++ b/src/cadet/gnunet-service-cadet_connection.c
@@ -1348,9 +1348,9 @@ schedule_next_keepalive (struct CadetConnection *c, int fwd)
   *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 @@ GCC_init (const struct GNUNET_CONFIGURATION_Handle *c)
     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);
 }
 

diff --git a/src/cadet/test_cadet.conf b/src/cadet/test_cadet.conf
index 72e63eef2b7e4e1b24fe1cf0aa5c31c2d58534a3..6ecf9a1ab75af6c5699aef54a032faf947b782dd 100644 (file)
--- a/src/cadet/test_cadet.conf
+++ b/src/cadet/test_cadet.conf
@@ -7,7 +7,7 @@ OVERLAY_TOPOLOGY = LINE
 #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