1 files changed, 20 insertions, 9 deletions

diff --git a/src/plugins/http/http_timer.h b/src/plugins/http/http_timer.h
index eec5a4595fe..06baa1f8557 100644
--- a/src/plugins/http/http_timer.h
+++ b/src/plugins/http/http_timer.h
@@ -19,20 +19,24 @@
 #include <http/http.h>
 #include <vppinfra/tw_timer_2t_1w_2048sl.h>
 
-#define HTTP_CONN_TIMEOUT 60
+#define HTTP_CONN_TIMEOUT	  60
+#define HTTP_TIMER_HANDLE_INVALID ((u32) ~0)
 
 typedef void (http_conn_timeout_fn) (void *);
+typedef void (http_conn_invalidate_timer_fn) (u32 hs_handle);
 
 typedef struct http_tw_ctx_
 {
   tw_timer_wheel_2t_1w_2048sl_t tw;
   clib_spinlock_t tw_lock;
-  http_conn_timeout_fn *cb_fn;
+  http_conn_timeout_fn *rpc_cb;
+  http_conn_invalidate_timer_fn *invalidate_cb;
 } http_tw_ctx_t;
 
 extern http_tw_ctx_t http_tw_ctx;
 
-void http_timers_init (vlib_main_t *vm, http_conn_timeout_fn *cb_fn);
+void http_timers_init (vlib_main_t *vm, http_conn_timeout_fn *rpc_cb,
+		       http_conn_invalidate_timer_fn *invalidate_cb);
 
 static inline void
 http_conn_timer_start (http_conn_t *hc)
@@ -41,6 +45,7 @@ http_conn_timer_start (http_conn_t *hc)
   u32 hs_handle;
   u64 timeout;
 
+  ASSERT (hc->timer_handle == HTTP_TIMER_HANDLE_INVALID);
   timeout = HTTP_CONN_TIMEOUT;
   hs_handle = hc->c_thread_index << 24 | hc->c_c_index;
 
@@ -55,12 +60,13 @@ http_conn_timer_stop (http_conn_t *hc)
 {
   http_tw_ctx_t *twc = &http_tw_ctx;
 
-  if (hc->timer_handle == ~0)
+  hc->pending_timer = 0;
+  if (hc->timer_handle == HTTP_TIMER_HANDLE_INVALID)
     return;
 
   clib_spinlock_lock (&twc->tw_lock);
   tw_timer_stop_2t_1w_2048sl (&twc->tw, hc->timer_handle);
-  hc->timer_handle = ~0;
+  hc->timer_handle = HTTP_TIMER_HANDLE_INVALID;
   clib_spinlock_unlock (&twc->tw_lock);
 }
 
@@ -69,14 +75,19 @@ http_conn_timer_update (http_conn_t *hc)
 {
   http_tw_ctx_t *twc = &http_tw_ctx;
   u64 timeout;
-
-  if (hc->timer_handle == ~0)
-    return;
+  u32 hs_handle;
 
   timeout = HTTP_CONN_TIMEOUT;
 
   clib_spinlock_lock (&twc->tw_lock);
-  tw_timer_update_2t_1w_2048sl (&twc->tw, hc->timer_handle, timeout);
+  if (hc->timer_handle != HTTP_TIMER_HANDLE_INVALID)
+    tw_timer_update_2t_1w_2048sl (&twc->tw, hc->timer_handle, timeout);
+  else
+    {
+      hs_handle = hc->c_thread_index << 24 | hc->c_c_index;
+      hc->timer_handle =
+	tw_timer_start_2t_1w_2048sl (&twc->tw, hs_handle, 0, timeout);
+    }
   clib_spinlock_unlock (&twc->tw_lock);
 }