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

[gnunet]

Author: bartpolot
Date: 2016-10-26 06:20:55 +0200 (Wed, 26 Oct 2016)
New Revision: 38211

Modified:
   gnunet/src/cadet/gnunet-service-cadet_connection.c
Log:
- don't send ACK con CREATE if one is queued

Modified: gnunet/src/cadet/gnunet-service-cadet_connection.c
===================================================================
--- gnunet/src/cadet/gnunet-service-cadet_connection.c  2016-10-26 04:20:54 UTC 
(rev 38210)
+++ gnunet/src/cadet/gnunet-service-cadet_connection.c  2016-10-26 04:20:55 UTC 
(rev 38211)
@@ -2036,8 +2036,8 @@
 
     if (CADET_TUNNEL_NEW == GCT_get_cstate (c->t))
       GCT_change_cstate (c->t,  CADET_TUNNEL_WAITING);
-
-    send_connection_ack (c, GNUNET_NO);
+    if (NULL == c->maintenance_q)
+      send_connection_ack (c, GNUNET_NO);
     if (CADET_CONNECTION_SENT == c->state)
       connection_change_state (c, CADET_CONNECTION_ACK);
   }
@@ -2202,10 +2202,8 @@
 
   GCC_check_connections ();
   log_message (&msg->header, peer, &msg->cid);
-  LOG (GNUNET_ERROR_TYPE_DEBUG, "  regarding %s\n",
-              GNUNET_i2s (&msg->peer1));
-  LOG (GNUNET_ERROR_TYPE_DEBUG, "  regarding %s\n",
-              GNUNET_i2s (&msg->peer2));
+  LOG (GNUNET_ERROR_TYPE_DEBUG, "  regarding %s\n", GNUNET_i2s (&msg->peer1));
+  LOG (GNUNET_ERROR_TYPE_DEBUG, "  regarding %s\n", GNUNET_i2s (&msg->peer2));
   c = connection_get (&msg->cid);
   if (NULL == c)
   {