Merge 958b84430a into e36ffdb0a5

Dockerfile

@@ -23,8 +23,8 @@ 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#4399f486aa6edefdc96d5e206a65ce42288ebfdd
-RUN opam switch create myswitch 4.14.1
+RUN opam init --disable-sandboxing -a --bare https://github.com/ocaml/opam-repository.git#f9f113a6bb242a13702859873fa0fcef9146eb6a
+RUN opam switch create myswitch 4.14.2
 RUN opam exec -- opam install -y mirage opam-monorepo ocaml-solo5
 RUN mkdir /tmp/orb-build
 ADD config.ml /tmp/orb-build/config.ml

Makefile.builder

@@ -1,5 +1,5 @@
 MIRAGE_KERNEL_NAME = dist/qubes-firewall.xen
-OCAML_VERSION ?= 4.14.0
+OCAML_VERSION ?= 4.14.2
 SOURCE_BUILD_DEP := firewall-build-dep
 
 firewall-build-dep:

build-with.sh

@@ -20,5 +20,5 @@ $builder build -t qubes-mirage-firewall .
 echo Building Firewall...
 $builder run --rm -i -v `pwd`:/tmp/orb-build:Z qubes-mirage-firewall
 echo "SHA2 of build:   $(sha256sum ./dist/qubes-firewall.xen)"
-echo "SHA2 last known: 163991ea96842e03d378501a0be99057ad2489440aff8ae81d850624d98fd3f0"
+echo "SHA2 last known: 0cbb202c1b93e10ad115c9e988f9384005656c0855ec9deaf05a5e9ac9972984"
 echo "(hashes should match for released versions)"

dispatcher.ml

@@ -446,14 +446,14 @@ struct
                  clients := !clients |> Dao.VifMap.add key cleanup)))
 
   let send_dns_client_query t ~src_port ~dst ~dst_port buf =
-    match t with
+    match t.uplink with
     | None ->
         Log.err (fun f -> f "No uplink interface");
         Lwt.return (Error (`Msg "failure"))
-    | Some t -> (
+    | Some uplink -> (
         Lwt.catch
           (fun () ->
-            U.write ~src_port ~dst ~dst_port t.udp buf >|= function
+            U.write ~src_port ~dst ~dst_port uplink.udp buf >|= function
             | Error s ->
                 Log.err (fun f -> f "error sending udp packet: %a" U.pp_error s);
                 Error (`Msg "failure")

unikernel.ml

@@ -103,7 +103,7 @@ module Main (R : Mirage_random.S)(Clock : Mirage_clock.MCLOCK)(Time : Mirage_tim
       ~uplink:None
     in
 
-    let send_dns_query = Dispatcher.send_dns_client_query None in
+    let send_dns_query = Dispatcher.send_dns_client_query router in
     let dns_mvar = Lwt_mvar.create_empty () in
     let nameservers = `Udp, [ config.Dao.dns, 53 ; config.Dao.dns2, 53 ] in
     let dns_client = Dns_client.create ~nameservers (router, send_dns_query, dns_mvar) in