Skip to content

Updated for Conduit TLS support #67

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

Closed
talex5 wants to merge 2 commits into from
Closed

Updated for Conduit TLS support #67

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0d7e3a8
Updated for private Io_page.t
talex5 Jan 27, 2015
f491f06
Updated for new conduit API
talex5 Jan 27, 2015
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
2 changes: 1 addition & 1 deletion conduit_server_manual/unikernel.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ module Main (C:CONSOLE) (S:STACKV4) = struct

module DNS = Dns_resolver_mirage.Make(OS.Time)(S)
module RES = Resolver_mirage.Make(DNS)
module CON = Conduit_mirage.Make(S)(Conduit_localhost)
module CON = Conduit_mirage.Make(S)(Conduit_localhost)(Conduit_mirage.No_TLS)
module H = HTTP.Make(CON)

let start console s =
Expand Down
4 changes: 2 additions & 2 deletions dns/unikernel.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ module Main (C:CONSOLE) (K:KV_RO) (S:STACKV4) = struct
in
let commfn = connect_to_resolver server port in
let hostname = "dark.recoil.org" in
let alloc () = Io_page.get 1 in
let alloc () = (Io_page.get 1 :> Dns.Buf.t) in
Dns_resolver.gethostbyname ~alloc commfn hostname
>>= fun ips ->
Lwt_list.iter_s (fun ip ->
Expand All @@ -80,7 +80,7 @@ module Main (C:CONSOLE) (K:KV_RO) (S:STACKV4) = struct
let ba = Cstruct.to_bigarray buf in
let src' = (Ipaddr.V4 dst), listening_port in
let dst' = (Ipaddr.V4 src), src_port in
let obuf = Io_page.get 1 in
let obuf = (Io_page.get 1 :> Dns.Buf.t) in
process_query ba (Dns.Buf.length ba) obuf src' dst' processor
>>= function
| None ->
Expand Down