[ovs-dev] [tests+nxm-ofctl 22/42] ofp-util: Fix interpretation of NXFW_TUN_ID bit for NXFF_OPENFLOW10.

Justin Pettit jpettit at nicira.com
Thu Nov 25 00:06:50 UTC 2010


Reviewing this one out of order, since it fixes a bug we're seeing.  And...looks good.

--Justin


On Nov 23, 2010, at 2:43 PM, Ben Pfaff wrote:

> In NXFF_OPENFLOW10, the tun_id field is always supposed to be wildcarded.
> That is what OVS used to do, but commit d8ae4d67 "flow: Fully separate
> flow_wildcards from OpenFlow wildcard bits" broke it.
> ---
> lib/ofp-util.c |    2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/lib/ofp-util.c b/lib/ofp-util.c
> index cc38105..d58f7ea 100644
> --- a/lib/ofp-util.c
> +++ b/lib/ofp-util.c
> @@ -124,7 +124,7 @@ ofputil_cls_rule_from_match(const struct ofp_match *match,
>     wc->nw_src_mask = ofputil_wcbits_to_netmask(ofpfw >> OFPFW_NW_SRC_SHIFT);
>     wc->nw_dst_mask = ofputil_wcbits_to_netmask(ofpfw >> OFPFW_NW_DST_SHIFT);
> 
> -    if (!(ofpfw & NXFW_TUN_ID)) {
> +    if (flow_format == NXFF_TUN_ID_FROM_COOKIE && !(ofpfw & NXFW_TUN_ID)) {
>         rule->flow.tun_id = htonl(ntohll(cookie) >> 32);
>     } else {
>         wc->wildcards |= FWW_TUN_ID;
> -- 
> 1.7.1
> 
> 
> _______________________________________________
> dev mailing list
> dev at openvswitch.org
> http://openvswitch.org/mailman/listinfo/dev_openvswitch.org





More information about the dev mailing list