aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBart Polot <bart@net.in.tum.de>2013-12-04 16:45:03 +0000
committerBart Polot <bart@net.in.tum.de>2013-12-04 16:45:03 +0000
commit80d214d5c173c4cf9730966968f74f85ab9cc299 (patch)
tree0e21a1f331844317fa086fa566d1ed505ca7cb25 /src
parentcbe89b1c5e2743f0606867a317cc91bda30d90f7 (diff)
downloadgnunet-80d214d5c173c4cf9730966968f74f85ab9cc299.tar.gz
gnunet-80d214d5c173c4cf9730966968f74f85ab9cc299.zip
- don't mark duplicate channel_confirm messages as error
Diffstat (limited to 'src')
-rw-r--r--src/mesh/gnunet-service-mesh_channel.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/mesh/gnunet-service-mesh_channel.c b/src/mesh/gnunet-service-mesh_channel.c
index 0775c8fa3..123b208a0 100644
--- a/src/mesh/gnunet-service-mesh_channel.c
+++ b/src/mesh/gnunet-service-mesh_channel.c
@@ -1053,10 +1053,12 @@ static void
1053channel_confirm (struct MeshChannel *ch, int fwd) 1053channel_confirm (struct MeshChannel *ch, int fwd)
1054{ 1054{
1055 struct MeshChannelReliability *rel; 1055 struct MeshChannelReliability *rel;
1056 enum MeshChannelState oldstate;
1056 1057
1057 LOG (GNUNET_ERROR_TYPE_DEBUG, 1058 LOG (GNUNET_ERROR_TYPE_DEBUG,
1058 " channel confirm %s %s:%X\n", 1059 " channel confirm %s %s:%X\n",
1059 GM_f2s (fwd), GMT_2s (ch->t), ch->gid); 1060 GM_f2s (fwd), GMT_2s (ch->t), ch->gid);
1061 oldstate = ch->state;
1060 ch->state = MESH_CHANNEL_READY; 1062 ch->state = MESH_CHANNEL_READY;
1061 1063
1062 rel = fwd ? ch->root_rel : ch->dest_rel; 1064 rel = fwd ? ch->root_rel : ch->dest_rel;
@@ -1077,7 +1079,7 @@ channel_confirm (struct MeshChannel *ch, int fwd)
1077 else 1079 else
1078 { 1080 {
1079 /* We SHOULD have been trying to retransmit this! */ 1081 /* We SHOULD have been trying to retransmit this! */
1080 GNUNET_break (0); 1082 GNUNET_break (oldstate == MESH_CHANNEL_READY);
1081 } 1083 }
1082 1084
1083 /* In case of a FWD ACK (SYNACK) send a BCK ACK (ACK). */ 1085 /* In case of a FWD ACK (SYNACK) send a BCK ACK (ACK). */