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

[gnunet]

Author: bartpolot
Date: 2012-12-21 02:37:02 +0100 (Fri, 21 Dec 2012)
New Revision: 25607

Modified:
   gnunet/src/mesh/mesh_tunnel_tree.c
Log:
- revert 25599, fix tree destruction segfault

Modified: gnunet/src/mesh/mesh_tunnel_tree.c
===================================================================
--- gnunet/src/mesh/mesh_tunnel_tree.c  2012-12-21 01:35:23 UTC (rev 25606)
+++ gnunet/src/mesh/mesh_tunnel_tree.c  2012-12-21 01:37:02 UTC (rev 25607)
@@ -379,6 +379,8 @@
   struct MeshTunnelTreeNode *n;
   struct MeshTunnelTreeNode *next;
 
+  if (NULL == parent)
+    return;
 #if MESH_TREE_DEBUG
   struct GNUNET_PeerIdentity id;
 
@@ -594,10 +596,7 @@
   struct MeshTunnelTreeNode *n;
 
   if (NULL == tree->me)
-  {
-    GNUNET_break (0);
     return;
-  }
   for (n = tree->me->children_head; NULL != n; n = n->next)
   {
     cb (cb_cls, n->peer);
@@ -766,8 +765,7 @@
   n->parent = NULL;
 
   while (MESH_PEER_RELAY == parent->status &&
-         NULL == parent->children_head &&
-         parent->peer != t->me->peer)
+         NULL == parent->children_head)
   {
 #if MESH_TREE_DEBUG
     GNUNET_PEER_resolve (parent->peer, &id);
@@ -775,6 +773,8 @@
                 GNUNET_i2s (&id));
 #endif
     n = parent->parent;
+    if (parent == t->me)
+      t->me = NULL;
     tree_node_destroy (parent);
     parent = n;
   }
@@ -1135,6 +1135,8 @@
 tree_debug (struct MeshTunnelTree *t)
 {
   tree_node_debug (t->root, 0);
+  FPRINTF (stderr, "root: %p\n", t->root);
+  FPRINTF (stderr, "me:   %p\n", t->me);
 }