[ovs-git] [openvswitch/ovs] 9fbdf5: conntrack: remove duplicated code

[GitHub]

  Branch: refs/heads/branch-2.6
  Home:   https://github.com/openvswitch/ovs
  Commit: 9fbdf54fe69c502534905c162477662be707305d
      https://github.com/openvswitch/ovs/commit/9fbdf54fe69c502534905c162477662be707305d
  Author: Wei <realbaseball2008 at gmail.com>
  Date:   2016-09-21 (Wed, 21 Sep 2016)

  Changed paths:
    M lib/conntrack.c

  Log Message:
  -----------
  conntrack: remove duplicated code

Signed-off-by: Wei <realbaseball2008 at gmail.com>
Signed-off-by: Daniele Di Proietto <diproiettod at vmware.com>


  Commit: 065497c1c0ccb5b3c8407b51611d73edb2046541
      https://github.com/openvswitch/ovs/commit/065497c1c0ccb5b3c8407b51611d73edb2046541
  Author: Wei <realbaseball2008 at gmail.com>
  Date:   2016-09-21 (Wed, 21 Sep 2016)

  Changed paths:
    M lib/conntrack.c

  Log Message:
  -----------
  conntrack: fix address offset bug

Signed-off-by: Wei <realbaseball2008 at gmail.com>
Signed-off-by: Daniele Di Proietto <diproiettod at vmware.com>


  Commit: ee86750acb07a039f171c0d5dfd12982537dfd7a
      https://github.com/openvswitch/ovs/commit/ee86750acb07a039f171c0d5dfd12982537dfd7a
  Author: Daniele Di Proietto <diproiettod at vmware.com>
  Date:   2016-09-21 (Wed, 21 Sep 2016)

  Changed paths:
    M lib/bfd.c
    M ofproto/ofproto-dpif-xlate.c
    M tests/ofproto-dpif.at

  Log Message:
  -----------
  ofproto-dpif-xlate: Adjust generated mask for fragments.

It's possible to install an OpenFlow flow that matches on udp source and
destination ports without matching on fragments.  If the subtable where
such flow stays is visited during translation of a later fragment, the
generated mask will have incorrect prerequisited for the datapath and it
would be revalidated away at the first chance.

This commit fixes it by adjusting the mask for later fragments after
translation.

Other prerequisites of the mask are also prerequisites in OpenFlow, but
not the ip fragment bit, that's why we need a special case here.

For completeness, this commits also fixes a related problem in bfd,
where we check the udp destination port without checking if the frame is
an ip fragment.  It's not really necessary to address this separately,
given the adjustment that we perform.

VMware-BZ: #1651589
Signed-off-by: Daniele Di Proietto <diproiettod at vmware.com>
Acked-by: Jarno Rajahalme <jarno at ovn.org>


  Commit: 76a88e72a696b863f5635862b3223bd25ec248d1
      https://github.com/openvswitch/ovs/commit/76a88e72a696b863f5635862b3223bd25ec248d1
  Author: Daniele Di Proietto <diproiettod at vmware.com>
  Date:   2016-09-21 (Wed, 21 Sep 2016)

  Changed paths:
    M lib/flow.h
    M lib/tnl-neigh-cache.c

  Log Message:
  -----------
  tnl-neigh-cache: Unwildcard flow members before inspecting them.

tnl_neigh_snoop() is part of the translation.  During translation we
have to unwildcard all the fields we examine to make a decision.

tnl_arp_snoop() and tnl_nd_snoop() failed to unwildcard fileds in case
of failure.  The solution is to do unwildcarding before the field is
inspected.

Signed-off-by: Daniele Di Proietto <diproiettod at vmware.com>
Acked-by: Jarno Rajahalme <jarno at ovn.org>


Compare: https://github.com/openvswitch/ovs/compare/ac7715cfbd3d...76a88e72a696