Message ID | 1472661204-11430-1-git-send-email-abiswas@us.ibm.com |
---|---|
State | Accepted |
Headers | show |
On Wed, Aug 31, 2016 at 09:33:24AM -0700, Amitabha Biswas wrote: > Fixes: 19cd0a87 > > Signed-off-by: Amitabha Biswas <abiswas@us.ibm.com> > Acked-by: Numan Siddique <nusiddiq@redhat.com> Thanks, applied to master. I adjusted the commit message to match our usual style: ovs-monitor-ipsec: Fix Python style. Found by flake8. Fixes: 19cd0a87827e ("ipsec: Do not allow ipsec_gre tunnel traffic to exit unencrypted") Signed-off-by: Amitabha Biswas <abiswas@us.ibm.com> Acked-by: Numan Siddique <nusiddiq@redhat.com> Signed-off-by: Ben Pfaff <blp@ovn.org>
On 31 August 2016 at 09:58, Ben Pfaff <blp@ovn.org> wrote: > On Wed, Aug 31, 2016 at 09:33:24AM -0700, Amitabha Biswas wrote: >> Fixes: 19cd0a87 >> >> Signed-off-by: Amitabha Biswas <abiswas@us.ibm.com> >> Acked-by: Numan Siddique <nusiddiq@redhat.com> > > Thanks, applied to master. I think this was affecting branch-2.6 as well: https://travis-ci.org/openvswitch/ovs/builds/156838691
On Thu, Sep 01, 2016 at 02:55:52PM -0700, Joe Stringer wrote: > On 31 August 2016 at 09:58, Ben Pfaff <blp@ovn.org> wrote: > > On Wed, Aug 31, 2016 at 09:33:24AM -0700, Amitabha Biswas wrote: > >> Fixes: 19cd0a87 > >> > >> Signed-off-by: Amitabha Biswas <abiswas@us.ibm.com> > >> Acked-by: Numan Siddique <nusiddiq@redhat.com> > > > > Thanks, applied to master. > > I think this was affecting branch-2.6 as well: > > https://travis-ci.org/openvswitch/ovs/builds/156838691 Oops, crossported now.
diff --git a/debian/ovs-monitor-ipsec b/debian/ovs-monitor-ipsec index e6617b0..6bc26aa 100755 --- a/debian/ovs-monitor-ipsec +++ b/debian/ovs-monitor-ipsec @@ -333,7 +333,7 @@ class IPsec(object): self.call_ip_xfrm(["policy", "add", "src", "0.0.0.0/0", "dst", "0.0.0.0/0", "proto", "gre", "dir", "out", "mark", IPSEC_MARK, "mask", IPSEC_MARK, - "action", "block", "priority", "4294967295"]); + "action", "block", "priority", "4294967295"]) def spd_add(self, local_ip, remote_ip): cmds = ("spdadd %s %s gre -P out ipsec esp/transport//require;\n" %