reynir/albatross
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

bump wire version

Browse source
This commit is contained in:
Hannes Mehnert 2019-10-12 01:38:44 +02:00
parent c9820f3106
commit 13edb22db3
13 changed files with 16 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
client/albatross_client_bistro.ml
View file

@ -3,7 +3,7 @@
open Lwt.Infix open Lwt.Infix
open X509 open X509
let version = `AV3 let version = `AV4
let read fd = let read fd =
(* now we busy read and process output *) (* now we busy read and process output *)

2
client/albatross_client_local.ml
View file

@ -2,7 +2,7 @@
open Lwt.Infix open Lwt.Infix
let version = `AV3 let version = `AV4
let socket t = function let socket t = function
| Some x -> x | Some x -> x

2
client/albatross_client_remote_tls.ml
View file

@ -2,7 +2,7 @@
open Lwt.Infix open Lwt.Infix
let version = `AV3 let version = `AV4
let rec read_tls_write_cons t = let rec read_tls_write_cons t =
Vmm_tls_lwt.read_tls t >>= function Vmm_tls_lwt.read_tls t >>= function

2
daemon/albatross_console.ml
View file

@ -14,7 +14,7 @@ open Lwt.Infix
open Astring open Astring
let my_version = `AV3 let my_version = `AV4
let pp_unix_error ppf e = Fmt.string ppf (Unix.error_message e) let pp_unix_error ppf e = Fmt.string ppf (Unix.error_message e)

2
daemon/albatross_influx.ml
View file

@ -156,7 +156,7 @@ module P = struct
vm ifd.bridge (String.concat ~sep:"," fields) vm ifd.bridge (String.concat ~sep:"," fields)
end end
let my_version = `AV3 let my_version = `AV4
let command = ref 1L let command = ref 1L

2
daemon/albatross_log.ml
View file

@ -10,7 +10,7 @@
open Lwt.Infix open Lwt.Infix
let my_version = `AV3 let my_version = `AV4
let broadcast prefix wire t = let broadcast prefix wire t =
Lwt_list.fold_left_s (fun t (id, s) -> Lwt_list.fold_left_s (fun t (id, s) ->

2
daemon/albatrossd.ml
View file

@ -6,7 +6,7 @@ open Vmm_core
open Lwt.Infix open Lwt.Infix
let version = `AV3 let version = `AV4
let state = ref (Vmm_vmmd.init version) let state = ref (Vmm_vmmd.init version)

2
provision/albatross_provision_request.ml
View file

@ -5,7 +5,7 @@ open Vmm_asn
open Rresult.R.Infix open Rresult.R.Infix
let version = `AV3 let version = `AV4
let csr priv name cmd = let csr priv name cmd =
let ext = let ext =

2
src/vmm_asn.ml
View file

@ -376,10 +376,12 @@ let block_cmd =
let version = let version =
let f data = match data with let f data = match data with
| 4 -> `AV4
| 3 -> `AV3 | 3 -> `AV3
| 2 -> `AV2 | 2 -> `AV2
| x -> Asn.S.error (`Parse (Printf.sprintf "unknown version number 0x%X" x)) | x -> Asn.S.error (`Parse (Printf.sprintf "unknown version number 0x%X" x))
and g = function and g = function
| `AV4 -> 4
| `AV3 -> 3 | `AV3 -> 3
| `AV2 -> 2 | `AV2 -> 2
in in

4
src/vmm_commands.ml
View file

@ -3,16 +3,18 @@
(* the wire protocol *) (* the wire protocol *)
open Vmm_core open Vmm_core
type version = [ `AV2 | `AV3 ] type version = [ `AV2 | `AV3 | `AV4 ]
let pp_version ppf v = let pp_version ppf v =
Fmt.int ppf Fmt.int ppf
(match v with (match v with
| `AV4 -> 4
| `AV3 -> 3 | `AV3 -> 3
| `AV2 -> 2) | `AV2 -> 2)
let version_eq a b = let version_eq a b =
match a, b with match a, b with
| `AV4, `AV4 -> true
| `AV3, `AV3 -> true | `AV3, `AV3 -> true
| `AV2, `AV2 -> true | `AV2, `AV2 -> true
| _ -> false | _ -> false

2
src/vmm_commands.mli
View file

@ -3,7 +3,7 @@
open Vmm_core open Vmm_core
(** The type of versions of the grammar defined below. *) (** 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. *) (** [version_eq a b] is true if [a] and [b] are equal. *)
val version_eq : version -> version -> bool val version_eq : version -> version -> bool

2
stats/albatross_stats_pure.ml
View file

@ -17,7 +17,7 @@ external vmmapi_close : vmctx -> unit = "vmmanage_vmmapi_close"
external vmmapi_statnames : vmctx -> string list = "vmmanage_vmmapi_statnames" external vmmapi_statnames : vmctx -> string list = "vmmanage_vmmapi_statnames"
external vmmapi_stats : vmctx -> int64 list = "vmmanage_vmmapi_stats" external vmmapi_stats : vmctx -> int64 list = "vmmanage_vmmapi_stats"
let my_version = `AV3 let my_version = `AV4
let descr = ref [] let descr = ref []

2
tls/albatross_tls_common.ml
View file

@ -2,7 +2,7 @@
open Lwt.Infix open Lwt.Infix
let my_version = `AV3 let my_version = `AV4
let command = ref 0L let command = ref 0L