From 355c55f745f507934deb236083db41ea2ee24312 Mon Sep 17 00:00:00 2001 From: "Coren[m]" Date: Sun, 6 Oct 2013 16:37:02 +0200 Subject: sendqueue_length no longer determines if we check for socket-can-write, but sendpacket() sets a timestamp if it happened network.*: - sendpacket(): checks result and on EAGAIN, stores time of this event - networking_wait_prepare(): uses the time if set to check up to 500ms later for the socket to be writeable again - networking_wait_cleanup(): clears the time if the socket was writeable - fixed some accidental tabs Messenger.*, tox.*: - pass-through functions to reach networking_wait_cleanup() - fixed some accidental tabs --- toxcore/Messenger.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'toxcore/Messenger.c') diff --git a/toxcore/Messenger.c b/toxcore/Messenger.c index e4387fcb..dfd32d40 100644 --- a/toxcore/Messenger.c +++ b/toxcore/Messenger.c @@ -1394,14 +1394,19 @@ void doMessenger(Messenger *m) */ int waitprepareMessenger(Messenger *m, uint8_t *data, uint16_t *lenptr) { - return networking_wait_prepare(m->net, sendqueue_total(m->net_crypto->lossless_udp), data, lenptr); + return networking_wait_prepare(m->net, sendqueue_total(m->net_crypto->lossless_udp), data, lenptr); } int waitexecuteMessenger(Messenger *m, uint8_t *data, uint16_t len, uint16_t milliseconds) { - return networking_wait_execute(data, len, milliseconds); + return networking_wait_execute(data, len, milliseconds); }; +void waitcleanupMessenger(Messenger *m, uint8_t *data, uint16_t len) +{ + networking_wait_cleanup(m->net, data, len); +} + /* return size of the messenger data (for saving) */ uint32_t Messenger_size_old(Messenger *m) { -- cgit v1.2.3