diff options
Diffstat (limited to 'src/transport/gnunet-transport.c')
-rw-r--r-- | src/transport/gnunet-transport.c | 34 |
1 files changed, 8 insertions, 26 deletions
diff --git a/src/transport/gnunet-transport.c b/src/transport/gnunet-transport.c index bed9bdc85..cbddee905 100644 --- a/src/transport/gnunet-transport.c +++ b/src/transport/gnunet-transport.c | |||
@@ -607,9 +607,7 @@ operation_timeout (void *cls) | |||
607 | FPRINTF (stdout, | 607 | FPRINTF (stdout, |
608 | _("Failed to connect to `%s'\n"), | 608 | _("Failed to connect to `%s'\n"), |
609 | GNUNET_i2s_full (&pid)); | 609 | GNUNET_i2s_full (&pid)); |
610 | if (NULL != end) | 610 | GNUNET_SCHEDULER_shutdown (); |
611 | GNUNET_SCHEDULER_cancel (end); | ||
612 | end = GNUNET_SCHEDULER_add_now (&shutdown_task, NULL); | ||
613 | ret = 1; | 611 | ret = 1; |
614 | return; | 612 | return; |
615 | } | 613 | } |
@@ -633,9 +631,7 @@ operation_timeout (void *cls) | |||
633 | FPRINTF (stdout, | 631 | FPRINTF (stdout, |
634 | "%s", | 632 | "%s", |
635 | _("Failed to list connections, timeout occured\n")); | 633 | _("Failed to list connections, timeout occured\n")); |
636 | if (NULL != end) | 634 | GNUNET_SCHEDULER_shutdown (); |
637 | GNUNET_SCHEDULER_cancel (end); | ||
638 | end = GNUNET_SCHEDULER_add_now (&shutdown_task, NULL); | ||
639 | ret = 1; | 635 | ret = 1; |
640 | return; | 636 | return; |
641 | } | 637 | } |
@@ -851,18 +847,13 @@ process_validation_string (void *cls, | |||
851 | GNUNET_free (vc); | 847 | GNUNET_free (vc); |
852 | if ((0 == address_resolutions) && (iterate_validation)) | 848 | if ((0 == address_resolutions) && (iterate_validation)) |
853 | { | 849 | { |
854 | if (NULL != end) | ||
855 | { | ||
856 | GNUNET_SCHEDULER_cancel (end); | ||
857 | end = NULL; | ||
858 | } | ||
859 | if (NULL != op_timeout) | 850 | if (NULL != op_timeout) |
860 | { | 851 | { |
861 | GNUNET_SCHEDULER_cancel (op_timeout); | 852 | GNUNET_SCHEDULER_cancel (op_timeout); |
862 | op_timeout = NULL; | 853 | op_timeout = NULL; |
863 | } | 854 | } |
864 | ret = 0; | 855 | ret = 0; |
865 | end = GNUNET_SCHEDULER_add_now (&shutdown_task, NULL); | 856 | GNUNET_SCHEDULER_shutdown (); |
866 | } | 857 | } |
867 | } | 858 | } |
868 | 859 | ||
@@ -937,9 +928,7 @@ process_validation_cb (void *cls, | |||
937 | return; | 928 | return; |
938 | } | 929 | } |
939 | vic = NULL; | 930 | vic = NULL; |
940 | if (NULL != end) | 931 | GNUNET_SCHEDULER_shutdown (); |
941 | GNUNET_SCHEDULER_cancel (end); | ||
942 | end = GNUNET_SCHEDULER_add_now (&shutdown_task, NULL); | ||
943 | return; | 932 | return; |
944 | } | 933 | } |
945 | resolve_validation_address (address, | 934 | resolve_validation_address (address, |
@@ -1364,19 +1353,13 @@ process_peer_string (void *cls, | |||
1364 | GNUNET_free (rc); | 1353 | GNUNET_free (rc); |
1365 | if ((0 == address_resolutions) && (iterate_connections)) | 1354 | if ((0 == address_resolutions) && (iterate_connections)) |
1366 | { | 1355 | { |
1367 | if (NULL != end) | ||
1368 | { | ||
1369 | GNUNET_SCHEDULER_cancel (end); | ||
1370 | end = NULL; | ||
1371 | } | ||
1372 | if (NULL != op_timeout) | 1356 | if (NULL != op_timeout) |
1373 | { | 1357 | { |
1374 | GNUNET_SCHEDULER_cancel (op_timeout); | 1358 | GNUNET_SCHEDULER_cancel (op_timeout); |
1375 | op_timeout = NULL; | 1359 | op_timeout = NULL; |
1376 | } | 1360 | } |
1377 | ret = 0; | 1361 | ret = 0; |
1378 | end = GNUNET_SCHEDULER_add_now (&shutdown_task, | 1362 | GNUNET_SCHEDULER_shutdown (); |
1379 | NULL); | ||
1380 | } | 1363 | } |
1381 | } | 1364 | } |
1382 | 1365 | ||
@@ -1950,10 +1933,9 @@ testservice_task (void *cls, | |||
1950 | GNUNET_break(0); | 1933 | GNUNET_break(0); |
1951 | return; | 1934 | return; |
1952 | } | 1935 | } |
1953 | 1936 | ||
1954 | end = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, | 1937 | GNUNET_SCHEDULER_add_shutdown (&shutdown_task, |
1955 | &shutdown_task, | 1938 | NULL); |
1956 | NULL); | ||
1957 | } | 1939 | } |
1958 | 1940 | ||
1959 | 1941 | ||