fix: tunnel dying some time after a network handover - #5994
Merged
Conversation
Contributor
|
GPT5.6-Sol-xHigh fully agrees with the analysis and the solution. |
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.
Introduced in my last commit
tunFdForCore()hands the corevpnInterface.dup()on the premise that the core closes the descriptor it was given and would otherwise take the VPN interface down. That premise does not hold. In the pinned xray-core,AndroidTun.Close()(proxy/tun/tun_android.go) returnsnilwithout touching the fd and the gVisorfdbasedendpoint it is passed to has an emptyClose()reading stops throughAttach(nil)→dispatcher.Stop()→Wait(). Nothing closes it so the duplicate just becomes aParcelFileDescriptornobody keeps a reference to and its finalizer performs the only close that fd ever gets at whatever point the GC runs, on a descriptor the running core is still dispatching on. From then on nothing arrives from the tun and every app hangs while the core stays up and only restarting the service recovers. Because the timing is the GC's the failure is not aligned with the handover that caused it which is what makes it hard to trace