aboutsummaryrefslogtreecommitdiff
path: root/src/cadet/test_cadet.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/cadet/test_cadet.c')
-rw-r--r--src/cadet/test_cadet.c37
1 files changed, 18 insertions, 19 deletions
diff --git a/src/cadet/test_cadet.c b/src/cadet/test_cadet.c
index 354593c4b..25713709c 100644
--- a/src/cadet/test_cadet.c
+++ b/src/cadet/test_cadet.c
@@ -263,7 +263,7 @@ static unsigned int msg_dropped;
263static struct GNUNET_CADET_Channel * 263static struct GNUNET_CADET_Channel *
264get_target_channel () 264get_target_channel ()
265{ 265{
266 if ((SPEED == test)&&(GNUNET_YES == test_backwards)) 266 if ((SPEED == test) && (GNUNET_YES == test_backwards))
267 return outgoing_ch; 267 return outgoing_ch;
268 else 268 else
269 return incoming_ch; 269 return incoming_ch;
@@ -383,7 +383,7 @@ stats_cont (void *cls,
383 "KA sent: %u, KA received: %u\n", 383 "KA sent: %u, KA received: %u\n",
384 ka_sent, 384 ka_sent,
385 ka_received); 385 ka_received);
386 if (((KEEPALIVE == test)||(REOPEN == test)) && 386 if (((KEEPALIVE == test) || (REOPEN == test)) &&
387 ((ka_sent < 2) || (ka_sent > ka_received + 1))) 387 ((ka_sent < 2) || (ka_sent > ka_received + 1)))
388 { 388 {
389 GNUNET_break (0); 389 GNUNET_break (0);
@@ -426,10 +426,10 @@ stats_iterator (void *cls,
426 i = GNUNET_TESTBED_get_index (peer); 426 i = GNUNET_TESTBED_get_index (peer);
427 GNUNET_log (GNUNET_ERROR_TYPE_INFO, "STATS PEER %u - %s [%s]: %llu\n", i, 427 GNUNET_log (GNUNET_ERROR_TYPE_INFO, "STATS PEER %u - %s [%s]: %llu\n", i,
428 subsystem, name, (unsigned long long) value); 428 subsystem, name, (unsigned long long) value);
429 if ((0 == strncmp (s_sent, name, strlen (s_sent)))&&(0 == i)) 429 if ((0 == strncmp (s_sent, name, strlen (s_sent))) && (0 == i))
430 ka_sent = value; 430 ka_sent = value;
431 if ((0 == strncmp (s_recv, name, strlen (s_recv)))&&(peers_requested - 1 == 431 if ((0 == strncmp (s_recv, name, strlen (s_recv))) && (peers_requested - 1 ==
432 i) ) 432 i) )
433 ka_received = value; 433 ka_received = value;
434 if (0 == strncmp (rdrops, name, strlen (rdrops))) 434 if (0 == strncmp (rdrops, name, strlen (rdrops)))
435 msg_dropped += value; 435 msg_dropped += value;
@@ -556,6 +556,7 @@ reconnect_op (void *cls)
556 send_test_message (outgoing_ch); 556 send_test_message (outgoing_ch);
557} 557}
558 558
559
559/** 560/**
560 * Function called whenever an MQ-channel is destroyed, unless the destruction 561 * Function called whenever an MQ-channel is destroyed, unless the destruction
561 * was requested by #GNUNET_CADET_channel_destroy. 562 * was requested by #GNUNET_CADET_channel_destroy.
@@ -594,14 +595,14 @@ disconnect_handler (void *cls,
594 GNUNET_log (GNUNET_ERROR_TYPE_WARNING, 595 GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
595 "Unknown channel! %p\n", 596 "Unknown channel! %p\n",
596 channel); 597 channel);
597 if ((NULL != disconnect_task)&&(REOPEN != test)) 598 if ((NULL != disconnect_task) && (REOPEN != test))
598 { 599 {
599 GNUNET_SCHEDULER_cancel (disconnect_task); 600 GNUNET_SCHEDULER_cancel (disconnect_task);
600 disconnect_task = 601 disconnect_task =
601 GNUNET_SCHEDULER_add_now (&gather_stats_and_exit, 602 GNUNET_SCHEDULER_add_now (&gather_stats_and_exit,
602 (void *) __LINE__); 603 (void *) __LINE__);
603 } 604 }
604 else if ((NULL != reconnect_task)&&(REOPEN == test)) 605 else if ((NULL != reconnect_task) && (REOPEN == test))
605 { 606 {
606 GNUNET_SCHEDULER_cancel (reconnect_task); 607 GNUNET_SCHEDULER_cancel (reconnect_task);
607 reconnect_task = 608 reconnect_task =
@@ -661,7 +662,7 @@ send_test_message (struct GNUNET_CADET_Channel *channel)
661 if (SPEED_ACK == test) // FIXME unify SPEED_ACK with an initializer 662 if (SPEED_ACK == test) // FIXME unify SPEED_ACK with an initializer
662 data_sent++; 663 data_sent++;
663 } 664 }
664 else if ((SPEED == test)||(SPEED_ACK == test)) 665 else if ((SPEED == test) || (SPEED_ACK == test))
665 { 666 {
666 if (get_target_channel () == channel) 667 if (get_target_channel () == channel)
667 { 668 {
@@ -860,7 +861,7 @@ handle_data (void *cls,
860 if (get_target_channel () == channel) /* Got "data" */ 861 if (get_target_channel () == channel) /* Got "data" */
861 { 862 {
862 GNUNET_log (GNUNET_ERROR_TYPE_INFO, " received data %u\n", data_received); 863 GNUNET_log (GNUNET_ERROR_TYPE_INFO, " received data %u\n", data_received);
863 if ((SPEED != test) ||( (ok_goal - 2) == ok) ) 864 if ((SPEED != test) || ( (ok_goal - 2) == ok) )
864 { 865 {
865 /* Send ACK */ 866 /* Send ACK */
866 send_test_message (channel); 867 send_test_message (channel);
@@ -874,14 +875,14 @@ handle_data (void *cls,
874 } 875 }
875 else /* Got "ack" */ 876 else /* Got "ack" */
876 { 877 {
877 if ((SPEED_ACK == test) ||(SPEED == test) ) 878 if ((SPEED_ACK == test) || (SPEED == test) )
878 { 879 {
879 GNUNET_log (GNUNET_ERROR_TYPE_INFO, " received ack %u\n", ack_received); 880 GNUNET_log (GNUNET_ERROR_TYPE_INFO, " received ack %u\n", ack_received);
880 /* Send more data */ 881 /* Send more data */
881 send_test_message (channel); 882 send_test_message (channel);
882 if ((ack_received < total_packets) &&(SPEED != test) ) 883 if ((ack_received < total_packets) && (SPEED != test) )
883 return; 884 return;
884 if ((ok == 2) &&(SPEED == test) ) 885 if ((ok == 2) && (SPEED == test) )
885 return; 886 return;
886 show_end_data (); 887 show_end_data ();
887 } 888 }
@@ -946,7 +947,7 @@ connect_handler (void *cls,
946 (long) cls); 947 (long) cls);
947 GNUNET_assert (0); 948 GNUNET_assert (0);
948 } 949 }
949 if ((NULL != disconnect_task)&&(REOPEN != test)) 950 if ((NULL != disconnect_task) && (REOPEN != test))
950 { 951 {
951 GNUNET_SCHEDULER_cancel (disconnect_task); 952 GNUNET_SCHEDULER_cancel (disconnect_task);
952 disconnect_task = GNUNET_SCHEDULER_add_delayed (short_time, 953 disconnect_task = GNUNET_SCHEDULER_add_delayed (short_time,
@@ -1223,8 +1224,7 @@ main (int argc, char *argv[])
1223 * total_packets received data packet (@dest) 1224 * total_packets received data packet (@dest)
1224 * total_packets received data packet (@orig) 1225 * total_packets received data packet (@orig)
1225 * 1 received channel destroy (@dest) FIXME #5818 1226 * 1 received channel destroy (@dest) FIXME #5818
1226 */ 1227 */ok_goal = total_packets * 2 + 2;
1227 ok_goal = total_packets * 2 + 2;
1228 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "SPEED_ACK\n"); 1228 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "SPEED_ACK\n");
1229 test = SPEED_ACK; 1229 test = SPEED_ACK;
1230 test_name = "speed ack"; 1230 test_name = "speed ack";
@@ -1237,8 +1237,7 @@ main (int argc, char *argv[])
1237 * total_packets received data packet (@dest) 1237 * total_packets received data packet (@dest)
1238 * 1 received data packet (@orig) 1238 * 1 received data packet (@orig)
1239 * 1 received channel destroy (@dest) FIXME #5818 1239 * 1 received channel destroy (@dest) FIXME #5818
1240 */ 1240 */ok_goal = total_packets + 4;
1241 ok_goal = total_packets + 4;
1242 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "SPEED\n"); 1241 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "SPEED\n");
1243 if (strstr (argv[0], "_reliable") != NULL) 1242 if (strstr (argv[0], "_reliable") != NULL)
1244 { 1243 {
@@ -1260,8 +1259,7 @@ main (int argc, char *argv[])
1260 * 1 incoming channel (@dest) 1259 * 1 incoming channel (@dest)
1261 * [wait] 1260 * [wait]
1262 * 1 received channel destroy (@dest) FIXME #5818 1261 * 1 received channel destroy (@dest) FIXME #5818
1263 */ 1262 */ok_goal = 1;
1264 ok_goal = 1;
1265 } 1263 }
1266 else if (strstr (argv[0], "_reopen") != NULL) 1264 else if (strstr (argv[0], "_reopen") != NULL)
1267 { 1265 {
@@ -1313,4 +1311,5 @@ main (int argc, char *argv[])
1313 return 0; 1311 return 0;
1314} 1312}
1315 1313
1314
1316/* end of test_cadet.c */ 1315/* end of test_cadet.c */