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

[gnunet]

Author: bartpolot
Date: 2013-10-10 20:10:59 +0200 (Thu, 10 Oct 2013)
New Revision: 30122

Modified:
   gnunet/src/mesh/gnunet-service-mesh-enc.c
   gnunet/src/mesh/gnunet-service-mesh_channel.c
   gnunet/src/mesh/gnunet-service-mesh_dht.c
   gnunet/src/mesh/gnunet-service-mesh_local.c
   gnunet/src/mesh/gnunet-service-mesh_local.h
Log:
- fix dht


Modified: gnunet/src/mesh/gnunet-service-mesh-enc.c
===================================================================
--- gnunet/src/mesh/gnunet-service-mesh-enc.c   2013-10-10 18:08:53 UTC (rev 
30121)
+++ gnunet/src/mesh/gnunet-service-mesh-enc.c   2013-10-10 18:10:59 UTC (rev 
30122)
@@ -46,7 +46,6 @@
 #include "platform.h"
 #include "gnunet_util_lib.h"
 #include "mesh_enc.h"
-#include "block_mesh.h"
 #include "gnunet_statistics_service.h"
 
 #include "gnunet-service-mesh_local.h"

Modified: gnunet/src/mesh/gnunet-service-mesh_channel.c
===================================================================
--- gnunet/src/mesh/gnunet-service-mesh_channel.c       2013-10-10 18:08:53 UTC 
(rev 30121)
+++ gnunet/src/mesh/gnunet-service-mesh_channel.c       2013-10-10 18:10:59 UTC 
(rev 30122)
@@ -338,14 +338,14 @@
   if (fwd)
   {
     if (ch->dest_rel->client_ready)
-      GML_send_data (ch, msg, ch->dest, ch->lid_dest);
+      GML_send_data (ch->dest, msg, ch->lid_dest);
     else
       add_buffered_data (msg, ch->dest_rel);
   }
   else
   {
     if (ch->root_rel->client_ready)
-      GML_send_data (ch, msg, ch->root, ch->lid_root);
+      GML_send_data (ch->root, msg, ch->lid_root);
     else
       add_buffered_data (msg, ch->root_rel);
   }

Modified: gnunet/src/mesh/gnunet-service-mesh_dht.c
===================================================================
--- gnunet/src/mesh/gnunet-service-mesh_dht.c   2013-10-10 18:08:53 UTC (rev 
30121)
+++ gnunet/src/mesh/gnunet-service-mesh_dht.c   2013-10-10 18:10:59 UTC (rev 
30122)
@@ -25,6 +25,7 @@
 #include "gnunet_dht_service.h"
 #include "gnunet_statistics_service.h"
 
+#include "block_mesh.h"
 #include "mesh_path.h"
 #include "gnunet-service-mesh_dht.h"
 #include "gnunet-service-mesh_peer.h"

Modified: gnunet/src/mesh/gnunet-service-mesh_local.c
===================================================================
--- gnunet/src/mesh/gnunet-service-mesh_local.c 2013-10-10 18:08:53 UTC (rev 
30121)
+++ gnunet/src/mesh/gnunet-service-mesh_local.c 2013-10-10 18:10:59 UTC (rev 
30122)
@@ -1099,11 +1099,11 @@
 /**
  * Modify the mesh message ID from global to local and send to client.
  *
+ * @param c Client to send to.
  * @param msg Message to modify and send.
- * @param c Client to send to.
- * @param tid Tunnel ID to use (c can be both owner and client).
+ * @param id Channel ID to use (c can be both owner and client).
  */
-static void
+void
 GML_send_data (struct MeshClient *c,
                const struct GNUNET_MESH_Data *msg,
                MESH_ChannelNumber id)

Modified: gnunet/src/mesh/gnunet-service-mesh_local.h
===================================================================
--- gnunet/src/mesh/gnunet-service-mesh_local.h 2013-10-10 18:08:53 UTC (rev 
30121)
+++ gnunet/src/mesh/gnunet-service-mesh_local.h 2013-10-10 18:10:59 UTC (rev 
30122)
@@ -177,17 +177,16 @@
 GML_send_channel_destroy (struct MeshClient *c, uint32_t id);
 
 /**
- * Modify the mesh message TID from global to local and send to client.
+ * Modify the mesh message ID from global to local and send to client.
  *
- * @param ch Channel on which to send the message.
+ * @param c Client to send to.
  * @param msg Message to modify and send.
- * @param c Client to send to.
- * @param tid Tunnel ID to use (c can be both owner and client).
+ * @param id Channel ID to use (c can be both owner and client).
  */
 void
-GML_send_data (struct MeshChannel *ch,
+GML_send_data (struct MeshClient *c,
                const struct GNUNET_MESH_Data *msg,
-               struct MeshClient *c, MESH_ChannelNumber id);
+               MESH_ChannelNumber id);
 
 /**
  * Get the static string to represent a client.