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

[gnunet]

Author: bartpolot
Date: 2012-03-06 16:57:24 +0100 (Tue, 06 Mar 2012)
New Revision: 20316

Modified:
   gnunet/src/mesh/mesh_tunnel_tree.c
Log:
- Fix for #2183: own position in tree only checked on new nodes caused 
assertion error when own node was reinserted

Modified: gnunet/src/mesh/mesh_tunnel_tree.c
===================================================================
--- gnunet/src/mesh/mesh_tunnel_tree.c  2012-03-06 14:41:16 UTC (rev 20315)
+++ gnunet/src/mesh/mesh_tunnel_tree.c  2012-03-06 15:57:24 UTC (rev 20316)
@@ -837,7 +837,7 @@
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "tree:   Adding peer %s.\n",
                 GNUNET_i2s (&id));
     GNUNET_PEER_resolve (parent->peer, &id);
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "tree:     to %s.\n",
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "tree:            to %s.\n",
                 GNUNET_i2s (&id));
 #endif
 
@@ -860,12 +860,12 @@
 #endif
       n = tree_node_new (parent, p->peers[i]);
       n->status = MESH_PEER_RELAY;
-      if (n->peer == 1)
-      {
-        t->me = n;
-        me = i;
-      }
     }
+    if (n->peer == 1)
+    {
+      t->me = n;
+      me = i;
+    }
     i++;
     parent = n;
   }