diff options
| author | Alin Gabriel Serdean <aserdean@ovn.org> | 2018-09-20 01:37:06 +0300 |
|---|---|---|
| committer | Alin Gabriel Serdean <aserdean@ovn.org> | 2018-09-20 17:49:32 +0300 |
| commit | ef1ebd3f33243e5585aa914208b94d0049fa2a7c (patch) | |
| tree | 39a030a63d7a223d023c59ae9aa66a0fe185b984 /datapath-windows | |
| parent | a468645c6d330943dbe0c8d466e05b9af2d7df0c (diff) | |
| download | openvswitch-ef1ebd3f33243e5585aa914208b94d0049fa2a7c.tar.gz | |
datapath-windows: Fix payload length calculation in Conntrack.h
The payload calculation in OvsGetTcpHeader is wrong:
`ntohs(ipHdr->tot_len) - expr` instead of `ntohs((ipHdr->tot_len) - expr)`.
We already have a macro for that calculation defined in NetProto.h so use it.
Signed-off-by: Alin Gabriel Serdean <aserdean@ovn.org>
Acked-by: Anand Kumar <kumaranand@vmware.com>
Diffstat (limited to 'datapath-windows')
| -rw-r--r-- | datapath-windows/ovsext/Conntrack.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/datapath-windows/ovsext/Conntrack.h b/datapath-windows/ovsext/Conntrack.h index 4678ed028..c3d317fa1 100644 --- a/datapath-windows/ovsext/Conntrack.h +++ b/datapath-windows/ovsext/Conntrack.h @@ -187,8 +187,7 @@ OvsGetTcpHeader(PNET_BUFFER_LIST nbl, tcp = (TCPHdr *)((PCHAR)ipHdr + ipHdr->ihl * 4); if (tcp->doff * 4 >= sizeof *tcp) { NdisMoveMemory(dest, tcp, sizeof(TCPHdr)); - *tcpPayloadLen = ntohs((ipHdr->tot_len) - (ipHdr->ihl * 4) - - (TCP_HDR_LEN(tcp))); + *tcpPayloadLen = TCP_DATA_LENGTH(ipHdr, tcp); return storage; } |