- refactor mesg sent

diff --git a/src/mesh/gnunet-service-mesh_channel.c b/src/mesh/gnunet-service-mesh_channel.c
index ce54571cb32a18a9675a4a097167846370a7aabd..553bddc5847ad2897cf6a7c6e7de5c408c7a0c42 100644 (file)
--- a/src/mesh/gnunet-service-mesh_channel.c
+++ b/src/mesh/gnunet-service-mesh_channel.c
@@ -722,23 +722,19 @@ ch_message_sent (void *cls,
 
 
     case GNUNET_MESSAGE_TYPE_MESH_DATA_ACK:
+    case GNUNET_MESSAGE_TYPE_MESH_CHANNEL_CREATE:
       rel = ch_q->rel;
       GNUNET_assert (rel->uniq == ch_q);
       rel->uniq = NULL;
-      break;
 
-
-    case GNUNET_MESSAGE_TYPE_MESH_CHANNEL_CREATE:
-      rel = ch_q->rel;
-      GNUNET_assert (rel->uniq == ch_q);
-      if (MESH_CHANNEL_READY != rel->ch->state)
+      if (MESH_CHANNEL_READY != rel->ch->state
+          && GNUNET_MESSAGE_TYPE_MESH_CHANNEL_CREATE == type)
       {
         GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == rel->retry_task);
         rel->retry_timer = GNUNET_TIME_STD_BACKOFF (rel->retry_timer);
         rel->retry_task = GNUNET_SCHEDULER_add_delayed (rel->retry_timer,
                                                         &channel_recreate, rel);
       }
-      rel->uniq = NULL;
       break;