export t type for every module

use t in messages

Author: fugitifduck

lib/OpenFlow0x04.ml

@@ -235,20 +235,22 @@ end
 
 module PortState = struct
 
-  let state_to_int (state : portState) : int32 =
+  type t = portState
+
+  let state_to_int (state : t) : int32 =
     Int32.logor (if state.link_down then (Int32.shift_left 1l 0) else 0l) 
      (Int32.logor (if state.blocked then (Int32.shift_left 1l 1) else 0l)  
       (if state.live then (Int32.shift_left 1l 2) else 0l))
 
-  let marshal (ps : portState) : int32 = state_to_int ps
+  let marshal (ps : t) : int32 = state_to_int ps
 
-  let parse bits : portState =
+  let parse bits : t =
     { link_down = Bits.test_bit 0 bits;
       blocked = Bits.test_bit 1 bits;
       live = Bits.test_bit 2 bits
     }
 
-  let to_string (state : portState) =
+  let to_string (state : t) =
     Format.sprintf "{ link_down = %B; blocked = %B; live = %B }"
     state.link_down
     state.blocked
@@ -372,8 +374,6 @@ cstruct ofp_table_feature_prop_header {
   uint16_t length
 } as big_endian
 
-(* MISSING: ofp_ queues *)
-
 cenum ofp_flow_mod_command {
   OFPFC_ADD            = 0; (* New flow. *)
   OFPFC_MODIFY         = 1; (* Modify all matching flows. *)
@@ -6715,14 +6715,14 @@ module Message = struct
     | EchoReply of bytes
     | FeaturesRequest
     | FeaturesReply of SwitchFeatures.t
-    | FlowModMsg of flowMod
+    | FlowModMsg of FlowMod.t
     | GroupModMsg of GroupMod.t
-    | PortModMsg of portMod
-    | MeterModMsg of meterMod
-    | PacketInMsg of packetIn
-    | FlowRemoved of flowRemoved
-    | PacketOutMsg of packetOut
-    | PortStatusMsg of portStatus
+    | PortModMsg of PortMod.t
+    | MeterModMsg of MeterMod.t
+    | PacketInMsg of PacketIn.t
+    | FlowRemoved of FlowRemoved.t
+    | PacketOutMsg of PacketOut.t
+    | PortStatusMsg of PortStatus.t
     | MultipartReq of MultipartReq.t
     | MultipartReply of MultipartReply.t
     | BarrierRequest
@@ -6734,10 +6734,10 @@ module Message = struct
     | GetConfigRequestMsg
     | GetConfigReplyMsg of SwitchConfig.t
     | SetConfigMsg of SwitchConfig.t
-    | TableModMsg of tableMod
+    | TableModMsg of TableMod.t
     | GetAsyncRequest
-    | GetAsyncReply of asyncConfig
-    | SetAsync of asyncConfig
+    | GetAsyncReply of AsyncConfig.t
+    | SetAsync of AsyncConfig.t
     | Error of Error.t
 
 

lib/OpenFlow0x04.mli

@@ -230,6 +230,7 @@ module Instruction : sig
   val sizeof : t -> int
 
   val marshal : Cstruct.t -> t -> int
+
   val parse : Cstruct.t ->  t
 
   val to_string : t -> string
@@ -243,6 +244,7 @@ module Instructions : sig
   val sizeof : t -> int
 
   val marshal : Cstruct.t -> t -> int
+
   val parse : Cstruct.t -> t
 
   val to_string : t -> string
@@ -292,6 +294,8 @@ end
 
 module PortState : sig
 
+  type t = portState
+
   val marshal : portState -> int32
 
   val parse : int32 -> portState
@@ -302,24 +306,29 @@ end
 
 module PortDesc : sig
 
-  val sizeof : portDesc -> int
+  type t = portDesc
+
+  val sizeof : t -> int
+
+  val marshal : Cstruct.t -> t -> int
 
-  val marshal : Cstruct.t -> portDesc -> int
+  val parse : Cstruct.t -> t
 
-  val parse : Cstruct.t -> portDesc
+  val to_string : t -> string
 
-  val to_string : portDesc -> string
 end
 
 module PortStatus : sig
 
-  val sizeof : portStatus -> int
+  type t = portStatus
 
-  val marshal : Cstruct.t ->  portStatus -> int
+  val sizeof : t -> int
 
-  val parse : Cstruct.t -> portStatus
+  val marshal : Cstruct.t ->  t -> int
 
-  val to_string : portStatus -> string
+  val parse : Cstruct.t -> t
+
+  val to_string : t -> string
 
 end
 
@@ -342,9 +351,11 @@ module PacketOut : sig
   type t = packetOut
 
   val sizeof : t -> int
+
   val to_string : t -> string
 
   val marshal : Cstruct.t -> t -> int
+
   val parse : Cstruct.t -> t
 
 end
@@ -709,8 +720,11 @@ module Error : sig
   }
 
   val marshal : Cstruct.t -> t -> int
+
   val parse : Cstruct.t -> t
+
   val sizeof : t -> int
+
   val to_string : t -> string
 
 end
@@ -793,14 +807,14 @@ module Message : sig
     | EchoReply of bytes
     | FeaturesRequest
     | FeaturesReply of SwitchFeatures.t
-    | FlowModMsg of flowMod
+    | FlowModMsg of FlowMod.t
     | GroupModMsg of GroupMod.t
-    | PortModMsg of portMod
-    | MeterModMsg of meterMod
-    | PacketInMsg of packetIn
-    | FlowRemoved of flowRemoved
-    | PacketOutMsg of packetOut
-    | PortStatusMsg of portStatus
+    | PortModMsg of PortMod.t
+    | MeterModMsg of MeterMod.t
+    | PacketInMsg of PacketIn.t
+    | FlowRemoved of FlowRemoved.t
+    | PacketOutMsg of PacketOut.t
+    | PortStatusMsg of PortStatus.t
     | MultipartReq of MultipartReq.t
     | MultipartReply of MultipartReply.t
     | BarrierRequest
@@ -812,10 +826,10 @@ module Message : sig
     | GetConfigRequestMsg
     | GetConfigReplyMsg of SwitchConfig.t
     | SetConfigMsg of SwitchConfig.t
-    | TableModMsg of tableMod
+    | TableModMsg of TableMod.t
     | GetAsyncRequest
-    | GetAsyncReply of asyncConfig
-    | SetAsync of asyncConfig
+    | GetAsyncReply of AsyncConfig.t
+    | SetAsync of AsyncConfig.t
     | Error of Error.t
 
   val sizeof : t -> int