cleanup(enginenetx): remove previous policies #1593
Merged
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
This diff refactors the code generating tactics to mix bridge and DNS tactics, such that we avoid trying all bridge tactics before falling back to DNS tactics. In the event in which the bridge is IP or endpoint blocked, this change makes sure we try using DNS tactics earlier, and, if the DNS is working, this means a faster bootstrap. Based on testing, where I replaced the bridge address with 10.0.0.1, we try DNS tactics after 8 seconds. After the first run, if the DNS tactics are working, we would immediately use them before bridge tactics, since we store information about tactics inside the $OONI_HOME/engine dir. Part of ooni/probe#2704.
Previously, we were only testing with DNS returning error, while now we should also have a test case for when it's working given that we're mixing tactics together now.
Co-authored-by: Arturo Filastò <[email protected]>
Co-authored-by: Arturo Filastò <[email protected]>
Co-authored-by: Arturo Filastò <[email protected]>
It's time to run some tests.
Conflicts: internal/enginenetx/network.go
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 #1592 and previous pull requests, I replaced the policies that embedded mixing logic with neutral policies and external mixing logic, which enabled me to implement what was requested in the #1552 pull request review. Now, with this pull request, I am cleaning up, by removing the policies that we were previously using. Work part of ooni/probe#2704.