Skip to content

Net.lookup returns Or_error rather than raising #247

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

Merged
avsm merged 1 commit into from
Feb 15, 2015
Merged

Net.lookup returns Or_error rather than raising #247

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
18 changes: 11 additions & 7 deletions async/cohttp_async.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,17 +25,21 @@ module Net = struct
let lookup uri =
let host = Option.value (Uri.host uri) ~default:"localhost" in
match Uri_services.tcp_port_of_uri ~default:"http" uri with
| None -> failwith "Net.connect" (* TODO proper exception *)
| None -> Deferred.Or_error.error_string
"Net.lookup: failed to get TCP port form Uri"
| Some port ->
let open Unix in
Addr_info.get ~host [Addr_info.AI_FAMILY PF_INET; Addr_info.AI_SOCKTYPE SOCK_STREAM]
>>= function
| {Addr_info.ai_addr=ADDR_INET(addr,_)}::_ ->
return (host, Ipaddr_unix.of_inet_addr addr, port)
| _ -> failwith "resolution failed"
Addr_info.get ~host [ Addr_info.AI_FAMILY PF_INET
; Addr_info.AI_SOCKTYPE SOCK_STREAM]
>>| function
| { Addr_info.ai_addr=ADDR_INET (addr,_) }::_ ->
Or_error.return (host, Ipaddr_unix.of_inet_addr addr, port)
| _ -> Or_error.error_string "resolution failed"

let connect_uri ?interrupt uri =
lookup uri >>= fun (host, addr, port) ->
lookup uri
|> Deferred.Or_error.ok_exn
>>= fun (host, addr, port) ->
let mode =
match Uri.scheme uri with
| Some "https" -> `OpenSSL (host, addr, port)
Expand Down