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

Upgrade the unikernel to mirasge.4.6.0 #69

Merged
merged 1 commit into from
Jul 17, 2024
Merged

Upgrade the unikernel to mirasge.4.6.0 #69

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
19 changes: 4 additions & 15 deletions mirage/config.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,28 +1,17 @@
open Mirage
(* mirage >= 4.6.0 & < 4.6.1 *)

let port =
let doc =
Key.Arg.info ~doc:"Set the port where the relay will listen."
[ "p"; "port" ]
in
Key.(create "port" Arg.(opt int 9000 doc))
open Mirage

let secure_port =
let doc =
Key.Arg.info ~doc:"The port of the relay where secured rooms are available."
[ "secure-port" ]
in
Key.(create "secure_port" Arg.(opt int 9001 doc))
let setup = runtime_arg ~pos:__POS__ "Unikernel.K.setup"

let bob =
foreign "Unikernel.Make"
main "Unikernel.Make" ~runtime_args:[ setup ]
~packages:
[
package "bob" ~pin:"git+https://github.com/dinosaure/bob.git";
package "spoke" ~sublibs:[ "core" ];
package "psq";
]
~keys:[ Key.v port; Key.v secure_port ]
(time @-> stackv4v6 @-> job)

let time = default_time
Expand Down
31 changes: 26 additions & 5 deletions mirage/unikernel.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,28 @@
open Lwt.Infix

module K = struct
open Cmdliner

let port =
let doc =
Arg.info ~doc:"Set the port where the relay will listen." [ "p"; "port" ]
in
Arg.(value & opt int 9000 doc)

let secure_port =
let doc =
Arg.info
~doc:"The port of the relay where the secured rooms are available."
[ "secure-port" ]
in
Arg.(value & opt int 9001 doc)

type t = { port : int; secure_port : int }

let v port secure_port = { port; secure_port }
let setup = Term.(const v $ port $ secure_port)
end

module Psq =
Psq.Make
(String)
Expand Down Expand Up @@ -444,14 +467,12 @@ module Make (Time : Mirage_time.S) (Stack : Tcpip.Stack.V4V6) = struct

module Bob_clear = Make (Stack.TCP)

let start _time stack =
let start _time stack { K.port; K.secure_port } =
let rooms = Bob.Secured.make () in
let handshake socket = Lwt.return (Ok (socket, Stack.TCP.dst socket)) in
Lwt.join
[
Bob_clear.relay ~port:(Key_gen.port ()) ~handshake (Stack.tcp stack)
rooms;
Secured.secure_room ~port:(Key_gen.secure_port ()) (Stack.tcp stack)
rooms;
Bob_clear.relay ~port ~handshake (Stack.tcp stack) rooms;
Secured.secure_room ~port:secure_port (Stack.tcp stack) rooms;
]
end
Loading