projects
/
oweals
/
gnunet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- use variables to cound ch, conns
[oweals/gnunet.git]
/
src
/
mesh
/
gnunet-service-mesh_channel.c
diff --git
a/src/mesh/gnunet-service-mesh_channel.c
b/src/mesh/gnunet-service-mesh_channel.c
index c06ebef5f13411b57ff95e446b348736207423b8..06cf599d4ca6c89e5a9933eee2f47cb9a630a886 100644
(file)
--- a/
src/mesh/gnunet-service-mesh_channel.c
+++ b/
src/mesh/gnunet-service-mesh_channel.c
@@
-636,7
+636,7
@@
send_client_nack (struct MeshChannel *ch)
GNUNET_break (0);
return;
}
GNUNET_break (0);
return;
}
- GML_send_nack (ch->root, ch->lid_root);
+ GML_send_
channel_
nack (ch->root, ch->lid_root);
}
}
@@
-780,7
+780,8
@@
ch_message_sent (void *cls,
rel->uniq = NULL;
if (MESH_CHANNEL_READY != rel->ch->state
rel->uniq = NULL;
if (MESH_CHANNEL_READY != rel->ch->state
- && GNUNET_MESSAGE_TYPE_MESH_DATA_ACK != type)
+ && GNUNET_MESSAGE_TYPE_MESH_DATA_ACK != type
+ && GNUNET_NO == rel->ch->destroy)
{
GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == rel->retry_task);
LOG (GNUNET_ERROR_TYPE_DEBUG, "!!! STD BACKOFF %s\n",
{
GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == rel->retry_task);
LOG (GNUNET_ERROR_TYPE_DEBUG, "!!! STD BACKOFF %s\n",
@@
-1264,6
+1265,8
@@
handle_loopback (struct MeshChannel *ch,
{
case GNUNET_MESSAGE_TYPE_MESH_DATA:
/* Don't send hop ACK, wait for client to ACK */
{
case GNUNET_MESSAGE_TYPE_MESH_DATA:
/* Don't send hop ACK, wait for client to ACK */
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "!!! SEND loopback %u (%u)\n",
+ ntohl (((struct GNUNET_MESH_Data *) msgh)->mid), ntohs (msgh->size));
GMCH_handle_data (ch, (struct GNUNET_MESH_Data *) msgh, fwd);
break;
GMCH_handle_data (ch, (struct GNUNET_MESH_Data *) msgh, fwd);
break;
@@
-1349,11
+1352,11
@@
GMCH_destroy (struct MeshChannel *ch)
/**
/**
- * Get
channel
ID.
+ * Get
the channel's public
ID.
*
* @param ch Channel.
*
*
* @param ch Channel.
*
- * @return ID
+ * @return ID
used to identify the channel with the remote peer.
*/
MESH_ChannelNumber
GMCH_get_id (const struct MeshChannel *ch)
*/
MESH_ChannelNumber
GMCH_get_id (const struct MeshChannel *ch)
@@
-1910,7
+1913,8
@@
GMCH_handle_data (struct MeshChannel *ch,
( !GM_is_pid_bigger (rel->mid_recv, mid) &&
GM_is_pid_bigger (rel->mid_recv + 64, mid) ) )
{
( !GM_is_pid_bigger (rel->mid_recv, mid) &&
GM_is_pid_bigger (rel->mid_recv + 64, mid) ) )
{
- LOG (GNUNET_ERROR_TYPE_DEBUG, "!!! RECV %u\n", mid);
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "!!! RECV %u (%u)\n",
+ mid, ntohs (msg->header.size));
if (GNUNET_YES == ch->reliable)
{
/* Is this the exact next expected messasge? */
if (GNUNET_YES == ch->reliable)
{
/* Is this the exact next expected messasge? */