X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=include%2Fopenflow.h;h=9db427b4902c2287cee163baedd9faa99b069983;hb=eca2aeb329f1ebf08cbda14f08197456d903111b;hp=3b5176a582f75f6aed57f4977c841487f241aed6;hpb=4f5b4efc54f3880ca5f5b5c292675aea8596a311;p=sliver-openvswitch.git diff --git a/include/openflow.h b/include/openflow.h index 3b5176a58..9db427b49 100644 --- a/include/openflow.h +++ b/include/openflow.h @@ -42,6 +42,24 @@ #include #endif +#ifdef SWIG +#define OFP_ASSERT(EXPR) /* SWIG can't handle OFP_ASSERT. */ +#elif !defined(__cplusplus) +/* Build-time assertion for use in a declaration context. */ +#define OFP_ASSERT(EXPR) \ + extern int (*build_assert(void))[ sizeof(struct { \ + unsigned int build_assert_failed : (EXPR) ? 1 : -1; })] +#else /* __cplusplus */ +#include +#define OFP_ASSERT BOOST_STATIC_ASSERT +#endif /* __cplusplus */ + +#ifndef SWIG +#define OFP_PACKED __attribute__((packed)) +#else +#define OFP_PACKED /* SWIG doesn't understand __attribute. */ +#endif + /* Maximum length of a OpenFlow packet. */ #define OFP_MAXLEN (sizeof(struct ofp_switch_features) \ + (sizeof(struct ofp_phy_port) * OFPP_MAX) + 200) @@ -50,7 +68,7 @@ /* The most significant bit being set in the version field indicates an * experimental OpenFlow version. */ -#define OFP_VERSION 0x83 +#define OFP_VERSION 0x85 #define OFP_MAX_TABLE_NAME_LEN 32 #define OFP_MAX_PORT_NAME_LEN 16 @@ -75,7 +93,7 @@ enum ofp_port { those disabled by STP. */ OFPP_ALL = 0xfffc, /* All physical ports except input port. */ OFPP_CONTROLLER = 0xfffd, /* Send to controller. */ - OFPP_LOCAL = 0xfffe, /* Local openflow "port". */ /* xxx Want?! */ + OFPP_LOCAL = 0xfffe, /* Local openflow "port". */ OFPP_NONE = 0xffff /* Not associated with a physical port. */ }; @@ -94,7 +112,9 @@ enum ofp_type { OFPT_PORT_STATUS, /* 11 Async message */ OFPT_ERROR_MSG, /* 12 Async message */ OFPT_STATS_REQUEST, /* 13 Controller/switch message */ - OFPT_STATS_REPLY /* 14 Controller/switch message */ + OFPT_STATS_REPLY, /* 14 Controller/switch message */ + OFPT_ECHO_REQUEST, /* 15 Symmetric message */ + OFPT_ECHO_REPLY /* 16 Symmetric message */ }; /* Header on all OpenFlow packets. */ @@ -106,12 +126,19 @@ struct ofp_header { Replies use the same id as was in the request to facilitate pairing. */ }; +OFP_ASSERT(sizeof(struct ofp_header) == 8); #define OFP_DEFAULT_MISS_SEND_LEN 128 enum ofp_config_flags { /* Tells datapath to notify the controller of expired flow entries. */ - OFPC_SEND_FLOW_EXP = 1 << 0 + OFPC_SEND_FLOW_EXP = 1 << 0, + + /* Handling of IP fragments. */ + OFPC_FRAG_NORMAL = 0 << 1, /* No special handling for fragments. */ + OFPC_FRAG_DROP = 1 << 1, /* Drop fragments. */ + OFPC_FRAG_REASM = 2 << 1, /* Reassemble (only if OFPC_IP_REASM set). */ + OFPC_FRAG_MASK = 3 << 1 }; /* Switch configuration. */ @@ -121,6 +148,7 @@ struct ofp_switch_config { uint16_t miss_send_len; /* Max bytes of new flow that datapath should send to the controller. */ }; +OFP_ASSERT(sizeof(struct ofp_switch_config) == 12); /* Capabilities supported by the datapath. */ enum ofp_capabilities { @@ -128,8 +156,9 @@ enum ofp_capabilities { OFPC_TABLE_STATS = 1 << 1, /* Table statistics. */ OFPC_PORT_STATS = 1 << 2, /* Port statistics. */ OFPC_STP = 1 << 3, /* 802.11d spanning tree. */ - OFPC_MULTI_PHY_TX = 1 << 4 /* Supports transmitting through multiple + OFPC_MULTI_PHY_TX = 1 << 4, /* Supports transmitting through multiple physical interfaces */ + OFPC_IP_REASM = 1 << 5 /* Can reassemble IP fragments. */ }; /* Flags to indicate behavior of the physical port */ @@ -158,15 +187,17 @@ struct ofp_phy_port { uint32_t speed; /* Current speed in Mbps */ uint32_t features; /* Bitmap of supported "ofp_port_features"s. */ }; +OFP_ASSERT(sizeof(struct ofp_phy_port) == 36); /* Switch features. */ struct ofp_switch_features { struct ofp_header header; - uint64_t datapath_id; /* Datapath unique ID */ + uint64_t datapath_id; /* Datapath unique ID. Only the lower 48-bits + are meaningful. */ /* Table info. */ uint32_t n_exact; /* Max exact-match table entries. */ - uint32_t n_compression; /* Max entries compressed on service port. */ + uint32_t n_compression; /* Max entries compressed on service port. */ uint32_t n_general; /* Max entries of arbitrary form. */ /* Buffer limits. A datapath that cannot buffer reports 0.*/ @@ -176,14 +207,16 @@ struct ofp_switch_features { /* Features. */ uint32_t capabilities; /* Bitmap of support "ofp_capabilities". */ uint32_t actions; /* Bitmap of supported "ofp_action_type"s. */ + uint8_t pad[4]; /* Align to 64-bits. */ /* Port info.*/ struct ofp_phy_port ports[0]; /* Port definitions. The number of ports is inferred from the length field in the header. */ }; +OFP_ASSERT(sizeof(struct ofp_switch_features) == 48); -/* What changed about the phsyical port */ +/* What changed about the physical port */ enum ofp_port_reason { OFPPR_ADD, /* The port was added */ OFPPR_DELETE, /* The port was removed */ @@ -197,12 +230,14 @@ struct ofp_port_status { uint8_t pad[3]; /* Align to 32-bits */ struct ofp_phy_port desc; }; +OFP_ASSERT(sizeof(struct ofp_port_status) == 48); /* Modify behavior of the physical port */ struct ofp_port_mod { struct ofp_header header; struct ofp_phy_port desc; }; +OFP_ASSERT(sizeof(struct ofp_port_mod) == 44); /* Why is this packet being sent to the controller? */ enum ofp_reason { @@ -225,6 +260,7 @@ struct ofp_packet_in { offsetof(struct ofp_packet_in, data) == sizeof(struct ofp_packet_in) - 2. */ }; +OFP_ASSERT(sizeof(struct ofp_packet_in) == 20); enum ofp_action_type { OFPAT_OUTPUT, /* Output to switch port. */ @@ -244,6 +280,7 @@ struct ofp_action_output { uint16_t max_len; uint16_t port; }; +OFP_ASSERT(sizeof(struct ofp_action_output) == 4); /* The VLAN id is 12-bits, so we'll use the entire 16 bits to indicate * special conditions. All ones is used to indicate that no VLAN id was @@ -258,10 +295,11 @@ struct ofp_action { struct ofp_action_output output; /* OFPAT_OUTPUT: output struct. */ uint16_t vlan_id; /* OFPAT_SET_DL_VLAN: VLAN id. */ uint8_t dl_addr[OFP_ETH_ALEN]; /* OFPAT_SET_DL_SRC/DST */ - uint32_t nw_addr; /* OFPAT_SET_NW_SRC/DST */ + uint32_t nw_addr OFP_PACKED; /* OFPAT_SET_NW_SRC/DST */ uint16_t tp; /* OFPAT_SET_TP_SRC/DST */ } arg; }; +OFP_ASSERT(sizeof(struct ofp_action) == 8); /* Send packet (controller -> datapath). */ struct ofp_packet_out { @@ -274,6 +312,7 @@ struct ofp_packet_out { uint8_t data[0]; /* buffer_id == -1 */ } u; }; +OFP_ASSERT(sizeof(struct ofp_packet_out) == 16); enum ofp_flow_mod_command { OFPFC_ADD, /* New flow. */ @@ -322,6 +361,7 @@ struct ofp_match { uint16_t tp_src; /* TCP/UDP source port. */ uint16_t tp_dst; /* TCP/UDP destination port. */ }; +OFP_ASSERT(sizeof(struct ofp_match) == 36); /* Value used in "max_idle" to indicate that the entry is permanent */ #define OFP_FLOW_PERMANENT 0 @@ -344,6 +384,7 @@ struct ofp_flow_mod { struct ofp_action actions[0]; /* The number of actions is inferred from the length field in the header. */ }; +OFP_ASSERT(sizeof(struct ofp_flow_mod) == 60); /* Flow expiration (datapath -> controller). */ struct ofp_flow_expired { @@ -354,9 +395,11 @@ struct ofp_flow_expired { uint8_t pad[2]; /* Align to 32-bits. */ uint32_t duration; /* Time flow was alive in seconds. */ + uint8_t pad2[4]; /* Align to 64-bits. */ uint64_t packet_count; uint64_t byte_count; }; +OFP_ASSERT(sizeof(struct ofp_flow_expired) == 72); /* Error message (datapath -> controller). */ struct ofp_error_msg { @@ -367,13 +410,19 @@ struct ofp_error_msg { uint8_t data[0]; /* Variable-length data. Interpreted based on the type and code. */ }; +OFP_ASSERT(sizeof(struct ofp_error_msg) == 12); enum ofp_stats_types { - /* Flow statistics. + /* Individual flow statistics. * The request body is struct ofp_flow_stats_request. * The reply body is an array of struct ofp_flow_stats. */ OFPST_FLOW, + /* Aggregate flow statistics. + * The request body is struct ofp_aggregate_stats_request. + * The reply body is struct ofp_aggregate_stats_reply. */ + OFPST_AGGREGATE, + /* Flow table statistics. * The request body is empty. * The reply body is an array of struct ofp_table_stats. */ @@ -391,6 +440,7 @@ struct ofp_stats_request { uint16_t flags; /* OFPSF_REQ_* flags (none yet defined). */ uint8_t body[0]; /* Body of the request. */ }; +OFP_ASSERT(sizeof(struct ofp_stats_request) == 12); enum ofp_stats_reply_flags { OFPSF_REPLY_MORE = 1 << 0, /* More replies to follow */ @@ -402,37 +452,50 @@ struct ofp_stats_reply { uint16_t flags; /* OFPSF_REPLY_* flags. */ uint8_t body[0]; /* Body of the reply. */ }; - -enum ofp_stats_type { - OFPFS_INDIV, /* Send an entry for each matching flow */ - OFPFS_AGGREGATE /* Aggregate matching flows */ -}; +OFP_ASSERT(sizeof(struct ofp_stats_reply) == 12); /* Body for ofp_stats_request of type OFPST_FLOW. */ struct ofp_flow_stats_request { struct ofp_match match; /* Fields to match */ uint8_t table_id; /* ID of table to read (from ofp_table_stats) or 0xff for all tables. */ - uint8_t type; /* One of OFPFS_ */ - uint16_t pad; /* Align to 32-bits */ + uint8_t pad[3]; /* Align to 32 bits. */ }; +OFP_ASSERT(sizeof(struct ofp_flow_stats_request) == 40); /* Body of reply to OFPST_FLOW request. */ struct ofp_flow_stats { - uint16_t length; /* Length of this entry */ - uint8_t table_id; /* ID of table flow came from. 0nly used for - non-aggregated results */ + uint16_t length; /* Length of this entry. */ + uint8_t table_id; /* ID of table flow came from. */ uint8_t pad; - struct ofp_match match; /* Description of fields */ - uint32_t duration; /* Time flow has been alive in seconds. Only - used for non-aggregated results. */ - uint64_t packet_count; /* Number of packets in flow. */ - uint64_t byte_count; /* Number of bytes in flow. */ + struct ofp_match match; /* Description of fields. */ + uint32_t duration; /* Time flow has been alive in seconds. */ uint16_t priority; /* Priority of the entry. Only meaningful when this is not an exact-match entry. */ - uint16_t max_idle; /* Only used for non-aggregated results. */ - struct ofp_action actions[0]; /* Only used for non-aggregated results. */ + uint16_t max_idle; /* Number of seconds idle before expiration. */ + uint64_t packet_count; /* Number of packets in flow. */ + uint64_t byte_count; /* Number of bytes in flow. */ + struct ofp_action actions[0]; /* Actions. */ +}; +OFP_ASSERT(sizeof(struct ofp_flow_stats) == 64); + +/* Body for ofp_stats_request of type OFPST_AGGREGATE. */ +struct ofp_aggregate_stats_request { + struct ofp_match match; /* Fields to match */ + uint8_t table_id; /* ID of table to read (from ofp_table_stats) + or 0xff for all tables. */ + uint8_t pad[3]; /* Align to 32 bits. */ +}; +OFP_ASSERT(sizeof(struct ofp_aggregate_stats_request) == 40); + +/* Body of reply to OFPST_AGGREGATE request. */ +struct ofp_aggregate_stats_reply { + uint64_t packet_count; /* Number of packets in flows. */ + uint64_t byte_count; /* Number of bytes in flows. */ + uint32_t flow_count; /* Number of flows. */ + uint8_t pad[4]; /* Align to 64 bits. */ }; +OFP_ASSERT(sizeof(struct ofp_aggregate_stats_reply) == 24); /* Body of reply to OFPST_TABLE request. */ struct ofp_table_stats { @@ -441,16 +504,19 @@ struct ofp_table_stats { char name[OFP_MAX_TABLE_NAME_LEN]; uint32_t max_entries; /* Max number of entries supported */ uint32_t active_count; /* Number of active entries */ + uint8_t pad2[4]; /* Align to 64 bits. */ uint64_t matched_count; /* Number of packets that hit table */ }; +OFP_ASSERT(sizeof(struct ofp_table_stats) == 56); /* Statistics about a particular port */ struct ofp_port_stats { uint16_t port_no; - uint8_t pad[2]; /* Align to 32-bits */ + uint8_t pad[6]; /* Align to 64-bits */ uint64_t rx_count; /* Number of received packets */ uint64_t tx_count; /* Number of transmitted packets */ uint64_t drop_count; /* Number of packets dropped by interface */ }; +OFP_ASSERT(sizeof(struct ofp_port_stats) == 32); #endif /* openflow.h */