Git-Mirrors/qubes-mirage-firewall
1
0
Fork 0
mirror of https://github.com/mirage/qubes-mirage-firewall.git synced 2025-04-25 01:19:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

remove context and resolver from test unikernel arguments

Browse Source
This commit is contained in:
Mindy 2019-06-11 18:03:45 -05:00
parent 49a826ee4d
commit a7d9efdc41
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
test/config.ml
View File

@ -1,14 +1,10 @@
open Mirage open Mirage
let client = let client =
let packages = [ package "cohttp-mirage"; package "duration" ] in
foreign foreign
~packages "Unikernel.Client" @@ time @-> console @-> stackv4 @-> job
"Unikernel.Client" @@ time @-> console @-> stackv4 @-> resolver @-> conduit @-> job
let () = let () =
let stack = generic_stackv4 default_network in let stack = generic_stackv4 default_network in
let res_dns = resolver_dns stack in let job = [ client $ default_time $ default_console $ stack ] in
let conduit = conduit_direct stack in
let job = [ client $ default_time $ default_console $ stack $ res_dns $ conduit ] in
register "http-fetch" job register "http-fetch" job

4
test/unikernel.ml
View File

@ -40,7 +40,7 @@ module Log = (val Logs.src_log src : Logs.LOG)
let netvm = "10.137.0.5" let netvm = "10.137.0.5"
let uri = Uri.of_string @@ "http://" ^ netvm ^ ":8082" let uri = Uri.of_string @@ "http://" ^ netvm ^ ":8082"
module Client (T: TIME) (C: CONSOLE) (STACK: Mirage_stack_lwt.V4) (RES: Resolver_lwt.S) (CON: Conduit_mirage.S) = struct module Client (T: TIME) (C: CONSOLE) (STACK: Mirage_stack_lwt.V4) = struct
let tcp_connect port stack = let tcp_connect port stack =
Log.info (fun f -> f "Entering tcp connect test: %s:%d" Log.info (fun f -> f "Entering tcp connect test: %s:%d"
@ -108,7 +108,7 @@ module Client (T: TIME) (C: CONSOLE) (STACK: Mirage_stack_lwt.V4) (RES: Resolver
Log.err (fun f -> f "UDP fetch test: failed: :( couldn't write the packet"); Log.err (fun f -> f "UDP fetch test: failed: :( couldn't write the packet");
Lwt.return_unit Lwt.return_unit
let start _time c stack res (ctx:CON.t) = let start _time c stack =
udp_fetch ~src_port:9090 ~echo_server_port:1235 stack >>= fun () -> udp_fetch ~src_port:9090 ~echo_server_port:1235 stack >>= fun () ->
udp_fetch ~src_port:9091 ~echo_server_port:6668 stack >>= fun () -> udp_fetch ~src_port:9091 ~echo_server_port:6668 stack >>= fun () ->
tcp_connect 53 stack >>= fun () -> tcp_connect 53 stack >>= fun () ->