X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Fofp-util.h;h=6eff98047c8d9c36bc6975b1ab7017029a816d31;hb=e868fb3d322f5c46385f1fc6db5bb1ab33f90305;hp=733fc714923f1363cf5f5ecc13d6e0a1d0c5bcec;hpb=d1e2cf211901ec64dc2f91ab5379a0ac2654ae62;p=openvswitch diff --git a/lib/ofp-util.h b/lib/ofp-util.h index 733fc714..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, @@ -106,26 +103,105 @@ int ofputil_netmask_to_wcbits(ovs_be32 netmask); /* Work with OpenFlow 1.0 ofp_match. */ void ofputil_cls_rule_from_match(const struct ofp_match *, unsigned int priority, enum nx_flow_format, - uint64_t cookie, struct cls_rule *); + 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); +int ofputil_flow_format_from_string(const char *); +enum nx_flow_format ofputil_min_flow_format(const struct cls_rule *, + bool cookie_support, + ovs_be64 cookie); + +struct ofpbuf *ofputil_make_set_flow_format(enum nx_flow_format); + +/* Flow format independent flow_mod. */ +struct flow_mod { + struct cls_rule cr; + ovs_be64 cookie; + uint16_t command; + uint16_t idle_timeout; + uint16_t hard_timeout; + uint32_t buffer_id; + uint16_t out_port; + uint16_t flags; + union ofp_action *actions; + size_t n_actions; +}; + +int ofputil_decode_flow_mod(struct flow_mod *, const struct ofp_header *, + enum nx_flow_format); +struct ofpbuf *ofputil_encode_flow_mod(const struct flow_mod *, + enum nx_flow_format); + +/* Flow stats or aggregate stats request, independent of flow format. */ +struct flow_stats_request { + bool aggregate; /* Aggregate results? */ + struct cls_rule match; + uint16_t out_port; + uint8_t table_id; +}; + +int ofputil_decode_flow_stats_request(struct flow_stats_request *, + const struct ofp_header *, + enum nx_flow_format); +struct ofpbuf *ofputil_encode_flow_stats_request( + const struct flow_stats_request *, enum nx_flow_format); + +/* Flow removed message, independent of flow format. */ +struct ofputil_flow_removed { + struct cls_rule rule; + ovs_be64 cookie; + uint8_t reason; /* One of OFPRR_*. */ + uint32_t duration_sec; + uint32_t duration_nsec; + uint16_t idle_timeout; + uint64_t packet_count; + uint64_t byte_count; +}; + +int ofputil_decode_flow_removed(struct ofputil_flow_removed *, + const struct ofp_header *, + enum nx_flow_format); + /* OpenFlow protocol utility functions. */ void *make_openflow(size_t openflow_len, uint8_t type, struct ofpbuf **); void *make_nxmsg(size_t openflow_len, uint32_t subtype, struct ofpbuf **); + void *make_openflow_xid(size_t openflow_len, uint8_t type, ovs_be32 xid, struct ofpbuf **); void *make_nxmsg_xid(size_t openflow_len, uint32_t subtype, ovs_be32 xid, struct ofpbuf **); + void *put_openflow(size_t openflow_len, uint8_t type, struct ofpbuf *); void *put_openflow_xid(size_t openflow_len, uint8_t type, ovs_be32 xid, struct ofpbuf *); + +void *put_nxmsg(size_t openflow_len, uint32_t subtype, struct ofpbuf *); +void *put_nxmsg_xid(size_t openflow_len, uint32_t subtype, ovs_be32 xid, + struct ofpbuf *); + void update_openflow_length(struct ofpbuf *); +void *ofputil_make_stats_request(size_t body_len, uint16_t type, + struct ofpbuf **); +void *ofputil_make_nxstats_request(size_t openflow_len, uint32_t subtype, + struct ofpbuf **); + const void *ofputil_stats_body(const struct ofp_header *); -size_t ofputil_stats_body_len(const struct ofp_header *oh); +size_t ofputil_stats_body_len(const struct ofp_header *); + +const void *ofputil_nxstats_body(const struct ofp_header *); +size_t ofputil_nxstats_body_len(const struct ofp_header *); struct ofpbuf *make_flow_mod(uint16_t command, const struct cls_rule *, size_t actions_len); @@ -155,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; @@ -163,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); @@ -307,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 */