Skip to content

fix unikernels: allow mirage 4.10 :) #54

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

Open
hannesm wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix unikernels: allow mirage 4.10 :) #54

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion unikernel/elit/config.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
(* mirage >= 4.9.0 & < 4.10.0 *)
(* mirage >= 4.9.0 & < 4.11.0 *)

open Mirage

Expand Down
2 changes: 1 addition & 1 deletion unikernel/signer/config.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
(* mirage >= 4.9.0 & < 4.10.0 *)
(* mirage >= 4.9.0 & < 4.11.0 *)

open Mirage

Expand Down
9 changes: 3 additions & 6 deletions unikernel/spamfilter/config.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
(* mirage >= 4.8.0 & < 4.9.0 *)
(* mirage >= 4.8.0 & < 4.11.0 *)

open Mirage

Expand All @@ -14,14 +14,11 @@ let runtime_args = [ setup ]

let spamfilter =
main ~runtime_args ~packages "Unikernel.Make" @@
time @-> mclock @-> pclock @-> stackv4v6 @-> happy_eyeballs @-> job
stackv4v6 @-> happy_eyeballs @-> job

let time = default_time
let mclock = default_monotonic_clock
let pclock = default_posix_clock
let stack = generic_stackv4v6 default_network
let he = generic_happy_eyeballs stack

let () =
register "spamfilter"
[ spamfilter $ time $ mclock $ pclock $ stack $ he ]
[ spamfilter $ stack $ he ]
9 changes: 3 additions & 6 deletions unikernel/spamfilter/unikernel.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,18 +33,15 @@ module K = struct
end

module Make
(Time : Mirage_time.S)
(Mclock : Mirage_clock.MCLOCK)
(Pclock : Mirage_clock.PCLOCK)
(Stack : Tcpip.Stack.V4V6)
(Happy_eyeballs : Happy_eyeballs_mirage.S with type flow = Stack.TCP.flow)
= struct

module Nss = Ca_certs_nss.Make (Pclock)
module Nss = Ca_certs_nss
module Fake_dns = Ptt_fake_dns.Make (struct let ipaddr = K.destination () end)
module Spam_filter = Spartacus.Make (Time) (Mclock) (Pclock) (Stack) (Fake_dns) (Happy_eyeballs)
module Spam_filter = Spartacus.Make (Stack) (Fake_dns) (Happy_eyeballs)

let start _time _mclock _pclock stack he { K.domain; postmaster }=
let start stack he { K.domain; postmaster }=
let authenticator = R.failwith_error_msg (Nss.authenticator ()) in
let tls = R.failwith_error_msg (Tls.Config.client ~authenticator ()) in
let ip = Stack.ip stack in
Expand Down