diff options
author | Bart Polot <bart@net.in.tum.de> | 2015-09-03 18:04:05 +0000 |
---|---|---|
committer | Bart Polot <bart@net.in.tum.de> | 2015-09-03 18:04:05 +0000 |
commit | 63f954e8e9575dfecfa86fb90240717b32e44a17 (patch) | |
tree | d44340860af4f938771e210bfd939417a8033ae7 /src/cadet/gnunet-cadet.c | |
parent | 9491e26539f60f85fe724679a545708aed9f1f2c (diff) | |
download | gnunet-63f954e8e9575dfecfa86fb90240717b32e44a17.tar.gz gnunet-63f954e8e9575dfecfa86fb90240717b32e44a17.zip |
- minor fixes
Diffstat (limited to 'src/cadet/gnunet-cadet.c')
-rw-r--r-- | src/cadet/gnunet-cadet.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/cadet/gnunet-cadet.c b/src/cadet/gnunet-cadet.c index 485c018f5..9c8615e1c 100644 --- a/src/cadet/gnunet-cadet.c +++ b/src/cadet/gnunet-cadet.c | |||
@@ -335,13 +335,16 @@ channel_ended (void *cls, | |||
335 | GNUNET_break (0); | 335 | GNUNET_break (0); |
336 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "ended: %p, expected: %p\n", channel, ch); | 336 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "ended: %p, expected: %p\n", channel, ch); |
337 | } | 337 | } |
338 | else | ||
339 | { | ||
340 | ch = NULL; | ||
341 | } | ||
338 | if (NULL != th) | 342 | if (NULL != th) |
339 | { | 343 | { |
340 | GNUNET_CADET_notify_transmit_ready_cancel (th); | 344 | GNUNET_CADET_notify_transmit_ready_cancel (th); |
341 | th = NULL; | 345 | th = NULL; |
342 | } | 346 | } |
343 | 347 | ||
344 | ch = NULL; | ||
345 | GNUNET_SCHEDULER_shutdown (); | 348 | GNUNET_SCHEDULER_shutdown (); |
346 | } | 349 | } |
347 | 350 | ||
@@ -375,8 +378,9 @@ channel_incoming (void *cls, | |||
375 | channel, port); | 378 | channel, port); |
376 | if (NULL != ch) | 379 | if (NULL != ch) |
377 | { | 380 | { |
381 | GNUNET_break (0); | ||
378 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 382 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, |
379 | "A channel already exists (%p)\n", channel); | 383 | "A channel already exists (%p)\n", ch); |
380 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 384 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, |
381 | "Incoming channel %p on port %u\n", channel, port); | 385 | "Incoming channel %p on port %u\n", channel, port); |
382 | return NULL; | 386 | return NULL; |