[ovs-git] [openvswitch/ovs] ca3574: IPsec: refactor out some code in OVS_MONITOR_IPSEC...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/openvswitch/ovs
  Commit: ca3574d552b2011859f9d72dd3f08353603b8213
      https://github.com/openvswitch/ovs/commit/ca3574d552b2011859f9d72dd3f08353603b8213
  Author: Ansis Atteka <aatteka at ovn.org>
  Date:   2016-07-21 (Thu, 21 Jul 2016)

  Changed paths:
    M tests/ofproto-macros.at
    M tests/ovs-monitor-ipsec.at

  Log Message:
  -----------
  IPsec: refactor out some code in OVS_MONITOR_IPSEC_START macro

This OVS_MONITOR_IPSEC_START macro will be helpful in the next
patch where it will be used also from tests/tunnel.at file to test
that skb marking happens correctly.  Otherwise, without ovs-monitor-ipsec
running the ovs-vswitchd would refuse to configure ipsec_XXX tunnels.

Signed-off-by: Ansis Atteka <aatteka at ovn.org>
Acked-by: Jarno Rajahalme <jarno at ovn.org>


  Commit: f574ff4aa9abaea9f8aa41cff3f82dd2b7a8c054
      https://github.com/openvswitch/ovs/commit/f574ff4aa9abaea9f8aa41cff3f82dd2b7a8c054
  Author: Ansis Atteka <aatteka at ovn.org>
  Date:   2016-07-21 (Thu, 21 Jul 2016)

  Changed paths:
    M ofproto/tunnel.c
    M tests/tunnel.at

  Log Message:
  -----------
  tunneling: get skb marking to work properly with tunnels

There are two issues that this patch fixes:
1. it was impossible to set skb mark at all through
   NXM_NX_PKT_MARK register for tunnel packets; AND
2. ipsec_xxx tunnels would not be marked with the default
   IPsec mark (broken by d23df9a87 "lib/odp: Use masked set
   actions.").

This patch also adds anti-regression tests to prevent such
breakages in the future.

Signed-off-by: Ansis Atteka <aatteka at ovn.org>
VMware-BZ: #1653178
Acked-by: Jarno Rajahalme <jarno at ovn.org>


Compare: https://github.com/openvswitch/ovs/compare/0ee007414206...f574ff4aa9ab