Age | Commit message (Collapse) | Author |
|
|
|
toxav_prepare_transmission() sets the internal toxav `call_active'
state variable. This is checked in toxav_kill_transmission() and
only if set, proceeds to release the resources.
|
|
|
|
|
|
Do this in two ways:
1) only allow ratox to stay in the file-sender for a certain amount
of time
2) Stop hammering tox_file_send_data(). When it returns -1, we put
the given friend into a cooldown-state, because all internal transmission
slots are full.
File sending thus now works in bursts, reading from file_in as long
as tox_do() allows or until tox_file_send_data() fails.
An easy way to see why we need to do the former is piping /dev/urandom
to file_in, which never blocks. Effectively, the user goes "offline"
after a while given he is trapped inside the loop.
Piping to /dev/urandom is not an unrealistic testcase. Imagine a
researcher who desperately needs true random data from his special
RNG in his lab using ratox and piping it through /dev/urandom.
|
|
rename file_pending to file_state
rename call_pending to call_state
0 = no call
1 = call pending
2 = call active
|
|
Due to a bug in toxcore the call is set to active too early,
leaving room for invocations of sendfriendcalldata() even though
the transmission has not yet been set up in cbcallstart.
Fix this with a small workaround keeping the transmission-state
in the client.
In the long run, this definitely needs to be fixed in toxcore
for consistency.
|
|
Basically the direct calls to cancelcall() should be minimized
and only set off in a callback.
Additionally, tweak other error-cases and don't always quit fatally
but instead provide ways to get out of an error-condition.
|
|
Now it's fun again to work with the code.
|
|
using the udata-void pointers to pass data as a source of information.
|
|
This saves a lot of LOC and is definitely easier to maintain.
|
|
|
|
|
|
|
|
In upcoming commits, these errors will be incorporated into the
logging-system, so they don't look so out of place when issued.
|
|
|
|
|
|
|
|
|
|
|
|
When you got a request, but not accepted it via request/out/... and
instead sent a request yourself, it would not remove the FIFO.
This patch fixes this behaviour by iterating through the request-
list and removing the FIFO if it's still existing.
Additionally, actually make it possible to reject requests and
re-add your friends later by managing the internal tox-state
properly.
|
|
Similar style as for detecting broken file transfers.
|
|
if (f->rxstate == TRANSFER_INPROGRESS &&
(fd = openat(f->dirfd, ffiles[FFILE_OUT].name, ffiles[FFILE_OUT].flags, 0666)) == -1 &&
errno == ENXIO) {
...
} else {
close(fd); <--- not always appropriate!
}
|
|
This will trigger the callback and reset toxav internal states
accordingly. In the callback we actually call cancelcall().
|
|
|
|
If not, abort receiving.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
No need to try to keep local state, just use toxav_get_call_state().
We now can auto-accept calls by pre-attaching on the call_out FIFO.
|
|
|
|
|
|
|
|
|
|
|
|
Reject calls on both sides to reset states. This still needs
to be tested to see if there's any effect of doing that.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|