[GNUnet-SVN] r31044 - gnunet/src/mesh

[gnunet]

Author: bartpolot
Date: 2013-12-04 17:45:03 +0100 (Wed, 04 Dec 2013)
New Revision: 31044

Modified:
   gnunet/src/mesh/gnunet-service-mesh_channel.c
Log:
- don't mark duplicate channel_confirm messages as error


Modified: gnunet/src/mesh/gnunet-service-mesh_channel.c
===================================================================
--- gnunet/src/mesh/gnunet-service-mesh_channel.c       2013-12-04 14:45:17 UTC 
(rev 31043)
+++ gnunet/src/mesh/gnunet-service-mesh_channel.c       2013-12-04 16:45:03 UTC 
(rev 31044)
@@ -1053,10 +1053,12 @@
 channel_confirm (struct MeshChannel *ch, int fwd)
 {
   struct MeshChannelReliability *rel;
+  enum MeshChannelState oldstate;
 
   LOG (GNUNET_ERROR_TYPE_DEBUG,
               "  channel confirm %s %s:%X\n",
               GM_f2s (fwd), GMT_2s (ch->t), ch->gid);
+  oldstate = ch->state;
   ch->state = MESH_CHANNEL_READY;
 
   rel = fwd ? ch->root_rel : ch->dest_rel;
@@ -1077,7 +1079,7 @@
   else
   {
     /* We SHOULD have been trying to retransmit this! */
-    GNUNET_break (0);
+    GNUNET_break (oldstate == MESH_CHANNEL_READY);
   }
 
   /* In case of a FWD ACK (SYNACK) send a BCK ACK (ACK). */