Vendor the OCaml DNS code #542
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
```
File "src/hostnet/vmnet.ml", line 327, characters 30-42:
327 | let client_negotiate ~uuid ?preferred_ip ~fd =
^^^^^^^^^^^^
Error (warning 16 [unerasable-optional-argument]): this optional argument cannot be erased.
```
Signed-off-by: David Scott <dave@recoil.org>
This was originally split into a library djs55/ocaml-dns-forward which became mirage/ocaml-dns-forward but it's only useful inside this project so we should inline it. Signed-off-by: David Scott <dave@recoil.org>
Signed-off-by: David Scott <dave@recoil.org>
This vendors the old version of ocaml-dns that we still use. Updating to the new APIs could be done, but much of this code is unused so we should prioritise code elimination first. Signed-off-by: David Scott <dave@recoil.org>
Signed-off-by: David Scott <dave@recoil.org>
Signed-off-by: David Scott <dave@recoil.org>
Signed-off-by: David Scott <dave@recoil.org>
Signed-off-by: David Scott <dave@recoil.org>
Signed-off-by: David Scott <dave@recoil.org>
Signed-off-by: David Scott <dave@recoil.org>
Signed-off-by: David Scott <dave@recoil.org>
Signed-off-by: David Scott <dave@recoil.org>
Signed-off-by: David Scott <dave@recoil.org>
Signed-off-by: David Scott <dave@recoil.org>
Signed-off-by: David Scott <dave@recoil.org>
Signed-off-by: David Scott <dave@recoil.org>
Signed-off-by: David Scott <dave@recoil.org>
Signed-off-by: David Scott <dave@recoil.org>
Signed-off-by: David Scott <dave@recoil.org>
Signed-off-by: David Scott <dave@recoil.org>
Signed-off-by: David Scott <dave@recoil.org>
Signed-off-by: David Scott <dave@recoil.org>
|
LGTM |
|
Looks fine. You may want to add a |
|
@avsm thanks, useful tip! |
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.
Previously we used 2 libraries:
ocaml-dns-forward: this was originally split out from this treeocaml-dnsHowever:
ocaml-dnsis completely different from version 2.0.0 onwards. It's now based on a DNS library with different goals, prioritising standards compliance; while we prioritise backwards compatibility with old resolvers. If we updated to the new implementation we might expose bugs in old clients which we wouldn't be able to work around easily. It would be interesting to try upgrading later, after we have updated all the other dependencies.ocaml-dns-forwardlibrary was never used by anyone else. It's really an implementation ofvpnkit-specific policy so should live in this repo anyway.Furthermore
ocaml-dnscontains lots of code we don't need and dependencies we don't want (e.g.hashcons). By vendoring it we can avoid the dependencies from the unused code.ocaml-dns-forwardis now unused, since we don't try to use it to talk to split-tunnel DNS servers in VPNs. It will be easier to trim if all the code lives in one place.This is a required step on the plan to vendor all the OCaml dependencies, to make building easier (and on Windows: to make building possible again)