[GNUnet-SVN] r32772 - gnunet/src/mesh

[gnunet]

Author: bartpolot
Date: 2014-03-22 03:58:45 +0100 (Sat, 22 Mar 2014)
New Revision: 32772

Modified:
   gnunet/src/mesh/gnunet-service-mesh_channel.c
Log:
- cancel SYNACK retry task when forced to SYNACK by an incoming SYN

Modified: gnunet/src/mesh/gnunet-service-mesh_channel.c
===================================================================
--- gnunet/src/mesh/gnunet-service-mesh_channel.c       2014-03-22 02:58:43 UTC 
(rev 32771)
+++ gnunet/src/mesh/gnunet-service-mesh_channel.c       2014-03-22 02:58:45 UTC 
(rev 32772)
@@ -2120,6 +2120,12 @@
   else
   {
     LOG (GNUNET_ERROR_TYPE_DEBUG, "  duplicate create channel\n");
+    if (GNUNET_SCHEDULER_NO_TASK != ch->dest_rel->retry_task)
+    {
+      /* we were waiting to re-send our 'SYNACK', wait no more! */
+      GNUNET_SCHEDULER_cancel (ch->dest_rel->retry_task);
+      ch->dest_rel->retry_task = GNUNET_SCHEDULER_NO_TASK;
+    }
   }
   send_ack (ch, GNUNET_YES);