More file transfer improvements.

This commit is contained in:
irungentoo 2015-11-21 10:05:39 -05:00
parent 608ee07c96
commit 25843bf141
No known key found for this signature in database
GPG Key ID: 10349DC9BED89E98
2 changed files with 7 additions and 2 deletions

View File

@ -2235,7 +2235,12 @@ static void send_crypto_packets(Net_Crypto *c)
total_resent += conn->last_num_packets_resent[ind]; total_resent += conn->last_num_packets_resent[ind];
} }
total_sent -= sum; if (sum > 0) {
total_sent -= sum;
} else {
if (total_resent > -sum)
total_resent = -sum;
}
/* if queue is too big only allow resending packets. */ /* if queue is too big only allow resending packets. */
uint32_t npackets = num_packets_array(&conn->send_array); uint32_t npackets = num_packets_array(&conn->send_array);

View File

@ -80,7 +80,7 @@
/* Base current transfer speed on last CONGESTION_QUEUE_ARRAY_SIZE number of points taken /* Base current transfer speed on last CONGESTION_QUEUE_ARRAY_SIZE number of points taken
at the dT defined in net_crypto.c */ at the dT defined in net_crypto.c */
#define CONGESTION_QUEUE_ARRAY_SIZE 24 #define CONGESTION_QUEUE_ARRAY_SIZE 12
#define CONGESTION_LAST_SENT_ARRAY_SIZE (CONGESTION_QUEUE_ARRAY_SIZE * 2) #define CONGESTION_LAST_SENT_ARRAY_SIZE (CONGESTION_QUEUE_ARRAY_SIZE * 2)
/* Default connection ping in ms. */ /* Default connection ping in ms. */