diff options
author | Nathan S. Evans <evans@in.tum.de> | 2010-06-24 11:03:11 +0000 |
---|---|---|
committer | Nathan S. Evans <evans@in.tum.de> | 2010-06-24 11:03:11 +0000 |
commit | 76259023a5566d42229a4a284616fa8bac93b6a5 (patch) | |
tree | 1bfe89a5a7ed226ba05e41e7fcbb369b98eec2d9 /src/dv/test_transport_api_dv.c | |
parent | 551e4e177a8623ac35ece7125ec07de5f9b9d294 (diff) | |
download | gnunet-76259023a5566d42229a4a284616fa8bac93b6a5.tar.gz gnunet-76259023a5566d42229a4a284616fa8bac93b6a5.zip |
misc bugfixes, especially core dumps for dv test case
Diffstat (limited to 'src/dv/test_transport_api_dv.c')
-rw-r--r-- | src/dv/test_transport_api_dv.c | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/src/dv/test_transport_api_dv.c b/src/dv/test_transport_api_dv.c index 3cfabe237..faf279066 100644 --- a/src/dv/test_transport_api_dv.c +++ b/src/dv/test_transport_api_dv.c | |||
@@ -321,7 +321,15 @@ process_mtype (void *cls, | |||
321 | if ((total_messages_received == expected_messages) && (total_other_messages == 0)) | 321 | if ((total_messages_received == expected_messages) && (total_other_messages == 0)) |
322 | { | 322 | { |
323 | GNUNET_SCHEDULER_cancel (sched, die_task); | 323 | GNUNET_SCHEDULER_cancel (sched, die_task); |
324 | GNUNET_SCHEDULER_add_delayed (sched, GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 420), &send_other_messages, NULL); | 324 | /* |
325 | if ((num_peers == 3) && (total_other_expected_messages == 2)) | ||
326 | { | ||
327 | GNUNET_SCHEDULER_add_now (sched, &send_other_messages, NULL); | ||
328 | } | ||
329 | else | ||
330 | { | ||
331 | GNUNET_SCHEDULER_add_delayed (sched, GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 20), &send_other_messages, NULL); | ||
332 | }*/ | ||
325 | } | 333 | } |
326 | else if ((total_other_expected_messages > 0) && (total_other_messages == total_other_expected_messages)) | 334 | else if ((total_other_expected_messages > 0) && (total_other_messages == total_other_expected_messages)) |
327 | { | 335 | { |
@@ -827,6 +835,12 @@ static void all_connect_handler (void *cls, | |||
827 | fprintf(dotOutFile, "\tn%s -- n%s [color=brown];\n", d->shortname, second_shortname); | 835 | fprintf(dotOutFile, "\tn%s -- n%s [color=brown];\n", d->shortname, second_shortname); |
828 | } | 836 | } |
829 | GNUNET_free(second_shortname); | 837 | GNUNET_free(second_shortname); |
838 | |||
839 | if ((num_peers == 3) && (temp_total_other_messages == 2)) | ||
840 | { | ||
841 | /*GNUNET_SCHEDULER_add_delayed (sched, GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 30), &send_other_messages, NULL);*/ | ||
842 | GNUNET_SCHEDULER_add_now (sched, &send_other_messages, NULL); | ||
843 | } | ||
830 | } | 844 | } |
831 | 845 | ||
832 | static void | 846 | static void |
@@ -1064,7 +1078,6 @@ main (int argc, char *argv[]) | |||
1064 | #endif | 1078 | #endif |
1065 | NULL); | 1079 | NULL); |
1066 | ret = check (); | 1080 | ret = check (); |
1067 | |||
1068 | /** | 1081 | /** |
1069 | * Need to remove base directory, subdirectories taken care | 1082 | * Need to remove base directory, subdirectories taken care |
1070 | * of by the testing framework. | 1083 | * of by the testing framework. |