diff options
author | Christian Grothoff <christian@grothoff.org> | 2013-11-09 20:19:39 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2013-11-09 20:19:39 +0000 |
commit | a1f112852c93046ff3bbcac107cf178c56f23bf2 (patch) | |
tree | 49f82cf39840d527afcc10656bb9c0376cf8cdba /src/identity/identity_api.c | |
parent | f2e6a9f69138f60a337d23d9149c7eab109f6f0a (diff) | |
download | gnunet-a1f112852c93046ff3bbcac107cf178c56f23bf2.tar.gz gnunet-a1f112852c93046ff3bbcac107cf178c56f23bf2.zip |
-fixing crash in #3101, but just replacing it with a break, so there is likely still an issue left
Diffstat (limited to 'src/identity/identity_api.c')
-rw-r--r-- | src/identity/identity_api.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/src/identity/identity_api.c b/src/identity/identity_api.c index d69739837..1a2b9e4da 100644 --- a/src/identity/identity_api.c +++ b/src/identity/identity_api.c | |||
@@ -418,6 +418,14 @@ message_handler (void *cls, | |||
418 | return; | 418 | return; |
419 | } | 419 | } |
420 | op = h->op_head; | 420 | op = h->op_head; |
421 | if (NULL == op) | ||
422 | { | ||
423 | GNUNET_break (0); | ||
424 | reschedule_connect (h); | ||
425 | return; | ||
426 | } | ||
427 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | ||
428 | "Received SET_DEFAULT message from identity service\n"); | ||
421 | GNUNET_CONTAINER_DLL_remove (h->op_head, | 429 | GNUNET_CONTAINER_DLL_remove (h->op_head, |
422 | h->op_tail, | 430 | h->op_tail, |
423 | op); | 431 | op); |
@@ -889,6 +897,8 @@ GNUNET_IDENTITY_cancel (struct GNUNET_IDENTITY_Operation *op) | |||
889 | (NULL == h->client) ) | 897 | (NULL == h->client) ) |
890 | { | 898 | { |
891 | /* request not active, can simply remove */ | 899 | /* request not active, can simply remove */ |
900 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | ||
901 | "Client aborted non-head operation, simply removing it\n"); | ||
892 | GNUNET_CONTAINER_DLL_remove (h->op_head, | 902 | GNUNET_CONTAINER_DLL_remove (h->op_head, |
893 | h->op_tail, | 903 | h->op_tail, |
894 | op); | 904 | op); |
@@ -898,6 +908,8 @@ GNUNET_IDENTITY_cancel (struct GNUNET_IDENTITY_Operation *op) | |||
898 | if (NULL != h->th) | 908 | if (NULL != h->th) |
899 | { | 909 | { |
900 | /* request active but not yet with service, can still abort */ | 910 | /* request active but not yet with service, can still abort */ |
911 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | ||
912 | "Client aborted head operation prior to transmission, aborting it\n"); | ||
901 | GNUNET_CLIENT_notify_transmit_ready_cancel (h->th); | 913 | GNUNET_CLIENT_notify_transmit_ready_cancel (h->th); |
902 | h->th = NULL; | 914 | h->th = NULL; |
903 | GNUNET_CONTAINER_DLL_remove (h->op_head, | 915 | GNUNET_CONTAINER_DLL_remove (h->op_head, |
@@ -908,6 +920,8 @@ GNUNET_IDENTITY_cancel (struct GNUNET_IDENTITY_Operation *op) | |||
908 | return; | 920 | return; |
909 | } | 921 | } |
910 | /* request active with service, simply ensure continuations are not called */ | 922 | /* request active with service, simply ensure continuations are not called */ |
923 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | ||
924 | "Client aborted active request, NULLing continuation\n"); | ||
911 | op->cont = NULL; | 925 | op->cont = NULL; |
912 | op->cb = NULL; | 926 | op->cb = NULL; |
913 | } | 927 | } |