ofp-msgs: Correct code for queue configuration messages in OpenFlow 1.0.

Reported-by: Simon Jouet <simon.jouet@gmail.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>

diff --git a/AUTHORS b/AUTHORS
index fc0d876..da75b98 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -254,6 +254,7 @@ Scott Hendricks         shendricks@nicira.com
 Sean Brady              sbrady@gtfservices.com
 Sebastian Andrzej Siewior  sebastian@breakpoint.cc
 Sébastien RICCIO        sr@swisscenter.com
+Simon Jouet             simon.jouet@gmail.com
 Spiro Kourtessis        spiro@vmware.com
 Sridhar Samudrala       samudrala.sridhar@gmail.com
 Srini Seetharaman       seethara@stanford.edu

diff --git a/lib/ofp-msgs.h b/lib/ofp-msgs.h
index 5eb067d..8aa13a9 100644 (file)
--- a/lib/ofp-msgs.h
+++ b/lib/ofp-msgs.h
@@ -204,12 +204,12 @@ enum ofpraw {
     /* OFPT 1.1+ (21): void. */
     OFPRAW_OFPT11_BARRIER_REPLY,
 
-    /* OFPT 1.0 (22): struct ofp10_queue_get_config_request. */
+    /* 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. */
     OFPRAW_OFPT11_QUEUE_GET_CONFIG_REQUEST,
 
-    /* OFPT 1.0 (23): struct ofp10_queue_get_config_reply, uint8_t[8][]. */
+    /* 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][]. */
     OFPRAW_OFPT11_QUEUE_GET_CONFIG_REPLY,

diff --git a/tests/ofp-print.at b/tests/ofp-print.at
index cfb604e..09fc06d 100644 (file)
--- a/tests/ofp-print.at
+++ b/tests/ofp-print.at
@@ -2393,7 +2393,7 @@ AT_CLEANUP
 
 AT_SETUP([OFPT_QUEUE_GET_CONFIG_REQUEST - OF1.0])
 AT_KEYWORDS([ofp-print])
-AT_CHECK([ovs-ofctl ofp-print "01 16 00 0c 00 00 00 01 00 01 00 00"], [0], [dnl
+AT_CHECK([ovs-ofctl ofp-print "01 14 00 0c 00 00 00 01 00 01 00 00"], [0], [dnl
 OFPT_QUEUE_GET_CONFIG_REQUEST (xid=0x1): port=1
 ])
 AT_CLEANUP
@@ -2408,7 +2408,7 @@ AT_CLEANUP
 
 AT_SETUP([OFPT_QUEUE_GET_CONFIG_REPLY - OF1.0])
 AT_KEYWORDS([ofp-print])
-AT_CHECK([ovs-ofctl ofp-print "01 17 00 40 00 00 00 01 \
+AT_CHECK([ovs-ofctl ofp-print "01 15 00 40 00 00 00 01 \
 00 01 00 00 00 00 00 00 \
 00 00 55 55 00 28 00 00 \
 00 01 00 10 00 00 00 00 01 f4 00 00 00 00 00 00 \