Of0x05 multipart

_oasis

@@ -41,6 +41,8 @@ Library openflow
     OpenFlow0x01_Stats,
     OpenFlow0x04,
     OpenFlow0x04_Core,
+    OpenFlow0x05,
+    OpenFlow0x05_Core,
     SDN_OpenFlow0x01,
     SDN_OpenFlow0x04,
     GroupTable0x04,
@@ -83,6 +85,7 @@ Library quickcheck
       Arbitrary_OpenFlow,
       Arbitrary_OpenFlow0x01,
       Arbitrary_OpenFlow0x04,
+      Arbitrary_OpenFlow0x05,
       Arbitrary_SDN_Types
 
 Executable testtool

lib/OpenFlow0x04.ml

@@ -2358,6 +2358,8 @@ end
 
 module Action = struct
 
+  type t = action
+
   type sequence = OpenFlow0x04_Core.actionSequence
 
   let sizeof (act : action) : int = match act with
@@ -2955,6 +2957,8 @@ end
 
 module Instruction = struct
 
+  type t = instruction
+
   let to_string ins =
     match ins with
       | GotoTable t -> Format.sprintf "Go to Table = %u" t
@@ -3074,6 +3078,8 @@ end
 
 module Instructions = struct
 
+  type t = instruction list
+
   let sizeof (inss : instruction list) : int =
     sum (map Instruction.sizeof inss)
 
@@ -3909,7 +3915,7 @@ module ActionHdr = struct
       | PopPbbHdr
       | SetMplsTtlHdr
       | DecMplsTtlHdr
-      | SetQueueHdr
+      | SetQueueHdr -> 4
       | ExperimenterAHdr _ -> 8
 
   let to_string (act : t) =

lib/OpenFlow0x04.mli

@@ -124,6 +124,8 @@ end
 
 module Action : sig
 
+  type t = action
+
   type sequence = OpenFlow0x04_Core.actionSequence
 
   val sizeof : action -> int
@@ -221,25 +223,29 @@ end
 
 module Instruction : sig
 
-  val to_string : instruction -> string
+  type t = instruction
 
-  val sizeof : instruction -> int
+  val to_string : t -> string
 
-  val marshal : Cstruct.t -> instruction -> int
+  val sizeof : t -> int
+
+  val marshal : Cstruct.t -> t -> int
 
-  val parse : Cstruct.t ->  instruction
+  val parse : Cstruct.t ->  t
 
 end
 
 module Instructions : sig
 
-  val sizeof : instruction list -> int
+  type t = instruction list
 
-  val marshal : Cstruct.t -> instruction list -> int
+  val sizeof : t -> int
 
-  val to_string : instruction list -> string
+  val marshal : Cstruct.t -> t -> int
 
-  val parse : Cstruct.t -> instruction list
+  val to_string : t -> string
+
+  val parse : Cstruct.t -> t
 
 end
 
@@ -474,6 +480,9 @@ module GroupStats : sig
   val marshal : Cstruct.t ->  groupStats -> int
 
   val parse : Cstruct.t ->  groupStats
+
+  val length_func : Cstruct.t -> int option
+
 end
 
 module SwitchDescriptionReply : sig
@@ -503,6 +512,8 @@ module FlowStats : sig
 
   val parse : Cstruct.t -> flowStats
 
+  val length_func : Cstruct.t -> int option
+
 end
 
 
@@ -532,6 +543,8 @@ module TableStats : sig
 
   val parse : Cstruct.t -> tableStats
 
+  val length_func : Cstruct.t -> int option
+
 end
 
 module PortStats : sig
@@ -574,6 +587,8 @@ module GroupDesc : sig
 
   val parse : Cstruct.t -> groupDesc
 
+  val length_func : Cstruct.t -> int option
+
 end
 
 module GroupFeatures : sig
@@ -602,6 +617,8 @@ module MeterStats : sig
 
   val parse : Cstruct.t -> meterStats
 
+  val length_func : Cstruct.t -> int option
+
 end
 
 module MeterConfig : sig
@@ -616,6 +633,8 @@ module MeterConfig : sig
 
   val parse : Cstruct.t -> meterConfig
 
+  val length_func : Cstruct.t -> int option
+
 end