X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=include%2Fopenflow%2Fopenflow-common.h;h=0bca0d26ba9cf3333c956a608fe8f40d0d98428e;hb=8087f5ff825cae3a699e5a60ca6dd0deb10fc8e5;hp=fe91b107619c00449a91e9335ae27c9d04a3db05;hpb=1d31ece9c09ecd31ed524f0f83573e8780774abb;p=sliver-openvswitch.git diff --git a/include/openflow/openflow-common.h b/include/openflow/openflow-common.h index fe91b1076..0bca0d26b 100644 --- a/include/openflow/openflow-common.h +++ b/include/openflow/openflow-common.h @@ -71,9 +71,11 @@ /* The most significant bit being set in the version field indicates an * experimental OpenFlow version. */ -#define OFP10_VERSION 0x01 -#define OFP11_VERSION 0x02 -#define OFP12_VERSION 0x03 +enum ofp_version { + OFP10_VERSION = 0x01, + OFP11_VERSION = 0x02, + OFP12_VERSION = 0x03, +}; #define OFP_MAX_TABLE_NAME_LEN 32 #define OFP_MAX_PORT_NAME_LEN 16 @@ -83,32 +85,6 @@ #define OFP_ETH_ALEN 6 /* Bytes in an Ethernet address. */ -/* Common OpenFlow message types. */ -enum ofp_type { - /* Immutable messages. */ - OFPT_HELLO, /* Symmetric message */ - OFPT_ERROR, /* Symmetric message */ - OFPT_ECHO_REQUEST, /* Symmetric message */ - OFPT_ECHO_REPLY, /* Symmetric message */ - OFPT_VENDOR, /* Symmetric message */ - - /* Switch configuration messages. */ - OFPT_FEATURES_REQUEST, /* Controller/switch message */ - OFPT_FEATURES_REPLY, /* Controller/switch message */ - OFPT_GET_CONFIG_REQUEST, /* Controller/switch message */ - OFPT_GET_CONFIG_REPLY, /* Controller/switch message */ - OFPT_SET_CONFIG, /* Controller/switch message */ - - /* Asynchronous messages. */ - OFPT_PACKET_IN, /* Async message */ - OFPT_FLOW_REMOVED, /* Async message */ - OFPT_PORT_STATUS, /* Async message */ - - /* Controller command messages. */ - OFPT_PACKET_OUT, /* Controller/switch message */ - OFPT_FLOW_MOD, /* Controller/switch message */ -}; - /* Header on all OpenFlow packets. */ struct ofp_header { uint8_t version; /* An OpenFlow version number, e.g. OFP10_VERSION. */ @@ -183,7 +159,6 @@ OFP_ASSERT(sizeof(struct ofp_queue_prop_min_rate) == 16); /* Switch features. */ struct ofp_switch_features { - struct ofp_header header; ovs_be64 datapath_id; /* Datapath unique ID. The lower 48-bits are for a MAC address, while the upper 16-bits are implementer-defined. */ @@ -200,7 +175,7 @@ struct ofp_switch_features { /* Followed by an array of struct ofp10_phy_port or struct ofp11_port * structures. The number is inferred from header.length. */ }; -OFP_ASSERT(sizeof(struct ofp_switch_features) == 32); +OFP_ASSERT(sizeof(struct ofp_switch_features) == 24); /* Common capabilities supported by the datapath (struct ofp_switch_features, * member capabilities). */ @@ -222,6 +197,20 @@ enum ofp_packet_in_reason { OFPR_N_REASONS }; +enum ofp_flow_mod_command { + OFPFC_ADD, /* New flow. */ + OFPFC_MODIFY, /* Modify all matching flows. */ + OFPFC_MODIFY_STRICT, /* Modify entry strictly matching wildcards */ + OFPFC_DELETE, /* Delete all matching flows. */ + OFPFC_DELETE_STRICT /* Strictly match wildcards and priority. */ +}; + +enum ofp_flow_mod_flags { + OFPFF_SEND_FLOW_REM = 1 << 0, /* Send flow removed message when flow + * expires or is deleted. */ + OFPFF_CHECK_OVERLAP = 1 << 1, /* Check for overlapping entries first. */ +}; + /* Action structure for OFPAT10_SET_VLAN_VID and OFPAT11_SET_VLAN_VID. */ struct ofp_action_vlan_vid { ovs_be16 type; /* Type. */ @@ -293,55 +282,34 @@ enum ofp_port_reason { /* A physical port has changed in the datapath */ struct ofp_port_status { - struct ofp_header header; uint8_t reason; /* One of OFPPR_*. */ uint8_t pad[7]; /* Align to 64-bits. */ /* Followed by struct ofp10_phy_port or struct ofp11_port. */ }; -OFP_ASSERT(sizeof(struct ofp_port_status) == 16); - -enum ofp_stats_types { - /* Description of this OpenFlow switch. (OFPMP_DESC) - * The OF1.0 request is struct ofp_stats_msg. - * The OF1.0 reply is struct ofp_desc_stats. */ - OFPST_DESC = 0, - - /* Individual flow statistics. (OFPMP_FLOW) - * The OF1.0 request is struct ofp_flow_stats_request. - * The OF1.0 reply body is an array of struct ofp_flow_stats. */ - OFPST_FLOW = 1, - - /* Aggregate flow statistics. (OFPMP_AGGREGATE) - * The OF1.0 request is struct ofp_flow_stats_request. - * The OF1.0 reply is struct ofp_aggregate_stats_reply. */ - OFPST_AGGREGATE = 2, - - /* Flow table statistics. (OFPMP_TABLE) - * The OF1.0 request is struct ofp_stats_msg. - * The OF1.0 reply body is an array of struct ofp_table_stats. */ - OFPST_TABLE = 3, - - /* Physical port statistics. (OFPMP_PORT_STATS) - * The OF1.0 request is struct ofp_port_stats_request. - * The OF1.0 reply body is an array of struct ofp_port_stats. */ - OFPST_PORT = 4, - - /* Queue statistics for a port. (OFPMP_QUEUE) - * The OF1.0 request is struct ofp_stats_msg. - * The OF1.0 reply body is an array of struct ofp_queue_stats. */ - OFPST_QUEUE = 5, - - /* Port description. (OFPMP_PORT_DESC) - * This was introduced as part of OF1.3, but is useful for bridges - * with many ports, so we support it with OF1.0, too. - * The OF1.0 request is struct ofp_stats_msg. - * The OF1.0 reply body is an array of struct ofp10_phy_port. */ - OFPST_PORT_DESC = 13, - - /* Vendor extension. - * The OF1.0 request and reply begin with struct ofp_vendor_stats. */ - OFPST_VENDOR = 0xffff +OFP_ASSERT(sizeof(struct ofp_port_status) == 8); + +#define DESC_STR_LEN 256 +#define SERIAL_NUM_LEN 32 +/* Body of reply to OFPST_DESC request. Each entry is a NULL-terminated ASCII + * string. */ +struct ofp_desc_stats { + char mfr_desc[DESC_STR_LEN]; /* Manufacturer description. */ + char hw_desc[DESC_STR_LEN]; /* Hardware description. */ + char sw_desc[DESC_STR_LEN]; /* Software description. */ + char serial_num[SERIAL_NUM_LEN]; /* Serial number. */ + char dp_desc[DESC_STR_LEN]; /* Human readable description of + the datapath. */ +}; +OFP_ASSERT(sizeof(struct ofp_desc_stats) == 1056); + +/* Reply to OFPST_AGGREGATE request. */ +struct ofp_aggregate_stats_reply { + ovs_32aligned_be64 packet_count; /* Number of packets in flows. */ + ovs_32aligned_be64 byte_count; /* Number of bytes in flows. */ + ovs_be32 flow_count; /* Number of flows. */ + uint8_t pad[4]; /* Align to 64 bits. */ }; +OFP_ASSERT(sizeof(struct ofp_aggregate_stats_reply) == 24); /* The match type indicates the match structure (set of fields that compose the * match) in use. The match type is placed in the type field at the beginning @@ -356,4 +324,14 @@ enum ofp_match_type { OFPMT_OXM = 1, /* OpenFlow Extensible Match */ }; +/* Group numbering. Groups can use any number up to OFPG_MAX. */ +enum ofp_group { + /* Last usable group number. */ + OFPG_MAX = 0xffffff00, + + /* Fake groups. */ + OFPG_ALL = 0xfffffffc, /* All groups, for group delete commands. */ + OFPG_ANY = 0xffffffff /* Wildcard, for flow stats requests. */ +}; + #endif /* openflow/openflow-common.h */