Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

conduit-mirage: ipv6 literal and dns support for default resolver #425

Merged
merged 1 commit into from
Apr 30, 2024
Merged

conduit-mirage: ipv6 literal and dns support for default resolver #425

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 14 additions & 3 deletions src/conduit-mirage/resolver_mirage.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,21 +95,32 @@ struct

module DNS = Dns_client_mirage.Make (R) (T) (C) (P) (S)

let resolve_v4v6 dns host =
(* Try to resolve a host, default to IPv4 *)
DNS.gethostbyname dns host >>= function
| Ok addr -> Lwt.return (Ok (Ipaddr.V4 addr))
| Error (`Msg v4_err) -> (
DNS.gethostbyname6 dns host >|= function
| Ok addr -> Ok (Ipaddr.V6 addr)
| Error (`Msg v6_err) ->
let msg = Fmt.str "v4: %s; v6: %s" v4_err v6_err in
Error (`Msg msg))

let dns_stub_resolver dns service uri : Conduit.endp Lwt.t =
let hostn = get_host uri in
let port = get_port service uri in
(match Ipaddr.V4.of_string hostn with
(match Ipaddr.of_string hostn with
| Ok addr -> Lwt.return (Ok addr)
| Error _ -> (
match Domain_name.of_string hostn with
| Error (`Msg msg) -> Lwt.return (Error (`Msg msg))
| Ok domain -> (
match Domain_name.host domain with
| Error (`Msg msg) -> Lwt.return (Error (`Msg msg))
| Ok host -> DNS.gethostbyname dns host)))
| Ok host -> resolve_v4v6 dns host)))
>|= function
| Error (`Msg err) -> `Unknown ("name resolution failed: " ^ err)
| Ok addr -> `TCP (Ipaddr.V4 addr, port)
| Ok addr -> `TCP (addr, port)

let register ?nameservers s res =
(* DNS stub resolver *)
Expand Down
Loading