[ovs-git] Open vSwitch: ofp-util: Properly handle "tun_id"s in tun_id_from_cookie flows. (master)

[dev at openvswitch.org]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Open vSwitch".

The branch, master has been updated
       via  0721c0739fb73e1ab2f0446e896deccc0bb8d92a (commit)
      from  e2bd05933f2c813e1cce42b8fe0db6230dffb13c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 0721c0739fb73e1ab2f0446e896deccc0bb8d92a
Diffs: http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=commitdiff;h=0721c0739fb73e1ab2f0446e896deccc0bb8d92a
Author: Ben Pfaff <blp at nicira.com>
		
ofp-util: Properly handle "tun_id"s in tun_id_from_cookie flows.
		
Just setting the tun_id field isn't enough--it's also necessary to set
the tun_id_mask.  Otherwise the call to cls_rule_zero_wildcarded_fields()
at the end of ofputil_cls_rule_from_match() will zero out the tun_id again.

This was broken by commit 8368c090cab "Implement arbitrary bitwise masks
for tun_id field" back in January.  (This makes me wonder whether we can
drop support for tun_id_from_cookie now.)

Reported-by: Dan Wendlandt <dan at nicira.com>


-----------------------------------------------------------------------

Summary of changes:
 lib/ofp-util.c   |    2 +-
 tests/ofproto.at |    8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
Open vSwitch