AsyncConfig change :

use bitmap to represent the accepted reason (previous
implementation was an misunderstanding of the spec)

Author: fugitifduck

lib/OpenFlow0x04.ml

@@ -6636,6 +6636,75 @@ end
 
 module AsyncConfig = struct
 
+  module PacketIn = struct
+    type t = packetInReasonMap
+
+    let to_string (t : t) =
+      Format.sprintf "{ table_miss = %B; apply_action = %B; invalid_ttl = %B }"
+      t.table_miss
+      t.apply_action
+      t.invalid_ttl
+
+    let marshal (t : t) : int8 = 
+      (if t.table_miss then 1 lsl 0 else 0) lor
+        (if t.apply_action then 1 lsl 1 else 0) lor
+          (if t.invalid_ttl then 1 lsl 2 else 0)
+
+    let parse bits : t =
+        { table_miss = test_bit16 0 bits
+        ; apply_action = test_bit16 1 bits
+        ; invalid_ttl = test_bit16 2 bits}
+
+    end
+
+    module PortStatus = struct
+
+      type t = portReasonMap
+
+      let to_string (t : t) =
+        Format.sprintf "{ add  = %B; delete = %B; modify = %B }"
+        t.add
+        t.delete
+        t.modify
+
+      let marshal (t : t) : int8 =
+        (if t.add then 1 lsl 0 else 0) lor
+          (if t.delete then 1 lsl 1 else 0) lor
+            (if t.modify then 1 lsl 2 else 0)
+
+      let parse bits : t =
+        { add = test_bit16 0 bits
+        ; delete = test_bit16 1 bits
+        ; modify = test_bit16 2 bits }
+
+    end
+
+    module FlowRemoved = struct
+
+      type t = flowReasonMask
+
+      let to_string (t : t) = 
+        Format.sprintf "{ idle_timeout = %B; hard_timeout = %B; delete = %B; \
+                         group_delete = %B }"
+        t.idle_timeout
+        t.hard_timeout
+        t.delete
+        t.group_delete
+
+      let marshal (t : t) : int8 =
+        (if t.idle_timeout then 1 lsl 0 else 0) lor
+          (if t.hard_timeout then 1 lsl 1 else 0) lor
+            (if t.delete then 1 lsl 2 else 0) lor
+              (if t.group_delete then 1 lsl 3 else 0)
+
+      let parse bits : t =
+        { idle_timeout = test_bit16 0 bits
+        ; hard_timeout = test_bit16 1 bits
+        ; delete = test_bit16 2 bits
+        ; group_delete = test_bit16 3 bits }
+
+    end
+
   cstruct ofp_async_config {
     uint32_t packet_in_mask0;
     uint32_t packet_in_mask1;
@@ -6654,29 +6723,29 @@ module AsyncConfig = struct
     Format.sprintf "{ packet_in reason (master/slave) = %s/%s; \
     port_status reason (master/slave) = %s/%s; \
     flow_removed reason (master/slave) = %s/%s }"
-    (PacketIn.Reason.to_string async.packet_in.m_master)
-    (PacketIn.Reason.to_string async.packet_in.m_slave)
-    (PortStatus.Reason.to_string async.port_status.m_master)
-    (PortStatus.Reason.to_string async.port_status.m_slave)
-    (FlowRemoved.RemovedReason.to_string async.flow_removed.m_master)
-    (FlowRemoved.RemovedReason.to_string async.flow_removed.m_slave)
+    (PacketIn.to_string async.packet_in.m_master)
+    (PacketIn.to_string async.packet_in.m_slave)
+    (PortStatus.to_string async.port_status.m_master)
+    (PortStatus.to_string async.port_status.m_slave)
+    (FlowRemoved.to_string async.flow_removed.m_master)
+    (FlowRemoved.to_string async.flow_removed.m_slave)
 
   let marshal (buf : Cstruct.t) (async : asyncConfig) : int =
-    set_ofp_async_config_packet_in_mask0 buf (Int32.of_int (PacketIn.Reason.marshal async.packet_in.m_master));
-    set_ofp_async_config_packet_in_mask1 buf (Int32.of_int (PacketIn.Reason.marshal async.packet_in.m_slave));
-    set_ofp_async_config_port_status_mask0 buf (Int32.of_int (PortStatus.Reason.marshal async.port_status.m_master));
-    set_ofp_async_config_port_status_mask1 buf (Int32.of_int (PortStatus.Reason.marshal async.port_status.m_slave));
-    set_ofp_async_config_flow_removed_mask0 buf (Int32.of_int (FlowRemoved.RemovedReason.marshal async.flow_removed.m_master));
-    set_ofp_async_config_flow_removed_mask1 buf (Int32.of_int (FlowRemoved.RemovedReason.marshal async.flow_removed.m_slave));
+    set_ofp_async_config_packet_in_mask0 buf (Int32.of_int (PacketIn.marshal async.packet_in.m_master));
+    set_ofp_async_config_packet_in_mask1 buf (Int32.of_int (PacketIn.marshal async.packet_in.m_slave));
+    set_ofp_async_config_port_status_mask0 buf (Int32.of_int (PortStatus.marshal async.port_status.m_master));
+    set_ofp_async_config_port_status_mask1 buf (Int32.of_int (PortStatus.marshal async.port_status.m_slave));
+    set_ofp_async_config_flow_removed_mask0 buf (Int32.of_int (FlowRemoved.marshal async.flow_removed.m_master));
+    set_ofp_async_config_flow_removed_mask1 buf (Int32.of_int (FlowRemoved.marshal async.flow_removed.m_slave));
     sizeof_ofp_async_config
 
   let parse (bits : Cstruct.t) : asyncConfig = 
-    let packet_in = { m_master = PacketIn.Reason.parse (Int32.to_int (get_ofp_async_config_packet_in_mask0 bits));
-                      m_slave = PacketIn.Reason.parse (Int32.to_int (get_ofp_async_config_packet_in_mask1 bits))} in
-    let port_status = { m_master = PortStatus.Reason.parse (Int32.to_int (get_ofp_async_config_port_status_mask0 bits));
-                        m_slave = PortStatus.Reason.parse (Int32.to_int (get_ofp_async_config_port_status_mask1 bits))} in
-    let flow_removed = { m_master = FlowRemoved.RemovedReason.parse (Int32.to_int (get_ofp_async_config_flow_removed_mask0 bits));
-                         m_slave = FlowRemoved.RemovedReason.parse (Int32.to_int (get_ofp_async_config_flow_removed_mask1 bits))} in
+    let packet_in = { m_master = PacketIn.parse (Int32.to_int (get_ofp_async_config_packet_in_mask0 bits));
+                      m_slave = PacketIn.parse (Int32.to_int (get_ofp_async_config_packet_in_mask1 bits))} in
+    let port_status = { m_master = PortStatus.parse (Int32.to_int (get_ofp_async_config_port_status_mask0 bits));
+                        m_slave = PortStatus.parse (Int32.to_int (get_ofp_async_config_port_status_mask1 bits))} in
+    let flow_removed = { m_master = FlowRemoved.parse (Int32.to_int (get_ofp_async_config_flow_removed_mask0 bits));
+                         m_slave = FlowRemoved.parse (Int32.to_int (get_ofp_async_config_flow_removed_mask1 bits))} in
     { packet_in; port_status; flow_removed }
 
 end

lib/OpenFlow0x04_Core.ml

@@ -655,7 +655,13 @@ type element =
 
 type helloElement = element list
 
-type asyncConfig = { packet_in : packetInReason asyncMask; 
-                     port_status : portReason asyncMask;
-                     flow_removed : flowReason asyncMask }
+type packetInReasonMap =  { table_miss : bool; apply_action : bool; invalid_ttl : bool }
 
+type portReasonMap =  { add : bool; delete : bool; modify : bool }
+
+type flowReasonMask = { idle_timeout : bool; hard_timeout : bool; delete : bool; 
+                        group_delete : bool}
+
+type asyncConfig = { packet_in : packetInReasonMap asyncMask; 
+                     port_status : portReasonMap asyncMask;
+                     flow_removed : flowReasonMask asyncMask }

lib/OpenFlow0x04_Core.mli

@@ -622,7 +622,14 @@ type element =
 
 type helloElement = element list
 
-type asyncConfig = { packet_in : packetInReason asyncMask; 
-                     port_status : portReason asyncMask;
-                     flow_removed : flowReason asyncMask }
+type packetInReasonMap =  { table_miss : bool; apply_action : bool; invalid_ttl : bool }
+
+type portReasonMap =  { add : bool; delete : bool; modify : bool }
+
+type flowReasonMask = { idle_timeout : bool; hard_timeout : bool; delete : bool; 
+                        group_delete : bool}
+
+type asyncConfig = { packet_in : packetInReasonMap asyncMask; 
+                     port_status : portReasonMap asyncMask;
+                     flow_removed : flowReasonMask asyncMask }
 

quickcheck/Arbitrary_OpenFlow0x04.ml

@@ -1883,36 +1883,34 @@ module AsyncConfig = struct
 
   type t = AsyncConfig.t
 
-  let arbitrary_FlowReason = 
-    oneof [ 
-      ret_gen FlowIdleTimeout;
-      ret_gen FlowHardTiemout;
-      ret_gen FlowDelete;
-      ret_gen FlowGroupDelete]
-
-  let arbitrary_PacketInReason =
-      oneof [
-          ret_gen NoMatch;
-          ret_gen ExplicitSend;
-          ret_gen InvalidTTL
-      ]
-
-  let arbitrary_PortStatusReason =
-        oneof [
-            ret_gen PortAdd;
-            ret_gen PortDelete;
-            ret_gen PortModify
-        ]
+  let arbitrary_packetInReasonMap = 
+    arbitrary_bool >>= fun table_miss ->
+    arbitrary_bool >>= fun apply_action ->
+    arbitrary_bool >>= fun invalid_ttl ->
+    ret_gen { table_miss; apply_action; invalid_ttl }
+
+  let arbitrary_portStatusReasonMap = 
+    arbitrary_bool >>= fun add ->
+    arbitrary_bool >>= fun delete ->
+    arbitrary_bool >>= fun modify ->
+    ret_gen { add; delete; modify }
+
+  let arbitrary_flowRemovedReasonMap =
+    arbitrary_bool >>= fun idle_timeout ->
+    arbitrary_bool >>= fun hard_timeout ->
+    arbitrary_bool >>= fun delete ->
+    arbitrary_bool >>= fun group_delete ->
+    ret_gen { idle_timeout; hard_timeout; delete; group_delete }
 
   let arbitrary_mask arb =
     arb >>= fun m_master ->
     arb >>= fun m_slave ->
     ret_gen { m_master; m_slave }
 
   let arbitrary = 
-    arbitrary_mask arbitrary_PacketInReason >>= fun packet_in ->
-    arbitrary_mask arbitrary_PortStatusReason >>= fun port_status ->
-    arbitrary_mask arbitrary_FlowReason >>= fun flow_removed ->
+    arbitrary_mask arbitrary_packetInReasonMap >>= fun packet_in ->
+    arbitrary_mask arbitrary_portStatusReasonMap >>= fun port_status ->
+    arbitrary_mask arbitrary_flowRemovedReasonMap >>= fun flow_removed ->
     ret_gen { packet_in; port_status; flow_removed }
 
   let marshal = AsyncConfig.marshal