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

[gnunet]

Author: bartpolot
Date: 2013-11-30 02:31:11 +0100 (Sat, 30 Nov 2013)
New Revision: 30989

Modified:
   gnunet/src/mesh/gnunet-service-mesh_channel.c
Log:
- initialize timers


Modified: gnunet/src/mesh/gnunet-service-mesh_channel.c
===================================================================
--- gnunet/src/mesh/gnunet-service-mesh_channel.c       2013-11-30 01:17:48 UTC 
(rev 30988)
+++ gnunet/src/mesh/gnunet-service-mesh_channel.c       2013-11-30 01:31:11 UTC 
(rev 30989)
@@ -733,7 +733,10 @@
       GNUNET_assert (rel->uniq == ch_q);
       if (MESH_CHANNEL_READY != rel->ch->state)
       {
+        struct GNUNET_TIME_Relative delay;
+
         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);
       }
@@ -1041,6 +1044,7 @@
 
   rel = fwd ? ch->root_rel : ch->dest_rel;
   rel->client_ready = GNUNET_YES;
+  rel->expected_delay = rel->retry_timer;
   send_client_ack (ch, fwd);
 
   if (GNUNET_SCHEDULER_NO_TASK != rel->retry_task)
@@ -1732,6 +1736,7 @@
   /* In unreliable channels, we'll use the DLL to buffer BCK data */
   ch->root_rel = GNUNET_new (struct MeshChannelReliability);
   ch->root_rel->ch = ch;
+  ch->root_rel->retry_timer = GNUNET_TIME_UNIT_SECONDS;
   ch->root_rel->expected_delay.rel_value_us = 0;
 
   LOG (GNUNET_ERROR_TYPE_DEBUG, "CREATED CHANNEL %s\n", GMCH_2s (ch));