Changed tree library: now assumes own short ID == 1, refactored code in library and mesh service, adapted and extended library testcase

1 files changed, 13 insertions, 34 deletions

diff --git a/src/mesh/mesh_tunnel_tree.h b/src/mesh/mesh_tunnel_tree.h
index 094a617cb..5060fa1a7 100644
--- a/src/mesh/mesh_tunnel_tree.h
+++ b/src/mesh/mesh_tunnel_tree.h
@@ -101,19 +101,6 @@ path_duplicate (struct MeshPeerPath *path);
 
 
 /**
- * Find the first peer whom to send a packet to go down this path
- *
- * @param t The tunnel tree to use
- * @param peer The peerinfo of the peer we are trying to reach
- *
- * @return peerinfo of the peer who is the first hop in the tunnel
- *         NULL on error
- */
-struct GNUNET_PeerIdentity *
-path_get_first_hop (struct MeshTunnelTree *t, GNUNET_PEER_Id peer);
-
-
-/**
  * Get the length of a path
  *
  * @param p The path to measure, with the local peer at any point of it
@@ -172,27 +159,6 @@ tree_new (GNUNET_PEER_Id peer);
 
 
 /**
- * Set own identity in the tree
- *
- * @param tree Tree.
- * @param peer A short peer id of local peer.
- */
-void
-tree_set_me (struct MeshTunnelTree *tree, GNUNET_PEER_Id peer);
-
-
-/**
- * Get the id of the local id of the tree.
- *
- * @param tree Tree whose local id we want to now.
- *
- * @return Short peer id of local peer.
- */
-GNUNET_PEER_Id
-tree_get_me (struct MeshTunnelTree *tree);
-
-
-/**
  * Set the status of a node.
  *
  * @param tree Tree.
@@ -226,6 +192,19 @@ tree_get_predecessor (struct MeshTunnelTree *tree);
 
 
 /**
+ * Find the first peer whom to send a packet to go down this path
+ *
+ * @param t The tunnel tree to use
+ * @param peer The peerinfo of the peer we are trying to reach
+ *
+ * @return peerinfo of the peer who is the first hop in the tunnel
+ *         NULL on error
+ */
+struct GNUNET_PeerIdentity *
+tree_get_first_hop (struct MeshTunnelTree *t, GNUNET_PEER_Id peer);
+
+
+/**
  * Find the given peer in the tree.
  *
  * @param tree Tree where to look for the peer.