Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add SOCKS5 bytestreams and a couple of other fixes #592

Merged
merged 18 commits into from Aug 28, 2019

Conversation

@hrxi
Copy link
Contributor

commented Aug 5, 2019

The other fixes are described in the commit messages.

hrxi added 8 commits Jul 21, 2019
Fix a couple of delegate copy warnigs
"warning: copying delegates is not supported"
Finish file transfer after receiving enough data
This means that we no longer rely on the remote end to close the
connection after sending the file, but additionally use the `<size>`
element from the initial file transfer `<description>` to check whether
the file transfer has been completed.

This was motivated by Conversations not closing the connection for
SOCKS5 file transfers.

@hrxi hrxi force-pushed the hrxi:gsoc_1 branch from 66e0732 to 642dac9 Aug 5, 2019

@hrxi

This comment has been minimized.

Copy link
Contributor Author

commented Aug 7, 2019

Travis failures are spurious, caused by timeouts and temporarily broken master.

@mar-v-in mar-v-in closed this Aug 7, 2019

@mar-v-in mar-v-in reopened this Aug 7, 2019

@mar-v-in

This comment has been minimized.

Copy link
Contributor

commented Aug 7, 2019

Travis failures are spurious

Travis CI currently has networking issues (see status page).

hrxi added 3 commits Aug 8, 2019
Fix race condition involving `session-terminate`
The Jingle file transfer (XEP-0234) specifies that the receiver of the
file transfer is the one to terminate the session. Otherwise, there
might be a race condition between the XMPP stream and out-of-band SOCKS5
connections.
Fix candidate selection for equal priority
XEP-0260 states that the candidate selected (offered) by the initiator
wins, not the one that was chosen by the initiator (i.e. offered by the
responder).

@hrxi hrxi force-pushed the hrxi:gsoc_1 branch from 4625c18 to e8bb67d Aug 27, 2019

@hrxi hrxi force-pushed the hrxi:gsoc_1 branch from e8bb67d to 6028fd1 Aug 27, 2019

@mar-v-in mar-v-in merged commit 9f613d5 into dino:master Aug 28, 2019

1 check passed

Travis CI - Pull Request Build Passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants
You can’t perform that action at this time.