Merge branch 'net' of https://github.com/notsecure/ProjectTox-Core into notsecure-net

This commit is contained in:
irungentoo 2014-05-26 13:36:58 -04:00
commit 41af0e4547
No known key found for this signature in database
GPG Key ID: 10349DC9BED89E98

View File

@ -2257,8 +2257,9 @@ static void send_crypto_packets(Net_Crypto *c)
conn->packet_send_rate = CRYPTO_PACKET_MIN_RATE;
}
if (conn->packet_send_rate > CRYPTO_PACKET_BUFFER_SIZE * 2)
conn->packet_send_rate = CRYPTO_PACKET_BUFFER_SIZE * 2;
if (conn->sending != 0 && num_packets_array(&conn->send_array) < CRYPTO_MIN_QUEUE_LENGTH / 2) {
--conn->sending;
}
}
@ -2285,10 +2286,6 @@ static void send_crypto_packets(Net_Crypto *c)
conn->packets_resent += ret;
conn->packets_left -= ret;
}
if (conn->sending != 0 && num_packets_array(&conn->send_array) < CRYPTO_MIN_QUEUE_LENGTH / 2) {
--conn->sending;
}
}
}
}