- initialize message for both directions

2 files changed, 5 insertions, 7 deletions

diff --git a/src/mesh/gnunet-service-mesh.c b/src/mesh/gnunet-service-mesh.c
index 7119bb4ab..7fae00227 100644
--- a/src/mesh/gnunet-service-mesh.c
+++ b/src/mesh/gnunet-service-mesh.c
@@ -4387,20 +4387,18 @@ tunnel_send_destroy (struct MeshTunnel *t, int send_back)
   struct GNUNET_PeerIdentity id;
   GNUNET_PEER_Id parent;
 
+  msg.header.size = htons (sizeof (msg));
+  msg.header.type = htons (GNUNET_MESSAGE_TYPE_MESH_TUNNEL_DESTROY);
+  GNUNET_PEER_resolve (t->id.oid, &msg.oid);
+  msg.tid = htonl (t->id.tid);
   if (tree_count_children(t->tree) > 0)
   {
-    msg.header.size = htons (sizeof (msg));
-    msg.header.type = htons (GNUNET_MESSAGE_TYPE_MESH_TUNNEL_DESTROY);
-    GNUNET_PEER_resolve (t->id.oid, &msg.oid);
-    msg.tid = htonl (t->id.tid);
     tunnel_send_multicast (t, &msg.header);
   }
   parent = tree_get_predecessor(t->tree);
   if (GNUNET_NO == send_back || 0 == parent)
     return;
 
-  msg.header.size = htons (sizeof (msg));
-  msg.header.type = htons (GNUNET_MESSAGE_TYPE_MESH_TUNNEL_DESTROY);
   GNUNET_PEER_resolve (parent, &id);
   send_prebuilt_message(&msg.header, &id, t);
 }
diff --git a/src/mesh/test_mesh_small.conf b/src/mesh/test_mesh_small.conf
index 943ef3638..f9d50b4e6 100644
--- a/src/mesh/test_mesh_small.conf
+++ b/src/mesh/test_mesh_small.conf
@@ -11,7 +11,7 @@ ID_ANNOUNCE_TIME = 2 s
 CONNECT_TIMEOUT = 30 s
 DEFAULT_TTL = 64
 DHT_REPLICAITON_LEVEL = 3
-# PREFIX = valgrind --leak-check=full --suppressions=valgrind-mesh.supp
+PREFIX = valgrind --leak-check=full --suppressions=valgrind-mesh.supp
 # PREFIX = xterm -geometry 100x85 -T peer1 -e gdb --args
 
 [testbed]