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

[gnunet]

Author: bartpolot
Date: 2013-07-22 19:52:42 +0200 (Mon, 22 Jul 2013)
New Revision: 28254

Modified:
   gnunet/src/mesh/gnunet-service-mesh.c
Log:
- cancel polling on cancel_queues

Modified: gnunet/src/mesh/gnunet-service-mesh.c
===================================================================
--- gnunet/src/mesh/gnunet-service-mesh.c       2013-07-22 17:35:19 UTC (rev 
28253)
+++ gnunet/src/mesh/gnunet-service-mesh.c       2013-07-22 17:52:42 UTC (rev 
28254)
@@ -1699,6 +1699,7 @@
   struct MeshPeerInfo *peer_info;
   struct MeshPeerQueue *pq;
   struct MeshPeerQueue *next;
+  struct MeshFlowControl *fc;
 
   if (0 == neighbor)
     return; /* Was local peer, 0'ed in tunnel_destroy_iterator */
@@ -1720,9 +1721,15 @@
   }
   if (NULL == peer_info->queue_head && NULL != peer_info->core_transmit)
   {
-    GNUNET_CORE_notify_transmit_ready_cancel(peer_info->core_transmit);
+    GNUNET_CORE_notify_transmit_ready_cancel (peer_info->core_transmit);
     peer_info->core_transmit = NULL;
   }
+  fc = neighbor == t->next_hop ? &t->next_fc : &t->prev_fc;
+  if (GNUNET_SCHEDULER_NO_TASK != fc->poll_task)
+  {
+    GNUNET_SCHEDULER_cancel (fc->poll_task);
+    fc->poll_task = GNUNET_SCHEDULER_NO_TASK;
+  }
 }