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

[gnunet]

Author: bartpolot
Date: 2013-11-30 02:57:54 +0100 (Sat, 30 Nov 2013)
New Revision: 30992

Modified:
   gnunet/src/mesh/gnunet-service-mesh_channel.c
Log:
- refactor mesg sent


Modified: gnunet/src/mesh/gnunet-service-mesh_channel.c
===================================================================
--- gnunet/src/mesh/gnunet-service-mesh_channel.c       2013-11-30 01:56:03 UTC 
(rev 30991)
+++ gnunet/src/mesh/gnunet-service-mesh_channel.c       2013-11-30 01:57:54 UTC 
(rev 30992)
@@ -722,23 +722,19 @@
 
 
     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;