github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-12-02 17:01:25 +00:00
Code Issues Projects Releases Wiki Activity

miragesdk: use cap-n-proto instead of custom binary protocol for calf/priv API

Browse Source 
Signed-off-by: Thomas Gazagnaire <thomas@gazagnaire.org>
This commit is contained in:
Thomas Gazagnaire
2017-04-10 22:35:44 +02:00
parent 75f5f058b4
commit a0546bba88
11 changed files with 435 additions and 411 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
projects/miragesdk/src/dhcp-client/calf/unikernel.ml
View File

@@ -175,18 +175,21 @@ let setup_log =
module Dhcp_client = Dhcp_client_mirage.Make(Time)(Net)
let pp_path = Fmt.(list ~sep:(unit "/") string)
let set_ip ctl k ip =
let str = Ipaddr.V4.to_string ip ^ "\n" in
Sdk.Ctl.Client.write ctl k str >>= function
| Ok () -> Lwt.return_unit
| Error e -> failf "error while writing %s: %a" k Sdk.Ctl.Client.pp_error e
| Error e ->
failf "error while writing %a: %a" pp_path k Sdk.Ctl.Client.pp_error e
let set_ip_opt ctl k = function
| None -> Lwt.return_unit
| Some ip -> set_ip ctl k ip
let get_mac ctl =
Sdk.Ctl.Client.read ctl "/mac" >>= function
Sdk.Ctl.Client.read ctl ["mac"] >>= function
| Ok None -> Lwt.return None
| Ok Some s -> Lwt.return @@ Macaddr.of_string (String.trim s)
| Error e -> failf "get_mac: %a" Sdk.Ctl.Client.pp_error e
@@ -208,8 +211,8 @@ let start () dhcp_codes net ctl =
Lwt_stream.last_new stream >>= fun result ->
let result = of_ipv4_config result in
Log.info (fun l -> l "found lease: %a" pp result);
set_ip ctl "/ip" result.address >>= fun () ->
set_ip_opt ctl "/gateway" result.gateway
set_ip ctl ["ip"] result.address >>= fun () ->
set_ip_opt ctl ["gateway"] result.gateway
(* FIXME: Main end *)

6
projects/miragesdk/src/dhcp-client/main.ml
View File

@@ -84,9 +84,9 @@ let run () cmd ethif path =
in
Lwt_main.run (
let routes = [
"/ip" , [`Write];
"/mac" , [`Read ];
"/gateway", [`Write];
["ip"] , [`Write];
["mac"] , [`Read ];
["gateway"], [`Write];
] in
Ctl.v path >>= fun db ->
let ctl fd = Ctl.Server.listen ~routes db fd in