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-other.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) (limited to 'datapath-windows/ovsext/Conntrack-other.c') diff --git a/datapath-windows/ovsext/Conntrack-other.c b/datapath-windows/ovsext/Conntrack-other.c index b85302038..6c68ba8d0 100644 --- a/datapath-windows/ovsext/Conntrack-other.c +++ b/datapath-windows/ovsext/Conntrack-other.c @@ -41,14 +41,7 @@ OvsCastConntrackEntryToOtherEntry(OVS_CT_ENTRY *conn) return CONTAINER_OF(conn, struct conn_other, up); } -static __inline VOID -OvsConntrackUpdateExpiration(struct conn_other *conn, long long now) -{ - ASSERT(conn); - conn->up.expiration = now + other_timeouts[conn->state]; -} - -enum ct_update_res +enum CT_UPDATE_RES OvsConntrackUpdateOtherEntry(OVS_CT_ENTRY *conn_, BOOLEAN reply, UINT64 now) @@ -62,7 +55,8 @@ OvsConntrackUpdateOtherEntry(OVS_CT_ENTRY *conn_, conn->state = OTHERS_MULTIPLE; } - OvsConntrackUpdateExpiration(conn, now); + OvsConntrackUpdateExpiration(&conn->up, now, + other_timeouts[conn->state]); return CT_UPDATE_VALID; } @@ -78,6 +72,7 @@ OvsConntrackCreateOtherEntry(UINT64 now) } conn->up = (OVS_CT_ENTRY) {0}; conn->state = OTHERS_FIRST; - OvsConntrackUpdateExpiration(conn, now); + OvsConntrackUpdateExpiration(&conn->up, now, + other_timeouts[conn->state]); return &conn->up; } -- cgit v1.2.1