Merge pull request #12 from robur-coop/update

update to recent mirage, and up-to-date miragevpn

Dockerfile

@@ -23,12 +23,10 @@ ENV OPAMCONFIRMLEVEL=unsafe-yes
 # Remove this line (and the base image pin above) if you want to test with the
 # latest versions.
 # taken from https://github.com/ocaml/opam-repository
-RUN opam init --disable-sandboxing -a --bare https://github.com/ocaml/opam-repository.git#2926702fdd0fe7cab6ee1fa26ccecd28c3c3dd95
+RUN opam init --disable-sandboxing -a --bare https://github.com/ocaml/opam-repository.git#3bcb45c36ed254e850b498bff678e3e5848b23e1
 RUN opam switch create myswitch 4.14.2
 RUN opam exec -- opam install -y mirage opam-monorepo ocaml-solo5
-RUN opam exec -- opam install -y tls
-RUN opam pin add -y https://github.com/robur-coop/miragevpn.git#34588aecfee64cbd1bf4be9ca4f198423a3c3c0b
-RUN opam pin add -y https://github.com/mirage/mirage-qubes.git#6d4745eb111c84d68efc8bb14e03d4c5c761df3b
+RUN opam pin add -yn https://github.com/robur-coop/miragevpn.git#fe78f5067cb71d435c2dade2bfaac537b2a2e745
 RUN mkdir /tmp/orb-build
 ADD config.ml /tmp/orb-build/config.ml
 WORKDIR /tmp/orb-build

config.ml

@@ -1,12 +1,12 @@
-(* mirage >= 4.5.0 & < 4.7.0 *)
+(* mirage >= 4.6.0 & < 4.7.0 *)
 open Mirage
 
 (* xenstore id 51712 is the root volume *)
 let block = block_of_xenstore_id "51712"
 let config = tar_kv_ro block
-let ethernet = etif default_network
+let ethernet = ethif default_network
 let arp = arp ethernet
-let ipv4 = ipv4_qubes default_qubesdb ethernet arp 
+let ipv4 = ipv4_qubes default_qubesdb ethernet arp
 let ipv6 = create_ipv6 default_network ethernet
 let ipv4_only = Runtime_arg.ipv4_only ~group:"sys-net" ()
 let ipv6_only = Runtime_arg.ipv4_only ~group:"sys-net" ()

qubes-miragevpn.sha256

@@ -1 +1 @@
-c1916f5d930383ddfe445f231e28db6e268b92a93858c83570a3766392d21f00  ./dist/qubes-miragevpn.xen
+90176d104e52f51f69c8326a045a37a77916a2c0f914e50c837773afab7a9f37  ./dist/qubes-miragevpn.xen

unikernel.ml

@@ -222,7 +222,7 @@ struct
         Option.iter (push % Option.some) (Option.join packet);
         Lwt.return fragments in
     Lwt_list.fold_left_s fold fragments css
-        
+
   let rec ovpn_loop t =
     let* css = O.read t.ovpn in
     Logs.debug (fun m -> m "Got %d packet(s) from OpenVPN" (List.length css));