aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBart Polot <bart@net.in.tum.de>2013-09-05 03:01:30 +0000
committerBart Polot <bart@net.in.tum.de>2013-09-05 03:01:30 +0000
commit8f7c2eb054f228bf04dd55b3bf3880c5b1613301 (patch)
tree91f04e67d2c65a48df822afe731655841fb45159 /src
parent25aee690c718ffe06e24642b70151694ca59be75 (diff)
downloadgnunet-8f7c2eb054f228bf04dd55b3bf3880c5b1613301.tar.gz
gnunet-8f7c2eb054f228bf04dd55b3bf3880c5b1613301.zip
- record channel number correctly
Diffstat (limited to 'src')
-rw-r--r--src/mesh/gnunet-service-mesh-enc.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/mesh/gnunet-service-mesh-enc.c b/src/mesh/gnunet-service-mesh-enc.c
index 1f4bfe4ea..902ad9379 100644
--- a/src/mesh/gnunet-service-mesh-enc.c
+++ b/src/mesh/gnunet-service-mesh-enc.c
@@ -4485,7 +4485,11 @@ channel_new (struct MeshTunnel2 *t,
4485 if (NULL != owner) 4485 if (NULL != owner)
4486 { 4486 {
4487 while (NULL != channel_get (t, t->next_chid)) 4487 while (NULL != channel_get (t, t->next_chid))
4488 {
4489 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Channel %u exists (%p)...\n",
4490 t->next_chid, channel_get (t, t->next_chid));
4488 t->next_chid = (t->next_chid + 1) & ~GNUNET_MESH_LOCAL_CHANNEL_ID_CLI; 4491 t->next_chid = (t->next_chid + 1) & ~GNUNET_MESH_LOCAL_CHANNEL_ID_CLI;
4492 }
4489 ch->gid = t->next_chid; 4493 ch->gid = t->next_chid;
4490 t->next_chid = (t->next_chid + 1) & ~GNUNET_MESH_LOCAL_CHANNEL_ID_CLI; 4494 t->next_chid = (t->next_chid + 1) & ~GNUNET_MESH_LOCAL_CHANNEL_ID_CLI;
4491 4495
@@ -5148,7 +5152,8 @@ handle_data (struct MeshTunnel2 *t, const struct GNUNET_MESH_Data *msg, int fwd)
5148 if (NULL == ch) 5152 if (NULL == ch)
5149 { 5153 {
5150 GNUNET_STATISTICS_update (stats, "# data on unknown channel", 1, GNUNET_NO); 5154 GNUNET_STATISTICS_update (stats, "# data on unknown channel", 1, GNUNET_NO);
5151 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "WARNING channel unknown\n"); 5155 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "WARNING channel %u unknown\n",
5156 ntohl (msg->chid));
5152 return; 5157 return;
5153 } 5158 }
5154 5159
@@ -5664,6 +5669,7 @@ handle_channel_create (struct MeshTunnel2 *t,
5664 5669
5665 /* Check if channel exists */ 5670 /* Check if channel exists */
5666 chid = ntohl (msg->chid); 5671 chid = ntohl (msg->chid);
5672 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " chid %u\n", chid);
5667 ch = channel_get (t, chid); 5673 ch = channel_get (t, chid);
5668 if (NULL != ch) 5674 if (NULL != ch)
5669 { 5675 {
@@ -5680,6 +5686,7 @@ handle_channel_create (struct MeshTunnel2 *t,
5680 { 5686 {
5681 /* Create channel */ 5687 /* Create channel */
5682 ch = channel_new (t, NULL, 0); 5688 ch = channel_new (t, NULL, 0);
5689 ch->gid = chid;
5683 channel_set_options (ch, ntohl (msg->opt)); 5690 channel_set_options (ch, ntohl (msg->opt));
5684 } 5691 }
5685 5692