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

[gnunet]

Author: bartpolot
Date: 2013-12-16 13:17:39 +0100 (Mon, 16 Dec 2013)
New Revision: 31407

Modified:
   gnunet/src/mesh/gnunet-service-mesh_connection.c
   gnunet/src/mesh/gnunet-service-mesh_peer.c
   gnunet/src/mesh/gnunet-service-mesh_peer.h
   gnunet/src/mesh/gnunet-service-mesh_tunnel.c
   gnunet/src/mesh/gnunet-service-mesh_tunnel.h
Log:
- small refactor


Modified: gnunet/src/mesh/gnunet-service-mesh_connection.c
===================================================================
--- gnunet/src/mesh/gnunet-service-mesh_connection.c    2013-12-16 12:12:30 UTC 
(rev 31406)
+++ gnunet/src/mesh/gnunet-service-mesh_connection.c    2013-12-16 12:17:39 UTC 
(rev 31407)
@@ -2222,10 +2222,7 @@
   if (GNUNET_OK != register_neighbors (c))
   {
     if (0 == own_pos)
-    {
       GMT_remove_path (c->t, p);
-      path_destroy (p);
-    }
     GMC_destroy (c);
     return NULL;
   }

Modified: gnunet/src/mesh/gnunet-service-mesh_peer.c
===================================================================
--- gnunet/src/mesh/gnunet-service-mesh_peer.c  2013-12-16 12:12:30 UTC (rev 
31406)
+++ gnunet/src/mesh/gnunet-service-mesh_peer.c  2013-12-16 12:17:39 UTC (rev 
31407)
@@ -1598,7 +1598,7 @@
  * Remove any path to the peer that has the extact same peers as the one given.
  *
  * @param peer Peer to remove the path from.
- * @param path Path to remove.
+ * @param path Path to remove. Is always destroyed .
  */
 void
 GMP_remove_path (struct MeshPeer *peer, struct MeshPeerPath *path)
@@ -1620,6 +1620,7 @@
         return;
     }
   }
+  path_destroy (path);
 }
 
 

Modified: gnunet/src/mesh/gnunet-service-mesh_peer.h
===================================================================
--- gnunet/src/mesh/gnunet-service-mesh_peer.h  2013-12-16 12:12:30 UTC (rev 
31406)
+++ gnunet/src/mesh/gnunet-service-mesh_peer.h  2013-12-16 12:17:39 UTC (rev 
31407)
@@ -254,7 +254,7 @@
  * Remove any path to the peer that has the extact same peers as the one given.
  *
  * @param peer Peer to remove the path from.
- * @param path Path to remove.
+ * @param path Path to remove. Is always destroyed .
  */
 void
 GMP_remove_path (struct MeshPeer *peer, struct MeshPeerPath *path);

Modified: gnunet/src/mesh/gnunet-service-mesh_tunnel.c
===================================================================
--- gnunet/src/mesh/gnunet-service-mesh_tunnel.c        2013-12-16 12:12:30 UTC 
(rev 31406)
+++ gnunet/src/mesh/gnunet-service-mesh_tunnel.c        2013-12-16 12:17:39 UTC 
(rev 31407)
@@ -1759,7 +1759,7 @@
  * Mark a path as no longer valid for this tunnel: has been tried and failed.
  *
  * @param t Tunnel to update.
- * @param path Invalid path.
+ * @param path Invalid path to remove. Is destroyed after removal.
  */
 void
 GMT_remove_path (struct MeshTunnel3 *t, struct MeshPeerPath *path)

Modified: gnunet/src/mesh/gnunet-service-mesh_tunnel.h
===================================================================
--- gnunet/src/mesh/gnunet-service-mesh_tunnel.h        2013-12-16 12:12:30 UTC 
(rev 31406)
+++ gnunet/src/mesh/gnunet-service-mesh_tunnel.h        2013-12-16 12:17:39 UTC 
(rev 31407)
@@ -217,7 +217,7 @@
  * Mark a path as no longer valid for this tunnel: has been tried and failed.
  *
  * @param t Tunnel to update.
- * @param path Invalid path.
+ * @param path Invalid path to remove. Is destroyed after removal.
  */
 void
 GMT_remove_path (struct MeshTunnel3 *t, struct MeshPeerPath *path);