ofp-parse: Refactor flow parsing.

[openvswitch] / lib / classifier.h

diff --git a/lib/classifier.h b/lib/classifier.h
index e178703c6f961e1dd4d49c059367966e31d56933..0d95a2ea411b862bfcb4b9520156bc39ecd38bb6 100644 (file)
--- a/lib/classifier.h
+++ b/lib/classifier.h
@@ -55,8 +55,9 @@ struct cls_table {
  * invariant that the classifier depends on:
  *
  *   - If a bit or a field is wildcarded in 'wc', then the corresponding bit or
- *     field in 'flow' is set to all-0-bits.  (The cls_rule_zero_wildcards()
- *     function can be used to restore this invariant after adding wildcards.)
+ *     field in 'flow' is set to all-0-bits.  (The
+ *     cls_rule_zero_wildcarded_fields() function can be used to restore this
+ *     invariant after adding wildcards.)
  */
 struct cls_rule {
     struct hmap_node hmap_node; /* Within struct cls_table 'rules'. */
@@ -72,12 +73,35 @@ enum {
     CLS_INC_ALL = CLS_INC_EXACT | CLS_INC_WILD
 };
 
-void cls_rule_from_flow(const struct flow *, uint32_t wildcards,
-                        unsigned int priority, struct cls_rule *);
+void cls_rule_init(const struct flow *, const struct flow_wildcards *,
+                   unsigned int priority, struct cls_rule *);
+void cls_rule_init_exact(const struct flow *, unsigned int priority,
+                         struct cls_rule *);
 void cls_rule_from_match(const struct ofp_match *, unsigned int priority,
                          int flow_format, uint64_t cookie, struct cls_rule *);
-
-void cls_rule_zero_wildcards(struct cls_rule *);
+void cls_rule_init_catchall(struct cls_rule *, unsigned int priority);
+
+void cls_rule_zero_wildcarded_fields(struct cls_rule *);
+
+void cls_rule_set_in_port(struct cls_rule *, uint16_t odp_port);
+void cls_rule_set_dl_type(struct cls_rule *, ovs_be16);
+void cls_rule_set_dl_src(struct cls_rule *, const uint8_t[6]);
+void cls_rule_set_dl_dst(struct cls_rule *, const uint8_t[6]);
+bool cls_rule_set_dl_tci(struct cls_rule *, ovs_be16 tci);
+bool cls_rule_set_dl_tci_masked(struct cls_rule *,
+                                ovs_be16 tci, ovs_be16 mask);
+void cls_rule_set_dl_vlan(struct cls_rule *, ovs_be16);
+void cls_rule_set_dl_vlan_pcp(struct cls_rule *, uint8_t);
+void cls_rule_set_tp_src(struct cls_rule *, ovs_be16);
+void cls_rule_set_tp_dst(struct cls_rule *, ovs_be16);
+void cls_rule_set_nw_proto(struct cls_rule *, uint8_t);
+void cls_rule_set_nw_src(struct cls_rule *, ovs_be32);
+bool cls_rule_set_nw_src_masked(struct cls_rule *, ovs_be32 ip, ovs_be32 mask);
+void cls_rule_set_nw_dst(struct cls_rule *, ovs_be32);
+bool cls_rule_set_nw_dst_masked(struct cls_rule *, ovs_be32 ip, ovs_be32 mask);
+void cls_rule_set_nw_tos(struct cls_rule *, uint8_t);
+void cls_rule_set_icmp_type(struct cls_rule *, uint8_t);
+void cls_rule_set_icmp_code(struct cls_rule *, uint8_t);
 
 char *cls_rule_to_string(const struct cls_rule *);
 void cls_rule_print(const struct cls_rule *);