summaryrefslogtreecommitdiff
path: root/lib/ofp-parse.c
diff options
context:
space:
mode:
authorJarno Rajahalme <jarno@ovn.org>2017-03-08 17:18:22 -0800
committerJarno Rajahalme <jarno@ovn.org>2017-03-08 17:22:27 -0800
commit67210a5510703df8311ce5e836c3c7ac92505cae (patch)
tree93bf36f989b979a85ba47a7d3b9db931898df9d1 /lib/ofp-parse.c
parentfcbf7e1ed3ef7d3f144fbd3c1ae3064939e8dfb5 (diff)
downloadopenvswitch-67210a5510703df8311ce5e836c3c7ac92505cae.tar.gz
lib: Check match and action prerequisities with 'match'.
Supply the match mask to prerequisities checking when available. This allows checking for zero-valued matches. Non-zero valued matches imply the presense of corresponding mask bits, but for zero valued matches we must explicitly check the mask, too. This is required now only for conntrack validity checking due to the conntrack state having and 'invalid' bit, but not 'valid' bit. One way to match an valid conntrack state is to match on the 'tracked' bit being one and 'invalid' bit being zero. The latter requires the corresponding mask bit be verified. Signed-off-by: Jarno Rajahalme <jarno@ovn.org> Acked-by: Joe Stringer <joe@ovn.org>
Diffstat (limited to 'lib/ofp-parse.c')
-rw-r--r--lib/ofp-parse.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ofp-parse.c b/lib/ofp-parse.c
index a6b9fcf2e..7826bc5f3 100644
--- a/lib/ofp-parse.c
+++ b/lib/ofp-parse.c
@@ -546,7 +546,7 @@ parse_ofp_str__(struct ofputil_flow_mod *fm, int command, char *string,
if (!error) {
enum ofperr err;
- err = ofpacts_check(ofpacts.data, ofpacts.size, &fm->match.flow,
+ err = ofpacts_check(ofpacts.data, ofpacts.size, &fm->match,
OFPP_MAX, fm->table_id, 255, usable_protocols);
if (!err && !*usable_protocols) {
err = OFPERR_OFPBAC_MATCH_INCONSISTENT;