X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fofp-msgs.h;h=d8dee5b53a9813e7347481d5787276739a33344d;hb=28c5588e8e1a8d091c5d2275232c35f2968a97fa;hp=496d120a475a6ce8742d35fd36471fe982f11753;hpb=2e1ae2005ed347d2dfebd23fff40c54a1a2a6716;p=sliver-openvswitch.git diff --git a/lib/ofp-msgs.h b/lib/ofp-msgs.h index 496d120a4..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. @@ -142,9 +142,9 @@ 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, @@ -153,7 +153,7 @@ enum ofpraw { /* 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, @@ -165,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, @@ -177,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. */ @@ -192,6 +198,26 @@ 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. */ @@ -201,9 +227,12 @@ enum ofpraw { /* NXT 1.0+ (19): struct nx_async_config. */ OFPRAW_NXT_SET_ASYNC_CONFIG, - /* OFPT 1.3+ (29): struct ofp13_meter_mod. */ + /* 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. */ @@ -249,7 +278,7 @@ 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[]. */ + /* OFPST 1.3+ (3): struct ofp13_table_stats[]. */ OFPRAW_OFPST13_TABLE_REPLY, /* OFPST 1.0 (4): struct ofp10_port_stats_request. */ @@ -279,15 +308,15 @@ enum ofpraw { /* OFPST 1.1+ (6): struct ofp11_group_stats_request. */ OFPRAW_OFPST11_GROUP_REQUEST, - /* OFPST 1.1-1.2 (6): struct ofp11_group_stats[]. */ + /* OFPST 1.1-1.2 (6): uint8_t[8][]. */ OFPRAW_OFPST11_GROUP_REPLY, - /* OFPST 1.3 (6): struct ofp13_group_stats[]. */ + /* 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): struct ofp11_group_desc_stats[]. */ + /* OFPST 1.1+ (7): uint8_t[8][]. */ OFPRAW_OFPST11_GROUP_DESC_REPLY, /* OFPST 1.2+ (8): void. */ @@ -299,13 +328,13 @@ enum ofpraw { /* OFPST 1.3+ (9): struct ofp13_meter_multipart_request. */ OFPRAW_OFPST13_METER_REQUEST, - /* OFPST 1.3+ (9): struct ofp13_meter_stats[]. */ + /* 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): struct ofp13_meter_config[]. */ + /* OFPST 1.3+ (10): uint8_t[8][]. */ OFPRAW_OFPST13_METER_CONFIG_REPLY, /* OFPST 1.3+ (11): void. */ @@ -314,10 +343,10 @@ enum ofpraw { /* OFPST 1.3+ (11): struct ofp13_meter_features. */ OFPRAW_OFPST13_METER_FEATURES_REPLY, - /* OFPST 1.3+ (12): struct ofp13_table_features[]. */ + /* OFPST 1.3+ (12): void. */ OFPRAW_OFPST13_TABLE_FEATURES_REQUEST, - /* OFPST 1.3+ (12): struct ofp13_table_features[]. */ + /* OFPST 1.3+ (12): struct ofp13_table_features, uint8_t[8][]. */ OFPRAW_OFPST13_TABLE_FEATURES_REPLY, /* OFPST 1.0+ (13): void. */ @@ -333,12 +362,6 @@ 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. */ OFPRAW_NXT_SET_FLOW_FORMAT, @@ -377,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 *); @@ -449,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. @@ -458,6 +484,18 @@ 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. */ @@ -467,6 +505,9 @@ enum ofptype { /* 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. */ @@ -498,34 +539,34 @@ enum ofptype { * OFPRAW_OFPST11_QUEUE_REPLY. * OFPRAW_OFPST13_QUEUE_REPLY. */ - OFPTYPE_GROUP_REQUEST, /* OFPRAW_OFPST11_GROUP_REQUEST. */ + OFPTYPE_GROUP_STATS_REQUEST, /* OFPRAW_OFPST11_GROUP_REQUEST. */ - OFPTYPE_GROUP_REPLY, /* OFPRAW_OFPST11_GROUP_REPLY. + OFPTYPE_GROUP_STATS_REPLY, /* OFPRAW_OFPST11_GROUP_REPLY. * OFPRAW_OFPST13_GROUP_REPLY. */ - OFPTYPE_GROUP_DESC_REQUEST, /* OFPRAW_OFPST11_GROUP_DESC_REQUEST. */ + OFPTYPE_GROUP_DESC_STATS_REQUEST, /* OFPRAW_OFPST11_GROUP_DESC_REQUEST. */ - OFPTYPE_GROUP_DESC_REPLY, /* OFPRAW_OFPST11_GROUP_DESC_REPLY. */ + OFPTYPE_GROUP_DESC_STATS_REPLY, /* OFPRAW_OFPST11_GROUP_DESC_REPLY. */ - OFPTYPE_GROUP_FEATURES_REQUEST, /* OFPRAW_OFPST12_GROUP_FEATURES_REQUEST. */ + OFPTYPE_GROUP_FEATURES_STATS_REQUEST, /* OFPRAW_OFPST12_GROUP_FEATURES_REQUEST. */ - OFPTYPE_GROUP_FEATURES_REPLY, /* OFPRAW_OFPST12_GROUP_FEATURES_REPLY. */ + OFPTYPE_GROUP_FEATURES_STATS_REPLY, /* OFPRAW_OFPST12_GROUP_FEATURES_REPLY. */ - OFPTYPE_METER_REQUEST, /* OFPRAW_OFPST13_METER_REQUEST. */ + OFPTYPE_METER_STATS_REQUEST, /* OFPRAW_OFPST13_METER_REQUEST. */ - OFPTYPE_METER_REPLY, /* OFPRAW_OFPST13_METER_REPLY. */ + OFPTYPE_METER_STATS_REPLY, /* OFPRAW_OFPST13_METER_REPLY. */ - OFPTYPE_METER_CONFIG_REQUEST, /* OFPRAW_OFPST13_METER_CONFIG_REQUEST. */ + OFPTYPE_METER_CONFIG_STATS_REQUEST, /* OFPRAW_OFPST13_METER_CONFIG_REQUEST. */ - OFPTYPE_METER_CONFIG_REPLY, /* OFPRAW_OFPST13_METER_CONFIG_REPLY. */ + OFPTYPE_METER_CONFIG_STATS_REPLY, /* OFPRAW_OFPST13_METER_CONFIG_REPLY. */ - OFPTYPE_METER_FEATURES_REQUEST, /* OFPRAW_OFPST13_METER_FEATURES_REQUEST. */ + OFPTYPE_METER_FEATURES_STATS_REQUEST, /* OFPRAW_OFPST13_METER_FEATURES_REQUEST. */ - OFPTYPE_METER_FEATURES_REPLY, /* OFPRAW_OFPST13_METER_FEATURES_REPLY. */ + OFPTYPE_METER_FEATURES_STATS_REPLY, /* OFPRAW_OFPST13_METER_FEATURES_REPLY. */ - OFPTYPE_TABLE_FEATURES_REQUEST, /* OFPRAW_OFPST13_TABLE_FEATURES_REQUEST. */ + OFPTYPE_TABLE_FEATURES_STATS_REQUEST, /* OFPRAW_OFPST13_TABLE_FEATURES_REQUEST. */ - OFPTYPE_TABLE_FEATURES_REPLY, /* OFPRAW_OFPST13_TABLE_FEATURES_REPLY. */ + OFPTYPE_TABLE_FEATURES_STATS_REPLY, /* OFPRAW_OFPST13_TABLE_FEATURES_REPLY. */ OFPTYPE_PORT_DESC_STATS_REQUEST, /* OFPRAW_OFPST_PORT_DESC_REQUEST. */ @@ -533,8 +574,6 @@ enum ofptype { * 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. */ @@ -557,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"). *