From 9855137d1312c0a3b3d0836b6c0ab2eb199d70ca Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Sun, 22 Jan 2017 00:34:55 +0100 Subject: [PATCH] another connect_task init missing --- src/cadet/test_cadet_local.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/src/cadet/test_cadet_local.c b/src/cadet/test_cadet_local.c index 05cfdb1ba..ddd294d6b 100644 --- a/src/cadet/test_cadet_local.c +++ b/src/cadet/test_cadet_local.c @@ -80,13 +80,15 @@ do_shutdown (void *cls) GNUNET_CADET_channel_destroy (ch); ch = NULL; } - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Disconnect client 1\n"); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Disconnect client 1\n"); if (NULL != cadet_peer_1) { GNUNET_CADET_disconnect (cadet_peer_1); cadet_peer_1 = NULL; } - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Disconnect client 2\n"); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Disconnect client 2\n"); if (NULL != cadet_peer_2) { GNUNET_CADET_disconnect (cadet_peer_2); @@ -196,10 +198,12 @@ channel_end (void *cls, ch = NULL; if (GNUNET_NO == got_data) { - GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply ( - GNUNET_TIME_UNIT_SECONDS, - 2), - &do_connect, NULL); + if (NULL == connect_task) + connect_task + = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, + 2), + &do_connect, + NULL); } } @@ -298,13 +302,13 @@ run (void *cls, (void *) 1L, /* cls */ &channel_end, /* channel end hndlr */ handlers1); /* traffic handlers */ - cadet_peer_2 = GNUNET_CADET_connect (cfg, /* configuration */ (void *) 2L, /* cls */ &channel_end, /* channel end hndlr */ handlers2); /* traffic handlers */ - if (NULL == cadet_peer_1 || NULL == cadet_peer_2) + if ( (NULL == cadet_peer_1) || + (NULL == cadet_peer_2) ) { GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Couldn't connect to cadet :(\n"); -- 2.25.1