X-Git-Url: http://git.cascardo.eti.br/?a=blobdiff_plain;f=lib%2Fofp-msgs.h;h=22f286408112d46928c251d47cec0af360f601b1;hb=6c6eedc5d6730835a0d9724e2e8cfe9cdf03b07d;hp=ffa940266fc0d729b21cb6b25d964323c737764b;hpb=7448d54862d79682685ae8a885c164b685dbe669;p=cascardo%2Fovs.git diff --git a/lib/ofp-msgs.h b/lib/ofp-msgs.h index ffa940266..22f286408 100644 --- a/lib/ofp-msgs.h +++ b/lib/ofp-msgs.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2013, 2014, 2015 Nicira, Inc. + * Copyright (c) 2012, 2013, 2014, 2015, 2016 Nicira, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -60,9 +60,14 @@ struct ovs_list; * * where the syntax of each part is: * - * - type: One of OFPT (standard OpenFlow message), OFPST (standard OpenFlow - * statistics message), NXT (Nicira extension message), or NXST (Nicira - * extension statistics message). + * - type: One of the following: + * + * * OFPT: standard OpenFlow message. + * * OFPST: standard OpenFlow statistics or multipart message. + * * NXT: Nicira extension message. + * * NXST: Nicira extension statistics or multipart message. + * * ONFT: Open Networking Foundation extension message. + * * ONFST: Open Networking Foundation multipart message. * * As new vendors implement extensions it will make sense to expand the * dictionary of possible types. @@ -73,9 +78,9 @@ struct ovs_list; * - number: * For OFPT, the 'type' in struct ofp_header. * For OFPST, the 'type' in struct ofp_stats_msg or ofp11_stats_msg. - * For NXT, the 'subtype' in struct nicira_header. - * For NXST, the 'subtype' in struct nicira10_stats_msg or - * nicira11_stats_msg. + * For NXT or ONFT, the 'subtype' in struct ofp_vendor_header. + * For NXST or ONFST, the 'subtype' in an appropriate vendor stats + * struct. * * - arguments: The types of data that follow the OpenFlow headers (the * message "body"). This can be "void" if the message has no body. @@ -148,10 +153,12 @@ enum ofpraw { 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[]. */ + /* OFPT 1.3+ (10): struct ofp12_packet_in, ovs_be64, uint8_t[]. */ OFPRAW_OFPT13_PACKET_IN, /* NXT 1.0+ (17): struct nx_packet_in, uint8_t[]. */ OFPRAW_NXT_PACKET_IN, + /* NXT 1.0+ (30): uint8_t[8][]. */ + OFPRAW_NXT_PACKET_IN2, /* OFPT 1.0 (11): struct ofp10_flow_removed. */ OFPRAW_OFPT10_FLOW_REMOVED, @@ -208,12 +215,12 @@ enum ofpraw { /* OFPT 1.0 (20): struct ofp10_queue_get_config_request. */ OFPRAW_OFPT10_QUEUE_GET_CONFIG_REQUEST, - /* OFPT 1.1+ (22): struct ofp11_queue_get_config_request. */ + /* OFPT 1.1-1.3 (22): struct ofp11_queue_get_config_request. */ OFPRAW_OFPT11_QUEUE_GET_CONFIG_REQUEST, /* OFPT 1.0 (21): 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][]. */ + /* OFPT 1.1-1.3 (23): struct ofp11_queue_get_config_reply, uint8_t[8][]. */ OFPRAW_OFPT11_QUEUE_GET_CONFIG_REPLY, /* OFPT 1.2+ (24): struct ofp12_role_request. */ @@ -232,13 +239,15 @@ enum ofpraw { OFPRAW_OFPT14_GET_ASYNC_REQUEST, /* OFPT 1.3 (27): struct ofp13_async_config. */ OFPRAW_OFPT13_GET_ASYNC_REPLY, - /* OFPT 1.4+ (27): struct ofp14_async_config, uint8_t[8][]. */ + /* OFPT 1.4+ (27): uint8_t[8][]. */ OFPRAW_OFPT14_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.4+ (28): struct ofp14_async_config, uint8_t[8][]. */ + /* NXT 1.0-1.3 (27): uint8_t[8][]. */ + OFPRAW_NXT_SET_ASYNC_CONFIG2, + /* OFPT 1.4+ (28): uint8_t[8][]. */ OFPRAW_OFPT14_SET_ASYNC, /* OFPT 1.3+ (29): struct ofp13_meter_mod, uint8_t[8][]. */ @@ -247,6 +256,12 @@ enum ofpraw { /* OFPT 1.4+ (30): struct ofp14_role_status, uint8_t[8][]. */ OFPRAW_OFPT14_ROLE_STATUS, + /* OFPT 1.4+ (31): struct ofp14_table_status, uint8_t[8][]. */ + OFPRAW_OFPT14_TABLE_STATUS, + + /* OFPT 1.4+ (32): struct ofp14_requestforward, uint8_t[8][]. */ + OFPRAW_OFPT14_REQUESTFORWARD, + /* OFPT 1.4+ (33): struct ofp14_bundle_ctrl_msg, uint8_t[8][]. */ OFPRAW_OFPT14_BUNDLE_CONTROL, @@ -339,7 +354,7 @@ enum ofpraw { /* OFPST 1.1-1.4 (7): void. */ OFPRAW_OFPST11_GROUP_DESC_REQUEST, - /* OFPST 1.5+ (7): ovs_be32. */ + /* OFPST 1.5+ (7): struct ofp15_group_desc_request. */ OFPRAW_OFPST15_GROUP_DESC_REQUEST, /* OFPST 1.1+ (7): uint8_t[8][]. */ @@ -375,10 +390,10 @@ enum ofpraw { /* OFPST 1.3+ (12): struct ofp13_table_features, uint8_t[8][]. */ OFPRAW_OFPST13_TABLE_FEATURES_REPLY, - /* OFPST 1.4+ (15): void. */ + /* OFPST 1.4+ (14): void. */ OFPRAW_OFPST14_TABLE_DESC_REQUEST, - /* OFPST 1.4+ (15): struct ofp14_table_desc, uint8_t[8][]. */ + /* OFPST 1.4+ (14): struct ofp14_table_desc, uint8_t[8][]. */ OFPRAW_OFPST14_TABLE_DESC_REPLY, /* OFPST 1.0-1.4 (13): void. */ @@ -393,6 +408,11 @@ enum ofpraw { /* OFPST 1.4+ (13): uint8_t[8][]. */ OFPRAW_OFPST14_PORT_DESC_REPLY, + /* OFPST 1.4+ (15): struct ofp14_queue_desc_request. */ + OFPRAW_OFPST14_QUEUE_DESC_REQUEST, + /* OFPST 1.4+ (15): uint8_t[8][]. */ + OFPRAW_OFPST14_QUEUE_DESC_REPLY, + /* OFPST 1.4+ (16): uint8_t[8][]. */ OFPRAW_OFPST14_FLOW_MONITOR_REQUEST, /* NXST 1.0 (2): uint8_t[8][]. */ @@ -432,14 +452,17 @@ enum ofpraw { /* NXT 1.0+ (23): void. */ OFPRAW_NXT_FLOW_MONITOR_RESUMED, - /* NXT 1.0+ (24): struct nx_geneve_table_mod, struct nx_geneve_map[]. */ - OFPRAW_NXT_GENEVE_TABLE_MOD, + /* NXT 1.0+ (24): struct nx_tlv_table_mod, struct nx_tlv_map[]. */ + OFPRAW_NXT_TLV_TABLE_MOD, /* NXT 1.0+ (25): void. */ - OFPRAW_NXT_GENEVE_TABLE_REQUEST, + OFPRAW_NXT_TLV_TABLE_REQUEST, - /* NXT 1.0+ (26): struct nx_geneve_table_reply, struct nx_geneve_map[]. */ - OFPRAW_NXT_GENEVE_TABLE_REPLY, + /* NXT 1.0+ (26): struct nx_tlv_table_reply, struct nx_tlv_map[]. */ + OFPRAW_NXT_TLV_TABLE_REPLY, + + /* NXT 1.0+ (28): uint8_t[8][]. */ + OFPRAW_NXT_RESUME, }; /* Decoding messages into OFPRAW_* values. */ @@ -504,6 +527,7 @@ enum ofptype { * OFPRAW_OFPT11_PACKET_IN. * OFPRAW_OFPT12_PACKET_IN. * OFPRAW_OFPT13_PACKET_IN. + * OFPRAW_NXT_PACKET_IN2. * OFPRAW_NXT_PACKET_IN. */ OFPTYPE_FLOW_REMOVED, /* OFPRAW_OFPT10_FLOW_REMOVED. * OFPRAW_OFPT11_FLOW_REMOVED. @@ -534,9 +558,11 @@ enum ofptype { /* Queue Configuration messages. */ OFPTYPE_QUEUE_GET_CONFIG_REQUEST, /* OFPRAW_OFPT10_QUEUE_GET_CONFIG_REQUEST. - * OFPRAW_OFPT11_QUEUE_GET_CONFIG_REQUEST. */ + * OFPRAW_OFPT11_QUEUE_GET_CONFIG_REQUEST. + * OFPRAW_OFPST14_QUEUE_DESC_REQUEST. */ OFPTYPE_QUEUE_GET_CONFIG_REPLY, /* OFPRAW_OFPT10_QUEUE_GET_CONFIG_REPLY. - * OFPRAW_OFPT11_QUEUE_GET_CONFIG_REPLY. */ + * OFPRAW_OFPT11_QUEUE_GET_CONFIG_REPLY. + * OFPRAW_OFPST14_QUEUE_DESC_REPLY. */ /* Controller role change request messages. */ OFPTYPE_ROLE_REQUEST, /* OFPRAW_OFPT12_ROLE_REQUEST. @@ -550,6 +576,7 @@ enum ofptype { OFPTYPE_GET_ASYNC_REPLY, /* OFPRAW_OFPT13_GET_ASYNC_REPLY. * OFPRAW_OFPT14_GET_ASYNC_REPLY. */ OFPTYPE_SET_ASYNC_CONFIG, /* OFPRAW_NXT_SET_ASYNC_CONFIG. + * OFPRAW_NXT_SET_ASYNC_CONFIG2. * OFPRAW_OFPT13_SET_ASYNC. * OFPRAW_OFPT14_SET_ASYNC. */ @@ -559,6 +586,12 @@ enum ofptype { /* Controller role change event messages. */ OFPTYPE_ROLE_STATUS, /* OFPRAW_OFPT14_ROLE_STATUS. */ + /* Request forwarding by the switch. */ + OFPTYPE_REQUESTFORWARD, /* OFPRAW_OFPT14_REQUESTFORWARD. */ + + /* Asynchronous messages. */ + OFPTYPE_TABLE_STATUS, /* OFPRAW_OFPT14_TABLE_STATUS. */ + OFPTYPE_BUNDLE_CONTROL, /* OFPRAW_OFPT14_BUNDLE_CONTROL. */ OFPTYPE_BUNDLE_ADD_MESSAGE, /* OFPRAW_OFPT14_BUNDLE_ADD_MESSAGE. */ @@ -648,9 +681,10 @@ enum ofptype { OFPTYPE_SET_PACKET_IN_FORMAT, /* OFPRAW_NXT_SET_PACKET_IN_FORMAT. */ OFPTYPE_FLOW_AGE, /* OFPRAW_NXT_FLOW_AGE. */ OFPTYPE_SET_CONTROLLER_ID, /* OFPRAW_NXT_SET_CONTROLLER_ID. */ - OFPTYPE_NXT_GENEVE_TABLE_MOD, /* OFPRAW_NXT_GENEVE_TABLE_MOD. */ - OFPTYPE_NXT_GENEVE_TABLE_REQUEST, /* OFPRAW_NXT_GENEVE_TABLE_REQUEST. */ - OFPTYPE_NXT_GENEVE_TABLE_REPLY, /* OFPRAW_NXT_GENEVE_TABLE_REPLY. */ + OFPTYPE_NXT_TLV_TABLE_MOD, /* OFPRAW_NXT_TLV_TABLE_MOD. */ + OFPTYPE_NXT_TLV_TABLE_REQUEST, /* OFPRAW_NXT_TLV_TABLE_REQUEST. */ + OFPTYPE_NXT_TLV_TABLE_REPLY, /* OFPRAW_NXT_TLV_TABLE_REPLY. */ + OFPTYPE_NXT_RESUME, /* OFPRAW_NXT_RESUME. */ /* Flow monitor extension. */ OFPTYPE_FLOW_MONITOR_CANCEL, /* OFPRAW_NXT_FLOW_MONITOR_CANCEL. */