What's the visible effect of this change? I am not sure, based on the patch description. One or two more sentences of context would help.
Thanks, Ben. On Mon, Apr 24, 2017 at 02:58:49PM -0700, Jarno Rajahalme wrote: > Specify the event mask with CT commit including bits for CT features > exposed at the OVS interface (mark and label changes in addition to > basic creation and destruction of conntrack entries). > > VMware-BZ: #1837218 > Signed-off-by: Jarno Rajahalme <[email protected]> > --- > This patch depends on the following other patches currently in review: > - "datapath-windows: Add missing IPCT_LABEL." > - "datapath: Add eventmask support to CT action." > > build-aux/extract-odp-netlink-h | 2 ++ > ofproto/ofproto-dpif-xlate.c | 3 +++ > 2 files changed, 5 insertions(+) > > diff --git a/build-aux/extract-odp-netlink-h b/build-aux/extract-odp-netlink-h > index 907a70a..7fb6ce8 100755 > --- a/build-aux/extract-odp-netlink-h > +++ b/build-aux/extract-odp-netlink-h > @@ -19,6 +19,8 @@ $i\ > #ifdef _WIN32\ > #include "OvsDpInterfaceExt.h"\ > #include "OvsDpInterfaceCtExt.h"\ > +#else\ > +#include "linux/netfilter/nf_conntrack_common.h"\ > #endif\ > > # Use OVS's own struct eth_addr instead of a 6-byte char array. > diff --git a/ofproto/ofproto-dpif-xlate.c b/ofproto/ofproto-dpif-xlate.c > index d8c6a7c..21f2f7a 100644 > --- a/ofproto/ofproto-dpif-xlate.c > +++ b/ofproto/ofproto-dpif-xlate.c > @@ -5351,6 +5351,9 @@ compose_conntrack_action(struct xlate_ctx *ctx, struct > ofpact_conntrack *ofc) > if (ofc->flags & NX_CT_F_COMMIT) { > nl_msg_put_flag(ctx->odp_actions, ofc->flags & NX_CT_F_FORCE ? > OVS_CT_ATTR_FORCE_COMMIT : OVS_CT_ATTR_COMMIT); > + nl_msg_put_u32(ctx->odp_actions, OVS_CT_ATTR_EVENTMASK, > + 1 << IPCT_NEW | 1 << IPCT_RELATED | 1 << IPCT_DESTROY > | > + 1 << IPCT_MARK | 1 << IPCT_LABEL); > } > nl_msg_put_u16(ctx->odp_actions, OVS_CT_ATTR_ZONE, zone); > put_ct_mark(&ctx->xin->flow, ctx->odp_actions, ctx->wc); > -- > 2.1.4 > > _______________________________________________ > dev mailing list > [email protected] > https://mail.openvswitch.org/mailman/listinfo/ovs-dev _______________________________________________ dev mailing list [email protected] https://mail.openvswitch.org/mailman/listinfo/ovs-dev
