X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Fofp-msgs.h;h=b8bc122c3a436827f3a83bce36d3baf9cb981e51;hb=5b289eaf9f880c5284510a45db8e13f55f4968f3;hp=ed73fc7284ec86b77a35a01e8598e31ec25bd40d;hpb=982697a4d24caa0a3bdaf85db67619338b382e50;p=openvswitch diff --git a/lib/ofp-msgs.h b/lib/ofp-msgs.h index ed73fc72..b8bc122c 100644 --- a/lib/ofp-msgs.h +++ b/lib/ofp-msgs.h @@ -120,18 +120,22 @@ enum ofpraw { /* OFPT 1.0+ (8): struct ofp_switch_config. */ OFPRAW_OFPT_GET_CONFIG_REPLY, - /* OFPT 1.0-1.1 (9): struct ofp_switch_config. */ + /* 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[]. */ OFPRAW_OFPT10_PACKET_IN, /* OFPT 1.1 (10): struct ofp11_packet_in up to data, uint8_t[]. */ OFPRAW_OFPT11_PACKET_IN, + /* OFPT 1.2 (10): struct ofp12_packet_in, uint8_t[]. */ + OFPRAW_OFPT12_PACKET_IN, /* NXT 1.0+ (17): struct nx_packet_in, uint8_t[]. */ OFPRAW_NXT_PACKET_IN, /* OFPT 1.0 (11): struct ofp_flow_removed. */ OFPRAW_OFPT10_FLOW_REMOVED, + /* OFPT 1.1+ (11): struct ofp11_flow_removed, uint8_t[8][]. */ + OFPRAW_OFPT11_FLOW_REMOVED, /* NXT 1.0+ (14): struct nx_flow_removed, uint8_t[8][]. */ OFPRAW_NXT_FLOW_REMOVED, @@ -145,7 +149,7 @@ enum ofpraw { /* OFPT 1.1+ (13): struct ofp11_packet_out, uint8_t[]. */ OFPRAW_OFPT11_PACKET_OUT, - /* OFPT 1.0 (14): struct ofp_flow_mod, struct ofp_action_header[]. */ + /* OFPT 1.0 (14): struct ofp10_flow_mod, struct ofp_action_header[]. */ OFPRAW_OFPT10_FLOW_MOD, /* OFPT 1.1+ (14): struct ofp11_flow_mod, struct ofp11_instruction[]. */ OFPRAW_OFPT11_FLOW_MOD, @@ -154,7 +158,7 @@ enum ofpraw { /* OFPT 1.0 (15): struct ofp10_port_mod. */ OFPRAW_OFPT10_PORT_MOD, - /* OFPT 1.1 (16): struct ofp11_port_mod. */ + /* OFPT 1.1+ (16): struct ofp11_port_mod. */ OFPRAW_OFPT11_PORT_MOD, /* OFPT 1.0 (18): void. */ @@ -175,42 +179,50 @@ enum ofpraw { /* OFPST 1.0+ (0): struct ofp_desc_stats. */ OFPRAW_OFPST_DESC_REPLY, - /* OFPST 1.0 (1): struct ofp_flow_stats_request. */ - OFPRAW_OFPST_FLOW_REQUEST, + /* OFPST 1.0 (1): struct ofp10_flow_stats_request. */ + OFPRAW_OFPST10_FLOW_REQUEST, + /* OFPST 1.1+ (1): struct ofp11_flow_stats_request, uint8_t[8][]. */ + OFPRAW_OFPST11_FLOW_REQUEST, /* NXST 1.0 (0): struct nx_flow_stats_request, uint8_t[8][]. */ OFPRAW_NXST_FLOW_REQUEST, /* OFPST 1.0 (1): uint8_t[]. */ - OFPRAW_OFPST_FLOW_REPLY, + OFPRAW_OFPST10_FLOW_REPLY, + /* OFPST 1.1+ (1): uint8_t[]. */ + OFPRAW_OFPST11_FLOW_REPLY, /* NXST 1.0 (0): uint8_t[]. */ OFPRAW_NXST_FLOW_REPLY, - /* OFPST 1.0 (2): struct ofp_flow_stats_request. */ + /* OFPST 1.0 (2): struct ofp10_flow_stats_request. */ OFPRAW_OFPST_AGGREGATE_REQUEST, /* NXST 1.0 (1): struct nx_flow_stats_request, uint8_t[8][]. */ OFPRAW_NXST_AGGREGATE_REQUEST, /* OFPST 1.0 (2): struct ofp_aggregate_stats_reply. */ OFPRAW_OFPST_AGGREGATE_REPLY, - /* NXST 1.0 (1): struct nx_aggregate_stats_reply. */ + /* NXST 1.0 (1): struct ofp_aggregate_stats_reply. */ OFPRAW_NXST_AGGREGATE_REPLY, - /* OFPST 1.0 (3): void. */ + /* OFPST 1.0-1.2 (3): void. */ OFPRAW_OFPST_TABLE_REQUEST, - /* OFPST 1.0 (3): struct ofp_table_stats[]. */ - OFPRAW_OFPST_TABLE_REPLY, + /* OFPST 1.0 (3): struct ofp10_table_stats[]. */ + OFPRAW_OFPST10_TABLE_REPLY, + /* OFPST 1.1 (3): struct ofp11_table_stats[]. */ + OFPRAW_OFPST11_TABLE_REPLY, + /* OFPST 1.2 (3): struct ofp12_table_stats[]. */ + OFPRAW_OFPST12_TABLE_REPLY, - /* OFPST 1.0 (4): struct ofp_port_stats_request. */ + /* OFPST 1.0 (4): struct ofp10_port_stats_request. */ OFPRAW_OFPST_PORT_REQUEST, - /* OFPST 1.0 (4): struct ofp_port_stats[]. */ + /* OFPST 1.0 (4): struct ofp10_port_stats[]. */ OFPRAW_OFPST_PORT_REPLY, - /* OFPST 1.0 (5): struct ofp_queue_stats_request. */ + /* OFPST 1.0 (5): struct ofp10_queue_stats_request. */ OFPRAW_OFPST_QUEUE_REQUEST, - /* OFPST 1.0 (5): struct ofp_queue_stats[]. */ + /* OFPST 1.0 (5): struct ofp10_queue_stats[]. */ OFPRAW_OFPST_QUEUE_REPLY, /* OFPST 1.0 (13): void. */ @@ -327,8 +339,10 @@ enum ofptype { /* Asynchronous messages. */ OFPTYPE_PACKET_IN, /* OFPRAW_OFPT10_PACKET_IN. * OFPRAW_OFPT11_PACKET_IN. + * OFPRAW_OFPT12_PACKET_IN. * OFPRAW_NXT_PACKET_IN. */ OFPTYPE_FLOW_REMOVED, /* OFPRAW_OFPT10_FLOW_REMOVED. + * OFPRAW_OFPT11_FLOW_REMOVED. * OFPRAW_NXT_FLOW_REMOVED. */ OFPTYPE_PORT_STATUS, /* OFPRAW_OFPT10_PORT_STATUS. * OFPRAW_OFPT11_PORT_STATUS. */ @@ -351,16 +365,20 @@ enum ofptype { /* Statistics. */ OFPTYPE_DESC_STATS_REQUEST, /* OFPRAW_OFPST_DESC_REQUEST. */ OFPTYPE_DESC_STATS_REPLY, /* OFPRAW_OFPST_DESC_REPLY. */ - OFPTYPE_FLOW_STATS_REQUEST, /* OFPRAW_OFPST_FLOW_REQUEST. + OFPTYPE_FLOW_STATS_REQUEST, /* OFPRAW_OFPST10_FLOW_REQUEST. + * OFPRAW_OFPST11_FLOW_REQUEST. * OFPRAW_NXST_FLOW_REQUEST. */ - OFPTYPE_FLOW_STATS_REPLY, /* OFPRAW_OFPST_FLOW_REPLY. + OFPTYPE_FLOW_STATS_REPLY, /* OFPRAW_OFPST10_FLOW_REPLY. + * OFPRAW_OFPST11_FLOW_REPLY. * OFPRAW_NXST_FLOW_REPLY. */ OFPTYPE_AGGREGATE_STATS_REQUEST, /* OFPRAW_OFPST_AGGREGATE_REQUEST. * OFPRAW_NXST_AGGREGATE_REQUEST. */ OFPTYPE_AGGREGATE_STATS_REPLY, /* OFPRAW_OFPST_AGGREGATE_REPLY. * OFPRAW_NXST_AGGREGATE_REPLY. */ OFPTYPE_TABLE_STATS_REQUEST, /* OFPRAW_OFPST_TABLE_REQUEST. */ - OFPTYPE_TABLE_STATS_REPLY, /* OFPRAW_OFPST_TABLE_REPLY. */ + OFPTYPE_TABLE_STATS_REPLY, /* OFPRAW_OFPST10_TABLE_REPLY. + * OFPRAW_OFPST11_TABLE_REPLY. + * OFPRAW_OFPST12_TABLE_REPLY. */ OFPTYPE_PORT_STATS_REQUEST, /* OFPRAW_OFPST_PORT_REQUEST. */ OFPTYPE_PORT_STATS_REPLY, /* OFPRAW_OFPST_PORT_REPLY. */ OFPTYPE_QUEUE_STATS_REQUEST, /* OFPRAW_OFPST_QUEUE_REQUEST. */