diff options
Diffstat (limited to 'src/stream/test_stream_big.c')
-rw-r--r-- | src/stream/test_stream_big.c | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/src/stream/test_stream_big.c b/src/stream/test_stream_big.c index ec1cd07af..35302182a 100644 --- a/src/stream/test_stream_big.c +++ b/src/stream/test_stream_big.c | |||
@@ -77,7 +77,6 @@ static struct GNUNET_STREAM_ListenSocket *peer2_listen_socket; | |||
77 | static const struct GNUNET_CONFIGURATION_Handle *config; | 77 | static const struct GNUNET_CONFIGURATION_Handle *config; |
78 | 78 | ||
79 | static GNUNET_SCHEDULER_TaskIdentifier abort_task; | 79 | static GNUNET_SCHEDULER_TaskIdentifier abort_task; |
80 | static GNUNET_SCHEDULER_TaskIdentifier test_task; | ||
81 | static GNUNET_SCHEDULER_TaskIdentifier read_task; | 80 | static GNUNET_SCHEDULER_TaskIdentifier read_task; |
82 | static GNUNET_SCHEDULER_TaskIdentifier write_task; | 81 | static GNUNET_SCHEDULER_TaskIdentifier write_task; |
83 | 82 | ||
@@ -97,10 +96,8 @@ do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
97 | if (NULL != peer2_listen_socket) | 96 | if (NULL != peer2_listen_socket) |
98 | GNUNET_STREAM_listen_close (peer2_listen_socket); /* Close listen socket */ | 97 | GNUNET_STREAM_listen_close (peer2_listen_socket); /* Close listen socket */ |
99 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: shutdown\n"); | 98 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: shutdown\n"); |
100 | if (0 != abort_task) | 99 | if (GNUNET_SCHEDULER_NO_TASK != abort_task) |
101 | { | ||
102 | GNUNET_SCHEDULER_cancel (abort_task); | 100 | GNUNET_SCHEDULER_cancel (abort_task); |
103 | } | ||
104 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: Wait\n"); | 101 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: Wait\n"); |
105 | GNUNET_SCHEDULER_shutdown (); | 102 | GNUNET_SCHEDULER_shutdown (); |
106 | } | 103 | } |
@@ -113,16 +110,10 @@ static void | |||
113 | do_abort (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 110 | do_abort (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) |
114 | { | 111 | { |
115 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: ABORT\n"); | 112 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: ABORT\n"); |
116 | if (0 != test_task) | 113 | if (GNUNET_SCHEDULER_NO_TASK != read_task) |
117 | { | ||
118 | GNUNET_SCHEDULER_cancel (test_task); | ||
119 | } | ||
120 | if (0 != read_task) | ||
121 | { | ||
122 | GNUNET_SCHEDULER_cancel (read_task); | 114 | GNUNET_SCHEDULER_cancel (read_task); |
123 | } | ||
124 | result = GNUNET_SYSERR; | 115 | result = GNUNET_SYSERR; |
125 | abort_task = 0; | 116 | abort_task = GNUNET_SCHEDULER_NO_TASK; |
126 | do_shutdown (cls, tc); | 117 | do_shutdown (cls, tc); |
127 | } | 118 | } |
128 | 119 | ||