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

[gnunet]

Author: bartpolot
Date: 2014-12-15 08:17:31 +0100 (Mon, 15 Dec 2014)
New Revision: 34573

Modified:
   gnunet/src/cadet/gnunet-service-cadet_tunnel.c
Log:
- fix minor t->estate issues for better debug traceability

Modified: gnunet/src/cadet/gnunet-service-cadet_tunnel.c
===================================================================
--- gnunet/src/cadet/gnunet-service-cadet_tunnel.c      2014-12-15 07:17:30 UTC 
(rev 34572)
+++ gnunet/src/cadet/gnunet-service-cadet_tunnel.c      2014-12-15 07:17:31 UTC 
(rev 34573)
@@ -745,7 +745,7 @@
   LOG (GNUNET_ERROR_TYPE_DEBUG, "  t_decrypt with %s\n",
        GNUNET_h2s ((struct GNUNET_HashCode *) &t->d_key));
 #endif
-  if (t->estate == CADET_TUNNEL_KEY_UNINITIALIZED)
+  if (CADET_TUNNEL_KEY_UNINITIALIZED == t->estate)
   {
     GNUNET_STATISTICS_update (stats, "# non decryptable data", 1, GNUNET_NO);
     LOG (GNUNET_ERROR_TYPE_WARNING,
@@ -1467,12 +1467,12 @@
   switch (t->estate)
   {
     case CADET_TUNNEL_KEY_UNINITIALIZED:
-      t->estate = CADET_TUNNEL_KEY_SENT;
+      GCT_change_estate (t, CADET_TUNNEL_KEY_SENT);
       break;
     case CADET_TUNNEL_KEY_SENT:
       break;
     case CADET_TUNNEL_KEY_OK:
-      t->estate = CADET_TUNNEL_KEY_REKEY;
+      GCT_change_estate (t, CADET_TUNNEL_KEY_REKEY);
       /* fall-thru */
     case CADET_TUNNEL_KEY_PING:
     case CADET_TUNNEL_KEY_REKEY:
@@ -2833,7 +2833,7 @@
 {
   if (NULL == t)
   {
-    GNUNET_assert (0);
+    GNUNET_break (0);
     return (enum CadetTunnelEState) -1;
   }
   return t->estate;