From: Yi-Hung Wei <yihung....@gmail.com> decode_nx_packet_in2() may be used by the switch to parse NXT_RESUME messages, where we need exact match on the oxm header. Therefore, change oxm_decode_loose() to oxm_decode() that takes an extra argument to indicate whether we want strict or loose match.
Fixes: 7befb20d0f70 ("ofp-util: Ignore unknown fields in ofputil_decode_packet_in2()") Signed-off-by: Yi-Hung Wei <yihung....@gmail.com> Signed-off-by: Joe Stringer <j...@ovn.org> Signed-off-by: Jarno Rajahalme <ja...@ovn.org> --- lib/nx-match.c | 10 +++++----- lib/nx-match.h | 4 ++-- lib/ofp-util.c | 5 ++--- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/lib/nx-match.c b/lib/nx-match.c index 2e62e99..43672cb 100644 --- a/lib/nx-match.c +++ b/lib/nx-match.c @@ -683,14 +683,14 @@ oxm_pull_match_loose(struct ofpbuf *b, const struct tun_table *tun_table, * * Returns 0 if successful, otherwise an OpenFlow error code. * - * Encountering unknown OXM headers or missing field prerequisites are not - * considered as error conditions. + * If 'loose' is true, encountering unknown OXM headers or missing field + * prerequisites are not considered as error conditions. */ enum ofperr -oxm_decode_match_loose(const void *oxm, size_t oxm_len, - const struct tun_table *tun_table, struct match *match) +oxm_decode_match(const void *oxm, size_t oxm_len, bool loose, + const struct tun_table *tun_table, struct match *match) { - return nx_pull_raw(oxm, oxm_len, false, match, NULL, NULL, tun_table); + return nx_pull_raw(oxm, oxm_len, !loose, match, NULL, NULL, tun_table); } /* Verify an array of OXM TLVs treating value of each TLV as a mask, diff --git a/lib/nx-match.h b/lib/nx-match.h index cee9e65..e103dd5 100644 --- a/lib/nx-match.h +++ b/lib/nx-match.h @@ -61,8 +61,8 @@ enum ofperr oxm_pull_match(struct ofpbuf *, const struct tun_table *, struct match *); enum ofperr oxm_pull_match_loose(struct ofpbuf *, const struct tun_table *, struct match *); -enum ofperr oxm_decode_match_loose(const void *, size_t, - const struct tun_table *, struct match *); +enum ofperr oxm_decode_match(const void *, size_t, bool, + const struct tun_table *, struct match *); enum ofperr oxm_pull_field_array(const void *, size_t fields_len, struct field_array *); diff --git a/lib/ofp-util.c b/lib/ofp-util.c index 9e8d4d2..d315337 100644 --- a/lib/ofp-util.c +++ b/lib/ofp-util.c @@ -3397,9 +3397,8 @@ decode_nx_packet_in2(const struct ofp_header *oh, bool loose, } case NXPINT_METADATA: - error = oxm_decode_match_loose(payload.msg, - ofpbuf_msgsize(&payload), - tun_table, &pin->flow_metadata); + error = oxm_decode_match(payload.msg, ofpbuf_msgsize(&payload), + loose, tun_table, &pin->flow_metadata); break; case NXPINT_USERDATA: -- 2.1.4 _______________________________________________ dev mailing list d...@openvswitch.org https://mail.openvswitch.org/mailman/listinfo/ovs-dev