From e8d13d0d17f9092dafd4d7918329567187b76441 Mon Sep 17 00:00:00 2001 From: swrup Date: Fri, 13 Mar 2026 16:05:25 +0100 Subject: [PATCH] wip network setup --- GNUmakefile | 2 +- network.sh | 22 +++++++++++++++------- src/global.ml | 3 ++- src/mte.ml | 2 +- src/util.ml | 2 +- 5 files changed, 20 insertions(+), 11 deletions(-) diff --git a/GNUmakefile b/GNUmakefile index 2d1e22ce..297198ca 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -5,7 +5,7 @@ vendor_list := \ base32 cohttp mirage-mtime mirage-ptime secmod_fat=secrets/secmod.fat -tap_device=tap-mte +tap_device=tap0 check-kvm: $(if $(wildcard /dev/kvm),,$(error KVM support not enabled)) diff --git a/network.sh b/network.sh index f2eb77f2..6233bf90 100755 --- a/network.sh +++ b/network.sh @@ -1,11 +1,19 @@ #!/bin/bash set -e -sudo ip link add name bridge-mte type bridge -sudo ip addr add 10.0.0.1/24 dev bridge-mte -sudo ip tuntap add name tap-mte mode tap -sudo ip link set tap-mte master bridge-mte -sudo ip link set bridge-mte up -sudo ip link set tap-mte up +sudo ip link add name br0 type bridge -# TODO setup postgresql +sudo ip link add veth0 type veth peer name veth0-host +sudo ip link set veth0 master br0 + +sudo ip tuntap add name tap0 mode tap +sudo ip link set tap0 master br0 + +sudo ip addr add 10.0.0.1/24 dev br0 +sudo ip addr add 10.0.0.2/24 dev veth0-host +sudo ip addr add 10.0.0.3/24 dev tap0 + +sudo ip link set br0 up +sudo ip link set veth0 up +sudo ip link set veth0-host up +sudo ip link set tap0 up diff --git a/src/global.ml b/src/global.ml index 30006f70..04a76dfb 100644 --- a/src/global.ml +++ b/src/global.ml @@ -8,8 +8,9 @@ let db_conn = | Error err -> Fmt.failwith "Database connection failure: %a." Caqti_error.pp err | Ok conn -> - let () = Pg.preflight conn in Logs.info (fun m -> m "... connection done."); + let () = Pg.preflight conn in + Logs.info (fun m -> m "Preflight done."); conn in let finally (module Conn : Pg.CONN) = Conn.disconnect () in diff --git a/src/mte.ml b/src/mte.ml index a13c7d28..d54079e0 100644 --- a/src/mte.ml +++ b/src/mte.ml @@ -75,7 +75,7 @@ let () = in let storage = Mkernel.block "storage" in let service = - let ipv4 = Ipaddr.V4.Prefix.of_string_exn "10.0.0.2/24" in + let ipv4 = Ipaddr.V4.Prefix.of_string_exn "10.0.0.3/24" in Mnet.stack ~name:"service" ipv4 in Mkernel.(run [ rng; storage; service ]) diff --git a/src/util.ml b/src/util.ml index 99dfe8f0..594205b7 100644 --- a/src/util.ml +++ b/src/util.ml @@ -56,7 +56,7 @@ module Log_reporter = struct let setup () = (*set_level_secmods (Some Logs.Debug);*) let level = Some Logs.Info in - Logs.set_level ~all:false level; + Logs.set_level ~all:true level; Logs.Src.set_level Logs.default level; Logs.set_reporter reporter; ()