[GNUnet-SVN] r27489 - in gnunet/src: fs include mesh

[gnunet]

Author: bartpolot
Date: 2013-06-19 13:50:50 +0200 (Wed, 19 Jun 2013)
New Revision: 27489

Modified:
   gnunet/src/fs/gnunet-service-fs_mesh.c
   gnunet/src/include/gnunet_mesh2_service.h
   gnunet/src/mesh/mesh2_api.c
Log:
Change in mesh API: data callback no longer provides sender, user must remember 
tunnel<->sender if needed (fix bug #2894)



Modified: gnunet/src/fs/gnunet-service-fs_mesh.c
===================================================================
--- gnunet/src/fs/gnunet-service-fs_mesh.c      2013-06-19 11:49:09 UTC (rev 
27488)
+++ gnunet/src/fs/gnunet-service-fs_mesh.c      2013-06-19 11:50:50 UTC (rev 
27489)
@@ -647,7 +647,8 @@
  * complete reply is received.
  *
  * @param cls closure with the 'struct StreamHandle'
- * @param client identification of the client, NULL
+ * @param tunnel tunnel handle
+ * @param tunnel_ctx tunnel context
  * @param message the actual message
  * @return GNUNET_OK on success, GNUNET_SYSERR to stop further processing
  */
@@ -655,8 +656,7 @@
 reply_cb (void *cls,
          struct GNUNET_MESH_Tunnel *tunnel,
          void **tunnel_ctx,
-         const struct GNUNET_PeerIdentity *sender,
-         const struct GNUNET_MessageHeader *message)
+          const struct GNUNET_MessageHeader *message)
 {
   struct StreamHandle *sh = *tunnel_ctx;
   const struct StreamReplyMessage *srm;
@@ -1080,7 +1080,8 @@
  * Do not call GNUNET_SERVER_mst_destroy in callback
  *
  * @param cls closure with the 'struct StreamClient'
- * @param client identification of the client, NULL
+ * @param tunnel tunnel handle
+ * @param tunnel_ctx tunnel context
  * @param message the actual message
  * @return GNUNET_OK on success, GNUNET_SYSERR to stop further processing
  */
@@ -1088,7 +1089,6 @@
 request_cb (void *cls,
            struct GNUNET_MESH_Tunnel *tunnel,
            void **tunnel_ctx,
-           const struct GNUNET_PeerIdentity *sender,
            const struct GNUNET_MessageHeader *message)
 {
   struct StreamClient *sc = *tunnel_ctx;

Modified: gnunet/src/include/gnunet_mesh2_service.h
===================================================================
--- gnunet/src/include/gnunet_mesh2_service.h   2013-06-19 11:49:09 UTC (rev 
27488)
+++ gnunet/src/include/gnunet_mesh2_service.h   2013-06-19 11:50:50 UTC (rev 
27489)
@@ -70,7 +70,6 @@
  * @param cls Closure (set from GNUNET_MESH_connect).
  * @param tunnel Connection to the other end.
  * @param tunnel_ctx Place to store local state associated with the tunnel.
- * @param sender Peer who sent the message.
  * @param message The actual message.
  * 
  * @return GNUNET_OK to keep the tunnel open,
@@ -79,7 +78,6 @@
 typedef int (*GNUNET_MESH_MessageCallback) (void *cls,
                                             struct GNUNET_MESH_Tunnel *tunnel,
                                             void **tunnel_ctx,
-                                            const struct GNUNET_PeerIdentity 
*sender,
                                             const struct GNUNET_MessageHeader 
*message);
 
 

Modified: gnunet/src/mesh/mesh2_api.c
===================================================================
--- gnunet/src/mesh/mesh2_api.c 2013-06-19 11:49:09 UTC (rev 27488)
+++ gnunet/src/mesh/mesh2_api.c 2013-06-19 11:50:50 UTC (rev 27489)
@@ -951,7 +951,7 @@
     if (handler->type == type)
     {
       if (GNUNET_OK !=
-          handler->callback (h->cls, t, &t->ctx, peer, payload))
+          handler->callback (h->cls, t, &t->ctx, payload))
       {
         LOG (GNUNET_ERROR_TYPE_DEBUG, "callback caused disconnection\n");
         GNUNET_MESH_tunnel_destroy (t);