diff options
-rw-r--r-- | src/cadet/gnunet-service-cadet_connection.c | 9 | ||||
-rw-r--r-- | src/cadet/test_cadet.conf | 2 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/cadet/gnunet-service-cadet_connection.c b/src/cadet/gnunet-service-cadet_connection.c index dc947998a..face765e4 100644 --- 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) | |||
1348 | *task_id = GNUNET_SCHEDULER_add_delayed (delay, | 1348 | *task_id = GNUNET_SCHEDULER_add_delayed (delay, |
1349 | keepalive_task, | 1349 | keepalive_task, |
1350 | c); | 1350 | c); |
1351 | LOG (GNUNET_ERROR_TYPE_DEBUG, | 1351 | LOG (GNUNET_ERROR_TYPE_INFO, |
1352 | "next keepalive in %s\n", | 1352 | "next keepalive for %s in in %s\n", |
1353 | GNUNET_STRINGS_relative_time_to_string (delay, GNUNET_YES)); | 1353 | GCC_2s (c), GNUNET_STRINGS_relative_time_to_string (delay, GNUNET_YES)); |
1354 | GCC_check_connections (); | 1354 | GCC_check_connections (); |
1355 | } | 1355 | } |
1356 | 1356 | ||
@@ -2659,7 +2659,8 @@ GCC_init (const struct GNUNET_CONFIGURATION_Handle *c) | |||
2659 | GNUNET_SCHEDULER_shutdown (); | 2659 | GNUNET_SCHEDULER_shutdown (); |
2660 | return; | 2660 | return; |
2661 | } | 2661 | } |
2662 | create_connection_time = GNUNET_TIME_UNIT_SECONDS; | 2662 | create_connection_time = GNUNET_TIME_relative_min (GNUNET_TIME_UNIT_SECONDS, |
2663 | refresh_connection_time); | ||
2663 | connections = GNUNET_CONTAINER_multihashmap_create (1024, GNUNET_NO); | 2664 | connections = GNUNET_CONTAINER_multihashmap_create (1024, GNUNET_NO); |
2664 | } | 2665 | } |
2665 | 2666 | ||
diff --git a/src/cadet/test_cadet.conf b/src/cadet/test_cadet.conf index 72e63eef2..6ecf9a1ab 100644 --- a/src/cadet/test_cadet.conf +++ b/src/cadet/test_cadet.conf | |||
@@ -7,7 +7,7 @@ OVERLAY_TOPOLOGY = LINE | |||
7 | #BINARY = gnunet-service-cadet-enc | 7 | #BINARY = gnunet-service-cadet-enc |
8 | #PREFIX = valgrind --leak-check=full | 8 | #PREFIX = valgrind --leak-check=full |
9 | #PREFIX = xterm -geometry 100x85 -T peer1 -e gdb --args | 9 | #PREFIX = xterm -geometry 100x85 -T peer1 -e gdb --args |
10 | REFRESH_CONNECTION_TIME = 333 ms | 10 | REFRESH_CONNECTION_TIME = 500 ms |
11 | ID_ANNOUNCE_TIME = 5 s | 11 | ID_ANNOUNCE_TIME = 5 s |
12 | CONNECT_TIMEOUT = 30 s | 12 | CONNECT_TIMEOUT = 30 s |
13 | DEFAULT_TTL = 16 | 13 | DEFAULT_TTL = 16 |