X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Fofp-util.h;h=6eff98047c8d9c36bc6975b1ab7017029a816d31;hb=cb034511802ff7516ca2a94da1e161965fb80ad0;hp=ea7939c195117a353ca095addced47bb626ca6c2;hpb=9b045a0c66e9dfa6dd0266efb023823eefe82045;p=openvswitch

diff --git a/lib/ofp-util.h b/lib/ofp-util.h
index ea7939c1..6eff9804 100644
--- a/lib/ofp-util.h
+++ b/lib/ofp-util.h
@@ -29,9 +29,6 @@
 struct cls_rule;
 struct ofpbuf;
 
-/* Alignment of ofp_actions. */
-#define OFP_ACTION_ALIGN 8
-
 /* Basic decoding and length validation of OpenFlow messages. */
 enum ofputil_msg_code {
     OFPUTIL_INVALID,
@@ -108,10 +105,15 @@ void ofputil_cls_rule_from_match(const struct ofp_match *,
                                  unsigned int priority, enum nx_flow_format,
                                  ovs_be64 cookie, struct cls_rule *);
 void ofputil_cls_rule_to_match(const struct cls_rule *, enum nx_flow_format,
-                               struct ofp_match *);
+                               struct ofp_match *,
+                               ovs_be64 cookie_in, ovs_be64 *cookie_out);
 void normalize_match(struct ofp_match *);
 char *ofp_match_to_literal_string(const struct ofp_match *match);
 
+/* dl_type translation between OpenFlow and 'struct flow' format. */
+ovs_be16 ofputil_dl_type_to_openflow(ovs_be16 flow_dl_type);
+ovs_be16 ofputil_dl_type_from_openflow(ovs_be16 ofp_dl_type);
+
 /* Flow formats. */
 bool ofputil_flow_format_is_valid(enum nx_flow_format);
 const char *ofputil_flow_format_to_string(enum nx_flow_format);
@@ -229,6 +231,10 @@ struct flow_stats_iterator {
 const struct ofp_flow_stats *flow_stats_first(struct flow_stats_iterator *,
                                               const struct ofp_stats_reply *);
 const struct ofp_flow_stats *flow_stats_next(struct flow_stats_iterator *);
+
+/* Actions. */
+
+#define OFP_ACTION_ALIGN 8      /* Alignment of ofp_actions. */
 
 struct actions_iterator {
     const union ofp_action *pos, *end;
@@ -237,6 +243,7 @@ const union ofp_action *actions_first(struct actions_iterator *,
                                       const union ofp_action *,
                                       size_t n_actions);
 const union ofp_action *actions_next(struct actions_iterator *);
+
 int validate_actions(const union ofp_action *, size_t n_actions,
                      const struct flow *, int max_ports);
 bool action_outputs_to_port(const union ofp_action *, uint16_t port);
@@ -381,6 +388,11 @@ get_ofp_err_code(int error)
     return error & 0xffff;
 }
 
-struct ofpbuf *make_ofp_error_msg(int error, const struct ofp_header *);
+struct ofpbuf *ofputil_encode_error_msg(int error, const struct ofp_header *);
+int ofputil_decode_error_msg(const struct ofp_header *, size_t *payload_ofs);
+
+/* String versions of errors. */
+void ofputil_format_error(struct ds *, int error);
+char *ofputil_error_to_string(int error);
 
 #endif /* ofp-util.h */