From 9c7d617d1d0e95e0b1270e57ef86b4b604a09efd Mon Sep 17 00:00:00 2001 From: Bart Polot Date: Wed, 25 Apr 2012 00:15:46 +0000 Subject: [PATCH] - Wrong order of function calling, caused notifing of destruction when ignoring. --- src/mesh/gnunet-service-mesh.c | 2 +- src/mesh/mesh_api.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mesh/gnunet-service-mesh.c b/src/mesh/gnunet-service-mesh.c index 86fb48609..9f1b7b491 100644 --- a/src/mesh/gnunet-service-mesh.c +++ b/src/mesh/gnunet-service-mesh.c @@ -4025,7 +4025,6 @@ handle_local_tunnel_destroy (void *cls, struct GNUNET_SERVER_Client *client, 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 @@ handle_local_tunnel_destroy (void *cls, struct GNUNET_SERVER_Client *client, 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 */ diff --git a/src/mesh/mesh_api.c b/src/mesh/mesh_api.c index a4f497829..cf9b1c812 100644 --- a/src/mesh/mesh_api.c +++ b/src/mesh/mesh_api.c @@ -865,7 +865,7 @@ process_tunnel_destroy (struct GNUNET_MESH_Handle *h, { 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; } -- 2.25.1