aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2015-10-27 17:23:59 +0000
committerChristian Grothoff <christian@grothoff.org>2015-10-27 17:23:59 +0000
commit5131f579f895086be91b6d00ab4f38d5d237209e (patch)
treeb4009027f7605d1ee6e9fa6696b4ef3fec1d0a9e
parent2e26303d8f168158b3d5f842e720abcccefec9eb (diff)
downloadgnunet-5131f579f895086be91b6d00ab4f38d5d237209e.tar.gz
gnunet-5131f579f895086be91b6d00ab4f38d5d237209e.zip
-fix SEGV
-rw-r--r--src/transport/transport_api.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/transport/transport_api.c b/src/transport/transport_api.c
index f69cd80cc..95eeb8788 100644
--- a/src/transport/transport_api.c
+++ b/src/transport/transport_api.c
@@ -763,7 +763,8 @@ demultiplexer (void *cls,
763 bytes_msg = ntohl (okm->bytes_msg); 763 bytes_msg = ntohl (okm->bytes_msg);
764 bytes_physical = ntohl (okm->bytes_physical); 764 bytes_physical = ntohl (okm->bytes_physical);
765 LOG (GNUNET_ERROR_TYPE_DEBUG, 765 LOG (GNUNET_ERROR_TYPE_DEBUG,
766 "Receiving SEND_OK message, transmission %s.\n", 766 "Receiving SEND_OK message, transmission to %s %s.\n",
767 GNUNET_i2s (&okm->peer),
767 ntohl (okm->success) == GNUNET_OK ? "succeeded" : "failed"); 768 ntohl (okm->success) == GNUNET_OK ? "succeeded" : "failed");
768 769
769 n = neighbour_find (h, 770 n = neighbour_find (h,
@@ -1106,8 +1107,6 @@ schedule_transmission_task (void *cls,
1106 } 1107 }
1107 else 1108 else
1108 { 1109 {
1109 if (GNUNET_YES != n->is_ready)
1110 return; /* service not ready for another one */
1111 n = GNUNET_CONTAINER_heap_peek (h->ready_heap); 1110 n = GNUNET_CONTAINER_heap_peek (h->ready_heap);
1112 if (NULL == n) 1111 if (NULL == n)
1113 return; /* no pending messages */ 1112 return; /* no pending messages */
@@ -1748,7 +1747,9 @@ GNUNET_TRANSPORT_get_hello_cancel (struct GNUNET_TRANSPORT_GetHelloHandle *ghh)
1748 1747
1749 if (NULL != ghh->notify_task) 1748 if (NULL != ghh->notify_task)
1750 GNUNET_SCHEDULER_cancel (ghh->notify_task); 1749 GNUNET_SCHEDULER_cancel (ghh->notify_task);
1751 GNUNET_CONTAINER_DLL_remove (handle->hwl_head, handle->hwl_tail, ghh); 1750 GNUNET_CONTAINER_DLL_remove (handle->hwl_head,
1751 handle->hwl_tail,
1752 ghh);
1752 GNUNET_free (ghh); 1753 GNUNET_free (ghh);
1753} 1754}
1754 1755