session: guard session lookup table allocs

[vpp.git] / src / vnet / session / session_node.c

diff --git a/src/vnet/session/session_node.c b/src/vnet/session/session_node.c
index 9e20670..01dd669 100644 (file)
--- a/src/vnet/session/session_node.c
+++ b/src/vnet/session/session_node.c
@@ -1420,9 +1420,12 @@ session_tx_fifo_read_and_snd_i (session_worker_t * wrk,
       ctx->sp.max_burst_size = max_burst;
       n_custom_tx = ctx->transport_vft->custom_tx (ctx->tc, &ctx->sp);
       *n_tx_packets += n_custom_tx;
-      if (PREDICT_FALSE
-         (ctx->s->session_state >= SESSION_STATE_TRANSPORT_CLOSED))
-       return SESSION_TX_OK;
+      if (PREDICT_FALSE (ctx->s->session_state >=
+                        SESSION_STATE_TRANSPORT_CLOSED))
+       {
+         svm_fifo_unset_event (ctx->s->tx_fifo);
+         return SESSION_TX_OK;
+       }
       max_burst -= n_custom_tx;
       if (!max_burst || (ctx->s->flags & SESSION_F_CUSTOM_TX))
        {
@@ -1612,7 +1615,9 @@ session_tx_fifo_dequeue_internal (session_worker_t * wrk,
   clib_llist_index_t ei;
   u32 n_packets;
 
-  if (PREDICT_FALSE (s->session_state >= SESSION_STATE_TRANSPORT_CLOSED))
+  if (PREDICT_FALSE ((s->session_state >= SESSION_STATE_TRANSPORT_CLOSED) ||
+                    (s->session_state == SESSION_STATE_CONNECTING &&
+                     (s->flags & SESSION_F_HALF_OPEN))))
     return 0;
 
   /* Clear custom-tx flag used to request reschedule for tx */