diff options
author | Matthias Wachs <wachs@net.in.tum.de> | 2011-04-20 08:26:19 +0000 |
---|---|---|
committer | Matthias Wachs <wachs@net.in.tum.de> | 2011-04-20 08:26:19 +0000 |
commit | 46aedb2a4c5ada8aa2fff6a4b860b1300ab7303f (patch) | |
tree | 6e07ad71afee0c1666076dbdd9e7c5a28b24dbed /src/testing/testing.c | |
parent | e027e2d0362fc9ebff1c679bbc50425a5d0db3f9 (diff) | |
download | gnunet-46aedb2a4c5ada8aa2fff6a4b860b1300ab7303f.tar.gz gnunet-46aedb2a4c5ada8aa2fff6a4b860b1300ab7303f.zip |
shutdown
Diffstat (limited to 'src/testing/testing.c')
-rw-r--r-- | src/testing/testing.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/testing/testing.c b/src/testing/testing.c index 024be6ff5..9558f45eb 100644 --- a/src/testing/testing.c +++ b/src/testing/testing.c | |||
@@ -1617,7 +1617,7 @@ notify_connect_result (void *cls, | |||
1617 | ctx->connect_request_handle = NULL; | 1617 | ctx->connect_request_handle = NULL; |
1618 | } | 1618 | } |
1619 | 1619 | ||
1620 | if (tc->reason == GNUNET_SCHEDULER_REASON_SHUTDOWN) | 1620 | if ( (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN) != 0) |
1621 | { | 1621 | { |
1622 | if (ctx->d1th != NULL) | 1622 | if (ctx->d1th != NULL) |
1623 | GNUNET_TRANSPORT_disconnect (ctx->d1th); | 1623 | GNUNET_TRANSPORT_disconnect (ctx->d1th); |
@@ -1765,7 +1765,7 @@ send_hello (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
1765 | struct ConnectContext *ctx = cls; | 1765 | struct ConnectContext *ctx = cls; |
1766 | struct GNUNET_MessageHeader *hello; | 1766 | struct GNUNET_MessageHeader *hello; |
1767 | ctx->hello_send_task = GNUNET_SCHEDULER_NO_TASK; | 1767 | ctx->hello_send_task = GNUNET_SCHEDULER_NO_TASK; |
1768 | if (tc->reason == GNUNET_SCHEDULER_REASON_SHUTDOWN) | 1768 | if ( (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN) != 0) |
1769 | return; | 1769 | return; |
1770 | if ((ctx->d1core_ready == GNUNET_YES) && (ctx->d2->hello != NULL) | 1770 | if ((ctx->d1core_ready == GNUNET_YES) && (ctx->d2->hello != NULL) |
1771 | && (NULL != GNUNET_HELLO_get_header (ctx->d2->hello)) | 1771 | && (NULL != GNUNET_HELLO_get_header (ctx->d2->hello)) |
@@ -1844,7 +1844,7 @@ reattempt_daemons_connect (void *cls, | |||
1844 | const struct GNUNET_SCHEDULER_TaskContext *tc) | 1844 | const struct GNUNET_SCHEDULER_TaskContext *tc) |
1845 | { | 1845 | { |
1846 | struct ConnectContext *ctx = cls; | 1846 | struct ConnectContext *ctx = cls; |
1847 | if (tc->reason == GNUNET_SCHEDULER_REASON_SHUTDOWN) | 1847 | if ( (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN) != 0) |
1848 | { | 1848 | { |
1849 | GNUNET_free(ctx); | 1849 | GNUNET_free(ctx); |
1850 | return; | 1850 | return; |