[GNUnet-SVN] r24831 - in gnunet/src: dht mesh

[gnunet]

Author: bartpolot
Date: 2012-11-08 02:59:00 +0100 (Thu, 08 Nov 2012)
New Revision: 24831

Modified:
   gnunet/src/dht/gnunet-service-dht_clients.c
   gnunet/src/mesh/gnunet-service-mesh.c
Log:
- fix multicast keepalive

Modified: gnunet/src/dht/gnunet-service-dht_clients.c
===================================================================
--- gnunet/src/dht/gnunet-service-dht_clients.c 2012-11-08 00:49:10 UTC (rev 
24830)
+++ gnunet/src/dht/gnunet-service-dht_clients.c 2012-11-08 01:59:00 UTC (rev 
24831)
@@ -599,6 +599,7 @@
   cqr->replication = ntohl (get->desired_replication_level);
   cqr->msg_options = ntohl (get->options);
   cqr->type = ntohl (get->type);
+  // FIXME use cqr->key, set multihashmap create to GNUNET_YES
   GNUNET_CONTAINER_multihashmap_put (forward_map, &get->key, cqr,
                                      
GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE);
   GDS_CLIENTS_process_get (ntohl (get->options),

Modified: gnunet/src/mesh/gnunet-service-mesh.c
===================================================================
--- gnunet/src/mesh/gnunet-service-mesh.c       2012-11-08 00:49:10 UTC (rev 
24830)
+++ gnunet/src/mesh/gnunet-service-mesh.c       2012-11-08 01:59:00 UTC (rev 
24831)
@@ -3583,7 +3583,8 @@
               "  no one to send data to\n");
     GNUNET_free (mdata->data);
     GNUNET_free (mdata);
-    t->fwd_queue_n--;
+    if (ntohs (msg->type) == GNUNET_MESSAGE_TYPE_MESH_MULTICAST)
+      t->fwd_queue_n--;
   }
   else
   {