table features properties should be a list

Author: fugitifduck

lib/OpenFlow0x04.ml

@@ -3846,6 +3846,10 @@ module TableFeatureProp = struct
 
     type t = tableFeatureProp
 
+    let length_func (buf : Cstruct.t) : int option =
+      if Cstruct.len buf < sizeof_ofp_table_feature_prop_header then None
+      else Some (pad_to_64bits (get_ofp_table_feature_prop_header_length buf))
+
     let sizeof tfp : int = 
       let size = sizeof_ofp_table_feature_prop_header + (match tfp with
         | TfpInstruction ins -> 
@@ -4083,7 +4087,7 @@ module TableFeature = struct
 
     let sizeof (tf : tableFeatures) =
       (* should be equal to tf.length *)
-      pad_to_64bits (sizeof_ofp_table_features + (TableFeatureProp.sizeof tf.feature_prop))
+      pad_to_64bits (sizeof_ofp_table_features + sum (map TableFeatureProp.sizeof tf.feature_prop))
 
     let marshal (buf : Cstruct.t) (tf : tableFeatures) : int =
       set_ofp_table_features_length buf tf.length;
@@ -4095,7 +4099,7 @@ module TableFeature = struct
       set_ofp_table_features_config buf (TableConfig.marshal tf.config);
       set_ofp_table_features_max_entries buf tf.max_entries;
       sizeof_ofp_table_features + (
-        TableFeatureProp.marshal (Cstruct.shift buf sizeof_ofp_table_features) tf.feature_prop)
+        marshal_fields (Cstruct.shift buf sizeof_ofp_table_features) tf.feature_prop TableFeatureProp.marshal)
 
     let parse (bits : Cstruct.t) : tableFeatures*Cstruct.t = 
       let length = get_ofp_table_features_length bits in
@@ -4105,7 +4109,7 @@ module TableFeature = struct
       let metadataWrite = get_ofp_table_features_metadata_write bits in
       let config = TableConfig.parse (get_ofp_table_features_config bits) in
       let maxEntries = get_ofp_table_features_max_entries bits in
-      let featureProp = TableFeatureProp.parse (Cstruct.sub bits sizeof_ofp_table_features (length-sizeof_ofp_table_features)) in
+      let featureProp = parse_fields (Cstruct.sub bits sizeof_ofp_table_features (length-sizeof_ofp_table_features)) TableFeatureProp.parse TableFeatureProp.length_func in
       { length = length;
         table_id = tableId;
         name = name;
@@ -4125,7 +4129,7 @@ module TableFeature = struct
       tf.metadata_write
       (TableConfig.to_string tf.config)
       tf.max_entries
-      (TableFeatureProp.to_string tf.feature_prop)
+      ("[ " ^ (String.concat "; " (map TableFeatureProp.to_string tf.feature_prop)) ^ " ]")
 
 end
 

lib/OpenFlow0x04_Core.ml

@@ -508,7 +508,7 @@ type tableConfig = Deprecated
 type tableFeatures = {length : int16;table_id : tableId; name : string;
                       metadata_match : int64; metadata_write : int64;
                       config : tableConfig; max_entries: int32;
-                      feature_prop : tableFeatureProp}
+                      feature_prop : tableFeatureProp list}
 
 type multipartType =
   | SwitchDescReq

lib/OpenFlow0x04_Core.mli

@@ -477,7 +477,7 @@ type tableConfig = Deprecated
 type tableFeatures = {length : int16; table_id : tableId; name : string;
                       metadata_match : int64; metadata_write : int64;
                       config : tableConfig; max_entries: int32;
-                      feature_prop : tableFeatureProp}
+                      feature_prop : tableFeatureProp list}
 
 type multipartType =
   | SwitchDescReq

quickcheck/Arbitrary_OpenFlow0x04.ml

@@ -801,7 +801,7 @@ module MultipartReq = struct
 
       let calc_length tfp =
         (* sizeof_ofp_table_feature = 64*)
-        ret_gen (64+(TableFeatureProp.size_of tfp))
+        ret_gen (64+sum (List.map TableFeatureProp.size_of tfp))
 
       let arbitrary = 
         arbitrary_uint8 >>= fun table_id ->
@@ -810,7 +810,7 @@ module MultipartReq = struct
         arbitrary_uint64 >>= fun metadata_write ->
         arbitrary_config >>= fun config ->
         arbitrary_uint32 >>= fun max_entries ->
-        TableFeatureProp.arbitrary >>= fun feature_prop ->
+        list1 TableFeatureProp.arbitrary >>= fun feature_prop ->
         calc_length feature_prop>>= fun length ->
         ret_gen {
           length;