aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBart Polot <bart@net.in.tum.de>2014-05-23 00:37:54 +0000
committerBart Polot <bart@net.in.tum.de>2014-05-23 00:37:54 +0000
commit06a0711f0f109abca99b87be479c9b7d0d87db91 (patch)
tree8db49ee0bcc17eae9abafba75718fdeaa27be6c1 /src
parent54e69797cee1454b45eca9ac740c11355a1d739b (diff)
downloadgnunet-06a0711f0f109abca99b87be479c9b7d0d87db91.tar.gz
gnunet-06a0711f0f109abca99b87be479c9b7d0d87db91.zip
- fixes
Diffstat (limited to 'src')
-rw-r--r--src/cadet/test_cadet.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/cadet/test_cadet.c b/src/cadet/test_cadet.c
index 87e5fe992..da43f4ba0 100644
--- a/src/cadet/test_cadet.c
+++ b/src/cadet/test_cadet.c
@@ -447,7 +447,7 @@ data_callback (void *cls, struct GNUNET_CADET_Channel *channel,
447 case 0L: 447 case 0L:
448 GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Root client got a message!\n"); 448 GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Root client got a message!\n");
449 break; 449 break;
450 case 2L: 450 case 1L:
451 case 4L: 451 case 4L:
452 GNUNET_assert (client == peers_requested - 1); 452 GNUNET_assert (client == peers_requested - 1);
453 GNUNET_log (GNUNET_ERROR_TYPE_INFO, 453 GNUNET_log (GNUNET_ERROR_TYPE_INFO,
@@ -455,6 +455,7 @@ data_callback (void *cls, struct GNUNET_CADET_Channel *channel,
455 client); 455 client);
456 break; 456 break;
457 default: 457 default:
458 GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Client %li not valid.\n", client);
458 GNUNET_abort (); 459 GNUNET_abort ();
459 break; 460 break;
460 } 461 }
@@ -650,7 +651,7 @@ incoming_channel (void *cls, struct GNUNET_CADET_Channel *channel,
650 GNUNET_i2s (initiator), (long) cls); 651 GNUNET_i2s (initiator), (long) cls);
651 ok++; 652 ok++;
652 GNUNET_log (GNUNET_ERROR_TYPE_INFO, " ok: %d\n", ok); 653 GNUNET_log (GNUNET_ERROR_TYPE_INFO, " ok: %d\n", ok);
653 if ((long) cls == 4L) 654 if ((long) cls == peers_requested - 1)
654 incoming_ch = channel; 655 incoming_ch = channel;
655 else 656 else
656 { 657 {
@@ -694,7 +695,7 @@ channel_cleaner (void *cls, const struct GNUNET_CADET_Channel *channel,
694 695
695 GNUNET_log (GNUNET_ERROR_TYPE_INFO, 696 GNUNET_log (GNUNET_ERROR_TYPE_INFO,
696 "Incoming channel disconnected at peer %ld\n", i); 697 "Incoming channel disconnected at peer %ld\n", i);
697 if (4L == i) 698 if (peers_running - 1 == i)
698 { 699 {
699 ok++; 700 ok++;
700 GNUNET_break (channel == incoming_ch); 701 GNUNET_break (channel == incoming_ch);