fix: cancel all outgoing requests when disconnect to prevent ANR #501
Conversation
This file contains 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
fortuna
requested changes
Feb 21, 2024
| } | ||
| return v.(Transport) | ||
| } | ||
| var Debug = log.New(io.Discard, "[DEBUG] ", log.LstdFlags) |
There was a problem hiding this comment.
This is not an efficient way to do logging, because you are still generating the messages, and discarding them. And you can't check the log levels.
Let's use slog instead:
https://pkg.go.dev/log/slog
https://go.dev/blog/slog
Android/app/src/go/backend/doh.go
Outdated
Comment on lines
28
to
30
| type DoHServer struct { | ||
| tspt doh.Transport | ||
| } |
There was a problem hiding this comment.
Suggested change
| type DoHServer struct { | |
| tspt doh.Transport | |
| } | |
| type DoHServer struct { | |
| server doh.Server | |
| } |
There was a problem hiding this comment.
renamed to type DoHServer struct { r doh.Resolver }
Android/app/src/go/backend/tunnel.go
Outdated
| *intra.Tunnel | ||
| } | ||
|
|
||
| func (s *Session) SetDoHServer(svr *DoHServer) { s.SetDNS(svr.tspt) } |
There was a problem hiding this comment.
We pass the server on ConnectSession. Is this ever used?
There was a problem hiding this comment.
Yes, user can update the DoH server even during connected session.
Co-authored-by: Vinicius Fortuna <[email protected]>
Co-authored-by: Vinicius Fortuna <[email protected]>
Co-authored-by: Vinicius Fortuna <[email protected]>
Co-authored-by: Vinicius Fortuna <[email protected]>
fortuna
approved these changes
Feb 21, 2024
fortuna
approved these changes
Feb 22, 2024
5 tasks
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.
In this PR, I fixed an ANR issue by adding a
context.Contextobject to thedoh.Transport.Querymethod. Thisctxwill be passed to all network related calls, and it will be cancelled when userDisconnects.But if we just simply add
ctxto the method,gomobilerequires we export all related packages (e.g.,time) that are used bycontext.Context, which is not applicable. Therefore we refactored the go code structure and introduced a newbackendpackage that will be the only interface that Java code can use.In addition, I retired
github.com/eycorsican/go-tun2socks/common/logand introduced our ownloggingpackage.TODO Items
The refactoring of
backendpackage is not done yet (for example,intra,intra/splitandintra/protectare still exported to Java), but it will involve a lot of changes that are not related to this PR, therefore I would postpone them to future changes.