turn: close socket when allocation is cancelled during gathering - #111
Open
Freazg wants to merge 1 commit into
Open
turn: close socket when allocation is cancelled during gathering#111Freazg wants to merge 1 commit into
Freazg wants to merge 1 commit into
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Problem
create_turn_endpoint()opens a datagram/stream transport to the TURNserver, then awaits the allocation in
TurnTransport._connect(). DuringICE candidate gathering,
Connection.gather_candidates()runs the relaytask under
asyncio.wait(timeout=...)and cancels it if it does notcomplete in time (e.g. a slow or unreachable TURN server).
The resulting
CancelledErroris raised inside_connect(), but thecleanup handler in
create_turn_endpoint()only catchesexcept Exception. SinceCancelledErroris aBaseException, it bypassesinner_transport.close(), and the already-open socket to the TURN serveris leaked. The protocol is never added to
Connection._protocolseither,so
Connection.close()does not close it. Under repeated short-livedconnections against a distant TURN server this leaks one fd per gather.
Fix
Catch
BaseExceptioninstead ofException, so a cancellation alsocloses the inner transport before re-raising.
Test
Added
TurnTest.test_udp_transport_cancelled, which cancels theallocation mid-setup and asserts the underlying transport is closed.
It fails on
main(socket left open) and passes with this change.