[GNUnet-SVN] r34597 - gnunet/src/cadet

[gnunet]

Author: bartpolot
Date: 2014-12-15 08:18:03 +0100 (Mon, 15 Dec 2014)
New Revision: 34597

Modified:
   gnunet/src/cadet/gnunet-service-cadet_tunnel.c
Log:
- send queued data the first time

Modified: gnunet/src/cadet/gnunet-service-cadet_tunnel.c
===================================================================
--- gnunet/src/cadet/gnunet-service-cadet_tunnel.c      2014-12-15 07:18:02 UTC 
(rev 34596)
+++ gnunet/src/cadet/gnunet-service-cadet_tunnel.c      2014-12-15 07:18:03 UTC 
(rev 34597)
@@ -2234,22 +2234,24 @@
 void
 GCT_change_estate (struct CadetTunnel* t, enum CadetTunnelEState state)
 {
+  enum CadetTunnelEState old;
+
   if (NULL == t)
     return;
 
+  old = t->estate;
+  t->estate = state;
   LOG (GNUNET_ERROR_TYPE_DEBUG, "Tunnel %s estate was %s\n",
+       GCP_2s (t->peer), estate2s (old));
+  LOG (GNUNET_ERROR_TYPE_DEBUG, "Tunnel %s estate is now %s\n",
        GCP_2s (t->peer), estate2s (t->estate));
-  LOG (GNUNET_ERROR_TYPE_DEBUG, "Tunnel %s estate is now %s\n",
-       GCP_2s (t->peer), estate2s (state));
 
   /* Send queued data if enc state changes to OK */
   if (myid != GCP_get_short_id (t->peer) &&
-      CADET_TUNNEL_KEY_OK != t->estate && CADET_TUNNEL_KEY_OK == state)
+      CADET_TUNNEL_KEY_OK != old && CADET_TUNNEL_KEY_OK == t->estate)
   {
     send_queued_data (t);
   }
-
-  t->estate = state;
 }