aboutsummaryrefslogtreecommitdiff
path: root/lib/ofp-msgs.h
diff options
context:
space:
mode:
authorSimon Horman <horms@verge.net.au>2012-08-21 13:55:35 +0900
committerBen Pfaff <blp@nicira.com>2012-08-29 09:56:35 -0700
commit617da9cda70c6f11a3e674bc4a81f54e8b77b690 (patch)
tree9fd1030ccc6150ffc58eeddcb66b2092d7a4b633 /lib/ofp-msgs.h
parent0157ad3a08e849dae1223fe5ee0f33afc99235fc (diff)
ofp-msgs: Split OFPRAW_OFPST_AGGREGATE_REQUEST
Split OFPRAW_OFPST_AGGREGATE_REQUEST into OpenFlow 1.0 and 1.1+ versions. This should be sufficient to allow adding encoding and decoding of Open Flow 1.1 and 1.2 Aggregate Stats Request messages. Encoding and decoding of Open Flow 1.1 and 1.2 Aggregate Stats Response messages works using the existing code without modification. Signed-off-by: Simon Horman <horms@verge.net.au> Signed-off-by: Ben Pfaff <blp@nicira.com>
Diffstat (limited to 'lib/ofp-msgs.h')
-rw-r--r--lib/ofp-msgs.h9
1 files changed, 6 insertions, 3 deletions
diff --git a/lib/ofp-msgs.h b/lib/ofp-msgs.h
index b8bc122c..7ef7c5a6 100644
--- a/lib/ofp-msgs.h
+++ b/lib/ofp-msgs.h
@@ -194,11 +194,13 @@ enum ofpraw {
OFPRAW_NXST_FLOW_REPLY,
/* OFPST 1.0 (2): struct ofp10_flow_stats_request. */
- OFPRAW_OFPST_AGGREGATE_REQUEST,
+ OFPRAW_OFPST10_AGGREGATE_REQUEST,
+ /* OFPST 1.1+ (2): struct ofp11_flow_stats_request, uint8_t[8][]. */
+ OFPRAW_OFPST11_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. */
+ /* OFPST 1.0+ (2): struct ofp_aggregate_stats_reply. */
OFPRAW_OFPST_AGGREGATE_REPLY,
/* NXST 1.0 (1): struct ofp_aggregate_stats_reply. */
OFPRAW_NXST_AGGREGATE_REPLY,
@@ -371,7 +373,8 @@ enum ofptype {
OFPTYPE_FLOW_STATS_REPLY, /* OFPRAW_OFPST10_FLOW_REPLY.
* OFPRAW_OFPST11_FLOW_REPLY.
* OFPRAW_NXST_FLOW_REPLY. */
- OFPTYPE_AGGREGATE_STATS_REQUEST, /* OFPRAW_OFPST_AGGREGATE_REQUEST.
+ OFPTYPE_AGGREGATE_STATS_REQUEST, /* OFPRAW_OFPST10_AGGREGATE_REQUEST.
+ * OFPRAW_OFPST11_AGGREGATE_REQUEST.
* OFPRAW_NXST_AGGREGATE_REQUEST. */
OFPTYPE_AGGREGATE_STATS_REPLY, /* OFPRAW_OFPST_AGGREGATE_REPLY.
* OFPRAW_NXST_AGGREGATE_REPLY. */