X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fofp-util.h;h=f8705a2db1788801d3f2739c9b7d303f42867310;hb=511a70176e971e28d43a62d9c8c4eb52a8beb49a;hp=d87554de35ddb5b4dc439629b84e67beef291bf8;hpb=eb12aa89e70848837127e10d6d0dd89be89ebaa2;p=sliver-openvswitch.git diff --git a/lib/ofp-util.h b/lib/ofp-util.h index d87554de3..f8705a2db 100644 --- a/lib/ofp-util.h +++ b/lib/ofp-util.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2009, 2010, 2011, 2012 Nicira, Inc. + * Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013 Nicira, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ #ifndef OFP_UTIL_H #define OFP_UTIL_H 1 -#include #include #include #include @@ -28,16 +27,19 @@ #include "netdev.h" #include "openflow/nicira-ext.h" #include "openvswitch/types.h" +#include "type-props.h" struct ofpbuf; /* Port numbers. */ -enum ofperr ofputil_port_from_ofp11(ovs_be32 ofp11_port, uint16_t *ofp10_port); -ovs_be32 ofputil_port_to_ofp11(uint16_t ofp10_port); +enum ofperr ofputil_port_from_ofp11(ovs_be32 ofp11_port, + ofp_port_t *ofp10_port); +ovs_be32 ofputil_port_to_ofp11(ofp_port_t ofp10_port); -enum ofperr ofputil_check_output_port(uint16_t ofp_port, int max_ports); -bool ofputil_port_from_string(const char *, uint16_t *portp); -void ofputil_format_port(uint16_t port, struct ds *); +enum ofperr ofputil_check_output_port(ofp_port_t ofp_port, + ofp_port_t max_ports); +bool ofputil_port_from_string(const char *, ofp_port_t *portp); +void ofputil_format_port(ofp_port_t port, struct ds *); /* Converting OFPFW10_NW_SRC_MASK and OFPFW10_NW_DST_MASK wildcard bit counts * to and from IP bitmasks. */ @@ -77,31 +79,33 @@ enum ofputil_protocol { #define OFPUTIL_P_OF10_STD_ANY (OFPUTIL_P_OF10_STD | OFPUTIL_P_OF10_STD_TID) #define OFPUTIL_P_OF10_NXM_ANY (OFPUTIL_P_OF10_NXM | OFPUTIL_P_OF10_NXM_TID) - /* OpenFlow 1.2 protocol (only one variant). + /* OpenFlow 1.2+ protocols (only one variant each). * - * This uses the standard OpenFlow Extensible Match (OXM) flow format. + * These use the standard OpenFlow Extensible Match (OXM) flow format. * - * OpenFlow 1.2 always operates with an equivalent of the + * OpenFlow 1.2+ always operates with an equivalent of the * nx_flow_mod_table_id Nicira extension enabled, so there is no "TID" * variant. */ OFPUTIL_P_OF12_OXM = 1 << 4, + OFPUTIL_P_OF13_OXM = 1 << 5, +#define OFPUTIL_P_ANY_OXM (OFPUTIL_P_OF12_OXM | OFPUTIL_P_OF13_OXM) /* All protocols. */ -#define OFPUTIL_P_ANY ((1 << 5) - 1) +#define OFPUTIL_P_ANY ((1 << 6) - 1) /* Protocols in which a specific table may be specified in flow_mods. */ #define OFPUTIL_P_TID (OFPUTIL_P_OF10_STD_TID | \ OFPUTIL_P_OF10_NXM_TID | \ - OFPUTIL_P_OF12_OXM) + OFPUTIL_P_ANY_OXM) }; /* Protocols to use for flow dumps, from most to least preferred. */ extern enum ofputil_protocol ofputil_flow_dump_protocols[]; extern size_t ofputil_n_flow_dump_protocols; -enum ofputil_protocol -ofputil_protocol_from_ofp_version(enum ofp_version version); -enum ofp_version ofputil_protocol_to_ofp_version(enum ofputil_protocol); +enum ofputil_protocol ofputil_protocol_from_ofp_version(enum ofp_version); +enum ofputil_protocol ofputil_protocols_from_ofp_version(enum ofp_version); +enum ofp_version ofputil_protocol_to_ofp_version(enum ofputil_protocol); bool ofputil_protocol_is_valid(enum ofputil_protocol); enum ofputil_protocol ofputil_protocol_set_tid(enum ofputil_protocol, @@ -128,9 +132,12 @@ void ofputil_format_version_name(struct ds *, enum ofp_version); void ofputil_format_version_bitmap(struct ds *msg, uint32_t bitmap); void ofputil_format_version_bitmap_names(struct ds *msg, uint32_t bitmap); +uint32_t ofputil_protocols_to_version_bitmap(enum ofputil_protocol); +enum ofputil_protocol ofputil_protocols_from_version_bitmap(uint32_t bitmap); + /* Bitmap of OpenFlow versions that Open vSwitch supports. */ #define OFPUTIL_SUPPORTED_VERSIONS \ - ((1u << OFP10_VERSION) | (1u << OFP12_VERSION)) + ((1u << OFP10_VERSION) | (1u << OFP12_VERSION) | (1u << OFP13_VERSION)) /* Bitmap of OpenFlow versions to enable by default (a subset of * OFPUTIL_SUPPORTED_VERSIONS). */ @@ -140,6 +147,7 @@ enum ofputil_protocol ofputil_protocols_from_string(const char *s); const char *ofputil_version_to_string(enum ofp_version ofp_version); uint32_t ofputil_versions_from_string(const char *s); +uint32_t ofputil_versions_from_strings(char ** const s, size_t count); bool ofputil_decode_hello(const struct ofp_header *, uint32_t *allowed_versions); @@ -213,7 +221,7 @@ struct ofputil_flow_mod { uint16_t idle_timeout; uint16_t hard_timeout; uint32_t buffer_id; - uint16_t out_port; + ofp_port_t out_port; uint16_t flags; struct ofpact *ofpacts; /* Series of "struct ofpact"s. */ size_t ofpacts_len; /* Length of ofpacts, in bytes. */ @@ -235,7 +243,7 @@ struct ofputil_flow_stats_request { struct match match; ovs_be64 cookie; ovs_be64 cookie_mask; - uint16_t out_port; + ofp_port_t out_port; uint8_t table_id; }; @@ -262,6 +270,7 @@ struct ofputil_flow_stats { uint64_t byte_count; /* Byte count, UINT64_MAX if unknown. */ struct ofpact *ofpacts; size_t ofpacts_len; + uint16_t flags; /* Added for OF 1.3 */ }; int ofputil_decode_flow_stats_reply(struct ofputil_flow_stats *, @@ -328,7 +337,10 @@ struct ofpbuf *ofputil_encode_packet_in(const struct ofputil_packet_in *, enum ofputil_protocol protocol, enum nx_packet_in_format); -const char *ofputil_packet_in_reason_to_string(enum ofp_packet_in_reason); +enum { OFPUTIL_PACKET_IN_REASON_BUFSIZE = INT_STRLEN(int) + 1 }; +const char *ofputil_packet_in_reason_to_string(enum ofp_packet_in_reason, + char *reasonbuf, + size_t bufsize); bool ofputil_packet_in_reason_from_string(const char *, enum ofp_packet_in_reason *); @@ -340,7 +352,7 @@ struct ofputil_packet_out { const void *packet; /* Packet data, if buffer_id == UINT32_MAX. */ size_t packet_len; /* Length of packet data in bytes. */ uint32_t buffer_id; /* Buffer id or UINT32_MAX if no buffer. */ - uint16_t in_port; /* Packet's input port. */ + ofp_port_t in_port; /* Packet's input port. */ struct ofpact *ofpacts; /* Actions. */ size_t ofpacts_len; /* Size of ofpacts in bytes. */ }; @@ -380,7 +392,7 @@ enum ofputil_port_state { /* Abstract ofp10_phy_port or ofp11_port. */ struct ofputil_phy_port { - uint16_t port_no; + ofp_port_t port_no; uint8_t hw_addr[OFP_ETH_ALEN]; char name[OFP_MAX_PORT_NAME_LEN]; enum ofputil_port_config config; @@ -398,7 +410,7 @@ struct ofputil_phy_port { }; enum ofputil_capabilities { - /* OpenFlow 1.0, 1.1 and 1.2 share these values for these capabilities. */ + /* OpenFlow 1.0, 1.1, 1.2, and 1.3 share these capability values. */ OFPUTIL_C_FLOW_STATS = 1 << 0, /* Flow statistics. */ OFPUTIL_C_TABLE_STATS = 1 << 1, /* Table statistics. */ OFPUTIL_C_PORT_STATS = 1 << 2, /* Port statistics. */ @@ -411,10 +423,10 @@ enum ofputil_capabilities { /* OpenFlow 1.0 only. */ OFPUTIL_C_STP = 1 << 3, /* 802.1d spanning tree. */ - /* OpenFlow 1.1 and 1.2 share this capability. */ + /* OpenFlow 1.1, 1.2, and 1.3 share this capability. */ OFPUTIL_C_GROUP_STATS = 1 << 4, /* Group statistics. */ - /* OpenFlow 1.2 only */ + /* OpenFlow 1.2 and 1.3 share this capability */ OFPUTIL_C_PORT_BLOCKED = 1 << 8, /* Switch will block looping ports */ }; @@ -454,6 +466,7 @@ struct ofputil_switch_features { uint64_t datapath_id; /* Datapath unique ID. */ uint32_t n_buffers; /* Max packets buffered at once. */ uint8_t n_tables; /* Number of tables supported by datapath. */ + uint8_t auxiliary_id; /* Identify auxiliary connections */ enum ofputil_capabilities capabilities; enum ofputil_action_bitmap actions; }; @@ -487,7 +500,7 @@ struct ofpbuf *ofputil_encode_port_status(const struct ofputil_port_status *, /* Abstract ofp_port_mod. */ struct ofputil_port_mod { - uint16_t port_no; + ofp_port_t port_no; uint8_t hw_addr[OFP_ETH_ALEN]; enum ofputil_port_config config; enum ofputil_port_config mask; @@ -499,6 +512,18 @@ enum ofperr ofputil_decode_port_mod(const struct ofp_header *, struct ofpbuf *ofputil_encode_port_mod(const struct ofputil_port_mod *, enum ofputil_protocol); +/* Abstract ofp_role_request and reply. */ +struct ofputil_role_request { + enum ofp12_controller_role role; + bool have_generation_id; + uint64_t generation_id; +}; + +enum ofperr ofputil_decode_role_message(const struct ofp_header *, + struct ofputil_role_request *); +struct ofpbuf *ofputil_encode_role_reply(const struct ofp_header *, + const struct ofputil_role_request *); + /* Abstract table stats. * * For now we use ofp12_table_stats as a superset of the other protocol @@ -512,7 +537,7 @@ struct ofpbuf *ofputil_encode_table_stats_reply( struct ofputil_flow_monitor_request { uint32_t id; enum nx_flow_monitor_flags flags; - uint16_t out_port; + ofp_port_t out_port; uint8_t table_id; struct match match; }; @@ -595,7 +620,6 @@ bool ofputil_frag_handling_from_string(const char *, enum ofp_config_flags *); * OFPUTIL_NXAST_NOTE * OFPUTIL_NXAST_SET_TUNNEL64 * OFPUTIL_NXAST_MULTIPATH - * OFPUTIL_NXAST_AUTOPATH * OFPUTIL_NXAST_BUNDLE * OFPUTIL_NXAST_BUNDLE_LOAD * OFPUTIL_NXAST_RESUBMIT_TABLE @@ -654,8 +678,6 @@ void *ofputil_put_action(enum ofputil_action_code, struct ofpbuf *buf); #define OFP_ACTION_ALIGN 8 /* Alignment of ofp_actions. */ -enum ofperr 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 *, ovs_be16 port); enum ofperr ofputil_pull_actions(struct ofpbuf *, unsigned int actions_len, @@ -668,24 +690,24 @@ union ofp_action *ofputil_actions_clone(const union ofp_action *, size_t n); /* Handy utility for parsing flows and actions. */ bool ofputil_parse_key_value(char **stringp, char **keyp, char **valuep); -struct ofpbuf *ofputlil_dump_ports(enum ofp_version ofp_version, int16_t port); - struct ofputil_port_stats { - uint16_t port_no; + ofp_port_t port_no; struct netdev_stats stats; + uint32_t duration_sec; /* UINT32_MAX if unknown. */ + uint32_t duration_nsec; }; struct ofpbuf *ofputil_encode_dump_ports_request(enum ofp_version ofp_version, - int16_t port); + ofp_port_t port); void ofputil_append_port_stat(struct list *replies, const struct ofputil_port_stats *ops); size_t ofputil_count_port_stats(const struct ofp_header *); int ofputil_decode_port_stats(struct ofputil_port_stats *, struct ofpbuf *msg); enum ofperr ofputil_decode_port_stats_request(const struct ofp_header *request, - uint16_t *ofp10_port); + ofp_port_t *ofp10_port); struct ofputil_queue_stats_request { - uint16_t port_no; + ofp_port_t port_no; /* OFPP_ANY means "all ports". */ uint32_t queue_id; }; @@ -697,7 +719,7 @@ ofputil_encode_queue_stats_request(enum ofp_version ofp_version, const struct ofputil_queue_stats_request *oqsr); struct ofputil_queue_stats { - uint16_t port_no; + ofp_port_t port_no; uint32_t queue_id; struct netdev_queue_stats stats; };