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

[gnunet]

Author: bartpolot
Date: 2013-11-07 14:00:38 +0100 (Thu, 07 Nov 2013)
New Revision: 30599

Modified:
   gnunet/src/mesh/gnunet-service-mesh_tunnel.c
Log:
- fix loopback channel create


Modified: gnunet/src/mesh/gnunet-service-mesh_tunnel.c
===================================================================
--- gnunet/src/mesh/gnunet-service-mesh_tunnel.c        2013-11-07 11:51:13 UTC 
(rev 30598)
+++ gnunet/src/mesh/gnunet-service-mesh_tunnel.c        2013-11-07 13:00:38 UTC 
(rev 30599)
@@ -544,7 +544,7 @@
   LOG (GNUNET_ERROR_TYPE_DEBUG, "GMT KX on Tunnel %s\n", GMT_2s (t));
 
   /* Avoid loopback. */
-  if (myid == GMP_get_short_id (t->peer))
+  if (GMT_is_loopback (t))
   {
     LOG (GNUNET_ERROR_TYPE_DEBUG, "  loopback!\n");
     GNUNET_break (0);
@@ -865,7 +865,7 @@
 
   /* Check channel */
   ch = GMT_get_channel (t, ntohl (msg->chid));
-  if (NULL != ch)
+  if (NULL != ch && ! GMT_is_loopback (t))
   {
     /* Probably a retransmission, safe to ignore */
     LOG (GNUNET_ERROR_TYPE_DEBUG, "   already exists...\n");
@@ -1845,7 +1845,7 @@
   }
   LOG (GNUNET_ERROR_TYPE_DEBUG, "GMT Send on Tunnel %s\n", GMT_2s (t));
 
-  if (myid == GMP_get_short_id (t->peer))
+  if (GMT_is_loopback (t))
   {
     LOG (GNUNET_ERROR_TYPE_DEBUG, "  loopback!\n");
     handle_decrypted (t, message, fwd);
@@ -1894,7 +1894,7 @@
 int
 GMT_is_loopback (const struct MeshTunnel3 *t)
 {
-  return (myid == GMP_get_short_id(t->peer));
+  return (myid == GMP_get_short_id (t->peer));
 }