aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBart Polot <bart@net.in.tum.de>2013-12-12 12:24:11 +0000
committerBart Polot <bart@net.in.tum.de>2013-12-12 12:24:11 +0000
commit2ef2006807bff52d2dfbf3d6fba58b9985163bc1 (patch)
treea36d6af04770eb458910d9edd56b0e52838b877a /src
parentfec80b5d6dcd240ddb64ddeda352ecbb56de9261 (diff)
downloadgnunet-2ef2006807bff52d2dfbf3d6fba58b9985163bc1.tar.gz
gnunet-2ef2006807bff52d2dfbf3d6fba58b9985163bc1.zip
- don't send ack on channels to be destroyed
Diffstat (limited to 'src')
-rw-r--r--src/mesh/gnunet-service-mesh_channel.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/mesh/gnunet-service-mesh_channel.c b/src/mesh/gnunet-service-mesh_channel.c
index 69b158303..d86e4fa01 100644
--- a/src/mesh/gnunet-service-mesh_channel.c
+++ b/src/mesh/gnunet-service-mesh_channel.c
@@ -595,7 +595,13 @@ static void
595send_client_ack (struct MeshChannel *ch, int fwd) 595send_client_ack (struct MeshChannel *ch, int fwd)
596{ 596{
597 struct MeshChannelReliability *rel = fwd ? ch->root_rel : ch->dest_rel; 597 struct MeshChannelReliability *rel = fwd ? ch->root_rel : ch->dest_rel;
598 struct MeshClient *c = fwd ? ch->root : ch->dest;
598 599
600 if (NULL == c)
601 {
602 GNUNET_break (GNUNET_NO != ch->destroy);
603 return;
604 }
599 LOG (GNUNET_ERROR_TYPE_DEBUG, 605 LOG (GNUNET_ERROR_TYPE_DEBUG,
600 " sending %s ack to client on channel %s\n", 606 " sending %s ack to client on channel %s\n",
601 GM_f2s (fwd), GMCH_2s (ch)); 607 GM_f2s (fwd), GMCH_2s (ch));
@@ -613,7 +619,7 @@ send_client_ack (struct MeshChannel *ch, int fwd)
613 } 619 }
614 rel->client_allowed = GNUNET_YES; 620 rel->client_allowed = GNUNET_YES;
615 621
616 GML_send_ack (fwd ? ch->root : ch->dest, fwd ? ch->lid_root : ch->lid_dest); 622 GML_send_ack (c, fwd ? ch->lid_root : ch->lid_dest);
617} 623}
618 624
619 625