From 26d3e4b2e9f2431c50100228d86d2cbd939cf31a Mon Sep 17 00:00:00 2001 From: Bart Polot Date: Wed, 2 Jul 2014 19:30:47 +0000 Subject: [PATCH] - fix error condition --- src/cadet/gnunet-service-cadet_tunnel.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/cadet/gnunet-service-cadet_tunnel.c b/src/cadet/gnunet-service-cadet_tunnel.c index 56fed1c81..72e4cf6ff 100644 --- a/src/cadet/gnunet-service-cadet_tunnel.c +++ b/src/cadet/gnunet-service-cadet_tunnel.c @@ -1019,7 +1019,8 @@ queue_data (struct CadetTunnel *t, const struct GNUNET_MessageHeader *msg) * this should be TunnelQueue given to the client. * Otherwise, NULL. * - * @return Handle to cancel message. NULL if @c cont is NULL. + * @return Handle to cancel message. + * NULL if @c cont is NULL or an error happens and message is dropped. */ static struct CadetTunnelQueue * send_prebuilt_message (const struct GNUNET_MessageHeader *message, @@ -1070,14 +1071,13 @@ send_prebuilt_message (const struct GNUNET_MessageHeader *message, c = tunnel_get_connection (t); if (NULL == c) { - if (GNUNET_SCHEDULER_NO_TASK != t->destroy_task - || (CADET_TUNNEL_SEARCHING != t->cstate - && CADET_TUNNEL_WAITING != t->cstate)) + /* Why is tunnel 'ready'? Should have been queued! */ + if (GNUNET_SCHEDULER_NO_TASK != t->destroy_task) { GNUNET_break (0); GCT_debug (t, GNUNET_ERROR_TYPE_WARNING); } - return NULL; + return NULL; /* Drop... */ } mid = 0; -- 2.25.1