From 49f306406b3247f99dc71b420880aaebd45ea74f Mon Sep 17 00:00:00 2001 From: Bart Polot Date: Wed, 26 Oct 2016 04:20:55 +0000 Subject: [PATCH] - don't send ACK con CREATE if one is queued --- src/cadet/gnunet-service-cadet_connection.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/cadet/gnunet-service-cadet_connection.c b/src/cadet/gnunet-service-cadet_connection.c index 41ecafa05..32ce49fc8 100644 --- a/src/cadet/gnunet-service-cadet_connection.c +++ b/src/cadet/gnunet-service-cadet_connection.c @@ -2036,8 +2036,8 @@ GCC_handle_create (struct CadetPeer *peer, 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_handle_broken (struct CadetPeer *peer, 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) { -- 2.25.1