aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBart Polot <bart@net.in.tum.de>2015-10-20 02:28:04 +0000
committerBart Polot <bart@net.in.tum.de>2015-10-20 02:28:04 +0000
commita5966c5d23874555161408f0eaf40922fe3ca7d1 (patch)
tree9a49c5e8e8b9dcec578146cd940f8d9c9cf279e6
parent65e4a9a5d2678e96505be1c7ca490e265709a7ff (diff)
downloadgnunet-a5966c5d23874555161408f0eaf40922fe3ca7d1.tar.gz
gnunet-a5966c5d23874555161408f0eaf40922fe3ca7d1.zip
When cancelling polls cancel pending messages as well, as the message will
trigger a new poll upon sending. Fix #4010.
-rw-r--r--src/cadet/gnunet-service-cadet_connection.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/cadet/gnunet-service-cadet_connection.c b/src/cadet/gnunet-service-cadet_connection.c
index 26ccabbcd..2d030f8af 100644
--- a/src/cadet/gnunet-service-cadet_connection.c
+++ b/src/cadet/gnunet-service-cadet_connection.c
@@ -3759,6 +3759,11 @@ GCC_stop_poll (struct CadetConnection *c, int fwd)
3759 GNUNET_SCHEDULER_cancel (fc->poll_task); 3759 GNUNET_SCHEDULER_cancel (fc->poll_task);
3760 fc->poll_task = NULL; 3760 fc->poll_task = NULL;
3761 } 3761 }
3762 if (NULL != fc->poll_msg)
3763 {
3764 GCC_cancel (fc->poll_msg);
3765 fc->poll_msg = NULL;
3766 }
3762} 3767}
3763 3768
3764 3769