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

[gnunet]

Author: bartpolot
Date: 2012-04-25 02:15:46 +0200 (Wed, 25 Apr 2012)
New Revision: 21146

Modified:
   gnunet/src/mesh/gnunet-service-mesh.c
   gnunet/src/mesh/mesh_api.c
Log:
- Wrong order of function calling, caused notifing of destruction when ignoring.

Modified: gnunet/src/mesh/gnunet-service-mesh.c
===================================================================
--- gnunet/src/mesh/gnunet-service-mesh.c       2012-04-24 18:27:29 UTC (rev 
21145)
+++ gnunet/src/mesh/gnunet-service-mesh.c       2012-04-25 00:15:46 UTC (rev 
21146)
@@ -4025,7 +4025,6 @@
     GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
     return;
   }
-  send_client_tunnel_disconnect(t, c);
   if (c != t->owner || tid >= GNUNET_MESH_LOCAL_TUNNEL_ID_SERV)
   {
     client_ignore_tunnel (c, t);
@@ -4045,6 +4044,7 @@
     GNUNET_SERVER_receive_done (client, GNUNET_OK);
     return;
   }
+  send_client_tunnel_disconnect(t, c);
   client_delete_tunnel(c, t);
 
   /* Don't try to ACK the client about the tunnel_destroy multicast packet */

Modified: gnunet/src/mesh/mesh_api.c
===================================================================
--- gnunet/src/mesh/mesh_api.c  2012-04-24 18:27:29 UTC (rev 21145)
+++ gnunet/src/mesh/mesh_api.c  2012-04-25 00:15:46 UTC (rev 21146)
@@ -865,7 +865,7 @@
   {
     GNUNET_break (0);
   }
-  LOG (GNUNET_ERROR_TYPE_DEBUG, "tunnel %u destroyed\n", t->tid);
+  LOG (GNUNET_ERROR_TYPE_DEBUG, "tunnel %X destroyed\n", t->tid);
   destroy_tunnel (t, GNUNET_YES);
   return;
 }