diff options
| author | Ben Pfaff <blp@nicira.com> | 2014-07-14 10:37:38 -0700 |
|---|---|---|
| committer | Ben Pfaff <blp@nicira.com> | 2014-07-15 09:58:38 -0700 |
| commit | 055ba36e82775037fe3770c6720b0dcdb04e5c89 (patch) | |
| tree | 780dd7d0471816acd0e0be9dcce068ca9eab9d96 | |
| parent | de2c1c0557de340aeb6fda1954dcfd9faa117d3a (diff) | |
| download | openvswitch-055ba36e82775037fe3770c6720b0dcdb04e5c89.tar.gz | |
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>
| -rw-r--r-- | AUTHORS | 1 | ||||
| -rw-r--r-- | lib/ofp-msgs.h | 4 | ||||
| -rw-r--r-- | tests/ofp-print.at | 4 |
3 files changed, 5 insertions, 4 deletions
@@ -250,6 +250,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 d8dee5b53..b3a0f4243 100644 --- a/lib/ofp-msgs.h +++ b/lib/ofp-msgs.h @@ -198,12 +198,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 ef3102fa4..71fe4aa49 100644 --- a/tests/ofp-print.at +++ b/tests/ofp-print.at @@ -2257,7 +2257,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 @@ -2272,7 +2272,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 \ |