Git-Mirrors/qubes-mirage-firewall
1
0
Fork 0
mirror of https://github.com/mirage/qubes-mirage-firewall.git synced 2024-10-01 01:05:39 -04:00
Code Issues Packages Projects Releases Wiki Activity

Rename some generic fn functions to what they explicitly do

Browse Source
This commit is contained in:
Calascibetta Romain 2024-05-22 11:37:19 +02:00
parent 412276cf4f
commit 962b4c2444
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
dao.ml
View File

@ -70,19 +70,19 @@ let vifs client domid =
| None -> Log.err (fun f -> f "Invalid domid %S" domid); Lwt.return [] | None -> Log.err (fun f -> f "Invalid domid %S" domid); Lwt.return []
| Some domid -> | Some domid ->
let path = Fmt.str "backend/vif/%d" domid in let path = Fmt.str "backend/vif/%d" domid in
let fn handle = let vifs_of_domain handle =
let* entries = directory ~handle path in let* devices = directory ~handle path in
let fn device_id = match int_of_string_opt device_id with let ip_of_vif device_id = match int_of_string_opt device_id with
| None -> | None ->
Log.err (fun f -> f "Invalid device ID %S for domid %d" device_id domid); Log.err (fun f -> f "Invalid device ID %S for domid %d" device_id domid);
Lwt.return_none Lwt.return_none
| Some device_id -> | Some device_id ->
let vif = { ClientVif.domid; device_id } in let vif = { ClientVif.domid; device_id } in
let fn () = let get_client_ip () =
let* str = Xen_os.Xs.read handle (Fmt.str "%s/%d/ip" path device_id) in let* str = Xen_os.Xs.read handle (Fmt.str "%s/%d/ip" path device_id) in
let[@warning "-8"] client_ip :: _ = String.split_on_char ' ' str in let[@warning "-8"] client_ip :: _ = String.split_on_char ' ' str in
Lwt.return_some (vif, Ipaddr.V4.of_string_exn client_ip) in Lwt.return_some (vif, Ipaddr.V4.of_string_exn client_ip) in
Lwt.catch fn @@ function Lwt.catch get_client_ip @@ function
| Xs_protocol.Enoent _ -> Lwt.return_none | Xs_protocol.Enoent _ -> Lwt.return_none
| Ipaddr.Parse_error (msg, client_ip) -> | Ipaddr.Parse_error (msg, client_ip) ->
Log.err (fun f -> f "Error parsing IP address of %a from %s: %s" Log.err (fun f -> f "Error parsing IP address of %a from %s: %s"
@ -92,8 +92,8 @@ let vifs client domid =
Log.err (fun f -> f "Error getting IP address of %a: %s" Log.err (fun f -> f "Error getting IP address of %a: %s"
ClientVif.pp vif (Printexc.to_string exn)); ClientVif.pp vif (Printexc.to_string exn));
Lwt.return_none in Lwt.return_none in
Lwt_list.filter_map_p fn entries in Lwt_list.filter_map_p ip_of_vif devices in
Xen_os.Xs.immediate client fn Xen_os.Xs.immediate client vifs_of_domain
let watch_clients fn = let watch_clients fn =
Xen_os.Xs.make () >>= fun xs -> Xen_os.Xs.make () >>= fun xs ->