From 6e83dfd9c77d83c873f9a51455a90d273e3ee157 Mon Sep 17 00:00:00 2001 From: Sairam Venugopal Date: Wed, 9 Nov 2016 16:34:22 -0800 Subject: datapath-windows: Enable support for tracking ICMP code and type Add support for tracking ICMP code and Type in the Hyper-V Conntrack module. This code is similar to the userspace connection tracker. Signed-off-by: Sairam Venugopal Acked-by: Anand Kumar Signed-off-by: Gurucharan Shetty --- datapath-windows/ovsext/Conntrack-tcp.c | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) (limited to 'datapath-windows/ovsext/Conntrack-tcp.c') diff --git a/datapath-windows/ovsext/Conntrack-tcp.c b/datapath-windows/ovsext/Conntrack-tcp.c index 6adf490f7..c7fcfa8ff 100644 --- a/datapath-windows/ovsext/Conntrack-tcp.c +++ b/datapath-windows/ovsext/Conntrack-tcp.c @@ -199,14 +199,6 @@ OvsGetTcpPayloadLength(PNET_BUFFER_LIST nbl) - (sizeof * tcp); } -static __inline void -OvsConntrackUpdateExpiration(struct conn_tcp *conn, - long long now, - long long interval) -{ - conn->up.expiration = now + interval; -} - static __inline struct conn_tcp* OvsCastConntrackEntryToTcpEntry(OVS_CT_ENTRY* conn) { @@ -383,18 +375,23 @@ OvsConntrackUpdateTcpEntry(OVS_CT_ENTRY* conn_, if (src->state >= CT_DPIF_TCPS_FIN_WAIT_2 && dst->state >= CT_DPIF_TCPS_FIN_WAIT_2) { - OvsConntrackUpdateExpiration(conn, now, 30 * CT_INTERVAL_SEC); + OvsConntrackUpdateExpiration(&conn->up, now, + 30 * CT_INTERVAL_SEC); } else if (src->state >= CT_DPIF_TCPS_CLOSING && dst->state >= CT_DPIF_TCPS_CLOSING) { - OvsConntrackUpdateExpiration(conn, now, 45 * CT_INTERVAL_SEC); + OvsConntrackUpdateExpiration(&conn->up, now, + 45 * CT_INTERVAL_SEC); } else if (src->state < CT_DPIF_TCPS_ESTABLISHED || dst->state < CT_DPIF_TCPS_ESTABLISHED) { - OvsConntrackUpdateExpiration(conn, now, 30 * CT_INTERVAL_SEC); + OvsConntrackUpdateExpiration(&conn->up, now, + 30 * CT_INTERVAL_SEC); } else if (src->state >= CT_DPIF_TCPS_CLOSING || dst->state >= CT_DPIF_TCPS_CLOSING) { - OvsConntrackUpdateExpiration(conn, now, 15 * 60 * CT_INTERVAL_SEC); + OvsConntrackUpdateExpiration(&conn->up, now, + 15 * 60 * CT_INTERVAL_SEC); } else { - OvsConntrackUpdateExpiration(conn, now, 24 * 60 * 60 * CT_INTERVAL_SEC); + OvsConntrackUpdateExpiration(&conn->up, now, + 24 * 60 * 60 * CT_INTERVAL_SEC); } } else if ((dst->state < CT_DPIF_TCPS_SYN_SENT || dst->state >= CT_DPIF_TCPS_FIN_WAIT_2 @@ -518,7 +515,7 @@ OvsConntrackCreateTcpEntry(const TCPHdr *tcp, src->state = CT_DPIF_TCPS_SYN_SENT; dst->state = CT_DPIF_TCPS_CLOSED; - OvsConntrackUpdateExpiration(newconn, now, CT_ENTRY_TIMEOUT); + OvsConntrackUpdateExpiration(&newconn->up, now, CT_ENTRY_TIMEOUT); return &newconn->up; } -- cgit v1.2.1