From dec32e624705767684b301f909e4c1c1373d8b5f Mon Sep 17 00:00:00 2001 From: Hannes Mehnert Date: Mon, 12 Nov 2018 22:11:06 +0100 Subject: [PATCH] bump wire version --- app/vmm_stats_pure.ml | 2 +- app/vmmc_bistro.ml | 2 +- app/vmmc_local.ml | 2 +- app/vmmc_remote.ml | 2 +- app/vmmd.ml | 2 +- app/vmmd_console.ml | 2 +- app/vmmd_influx.ml | 2 +- app/vmmd_log.ml | 2 +- app/vmmd_tls.ml | 2 +- app/vmmp_request.ml | 2 +- src/vmm_asn.ml | 4 ++-- src/vmm_commands.ml | 6 +++--- src/vmm_commands.mli | 2 +- 13 files changed, 16 insertions(+), 16 deletions(-) diff --git a/app/vmm_stats_pure.ml b/app/vmm_stats_pure.ml index 538f809..1111aff 100644 --- a/app/vmm_stats_pure.ml +++ b/app/vmm_stats_pure.ml @@ -16,7 +16,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 = `AV2 +let my_version = `AV3 let descr = ref [] diff --git a/app/vmmc_bistro.ml b/app/vmmc_bistro.ml index a942e23..9030280 100644 --- a/app/vmmc_bistro.ml +++ b/app/vmmc_bistro.ml @@ -2,7 +2,7 @@ open Lwt.Infix -let version = `AV2 +let version = `AV3 let read fd = (* now we busy read and process output *) diff --git a/app/vmmc_local.ml b/app/vmmc_local.ml index dc9199b..d056d09 100644 --- a/app/vmmc_local.ml +++ b/app/vmmc_local.ml @@ -2,7 +2,7 @@ open Lwt.Infix -let version = `AV2 +let version = `AV3 let socket t = function | Some x -> x diff --git a/app/vmmc_remote.ml b/app/vmmc_remote.ml index 909c520..001ca3a 100644 --- a/app/vmmc_remote.ml +++ b/app/vmmc_remote.ml @@ -2,7 +2,7 @@ open Lwt.Infix -let version = `AV2 +let version = `AV3 let rec read_tls_write_cons t = Vmm_tls_lwt.read_tls t >>= function diff --git a/app/vmmd.ml b/app/vmmd.ml index 8585ed6..cfb11fe 100644 --- a/app/vmmd.ml +++ b/app/vmmd.ml @@ -18,7 +18,7 @@ let pp_stats ppf s = open Lwt.Infix -let version = `AV2 +let version = `AV3 let state = ref (Vmm_vmmd.init version) diff --git a/app/vmmd_console.ml b/app/vmmd_console.ml index 5962289..6c0ac54 100644 --- a/app/vmmd_console.ml +++ b/app/vmmd_console.ml @@ -14,7 +14,7 @@ open Lwt.Infix open Astring -let my_version = `AV2 +let my_version = `AV3 let pp_unix_error ppf e = Fmt.string ppf (Unix.error_message e) diff --git a/app/vmmd_influx.ml b/app/vmmd_influx.ml index 5eca733..a13b3e9 100644 --- a/app/vmmd_influx.ml +++ b/app/vmmd_influx.ml @@ -141,7 +141,7 @@ module P = struct vm ifd.ifname (String.concat ~sep:"," fields) end -let my_version = `AV2 +let my_version = `AV3 let command = ref 1L diff --git a/app/vmmd_log.ml b/app/vmmd_log.ml index 47cf8b1..dfd5eac 100644 --- a/app/vmmd_log.ml +++ b/app/vmmd_log.ml @@ -10,7 +10,7 @@ open Lwt.Infix -let my_version = `AV2 +let my_version = `AV3 let broadcast prefix wire t = Lwt_list.fold_left_s (fun t (id, s) -> diff --git a/app/vmmd_tls.ml b/app/vmmd_tls.ml index c3e6046..ffeead9 100644 --- a/app/vmmd_tls.ml +++ b/app/vmmd_tls.ml @@ -2,7 +2,7 @@ open Lwt.Infix -let my_version = `AV2 +let my_version = `AV3 let command = ref 0L diff --git a/app/vmmp_request.ml b/app/vmmp_request.ml index a7b0f1e..55c8b81 100644 --- a/app/vmmp_request.ml +++ b/app/vmmp_request.ml @@ -5,7 +5,7 @@ open Vmm_asn open Rresult.R.Infix -let version = `AV2 +let version = `AV3 let csr priv name cmd = let exts = [ (false, `Unsupported (oid, cert_extension_to_cstruct (version, cmd))) ] diff --git a/src/vmm_asn.ml b/src/vmm_asn.ml index f181826..b819cce 100644 --- a/src/vmm_asn.ml +++ b/src/vmm_asn.ml @@ -308,10 +308,10 @@ let block_cmd = let version = let f data = match data with - | 2 -> `AV2 + | 3 -> `AV3 | _ -> Asn.S.error (`Parse "unknown version number") and g = function - | `AV2 -> 2 + | `AV3 -> 3 in Asn.S.map f g Asn.S.int diff --git a/src/vmm_commands.ml b/src/vmm_commands.ml index efd6b3e..643db14 100644 --- a/src/vmm_commands.ml +++ b/src/vmm_commands.ml @@ -3,16 +3,16 @@ (* the wire protocol *) open Vmm_core -type version = [ `AV2 ] +type version = [ `AV3 ] let pp_version ppf v = Fmt.int ppf (match v with - | `AV2 -> 2) + | `AV3 -> 3) let version_eq a b = match a, b with - | `AV2, `AV2 -> true + | `AV3, `AV3 -> true | _ -> false type console_cmd = [ diff --git a/src/vmm_commands.mli b/src/vmm_commands.mli index 2836c81..4d47075 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 ] +type version = [ `AV3 ] (** [version_eq a b] is true if [a] and [b] are equal. *) val version_eq : version -> version -> bool