Reapply "fix dns on android" + fix argument order #1725
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
The reason the dns fix on android didn't work is that the DnsInterceptor had a reversed to/from argument order for its `SendServerMessageBufferTo` overload, and so android/mac needed the to/from to be reversed so that the second reverse cancelled out the first one. Upon review, the DnsInterceptor order (to, from) is more intuitive than the base order (from, to), so this reapplies the dns fix and swaps everything *except* DnsInterceptor to match the (to, from) argument order.
majestrate
approved these changes
Sep 1, 2021
jagerman
added a commit
to jagerman/loki-network
that referenced
this pull request
Sep 1, 2021
PR oxen-io#1725 reversed argument orders but UnboundResolver was still using (from,to) ordering in its callbacks, which leaked through to make a wrong order in our reply function (which simply forwards arguments). This fixes that bug by making UnboundResolver callback argument order consistent (i.e. using to, from) with the PacketHandler argument order.
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.
The reason the dns fix on android didn't work is that the DnsInterceptor
had a reversed to/from argument order for its
SendServerMessageBufferTooverload, and so android/mac needed theto/from to be reversed so that the second reverse cancelled out the
first one.
Upon review, the DnsInterceptor order (to, from) is more intuitive than
the base order (from, to), so this reapplies the dns fix and swaps
everything except DnsInterceptor to match the (to, from) argument
order.