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

[gnunet]

Author: bartpolot
Date: 2014-03-22 03:58:27 +0100 (Sat, 22 Mar 2014)
New Revision: 32760

Modified:
   gnunet/src/mesh/gnunet-service-mesh_peer.c
Log:
- check path length AFTER shortening

Modified: gnunet/src/mesh/gnunet-service-mesh_peer.c
===================================================================
--- gnunet/src/mesh/gnunet-service-mesh_peer.c  2014-03-22 02:58:26 UTC (rev 
32759)
+++ gnunet/src/mesh/gnunet-service-mesh_peer.c  2014-03-22 02:58:27 UTC (rev 
32760)
@@ -1664,12 +1664,7 @@
     path_destroy (path);
     return NULL;
   }
-  if (2 >= path->length && GNUNET_NO == trusted)
-  {
-    /* Only allow CORE to tell us about direct paths */
-    path_destroy (path);
-    return NULL;
-  }
+
   for (l = 1; l < path->length; l++)
   {
     if (path->peers[l] == myid)
@@ -1688,6 +1683,13 @@
 
   LOG (GNUNET_ERROR_TYPE_DEBUG, " final length: %u\n", path->length);
 
+  if (2 >= path->length && GNUNET_NO == trusted)
+  {
+    /* Only allow CORE to tell us about direct paths */
+    path_destroy (path);
+    return NULL;
+  }
+
   l = path_get_length (path);
   if (0 == l)
   {