mirror of
https://github.com/mirage/qubes-mirage-firewall.git
synced 2024-06-26 14:12:23 +00:00
Compare commits
5 Commits
0f74b139e0
...
f2f44f9749
Author | SHA1 | Date | |
---|---|---|---|
![]() |
f2f44f9749 | ||
![]() |
958b84430a | ||
![]() |
8d67e9d47a | ||
![]() |
8e4c24bfba | ||
![]() |
a37584a720 |
|
@ -23,8 +23,8 @@ ENV OPAMCONFIRMLEVEL=unsafe-yes
|
||||||
# Remove this line (and the base image pin above) if you want to test with the
|
# Remove this line (and the base image pin above) if you want to test with the
|
||||||
# latest versions.
|
# latest versions.
|
||||||
# taken from https://github.com/ocaml/opam-repository
|
# 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 init --disable-sandboxing -a --bare https://github.com/ocaml/opam-repository.git#f9f113a6bb242a13702859873fa0fcef9146eb6a
|
||||||
RUN opam switch create myswitch 4.14.1
|
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 mirage opam-monorepo ocaml-solo5
|
||||||
RUN mkdir /tmp/orb-build
|
RUN mkdir /tmp/orb-build
|
||||||
ADD config.ml /tmp/orb-build/config.ml
|
ADD config.ml /tmp/orb-build/config.ml
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
MIRAGE_KERNEL_NAME = dist/qubes-firewall.xen
|
MIRAGE_KERNEL_NAME = dist/qubes-firewall.xen
|
||||||
OCAML_VERSION ?= 4.14.0
|
OCAML_VERSION ?= 4.14.2
|
||||||
SOURCE_BUILD_DEP := firewall-build-dep
|
SOURCE_BUILD_DEP := firewall-build-dep
|
||||||
|
|
||||||
firewall-build-dep:
|
firewall-build-dep:
|
||||||
|
|
|
@ -20,5 +20,5 @@ $builder build -t qubes-mirage-firewall .
|
||||||
echo Building Firewall...
|
echo Building Firewall...
|
||||||
$builder run --rm -i -v `pwd`:/tmp/orb-build:Z qubes-mirage-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 of build: $(sha256sum ./dist/qubes-firewall.xen)"
|
||||||
echo "SHA2 last known: 163991ea96842e03d378501a0be99057ad2489440aff8ae81d850624d98fd3f0"
|
echo "SHA2 last known: 0cbb202c1b93e10ad115c9e988f9384005656c0855ec9deaf05a5e9ac9972984"
|
||||||
echo "(hashes should match for released versions)"
|
echo "(hashes should match for released versions)"
|
||||||
|
|
|
@ -446,14 +446,14 @@ struct
|
||||||
clients := !clients |> Dao.VifMap.add key cleanup)))
|
clients := !clients |> Dao.VifMap.add key cleanup)))
|
||||||
|
|
||||||
let send_dns_client_query t ~src_port ~dst ~dst_port buf =
|
let send_dns_client_query t ~src_port ~dst ~dst_port buf =
|
||||||
match t with
|
match t.uplink with
|
||||||
| None ->
|
| None ->
|
||||||
Log.err (fun f -> f "No uplink interface");
|
Log.err (fun f -> f "No uplink interface");
|
||||||
Lwt.return (Error (`Msg "failure"))
|
Lwt.return (Error (`Msg "failure"))
|
||||||
| Some t -> (
|
| Some uplink -> (
|
||||||
Lwt.catch
|
Lwt.catch
|
||||||
(fun () ->
|
(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 ->
|
| Error s ->
|
||||||
Log.err (fun f -> f "error sending udp packet: %a" U.pp_error s);
|
Log.err (fun f -> f "error sending udp packet: %a" U.pp_error s);
|
||||||
Error (`Msg "failure")
|
Error (`Msg "failure")
|
||||||
|
|
|
@ -103,7 +103,7 @@ module Main (R : Mirage_random.S)(Clock : Mirage_clock.MCLOCK)(Time : Mirage_tim
|
||||||
~uplink:None
|
~uplink:None
|
||||||
in
|
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 dns_mvar = Lwt_mvar.create_empty () in
|
||||||
let nameservers = `Udp, [ config.Dao.dns, 53 ; config.Dao.dns2, 53 ] 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
|
let dns_client = Dns_client.create ~nameservers (router, send_dns_query, dns_mvar) in
|
||||||
|
|
Loading…
Reference in New Issue
Block a user