diff options
| author | mannol <eniz_vukovic@hotmail.com> | 2014-07-21 04:10:05 +0200 |
|---|---|---|
| committer | mannol <eniz_vukovic@hotmail.com> | 2014-07-21 04:10:05 +0200 |
| commit | 79115259a81dc958041f18573f34299c083cebea (patch) | |
| tree | 594fbf60dc01e2aa78c775c4e2d9977c5b18752f /toxcore/net_crypto.h | |
| parent | 2ca2baf120c5dd4dcdd9c450ef35560b0726136f (diff) | |
| parent | b63e4ad88fb93820fb740372f36d74c65b8b7b81 (diff) | |
Fixed conflicts
Diffstat (limited to 'toxcore/net_crypto.h')
| -rw-r--r-- | toxcore/net_crypto.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/toxcore/net_crypto.h b/toxcore/net_crypto.h index 4fed0000..2bc9a716 100644 --- a/toxcore/net_crypto.h +++ b/toxcore/net_crypto.h | |||
| @@ -143,9 +143,9 @@ typedef struct { | |||
| 143 | uint32_t packets_left; | 143 | uint32_t packets_left; |
| 144 | uint64_t last_packets_left_set; | 144 | uint64_t last_packets_left_set; |
| 145 | 145 | ||
| 146 | double dropped, drop_ignore, rate_increase; | 146 | double dropped, drop_ignore, rate_increase, last_send_rate; |
| 147 | uint64_t drop_ignore_start, rate_increase_stop_start; | 147 | uint64_t drop_ignore_start, rate_increase_stop_start; |
| 148 | uint32_t packets_resent; | 148 | uint32_t packets_resent, last_queue_size, packets_sent, last_packets_sent; |
| 149 | 149 | ||
| 150 | uint8_t sending; /* indicates if data is being sent or not. */ | 150 | uint8_t sending; /* indicates if data is being sent or not. */ |
| 151 | 151 | ||