Merge pull request #179 from robertsoule/sexp-pattern

Added with sexp serialization to pattern type.

Author: jnfoster

lib/OpenFlow0x01_Core.ml

@@ -1,12 +1,13 @@
 open Packet
+open Core.Std
 
-type 'a mask = { m_value : 'a; m_mask : 'a option }
+type 'a mask = { m_value : 'a; m_mask : 'a option } with sexp
 
-type switchId = int64
+type switchId = int64 with sexp
 
-type portId = int16
+type portId = int16 with sexp
 
-type queueId = int32
+type queueId = int32 with sexp
 
 type xid = OpenFlow_Header.xid
 
@@ -22,7 +23,7 @@ type pattern =
     ; nwTos : nwTos option
     ; tpSrc : tpPort option
     ; tpDst : tpPort option
-    ; inPort : portId option }
+    ; inPort : portId option } with sexp
 
 type pseudoPort =
   | PhysicalPort of portId

lib/OpenFlow0x01_Core.mli

@@ -8,24 +8,25 @@ Most data structures are documented with a pointer to relevent section in the
 OpenFlow 1.0 specification, rather than reproducing the specification here. *)
 
 open Packet
+open Core.Std
 
 (** {2 OpenFlow types}
 
     These types are primarily drawn from Section 5 of the OpenFlow 1.0
     specification.
 *)
 
-type 'a mask = { m_value : 'a; m_mask : 'a option }
+type 'a mask = { m_value : 'a; m_mask : 'a option } with sexp
 
 (** [switchId] is the type of switch identifiers received as part of
 [SwitchFeature] replies. *)
-type switchId = int64
+type switchId = int64 with sexp
 
 (** [portId] is the type of physical port identifiers (port numbers). *)
-type portId = int16
+type portId = int16 with sexp
 
 (** [queueId] identifies a specific queue for QoS. *)
-type queueId = int32
+type queueId = int32 with sexp
 
 (** Transaction ID of OpenFlow messages. *)
 type xid = OpenFlow_Header.xid
@@ -47,7 +48,7 @@ type pattern =
     ; tpSrc : tpPort option (** TCP/UDP source port. *)
     ; tpDst : tpPort option (** TCP/UDP destination port. *)
     ; inPort : portId option (** Input switch port. *)
-    }
+    } with sexp
 
 (** A pseudo-port, as described by the [ofp_port] enumeration in
     Section 5.2.1 of the OpenFlow 1.0 specification. *)