[ovs-build] Fixed: openvswitch/ovs#2538 (branch-2.5 - 53950e5)

[Travis CI]

Build Update for openvswitch/ovs
-------------------------------------

Build: #2538
Status: Fixed

Duration: 21 minutes and 50 seconds
Commit: 53950e5 (branch-2.5)
Author: Joe Stringer
Message: ofproto-dpif-xlate: xlate ct_{mark, label} correctly.

When translating multiple ct actions in a row which include modification
of ct_mark or ct_labels, these fields could be incorrectly translated
into datapath actions, resulting in modification of these fields for
entries when the OpenFlow rules didn't actually specify the change.

For instance, the following OpenFlow actions:
ct(zone=1,commit,exec(set_field(1->ct_mark))),ct(zone=2,table=1),...

Would translate into the datapath actions:
ct(zone=1,commit,mark=1),ct(zone=2,mark=1),recirc(...),...

This commit fixes the issue by zeroing the wildcards for these fields
prior to performing nested actions translation (and restoring
afterwards). As such, these fields do not hold both the match and the
field modification values at the same time. As a result, the ct_mark and
ct_labels don't leak from one ct action to the next.

Upstream: f2d105b5915f ("ofproto-dpif-xlate: xlate ct_{mark, label} correctly.")
Fixes: 8e53fe8cf7a1 ("Add connection tracking mark support.")
Fixes: 9daf23484fb1 ("Add connection tracking label support.")
Signed-off-by: Joe Stringer <joe at ovn.org>
Acked-by: Ben Pfaff <blp at ovn.org>

View the changeset: https://github.com/openvswitch/ovs/compare/62f732deecee...53950e50b2f5

View the full build log and details: https://travis-ci.org/openvswitch/ovs/builds/125178462

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://www.openvswitch.org/pipermail/ovs-build/attachments/20160423/34afd890/attachment-0002.html>