[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r28901 - gnunet/src/mesh
From: |
gnunet |
Subject: |
[GNUnet-SVN] r28901 - gnunet/src/mesh |
Date: |
Thu, 29 Aug 2013 18:13:29 +0200 |
Author: bartpolot
Date: 2013-08-29 18:13:29 +0200 (Thu, 29 Aug 2013)
New Revision: 28901
Modified:
gnunet/src/mesh/gnunet-service-mesh-enc.c
Log:
- sync
Modified: gnunet/src/mesh/gnunet-service-mesh-enc.c
===================================================================
--- gnunet/src/mesh/gnunet-service-mesh-enc.c 2013-08-29 15:47:47 UTC (rev
28900)
+++ gnunet/src/mesh/gnunet-service-mesh-enc.c 2013-08-29 16:13:29 UTC (rev
28901)
@@ -2920,6 +2920,38 @@
return GNUNET_CONTAINER_multihashmap32_get (c->own_channels, chid);
}
+
+static void
+channel_debug (struct MeshChannel *ch)
+{
+ if (NULL == ch)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "*** DEBUG NULL CHANNEL ***\n");
+ return;
+ }
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Channel %X\n", ch->gid);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " root %p/%p\n",
+ ch->root, ch->root_rel);
+ if (NULL != ch->root)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " cli %u\n", ch->root->id);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " ready %s\n",
+ ch->root_rel->client_ready ? "YES" : "NO");
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " id %X\n", ch->lid_root);
+ }
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " root %p/%p\n",
+ ch->dest, ch->dest_rel);
+ if (NULL != ch->dest)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " cli %u\n", ch->dest->id);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " ready %s\n",
+ ch->dest_rel->client_ready ? "YES" : "NO");
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " id %X\n", ch->lid_dest);
+ }
+
+}
+
+
/**
* Search for a tunnel by global ID using full PeerIdentities.
*
@@ -3747,8 +3779,7 @@
if (NULL == c || connection_is_terminal (c, fwd))
{
- GNUNET_assert (NULL != ch);
- buffer = tunnel_get_buffer (ch->t, fwd);
+ buffer = tunnel_get_buffer (NULL == c ? ch->t : c->t, fwd);
}
else
{
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r28901 - gnunet/src/mesh,
gnunet <=