From 56de7118d0909425d714457f0cb470d69f069421 Mon Sep 17 00:00:00 2001 From: Simon Horman Date: Fri, 12 Oct 2012 13:00:38 +0900 Subject: [PATCH] ofp-msgs: Update for OpenFlow 1.1 & 1.2 Port Desc Stats * Split OFPRAW_OFPST_PORT_DESC_REPLY into OpenFlow 1.0 and OpenFlow 1.1+ versions. * Allow OFPRAW_OFPST_PORT_DESC_REQUEST to be used for OpenFlow 1.0+ instead of only OpenFlow 1.0. This appears to be necessary and sufficient to allow encoding of Port Desc Stats reply messages and decoding of Port Desc Stats request messages. Or in other words both the client and server side of ovs-ofctl dump-ports-desc Signed-off-by: Simon Horman Signed-off-by: Ben Pfaff --- lib/ofp-msgs.h | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/lib/ofp-msgs.h b/lib/ofp-msgs.h index 6420c5d2b..4bcc1b435 100644 --- a/lib/ofp-msgs.h +++ b/lib/ofp-msgs.h @@ -231,11 +231,13 @@ enum ofpraw { /* OFPST 1.0 (5): struct ofp10_queue_stats[]. */ OFPRAW_OFPST_QUEUE_REPLY, - /* OFPST 1.0 (13): void. */ + /* OFPST 1.0+ (13): void. */ OFPRAW_OFPST_PORT_DESC_REQUEST, /* OFPST 1.0 (13): struct ofp10_phy_port[]. */ - OFPRAW_OFPST_PORT_DESC_REPLY, + OFPRAW_OFPST10_PORT_DESC_REPLY, + /* OFPST 1.1+ (13): struct ofp11_port[]. */ + OFPRAW_OFPST11_PORT_DESC_REPLY, /* Nicira extension messages. * @@ -393,7 +395,8 @@ enum ofptype { OFPTYPE_QUEUE_STATS_REQUEST, /* OFPRAW_OFPST_QUEUE_REQUEST. */ OFPTYPE_QUEUE_STATS_REPLY, /* OFPRAW_OFPST_QUEUE_REPLY. */ OFPTYPE_PORT_DESC_STATS_REQUEST, /* OFPRAW_OFPST_PORT_DESC_REQUEST. */ - OFPTYPE_PORT_DESC_STATS_REPLY, /* OFPRAW_OFPST_PORT_DESC_REPLY. */ + OFPTYPE_PORT_DESC_STATS_REPLY, /* OFPRAW_OFPST10_PORT_DESC_REPLY. + * OFPRAW_OFPST11_PORT_DESC_REPLY. */ /* Nicira extensions. */ OFPTYPE_ROLE_REQUEST, /* OFPRAW_NXT_ROLE_REQUEST. */ -- 2.43.0