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

[gnunet]

Author: bartpolot
Date: 2013-08-22 18:39:16 +0200 (Thu, 22 Aug 2013)
New Revision: 28799

Modified:
   gnunet/src/mesh/gnunet-service-mesh-enc.c
Log:
- sync


Modified: gnunet/src/mesh/gnunet-service-mesh-enc.c
===================================================================
--- gnunet/src/mesh/gnunet-service-mesh-enc.c   2013-08-22 15:55:51 UTC (rev 
28798)
+++ gnunet/src/mesh/gnunet-service-mesh-enc.c   2013-08-22 16:39:16 UTC (rev 
28799)
@@ -4735,13 +4735,12 @@
 
   if (GNUNET_MESSAGE_TYPE_MESH_POLL == type ||
       GNUNET_MESSAGE_TYPE_MESH_ACK == type)
+  {
+    fc->queue_n--; /* We are going to do queue_n++ later, compensate*/
+    peer->queue_n--;
     priority = 100;
+  }
 
-  if (NULL != ch &&
-      ( (NULL != ch->root && GNUNET_MESSAGE_TYPE_MESH_FWD == type) ||
-        (NULL != ch->dest && GNUNET_MESSAGE_TYPE_MESH_BCK == type) ))
-    priority = 50;
-
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "priority %d\n", priority);
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "fc %p\n", fc);
   if (fc->queue_n >= fc->queue_max && 0 == priority)