[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r31421 - gnunet/src/mesh
From: |
gnunet |
Subject: |
[GNUnet-SVN] r31421 - gnunet/src/mesh |
Date: |
Mon, 16 Dec 2013 17:07:13 +0100 |
Author: bartpolot
Date: 2013-12-16 17:07:13 +0100 (Mon, 16 Dec 2013)
New Revision: 31421
Modified:
gnunet/src/mesh/gnunet-service-mesh_tunnel.c
gnunet/src/mesh/gnunet-service-mesh_tunnel.h
Log:
- debug info
Modified: gnunet/src/mesh/gnunet-service-mesh_tunnel.c
===================================================================
--- gnunet/src/mesh/gnunet-service-mesh_tunnel.c 2013-12-16 16:07:00 UTC
(rev 31420)
+++ gnunet/src/mesh/gnunet-service-mesh_tunnel.c 2013-12-16 16:07:13 UTC
(rev 31421)
@@ -341,8 +341,6 @@
static int
is_ready (struct MeshTunnel3 *t)
{
- LOG (GNUNET_ERROR_TYPE_DEBUG, " ready: cs=%s, es=%s\n",
- cstate2s (t->cstate), estate2s (t->estate));
return (MESH_TUNNEL3_READY == t->cstate
&& MESH_TUNNEL3_KEY_OK == t->estate)
|| GMT_is_loopback (t);
@@ -746,7 +744,11 @@
c = tunnel_get_connection (t);
if (NULL == c)
{
- GNUNET_break (GNUNET_YES == t->destroy);
+ if (GNUNET_YES == t->destroy || MESH_TUNNEL3_SEARCHING != t->cstate)
+ {
+ GNUNET_break (0);
+ GMT_debug (t);
+ }
return NULL;
}
type = ntohs (message->type);
@@ -871,8 +873,7 @@
if (NULL == t->connection_head)
{
GNUNET_break (MESH_TUNNEL3_SEARCHING == t->cstate);
- LOG (GNUNET_ERROR_TYPE_DEBUG, " tunnel %s connection state %s\n",
- GMT_2s (t), cstate2s (t->cstate));
+ GMT_debug (t);
return;
}
@@ -2466,3 +2467,34 @@
return GMP_2s (t->peer);
}
+
+
+/**
+ * Log all possible info about the tunnel state.
+ *
+ * @param t Tunnel to debug.
+ */
+void
+GMT_debug (const struct MeshTunnel3 *t)
+{
+ struct MeshTChannel *iterch;
+ struct MeshTConnection *iterc;
+
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "DEBUG %s\n", GMT_2s (t));
+ LOG (GNUNET_ERROR_TYPE_DEBUG, " cstate %s, estate %s\n",
+ cstate2s (t->cstate), estate2s (t->estate));
+
+ LOG (GNUNET_ERROR_TYPE_DEBUG, " channels:\n");
+ for (iterch = t->channel_head; NULL != iterch; iterch = iterch->next)
+ {
+ LOG (GNUNET_ERROR_TYPE_DEBUG, " - %s\n", GMCH_2s (iterch->ch));
+ }
+
+ LOG (GNUNET_ERROR_TYPE_DEBUG, " connections:\n");
+ for (iterc = t->connection_head; NULL != iterc; iterc = iterc->next)
+ {
+ LOG (GNUNET_ERROR_TYPE_DEBUG, " - %s\n", GMC_2s (iterc->c));
+ }
+
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "DEBUG END\n");
+}
Modified: gnunet/src/mesh/gnunet-service-mesh_tunnel.h
===================================================================
--- gnunet/src/mesh/gnunet-service-mesh_tunnel.h 2013-12-16 16:07:00 UTC
(rev 31420)
+++ gnunet/src/mesh/gnunet-service-mesh_tunnel.h 2013-12-16 16:07:13 UTC
(rev 31421)
@@ -455,6 +455,14 @@
const char *
GMT_2s (const struct MeshTunnel3 *t);
+/**
+ * Log all possible info about the tunnel state.
+ *
+ * @param t Tunnel to debug.
+ */
+void
+GMT_debug (const struct MeshTunnel3 *t);
+
#if 0 /* keep Emacsens' auto-indent happy */
{
#endif
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r31421 - gnunet/src/mesh,
gnunet <=