diff options
author | Coren[m] <Break@Ocean> | 2013-10-06 16:37:02 +0200 |
---|---|---|
committer | Coren[m] <Break@Ocean> | 2013-10-06 16:37:02 +0200 |
commit | 355c55f745f507934deb236083db41ea2ee24312 (patch) | |
tree | d044f3a68eeb4bfe43a1a5e0be40cbec260d50fa /toxcore/Messenger.c | |
parent | 1331a32223da0090ab982eabd4e04f3d8e36b6af (diff) |
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
Diffstat (limited to 'toxcore/Messenger.c')
-rw-r--r-- | toxcore/Messenger.c | 9 |
1 files changed, 7 insertions, 2 deletions
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) | |||
1394 | */ | 1394 | */ |
1395 | int waitprepareMessenger(Messenger *m, uint8_t *data, uint16_t *lenptr) | 1395 | int waitprepareMessenger(Messenger *m, uint8_t *data, uint16_t *lenptr) |
1396 | { | 1396 | { |
1397 | return networking_wait_prepare(m->net, sendqueue_total(m->net_crypto->lossless_udp), data, lenptr); | 1397 | return networking_wait_prepare(m->net, sendqueue_total(m->net_crypto->lossless_udp), data, lenptr); |
1398 | } | 1398 | } |
1399 | 1399 | ||
1400 | int waitexecuteMessenger(Messenger *m, uint8_t *data, uint16_t len, uint16_t milliseconds) | 1400 | int waitexecuteMessenger(Messenger *m, uint8_t *data, uint16_t len, uint16_t milliseconds) |
1401 | { | 1401 | { |
1402 | return networking_wait_execute(data, len, milliseconds); | 1402 | return networking_wait_execute(data, len, milliseconds); |
1403 | }; | 1403 | }; |
1404 | 1404 | ||
1405 | void waitcleanupMessenger(Messenger *m, uint8_t *data, uint16_t len) | ||
1406 | { | ||
1407 | networking_wait_cleanup(m->net, data, len); | ||
1408 | } | ||
1409 | |||
1405 | /* return size of the messenger data (for saving) */ | 1410 | /* return size of the messenger data (for saving) */ |
1406 | uint32_t Messenger_size_old(Messenger *m) | 1411 | uint32_t Messenger_size_old(Messenger *m) |
1407 | { | 1412 | { |