X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Fofp-util.h;h=fdeb9d9e3bd4cb94821c85cb9d78ee37ec46e7c8;hb=b0387df4e0ac796af05765834bb6e7750b8b6ae6;hp=f91e76228eaf86238405f80dc6228eb29c28ae71;hpb=7fa9111326e440a56dff41e0d4571716032a1de7;p=openvswitch diff --git a/lib/ofp-util.h b/lib/ofp-util.h index f91e7622..fdeb9d9e 100644 --- a/lib/ofp-util.h +++ b/lib/ofp-util.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2009, 2010 Nicira Networks. + * Copyright (c) 2008, 2009, 2010, 2011 Nicira Networks. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -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, @@ -74,8 +71,6 @@ enum ofputil_msg_code { OFPUTIL_OFPST_AGGREGATE_REPLY, /* NXT_* messages. */ - OFPUTIL_NXT_STATUS_REQUEST, - OFPUTIL_NXT_STATUS_REPLY, OFPUTIL_NXT_TUN_ID_FROM_COOKIE, OFPUTIL_NXT_ROLE_REQUEST, OFPUTIL_NXT_ROLE_REPLY, @@ -106,15 +101,26 @@ 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 { @@ -149,6 +155,56 @@ int ofputil_decode_flow_stats_request(struct flow_stats_request *, struct ofpbuf *ofputil_encode_flow_stats_request( const struct flow_stats_request *, enum nx_flow_format); +/* Flow stats reply, independent of flow format. */ +struct ofputil_flow_stats { + struct cls_rule rule; + ovs_be64 cookie; + uint8_t table_id; + uint32_t duration_sec; + uint32_t duration_nsec; + uint16_t idle_timeout; + uint16_t hard_timeout; + uint64_t packet_count; + uint64_t byte_count; + union ofp_action *actions; + size_t n_actions; +}; + +int ofputil_decode_flow_stats_reply(struct ofputil_flow_stats *, + struct ofpbuf *msg, + 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); +struct ofpbuf *ofputil_encode_flow_removed(const struct ofputil_flow_removed *, + enum nx_flow_format); + +/* Abstract packet-in message. */ +struct ofputil_packet_in { + struct ofpbuf *packet; + uint16_t in_port; + uint8_t reason; /* One of OFPR_*. */ + + uint32_t buffer_id; + int send_len; +}; + +struct ofpbuf *ofputil_encode_packet_in(const struct ofputil_packet_in *, + struct ofpbuf *rw_packet); + /* 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 **); @@ -174,7 +230,10 @@ 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); @@ -198,12 +257,11 @@ struct ofpbuf *make_unbuffered_packet_out(const struct ofpbuf *packet, struct ofpbuf *make_echo_request(void); struct ofpbuf *make_echo_reply(const struct ofp_header *rq); -struct flow_stats_iterator { - const uint8_t *pos, *end; -}; -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 *); +void hton_ofp_phy_port(struct ofp_phy_port *); + +/* Actions. */ + +#define OFP_ACTION_ALIGN 8 /* Alignment of ofp_actions. */ struct actions_iterator { const union ofp_action *pos, *end; @@ -212,6 +270,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); @@ -356,6 +415,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 */