diff options
Diffstat (limited to 'toxcore/Messenger.c')
-rw-r--r-- | toxcore/Messenger.c | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/toxcore/Messenger.c b/toxcore/Messenger.c index 81a347be..e48fa5fc 100644 --- a/toxcore/Messenger.c +++ b/toxcore/Messenger.c | |||
@@ -2342,19 +2342,24 @@ void do_messenger(Messenger *m) | |||
2342 | /* | 2342 | /* |
2343 | * functions to avoid excessive polling | 2343 | * functions to avoid excessive polling |
2344 | */ | 2344 | */ |
2345 | int wait_prepare_messenger(Messenger *m, uint8_t *data, uint16_t *lenptr) | 2345 | size_t wait_data_size() |
2346 | { | 2346 | { |
2347 | return networking_wait_prepare(m->net, sendqueue_total(m->net_crypto->lossless_udp), data, lenptr); | 2347 | return networking_wait_data_size(); |
2348 | } | 2348 | } |
2349 | 2349 | ||
2350 | int wait_execute_messenger(Messenger *m, uint8_t *data, uint16_t len, uint16_t milliseconds) | 2350 | int wait_prepare_messenger(Messenger *m, uint8_t *data) |
2351 | { | 2351 | { |
2352 | return networking_wait_execute(data, len, milliseconds); | 2352 | return networking_wait_prepare(m->net, sendqueue_total(m->net_crypto->lossless_udp), data); |
2353 | }; | 2353 | } |
2354 | |||
2355 | int wait_execute_messenger(uint8_t *data, long seconds, long microseconds) | ||
2356 | { | ||
2357 | return networking_wait_execute(data, seconds, microseconds); | ||
2358 | } | ||
2354 | 2359 | ||
2355 | void wait_cleanup_messenger(Messenger *m, uint8_t *data, uint16_t len) | 2360 | int wait_cleanup_messenger(Messenger *m, uint8_t *data) |
2356 | { | 2361 | { |
2357 | networking_wait_cleanup(m->net, data, len); | 2362 | return networking_wait_cleanup(m->net, data); |
2358 | } | 2363 | } |
2359 | 2364 | ||
2360 | /* new messenger format for load/save, more robust and forward compatible */ | 2365 | /* new messenger format for load/save, more robust and forward compatible */ |