diff --git a/client/albatross_client_bistro.ml b/client/albatross_client_bistro.ml index 08ab831..0af4a77 100644 --- a/client/albatross_client_bistro.ml +++ b/client/albatross_client_bistro.ml @@ -3,7 +3,7 @@ open Lwt.Infix open X509 -let version = `AV3 +let version = `AV4 let read fd = (* now we busy read and process output *) diff --git a/client/albatross_client_local.ml b/client/albatross_client_local.ml index dfc7c6b..45a72f9 100644 --- a/client/albatross_client_local.ml +++ b/client/albatross_client_local.ml @@ -2,7 +2,7 @@ open Lwt.Infix -let version = `AV3 +let version = `AV4 let socket t = function | Some x -> x diff --git a/client/albatross_client_remote_tls.ml b/client/albatross_client_remote_tls.ml index 989910a..0ba2c3c 100644 --- a/client/albatross_client_remote_tls.ml +++ b/client/albatross_client_remote_tls.ml @@ -2,7 +2,7 @@ open Lwt.Infix -let version = `AV3 +let version = `AV4 let rec read_tls_write_cons t = Vmm_tls_lwt.read_tls t >>= function diff --git a/daemon/albatross_console.ml b/daemon/albatross_console.ml index 9d20ca7..f3e1411 100644 --- a/daemon/albatross_console.ml +++ b/daemon/albatross_console.ml @@ -14,7 +14,7 @@ open Lwt.Infix open Astring -let my_version = `AV3 +let my_version = `AV4 let pp_unix_error ppf e = Fmt.string ppf (Unix.error_message e) diff --git a/daemon/albatross_influx.ml b/daemon/albatross_influx.ml index 4f1351c..ca9655c 100644 --- a/daemon/albatross_influx.ml +++ b/daemon/albatross_influx.ml @@ -156,7 +156,7 @@ module P = struct vm ifd.bridge (String.concat ~sep:"," fields) end -let my_version = `AV3 +let my_version = `AV4 let command = ref 1L diff --git a/daemon/albatross_log.ml b/daemon/albatross_log.ml index 84a134f..28944d9 100644 --- a/daemon/albatross_log.ml +++ b/daemon/albatross_log.ml @@ -10,7 +10,7 @@ open Lwt.Infix -let my_version = `AV3 +let my_version = `AV4 let broadcast prefix wire t = Lwt_list.fold_left_s (fun t (id, s) -> diff --git a/daemon/albatrossd.ml b/daemon/albatrossd.ml index 46c8170..cf82639 100644 --- a/daemon/albatrossd.ml +++ b/daemon/albatrossd.ml @@ -6,7 +6,7 @@ open Vmm_core open Lwt.Infix -let version = `AV3 +let version = `AV4 let state = ref (Vmm_vmmd.init version) diff --git a/provision/albatross_provision_request.ml b/provision/albatross_provision_request.ml index 157d24a..58026c3 100644 --- a/provision/albatross_provision_request.ml +++ b/provision/albatross_provision_request.ml @@ -5,7 +5,7 @@ open Vmm_asn open Rresult.R.Infix -let version = `AV3 +let version = `AV4 let csr priv name cmd = let ext = diff --git a/src/vmm_asn.ml b/src/vmm_asn.ml index ace72db..fe1cf3d 100644 --- a/src/vmm_asn.ml +++ b/src/vmm_asn.ml @@ -376,10 +376,12 @@ let block_cmd = let version = let f data = match data with + | 4 -> `AV4 | 3 -> `AV3 | 2 -> `AV2 | x -> Asn.S.error (`Parse (Printf.sprintf "unknown version number 0x%X" x)) and g = function + | `AV4 -> 4 | `AV3 -> 3 | `AV2 -> 2 in diff --git a/src/vmm_commands.ml b/src/vmm_commands.ml index 06e5b85..ca5c66b 100644 --- a/src/vmm_commands.ml +++ b/src/vmm_commands.ml @@ -3,16 +3,18 @@ (* the wire protocol *) open Vmm_core -type version = [ `AV2 | `AV3 ] +type version = [ `AV2 | `AV3 | `AV4 ] let pp_version ppf v = Fmt.int ppf (match v with + | `AV4 -> 4 | `AV3 -> 3 | `AV2 -> 2) let version_eq a b = match a, b with + | `AV4, `AV4 -> true | `AV3, `AV3 -> true | `AV2, `AV2 -> true | _ -> false diff --git a/src/vmm_commands.mli b/src/vmm_commands.mli index 579bdc6..9bf01f5 100644 --- a/src/vmm_commands.mli +++ b/src/vmm_commands.mli @@ -3,7 +3,7 @@ open Vmm_core (** The type of versions of the grammar defined below. *) -type version = [ `AV2 | `AV3 ] +type version = [ `AV2 | `AV3 | `AV4 ] (** [version_eq a b] is true if [a] and [b] are equal. *) val version_eq : version -> version -> bool diff --git a/stats/albatross_stats_pure.ml b/stats/albatross_stats_pure.ml index 6b680be..c228dfa 100644 --- a/stats/albatross_stats_pure.ml +++ b/stats/albatross_stats_pure.ml @@ -17,7 +17,7 @@ external vmmapi_close : vmctx -> unit = "vmmanage_vmmapi_close" external vmmapi_statnames : vmctx -> string list = "vmmanage_vmmapi_statnames" external vmmapi_stats : vmctx -> int64 list = "vmmanage_vmmapi_stats" -let my_version = `AV3 +let my_version = `AV4 let descr = ref [] diff --git a/tls/albatross_tls_common.ml b/tls/albatross_tls_common.ml index 0844736..9f35500 100644 --- a/tls/albatross_tls_common.ml +++ b/tls/albatross_tls_common.ml @@ -2,7 +2,7 @@ open Lwt.Infix -let my_version = `AV3 +let my_version = `AV4 let command = ref 0L