projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
openflow: Move enums for "packet_out" and "flow_mod" to common header.
[openvswitch]
/
lib
/
ofp-util.h
diff --git
a/lib/ofp-util.h
b/lib/ofp-util.h
index 20b6246899358bc4ac4abc848bf45774259fb843..aaab83cbdbc091f0b65af45a4ad4d250863b71cc 100644
(file)
--- a/
lib/ofp-util.h
+++ b/
lib/ofp-util.h
@@
-186,6
+186,13
@@
void ofputil_normalize_rule(struct cls_rule *);
void ofputil_cls_rule_to_ofp10_match(const struct cls_rule *,
struct ofp10_match *);
void ofputil_cls_rule_to_ofp10_match(const struct cls_rule *,
struct ofp10_match *);
+/* Work with ofp11_match. */
+enum ofperr ofputil_cls_rule_from_ofp11_match(const struct ofp11_match *,
+ unsigned int priority,
+ struct cls_rule *);
+void ofputil_cls_rule_to_ofp11_match(const struct cls_rule *,
+ struct ofp11_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);
/* 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);
@@
-327,8
+334,8
@@
struct ofputil_packet_in {
struct flow_metadata fmd; /* Metadata at creation time. */
};
struct flow_metadata fmd; /* Metadata at creation time. */
};
-
int
ofputil_decode_packet_in(struct ofputil_packet_in *,
- const struct ofp_header *);
+
enum ofperr
ofputil_decode_packet_in(struct ofputil_packet_in *,
+
const struct ofp_header *);
struct ofpbuf *ofputil_encode_packet_in(const struct ofputil_packet_in *,
enum nx_packet_in_format);
struct ofpbuf *ofputil_encode_packet_in(const struct ofputil_packet_in *,
enum nx_packet_in_format);
@@
-539,10
+546,6
@@
struct ofpbuf *make_flow_mod(uint16_t command, const struct cls_rule *,
size_t actions_len);
struct ofpbuf *make_add_flow(const struct cls_rule *, uint32_t buffer_id,
uint16_t max_idle, size_t actions_len);
size_t actions_len);
struct ofpbuf *make_add_flow(const struct cls_rule *, uint32_t buffer_id,
uint16_t max_idle, size_t actions_len);
-struct ofpbuf *make_del_flow(const struct cls_rule *);
-struct ofpbuf *make_add_simple_flow(const struct cls_rule *,
- uint32_t buffer_id, uint16_t out_port,
- uint16_t max_idle);
struct ofpbuf *make_packet_in(uint32_t buffer_id, uint16_t in_port,
uint8_t reason,
const struct ofpbuf *payload, int max_send_len);
struct ofpbuf *make_packet_in(uint32_t buffer_id, uint16_t in_port,
uint8_t reason,
const struct ofpbuf *payload, int max_send_len);