summaryrefslogtreecommitdiff
path: root/toxcore
diff options
context:
space:
mode:
authorirungentoo <irungentoo@gmail.com>2014-07-14 16:23:19 -0400
committerirungentoo <irungentoo@gmail.com>2014-07-14 16:23:19 -0400
commit4da8664a1521f2feeafbe8c036380c670cbc6d32 (patch)
treebe10411f11e7fdbfe8407c69f5a5a987d1249e36 /toxcore
parent0244bd596deaba90bcf9282e1709ea5f25b328ca (diff)
Packets can now be sent from the connection status callback.
Diffstat (limited to 'toxcore')
-rw-r--r--toxcore/net_crypto.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/toxcore/net_crypto.c b/toxcore/net_crypto.c
index bb1bbe05..10921abb 100644
--- a/toxcore/net_crypto.c
+++ b/toxcore/net_crypto.c
@@ -1149,11 +1149,11 @@ static int handle_data_packet_helper(const Net_Crypto *c, int crypt_connection_i
1149 } 1149 }
1150 1150
1151 if (conn->status == CRYPTO_CONN_NOT_CONFIRMED) { 1151 if (conn->status == CRYPTO_CONN_NOT_CONFIRMED) {
1152 if (conn->connection_status_callback)
1153 conn->connection_status_callback(conn->connection_status_callback_object, conn->connection_status_callback_id, 1);
1154
1155 clear_temp_packet(c, crypt_connection_id); 1152 clear_temp_packet(c, crypt_connection_id);
1156 conn->status = CRYPTO_CONN_ESTABLISHED; 1153 conn->status = CRYPTO_CONN_ESTABLISHED;
1154
1155 if (conn->connection_status_callback)
1156 conn->connection_status_callback(conn->connection_status_callback_object, conn->connection_status_callback_id, 1);
1157 } 1157 }
1158 1158
1159 return 0; 1159 return 0;
@@ -2252,7 +2252,8 @@ static void send_crypto_packets(Net_Crypto *c)
2252 2252
2253 /* additional step: adjust the send rate based on the size change of the send queue */ 2253 /* additional step: adjust the send rate based on the size change of the send queue */
2254 uint32_t queue_size = num_packets_array(&conn->send_array); 2254 uint32_t queue_size = num_packets_array(&conn->send_array);
2255 if(queue_size > conn->packet_send_rate && queue_size > conn->last_queue_size) { 2255
2256 if (queue_size > conn->packet_send_rate && queue_size > conn->last_queue_size) {
2256 conn->rate_increase = 0; 2257 conn->rate_increase = 0;
2257 conn->packets_resent = conn->packets_sent; 2258 conn->packets_resent = conn->packets_sent;
2258 } 2259 }