| Message ID | 20170816182302.3904-1-kumaranand@vmware.com |
|---|---|
| State | Accepted |
| Headers | show |
Acked-by: Alin Gabriel Serdean <aserdean@ovn.org> > -----Original Message----- > From: ovs-dev-bounces@openvswitch.org [mailto:ovs-dev- > bounces@openvswitch.org] On Behalf Of Anand Kumar > Sent: Wednesday, August 16, 2017 9:23 PM > To: dev@openvswitch.org > Subject: [ovs-dev] [PATCH v3] datapath-windows: Update Orig Tuple to use > ICMP Type and Code > > - Also add some padding for the ct_endpoint's union, so that each member > of ct_endpoint's union are of same size. > > Co-authored-by: Sairam Venugopal <vsairam@vmware.com> > Signed-off-by: Anand Kumar <kumaranand@vmware.com> > ---
I applied this on master and branch-2.8 Thanks, Alin. > -----Original Message----- > From: ovs-dev-bounces@openvswitch.org [mailto:ovs-dev- > bounces@openvswitch.org] On Behalf Of aserdean@ovn.org > Sent: Thursday, August 17, 2017 10:48 PM > To: 'Anand Kumar' <kumaranand@vmware.com>; dev@openvswitch.org > Subject: Re: [ovs-dev] [PATCH v3] datapath-windows: Update Orig Tuple to > use ICMP Type and Code > > Acked-by: Alin Gabriel Serdean <aserdean@ovn.org> > > > -----Original Message----- > > From: ovs-dev-bounces@openvswitch.org [mailto:ovs-dev- > > bounces@openvswitch.org] On Behalf Of Anand Kumar > > Sent: Wednesday, August 16, 2017 9:23 PM > > To: dev@openvswitch.org > > Subject: [ovs-dev] [PATCH v3] datapath-windows: Update Orig Tuple to > > use ICMP Type and Code > > > > - Also add some padding for the ct_endpoint's union, so that each > > member of ct_endpoint's union are of same size. > > > > Co-authored-by: Sairam Venugopal <vsairam@vmware.com> > > Signed-off-by: Anand Kumar <kumaranand@vmware.com> > > --- > > _______________________________________________ > dev mailing list > dev@openvswitch.org > https://mail.openvswitch.org/mailman/listinfo/ovs-dev
diff --git a/datapath-windows/ovsext/Conntrack.c b/datapath-windows/ovsext/Conntrack.c index 917ebee..ce8c1c8 100644 --- a/datapath-windows/ovsext/Conntrack.c +++ b/datapath-windows/ovsext/Conntrack.c @@ -782,9 +782,16 @@ OvsCtExecute_(OvsForwardingContext *fwdCtx, key->ct.tuple_ipv4.ipv4_src = ctKey->src.addr.ipv4_aligned; key->ct.tuple_ipv4.ipv4_dst = ctKey->dst.addr.ipv4_aligned; - key->ct.tuple_ipv4.src_port = ctKey->src.port; - key->ct.tuple_ipv4.dst_port = ctKey->dst.port; key->ct.tuple_ipv4.ipv4_proto = ctKey->nw_proto; + + /* Orig tuple Port is overloaded to take in ICMP-Type & Code */ + /* This mimics the behavior in lib/conntrack.c*/ + key->ct.tuple_ipv4.src_port = ctKey->nw_proto != IPPROTO_ICMP ? + ctKey->src.port : + htons(ctKey->src.icmp_type); + key->ct.tuple_ipv4.dst_port = ctKey->nw_proto != IPPROTO_ICMP ? + ctKey->dst.port : + htons(ctKey->src.icmp_code); } if (entryCreated && entry) { diff --git a/datapath-windows/ovsext/Conntrack.h b/datapath-windows/ovsext/Conntrack.h index 04ca299..bca7d90 100644 --- a/datapath-windows/ovsext/Conntrack.h +++ b/datapath-windows/ovsext/Conntrack.h @@ -41,14 +41,16 @@ struct ct_addr { struct ct_endpoint { struct ct_addr addr; union { - ovs_be16 port; + struct { + ovs_be16 port; + uint16 pad_port; + }; struct { ovs_be16 icmp_id; uint8_t icmp_type; uint8_t icmp_code; }; }; - UINT16 pad; }; typedef enum CT_UPDATE_RES {
- Also add some padding for the ct_endpoint's union, so that each member of ct_endpoint's union are of same size. Co-authored-by: Sairam Venugopal <vsairam@vmware.com> Signed-off-by: Anand Kumar <kumaranand@vmware.com> --- datapath-windows/ovsext/Conntrack.c | 11 +++++++++-- datapath-windows/ovsext/Conntrack.h | 6 ++++-- 2 files changed, 13 insertions(+), 4 deletions(-)