X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fofp-msgs.h;h=d8dee5b53a9813e7347481d5787276739a33344d;hb=cfc50ae514f805dcd9c14589f21158185424daf6;hp=5ed8705e87fa0b5c41b03a1ff73b9d2eb522996c;hpb=cf7cf630e24dddba9177fcd68bcfa903689c7b72;p=sliver-openvswitch.git diff --git a/lib/ofp-msgs.h b/lib/ofp-msgs.h index 5ed8705e8..d8dee5b53 100644 --- a/lib/ofp-msgs.h +++ b/lib/ofp-msgs.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012 Nicira, Inc. + * Copyright (c) 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. @@ -128,8 +128,10 @@ enum ofpraw { /* OFPT 1.0 (6): struct ofp_switch_features, struct ofp10_phy_port[]. */ OFPRAW_OFPT10_FEATURES_REPLY, - /* OFPT 1.1+ (6): struct ofp_switch_features, struct ofp11_port[]. */ + /* OFPT 1.1-1.2 (6): struct ofp_switch_features, struct ofp11_port[]. */ OFPRAW_OFPT11_FEATURES_REPLY, + /* OFPT 1.3+ (6): struct ofp_switch_features. */ + OFPRAW_OFPT13_FEATURES_REPLY, /* OFPT 1.0+ (7): void. */ OFPRAW_OFPT_GET_CONFIG_REQUEST, @@ -140,16 +142,18 @@ enum ofpraw { /* OFPT 1.0+ (9): struct ofp_switch_config. */ OFPRAW_OFPT_SET_CONFIG, - /* OFPT 1.0 (10): struct ofp_packet_in up to data, uint8_t[]. */ + /* OFPT 1.0 (10): struct ofp10_packet_in up to data, uint8_t[]. */ OFPRAW_OFPT10_PACKET_IN, - /* OFPT 1.1 (10): struct ofp11_packet_in up to data, uint8_t[]. */ + /* OFPT 1.1 (10): struct ofp11_packet_in, uint8_t[]. */ OFPRAW_OFPT11_PACKET_IN, /* OFPT 1.2 (10): struct ofp12_packet_in, uint8_t[]. */ OFPRAW_OFPT12_PACKET_IN, + /* OFPT 1.3 (10): struct ofp13_packet_in, uint8_t[]. */ + OFPRAW_OFPT13_PACKET_IN, /* NXT 1.0+ (17): struct nx_packet_in, uint8_t[]. */ OFPRAW_NXT_PACKET_IN, - /* OFPT 1.0 (11): struct ofp_flow_removed. */ + /* OFPT 1.0 (11): struct ofp10_flow_removed. */ OFPRAW_OFPT10_FLOW_REMOVED, /* OFPT 1.1+ (11): struct ofp11_flow_removed, uint8_t[8][]. */ OFPRAW_OFPT11_FLOW_REMOVED, @@ -161,7 +165,7 @@ enum ofpraw { /* OFPT 1.1+ (12): struct ofp_port_status, struct ofp11_port. */ OFPRAW_OFPT11_PORT_STATUS, - /* OFPT 1.0 (13): struct ofp_packet_out, uint8_t[]. */ + /* OFPT 1.0 (13): struct ofp10_packet_out, uint8_t[]. */ OFPRAW_OFPT10_PACKET_OUT, /* OFPT 1.1+ (13): struct ofp11_packet_out, uint8_t[]. */ OFPRAW_OFPT11_PACKET_OUT, @@ -173,11 +177,17 @@ enum ofpraw { /* NXT 1.0+ (13): struct nx_flow_mod, uint8_t[8][]. */ OFPRAW_NXT_FLOW_MOD, + /* OFPT 1.1+ (15): struct ofp11_group_mod, uint8_t[8][]. */ + OFPRAW_OFPT11_GROUP_MOD, + /* OFPT 1.0 (15): struct ofp10_port_mod. */ OFPRAW_OFPT10_PORT_MOD, /* OFPT 1.1+ (16): struct ofp11_port_mod. */ OFPRAW_OFPT11_PORT_MOD, + /* OFPT 1.1+ (17): struct ofp11_table_mod. */ + OFPRAW_OFPT11_TABLE_MOD, + /* OFPT 1.0 (18): void. */ OFPRAW_OFPT10_BARRIER_REQUEST, /* OFPT 1.1+ (20): void. */ @@ -188,6 +198,41 @@ enum ofpraw { /* OFPT 1.1+ (21): void. */ OFPRAW_OFPT11_BARRIER_REPLY, + /* OFPT 1.0 (22): struct ofp10_queue_get_config_request. */ + OFPRAW_OFPT10_QUEUE_GET_CONFIG_REQUEST, + /* OFPT 1.1+ (22): struct ofp11_queue_get_config_request. */ + OFPRAW_OFPT11_QUEUE_GET_CONFIG_REQUEST, + + /* OFPT 1.0 (23): struct ofp10_queue_get_config_reply, uint8_t[8][]. */ + OFPRAW_OFPT10_QUEUE_GET_CONFIG_REPLY, + /* OFPT 1.1+ (23): struct ofp11_queue_get_config_reply, uint8_t[8][]. */ + OFPRAW_OFPT11_QUEUE_GET_CONFIG_REPLY, + + /* OFPT 1.2+ (24): struct ofp12_role_request. */ + OFPRAW_OFPT12_ROLE_REQUEST, + /* NXT 1.0+ (10): struct nx_role_request. */ + OFPRAW_NXT_ROLE_REQUEST, + + /* OFPT 1.2+ (25): struct ofp12_role_request. */ + OFPRAW_OFPT12_ROLE_REPLY, + /* NXT 1.0+ (11): struct nx_role_request. */ + OFPRAW_NXT_ROLE_REPLY, + + /* OFPT 1.3+ (26): void. */ + OFPRAW_OFPT13_GET_ASYNC_REQUEST, + /* OFPT 1.3+ (27): struct ofp13_async_config. */ + OFPRAW_OFPT13_GET_ASYNC_REPLY, + /* OFPT 1.3+ (28): struct ofp13_async_config. */ + OFPRAW_OFPT13_SET_ASYNC, + /* NXT 1.0+ (19): struct nx_async_config. */ + OFPRAW_NXT_SET_ASYNC_CONFIG, + + /* OFPT 1.3+ (29): struct ofp13_meter_mod, uint8_t[8][]. */ + OFPRAW_OFPT13_METER_MOD, + + /* OFPT 1.4+ (30): struct ofp14_role_status, uint8_t[8][]. */ + OFPRAW_OFPT14_ROLE_STATUS, + /* Standard statistics. */ /* OFPST 1.0+ (0): void. */ @@ -205,8 +250,10 @@ enum ofpraw { /* OFPST 1.0 (1): uint8_t[]. */ OFPRAW_OFPST10_FLOW_REPLY, - /* OFPST 1.1+ (1): uint8_t[]. */ + /* OFPST 1.1-1.2 (1): uint8_t[]. */ OFPRAW_OFPST11_FLOW_REPLY, + /* OFPST 1.3+ (1): uint8_t[]. */ + OFPRAW_OFPST13_FLOW_REPLY, /* NXST 1.0 (0): uint8_t[]. */ OFPRAW_NXST_FLOW_REPLY, @@ -222,7 +269,7 @@ enum ofpraw { /* NXST 1.0 (1): struct ofp_aggregate_stats_reply. */ OFPRAW_NXST_AGGREGATE_REPLY, - /* OFPST 1.0-1.2 (3): void. */ + /* OFPST 1.0+ (3): void. */ OFPRAW_OFPST_TABLE_REQUEST, /* OFPST 1.0 (3): struct ofp10_table_stats[]. */ @@ -231,6 +278,8 @@ enum ofpraw { OFPRAW_OFPST11_TABLE_REPLY, /* OFPST 1.2 (3): struct ofp12_table_stats[]. */ OFPRAW_OFPST12_TABLE_REPLY, + /* OFPST 1.3+ (3): struct ofp13_table_stats[]. */ + OFPRAW_OFPST13_TABLE_REPLY, /* OFPST 1.0 (4): struct ofp10_port_stats_request. */ OFPRAW_OFPST10_PORT_REQUEST, @@ -239,8 +288,10 @@ enum ofpraw { /* OFPST 1.0 (4): struct ofp10_port_stats[]. */ OFPRAW_OFPST10_PORT_REPLY, - /* OFPST 1.1+ (4): struct ofp11_port_stats[]. */ + /* OFPST 1.1-1.2 (4): struct ofp11_port_stats[]. */ OFPRAW_OFPST11_PORT_REPLY, + /* OFPST 1.3+ (4): struct ofp13_port_stats[]. */ + OFPRAW_OFPST13_PORT_REPLY, /* OFPST 1.0 (5): struct ofp10_queue_stats_request. */ OFPRAW_OFPST10_QUEUE_REQUEST, @@ -249,8 +300,54 @@ enum ofpraw { /* OFPST 1.0 (5): struct ofp10_queue_stats[]. */ OFPRAW_OFPST10_QUEUE_REPLY, - /* OFPST 1.1+ (5): struct ofp11_queue_stats[]. */ + /* OFPST 1.1-1.2 (5): struct ofp11_queue_stats[]. */ OFPRAW_OFPST11_QUEUE_REPLY, + /* OFPST 1.3+ (5): struct ofp13_queue_stats[]. */ + OFPRAW_OFPST13_QUEUE_REPLY, + + /* OFPST 1.1+ (6): struct ofp11_group_stats_request. */ + OFPRAW_OFPST11_GROUP_REQUEST, + + /* OFPST 1.1-1.2 (6): uint8_t[8][]. */ + OFPRAW_OFPST11_GROUP_REPLY, + /* OFPST 1.3+ (6): uint8_t[8][]. */ + OFPRAW_OFPST13_GROUP_REPLY, + + /* OFPST 1.1+ (7): void. */ + OFPRAW_OFPST11_GROUP_DESC_REQUEST, + + /* OFPST 1.1+ (7): uint8_t[8][]. */ + OFPRAW_OFPST11_GROUP_DESC_REPLY, + + /* OFPST 1.2+ (8): void. */ + OFPRAW_OFPST12_GROUP_FEATURES_REQUEST, + + /* OFPST 1.2+ (8): struct ofp12_group_features_stats. */ + OFPRAW_OFPST12_GROUP_FEATURES_REPLY, + + /* OFPST 1.3+ (9): struct ofp13_meter_multipart_request. */ + OFPRAW_OFPST13_METER_REQUEST, + + /* OFPST 1.3+ (9): uint8_t[8][]. */ + OFPRAW_OFPST13_METER_REPLY, + + /* OFPST 1.3+ (10): struct ofp13_meter_multipart_request. */ + OFPRAW_OFPST13_METER_CONFIG_REQUEST, + + /* OFPST 1.3+ (10): uint8_t[8][]. */ + OFPRAW_OFPST13_METER_CONFIG_REPLY, + + /* OFPST 1.3+ (11): void. */ + OFPRAW_OFPST13_METER_FEATURES_REQUEST, + + /* OFPST 1.3+ (11): struct ofp13_meter_features. */ + OFPRAW_OFPST13_METER_FEATURES_REPLY, + + /* OFPST 1.3+ (12): void. */ + OFPRAW_OFPST13_TABLE_FEATURES_REQUEST, + + /* OFPST 1.3+ (12): struct ofp13_table_features, uint8_t[8][]. */ + OFPRAW_OFPST13_TABLE_FEATURES_REPLY, /* OFPST 1.0+ (13): void. */ OFPRAW_OFPST_PORT_DESC_REQUEST, @@ -265,13 +362,7 @@ enum ofpraw { * Nicira extensions that correspond to standard OpenFlow messages are listed * alongside the standard versions above. */ - /* NXT 1.0+ (10): struct nx_role_request. */ - OFPRAW_NXT_ROLE_REQUEST, - - /* NXT 1.0+ (11): struct nx_role_request. */ - OFPRAW_NXT_ROLE_REPLY, - - /* NXT 1.0+ (12): struct nx_set_flow_format. */ + /* NXT 1.0 (12): struct nx_set_flow_format. */ OFPRAW_NXT_SET_FLOW_FORMAT, /* NXT 1.0+ (15): struct nx_flow_mod_table_id. */ @@ -283,9 +374,6 @@ enum ofpraw { /* NXT 1.0+ (18): void. */ OFPRAW_NXT_FLOW_AGE, - /* NXT 1.0+ (19): struct nx_async_config. */ - OFPRAW_NXT_SET_ASYNC_CONFIG, - /* NXT 1.0+ (20): struct nx_controller_id. */ OFPRAW_NXT_SET_CONTROLLER_ID, @@ -312,6 +400,7 @@ enum ofpraw { /* Decoding messages into OFPRAW_* values. */ enum ofperr ofpraw_decode(enum ofpraw *, const struct ofp_header *); +enum ofpraw ofpraw_decode_assert(const struct ofp_header *); enum ofperr ofpraw_pull(enum ofpraw *, struct ofpbuf *); enum ofpraw ofpraw_pull_assert(struct ofpbuf *); @@ -360,7 +449,8 @@ enum ofptype { /* Switch configuration messages. */ OFPTYPE_FEATURES_REQUEST, /* OFPRAW_OFPT_FEATURES_REQUEST. */ OFPTYPE_FEATURES_REPLY, /* OFPRAW_OFPT10_FEATURES_REPLY. - * OFPRAW_OFPT11_FEATURES_REPLY. */ + * OFPRAW_OFPT11_FEATURES_REPLY. + * OFPRAW_OFPT13_FEATURES_REPLY. */ OFPTYPE_GET_CONFIG_REQUEST, /* OFPRAW_OFPT_GET_CONFIG_REQUEST. */ OFPTYPE_GET_CONFIG_REPLY, /* OFPRAW_OFPT_GET_CONFIG_REPLY. */ OFPTYPE_SET_CONFIG, /* OFPRAW_OFPT_SET_CONFIG. */ @@ -369,6 +459,7 @@ enum ofptype { OFPTYPE_PACKET_IN, /* OFPRAW_OFPT10_PACKET_IN. * OFPRAW_OFPT11_PACKET_IN. * OFPRAW_OFPT12_PACKET_IN. + * OFPRAW_OFPT13_PACKET_IN. * OFPRAW_NXT_PACKET_IN. */ OFPTYPE_FLOW_REMOVED, /* OFPRAW_OFPT10_FLOW_REMOVED. * OFPRAW_OFPT11_FLOW_REMOVED. @@ -382,8 +473,10 @@ enum ofptype { OFPTYPE_FLOW_MOD, /* OFPRAW_OFPT10_FLOW_MOD. * OFPRAW_OFPT11_FLOW_MOD. * OFPRAW_NXT_FLOW_MOD. */ + OFPTYPE_GROUP_MOD, /* OFPRAW_OFPT11_GROUP_MOD. */ OFPTYPE_PORT_MOD, /* OFPRAW_OFPT10_PORT_MOD. * OFPRAW_OFPT11_PORT_MOD. */ + OFPTYPE_TABLE_MOD, /* OFPRAW_OFPT11_TABLE_MOD. */ /* Barrier messages. */ OFPTYPE_BARRIER_REQUEST, /* OFPRAW_OFPT10_BARRIER_REQUEST. @@ -391,6 +484,30 @@ enum ofptype { OFPTYPE_BARRIER_REPLY, /* OFPRAW_OFPT10_BARRIER_REPLY. * OFPRAW_OFPT11_BARRIER_REPLY. */ + /* Queue Configuration messages. */ + OFPTYPE_QUEUE_GET_CONFIG_REQUEST, /* OFPRAW_OFPT10_QUEUE_GET_CONFIG_REQUEST. + * OFPRAW_OFPT11_QUEUE_GET_CONFIG_REQUEST. */ + OFPTYPE_QUEUE_GET_CONFIG_REPLY, /* OFPRAW_OFPT10_QUEUE_GET_CONFIG_REPLY. + * OFPRAW_OFPT11_QUEUE_GET_CONFIG_REPLY. */ + + /* Controller role change request messages. */ + OFPTYPE_ROLE_REQUEST, /* OFPRAW_OFPT12_ROLE_REQUEST. + * OFPRAW_NXT_ROLE_REQUEST. */ + OFPTYPE_ROLE_REPLY, /* OFPRAW_OFPT12_ROLE_REPLY. + * OFPRAW_NXT_ROLE_REPLY. */ + + /* Asynchronous message configuration. */ + OFPTYPE_GET_ASYNC_REQUEST, /* OFPRAW_OFPT13_GET_ASYNC_REQUEST. */ + OFPTYPE_GET_ASYNC_REPLY, /* OFPRAW_OFPT13_GET_ASYNC_REPLY. */ + OFPTYPE_SET_ASYNC_CONFIG, /* OFPRAW_NXT_SET_ASYNC_CONFIG. + * OFPRAW_OFPT13_SET_ASYNC. */ + + /* Meters and rate limiters configuration messages. */ + OFPTYPE_METER_MOD, /* OFPRAW_OFPT13_METER_MOD. */ + + /* Controller role change event messages. */ + OFPTYPE_ROLE_STATUS, /* OFPRAW_OFPT14_ROLE_STATUS. */ + /* Statistics. */ OFPTYPE_DESC_STATS_REQUEST, /* OFPRAW_OFPST_DESC_REQUEST. */ OFPTYPE_DESC_STATS_REPLY, /* OFPRAW_OFPST_DESC_REPLY. */ @@ -399,6 +516,7 @@ enum ofptype { * OFPRAW_NXST_FLOW_REQUEST. */ OFPTYPE_FLOW_STATS_REPLY, /* OFPRAW_OFPST10_FLOW_REPLY. * OFPRAW_OFPST11_FLOW_REPLY. + * OFPRAW_OFPST13_FLOW_REPLY. * OFPRAW_NXST_FLOW_REPLY. */ OFPTYPE_AGGREGATE_STATS_REQUEST, /* OFPRAW_OFPST10_AGGREGATE_REQUEST. * OFPRAW_OFPST11_AGGREGATE_REQUEST. @@ -408,28 +526,58 @@ enum ofptype { OFPTYPE_TABLE_STATS_REQUEST, /* OFPRAW_OFPST_TABLE_REQUEST. */ OFPTYPE_TABLE_STATS_REPLY, /* OFPRAW_OFPST10_TABLE_REPLY. * OFPRAW_OFPST11_TABLE_REPLY. - * OFPRAW_OFPST12_TABLE_REPLY. */ + * OFPRAW_OFPST12_TABLE_REPLY. + * OFPRAW_OFPST13_TABLE_REPLY. */ OFPTYPE_PORT_STATS_REQUEST, /* OFPRAW_OFPST10_PORT_REQUEST. * OFPRAW_OFPST11_PORT_REQUEST. */ OFPTYPE_PORT_STATS_REPLY, /* OFPRAW_OFPST10_PORT_REPLY. - * OFPRAW_OFPST11_PORT_REPLY. */ + * OFPRAW_OFPST11_PORT_REPLY. + * OFPRAW_OFPST13_PORT_REPLY. */ OFPTYPE_QUEUE_STATS_REQUEST, /* OFPRAW_OFPST10_QUEUE_REQUEST. * OFPRAW_OFPST11_QUEUE_REQUEST. */ OFPTYPE_QUEUE_STATS_REPLY, /* OFPRAW_OFPST10_QUEUE_REPLY. - * OFPRAW_OFPST11_QUEUE_REPLY. */ + * OFPRAW_OFPST11_QUEUE_REPLY. + * OFPRAW_OFPST13_QUEUE_REPLY. */ + + OFPTYPE_GROUP_STATS_REQUEST, /* OFPRAW_OFPST11_GROUP_REQUEST. */ + + OFPTYPE_GROUP_STATS_REPLY, /* OFPRAW_OFPST11_GROUP_REPLY. + * OFPRAW_OFPST13_GROUP_REPLY. */ + + OFPTYPE_GROUP_DESC_STATS_REQUEST, /* OFPRAW_OFPST11_GROUP_DESC_REQUEST. */ + + OFPTYPE_GROUP_DESC_STATS_REPLY, /* OFPRAW_OFPST11_GROUP_DESC_REPLY. */ + + OFPTYPE_GROUP_FEATURES_STATS_REQUEST, /* OFPRAW_OFPST12_GROUP_FEATURES_REQUEST. */ + + OFPTYPE_GROUP_FEATURES_STATS_REPLY, /* OFPRAW_OFPST12_GROUP_FEATURES_REPLY. */ + + OFPTYPE_METER_STATS_REQUEST, /* OFPRAW_OFPST13_METER_REQUEST. */ + + OFPTYPE_METER_STATS_REPLY, /* OFPRAW_OFPST13_METER_REPLY. */ + + OFPTYPE_METER_CONFIG_STATS_REQUEST, /* OFPRAW_OFPST13_METER_CONFIG_REQUEST. */ + + OFPTYPE_METER_CONFIG_STATS_REPLY, /* OFPRAW_OFPST13_METER_CONFIG_REPLY. */ + + OFPTYPE_METER_FEATURES_STATS_REQUEST, /* OFPRAW_OFPST13_METER_FEATURES_REQUEST. */ + + OFPTYPE_METER_FEATURES_STATS_REPLY, /* OFPRAW_OFPST13_METER_FEATURES_REPLY. */ + + OFPTYPE_TABLE_FEATURES_STATS_REQUEST, /* OFPRAW_OFPST13_TABLE_FEATURES_REQUEST. */ + + OFPTYPE_TABLE_FEATURES_STATS_REPLY, /* OFPRAW_OFPST13_TABLE_FEATURES_REPLY. */ + OFPTYPE_PORT_DESC_STATS_REQUEST, /* OFPRAW_OFPST_PORT_DESC_REQUEST. */ OFPTYPE_PORT_DESC_STATS_REPLY, /* OFPRAW_OFPST10_PORT_DESC_REPLY. * OFPRAW_OFPST11_PORT_DESC_REPLY. */ /* Nicira extensions. */ - OFPTYPE_ROLE_REQUEST, /* OFPRAW_NXT_ROLE_REQUEST. */ - OFPTYPE_ROLE_REPLY, /* OFPRAW_NXT_ROLE_REPLY. */ OFPTYPE_SET_FLOW_FORMAT, /* OFPRAW_NXT_SET_FLOW_FORMAT. */ OFPTYPE_FLOW_MOD_TABLE_ID, /* OFPRAW_NXT_FLOW_MOD_TABLE_ID. */ OFPTYPE_SET_PACKET_IN_FORMAT, /* OFPRAW_NXT_SET_PACKET_IN_FORMAT. */ OFPTYPE_FLOW_AGE, /* OFPRAW_NXT_FLOW_AGE. */ - OFPTYPE_SET_ASYNC_CONFIG, /* OFPRAW_NXT_SET_ASYNC_CONFIG. */ OFPTYPE_SET_CONTROLLER_ID, /* OFPRAW_NXT_SET_CONTROLLER_ID. */ /* Flow monitor extension. */ @@ -448,6 +596,7 @@ enum ofptype ofptype_from_ofpraw(enum ofpraw); /* OpenFlow message properties. */ void ofpmsg_update_length(struct ofpbuf *); const void *ofpmsg_body(const struct ofp_header *); +bool ofpmsg_is_stat_request(const struct ofp_header *); /* Multipart messages (aka "statistics"). *