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

[gnunet]

Author: bartpolot
Date: 2013-12-17 01:06:15 +0100 (Tue, 17 Dec 2013)
New Revision: 31453

Modified:
   gnunet/src/mesh/gnunet-service-mesh_connection.c
   gnunet/src/mesh/gnunet-service-mesh_peer.c
Log:
- refine break condition


Modified: gnunet/src/mesh/gnunet-service-mesh_connection.c
===================================================================
--- gnunet/src/mesh/gnunet-service-mesh_connection.c    2013-12-16 23:45:32 UTC 
(rev 31452)
+++ gnunet/src/mesh/gnunet-service-mesh_connection.c    2013-12-17 00:06:15 UTC 
(rev 31453)
@@ -1186,8 +1186,8 @@
   peer = get_next_hop (c);
   if (GNUNET_OK != GMP_remove_connection (peer, c))
   {
-    GNUNET_break (MESH_CONNECTION_NEW == c->state/*
-                  || MESH_CONNECTION_DESTROYED == c->state*/);
+    GNUNET_break (MESH_CONNECTION_NEW == c->state
+                  || MESH_CONNECTION_DESTROYED == c->state);
     LOG (GNUNET_ERROR_TYPE_DEBUG, "  cstate: %u\n", c->state);
     if (NULL != c->t) GMT_debug (c->t);
   }
@@ -1195,8 +1195,8 @@
   peer = get_prev_hop (c);
   if (GNUNET_OK != GMP_remove_connection (peer, c))
   {
-    GNUNET_break (MESH_CONNECTION_NEW == c->state/*
-                  || MESH_CONNECTION_DESTROYED == c->state*/);
+    GNUNET_break (MESH_CONNECTION_NEW == c->state
+                  || MESH_CONNECTION_DESTROYED == c->state);
     LOG (GNUNET_ERROR_TYPE_DEBUG, "  cstate: %u\n", c->state);
     if (NULL != c->t) GMT_debug (c->t);
   }

Modified: gnunet/src/mesh/gnunet-service-mesh_peer.c
===================================================================
--- gnunet/src/mesh/gnunet-service-mesh_peer.c  2013-12-16 23:45:32 UTC (rev 
31452)
+++ gnunet/src/mesh/gnunet-service-mesh_peer.c  2013-12-17 00:06:15 UTC (rev 
31453)
@@ -225,6 +225,8 @@
   struct MeshPeer *peer = cls;
   struct MeshConnection *c = value;
 
+  LOG (GNUNET_ERROR_TYPE_DEBUG, "  notifying %s due to %s\n",
+       GMC_2s (c), GMP_2s (peer));
   GMC_notify_broken (c, peer);
 
   return GNUNET_YES;
@@ -287,7 +289,7 @@
     return;
   }
   if (myid == p->id)
-    LOG (GNUNET_ERROR_TYPE_DEBUG, "     (self)\n");
+    LOG (GNUNET_ERROR_TYPE_DEBUG, "     (self: %s)\n", GMP_2s (p));
   else
     LOG (GNUNET_ERROR_TYPE_DEBUG, "     %s\n", GMP_2s (p));