summaryrefslogtreecommitdiff
path: root/tests/ovs-ofctl.at
diff options
context:
space:
mode:
authorJoe Stringer <joestringer@nicira.com>2015-07-09 14:40:53 -0700
committerJoe Stringer <joestringer@nicira.com>2015-07-17 10:24:36 -0700
commita805558c400cbde7ced2db993491d61a70f6b734 (patch)
tree6cfc3daf79c6957f5ae55f9ab7a69f54eb1c81f5 /tests/ovs-ofctl.at
parent09b0fa9c559e448936feafa3fe68b4f955832afa (diff)
downloadopenvswitch-a805558c400cbde7ced2db993491d61a70f6b734.tar.gz
ofp-parse: Fix typo in consistency check.
This check in parse_ofp_str__() attempted to detect inconsistencies between matches and actions, or inconsistencies within the actions. In this case, ofpacts_check() would effectively zero the "usable_protocols" and return 0 (ie, OK). However, when checking the return parameter, it checks the pointer rather than the value. In practice, this seems to only come up for fields which are used internally in OVS and not exposed for matching from the controller, like tunnel flags or skb_priority. Found by MIT STACK undefined behaviour checker. Signed-off-by: Joe Stringer <joestringer@nicira.com> Acked-by: Ben Pfaff <blp@nicira.com>
Diffstat (limited to 'tests/ovs-ofctl.at')
-rw-r--r--tests/ovs-ofctl.at6
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/ovs-ofctl.at b/tests/ovs-ofctl.at
index 2383aebfb..c1e9ec45e 100644
--- a/tests/ovs-ofctl.at
+++ b/tests/ovs-ofctl.at
@@ -127,9 +127,9 @@ do
echo "### test case: '$1' should have usable protocols '$2'"
if test "$2" = none; then
AT_CHECK([ovs-ofctl parse-flow "$1,actions=drop"], [1],
- [usable protocols: none
+ [dnl
],
- [ovs-ofctl: no usable protocol
+ [ovs-ofctl: actions are invalid with specified match (OFPBAC_MATCH_INCONSISTENT)
])
else
AT_CHECK_UNQUOTED([ovs-ofctl parse-flow "$1,actions=drop" | sed 1q], [0],
@@ -309,7 +309,7 @@ skb_priority=0x12341234,tcp,tp_src=123,actions=flood
]])
AT_CHECK([ovs-ofctl parse-flows flows.txt
-], [1], [usable protocols: none
+], [1], [dnl
], [stderr])
AT_CLEANUP