summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBart Polot <bart@net.in.tum.de>2016-10-26 04:20:55 +0000
committerBart Polot <bart@net.in.tum.de>2016-10-26 04:20:55 +0000
commit49f306406b3247f99dc71b420880aaebd45ea74f (patch)
tree8d69f5cbe6c5d3848eee5857b0d0bb466b48a505
parentbbdbdc3a614060c7d2f156985ae1fb76209cebc9 (diff)
downloadgnunet-49f306406b3247f99dc71b420880aaebd45ea74f.tar.gz
gnunet-49f306406b3247f99dc71b420880aaebd45ea74f.zip
- don't send ACK con CREATE if one is queued
-rw-r--r--src/cadet/gnunet-service-cadet_connection.c10
1 files 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,
2036 2036
2037 if (CADET_TUNNEL_NEW == GCT_get_cstate (c->t)) 2037 if (CADET_TUNNEL_NEW == GCT_get_cstate (c->t))
2038 GCT_change_cstate (c->t, CADET_TUNNEL_WAITING); 2038 GCT_change_cstate (c->t, CADET_TUNNEL_WAITING);
2039 2039 if (NULL == c->maintenance_q)
2040 send_connection_ack (c, GNUNET_NO); 2040 send_connection_ack (c, GNUNET_NO);
2041 if (CADET_CONNECTION_SENT == c->state) 2041 if (CADET_CONNECTION_SENT == c->state)
2042 connection_change_state (c, CADET_CONNECTION_ACK); 2042 connection_change_state (c, CADET_CONNECTION_ACK);
2043 } 2043 }
@@ -2202,10 +2202,8 @@ GCC_handle_broken (struct CadetPeer *peer,
2202 2202
2203 GCC_check_connections (); 2203 GCC_check_connections ();
2204 log_message (&msg->header, peer, &msg->cid); 2204 log_message (&msg->header, peer, &msg->cid);
2205 LOG (GNUNET_ERROR_TYPE_DEBUG, " regarding %s\n", 2205 LOG (GNUNET_ERROR_TYPE_DEBUG, " regarding %s\n", GNUNET_i2s (&msg->peer1));
2206 GNUNET_i2s (&msg->peer1)); 2206 LOG (GNUNET_ERROR_TYPE_DEBUG, " regarding %s\n", GNUNET_i2s (&msg->peer2));
2207 LOG (GNUNET_ERROR_TYPE_DEBUG, " regarding %s\n",
2208 GNUNET_i2s (&msg->peer2));
2209 c = connection_get (&msg->cid); 2207 c = connection_get (&msg->cid);
2210 if (NULL == c) 2208 if (NULL == c)
2211 { 2209 {