ofp-msgs: Split OFPRAW_OFPST_TABLE_REPLY

Split OFPRAW_OFPST_TABLE_REPLY into OpenFlow 1.0, 1.1 and 1.2 versions.

This is preparation for allowing encoding and  decoding of Open Flow 1.1
and 1.2 Table Stats Reply messages.

Signed-off-by: Simon Horman <horms@verge.net.au>
Signed-off-by: Ben Pfaff <blp@nicira.com>

diff --git a/lib/ofp-msgs.h b/lib/ofp-msgs.h
index 7e7b21b636becff0aa267bf3827e525526a73ada..b8bc122c3a436827f3a83bce36d3baf9cb981e51 100644 (file)
--- a/lib/ofp-msgs.h
+++ b/lib/ofp-msgs.h
@@ -203,11 +203,15 @@ enum ofpraw {
     /* 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 ofp10_table_stats[]. */
-    OFPRAW_OFPST_TABLE_REPLY,
+    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 ofp10_port_stats_request. */
     OFPRAW_OFPST_PORT_REQUEST,
@@ -372,7 +376,9 @@ enum ofptype {
     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. */