session vcl: refactor builtin tx event for main tx

[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 150da25..c61e89b 100644 (file)
--- a/src/vnet/session/session_node.c
+++ b/src/vnet/session/session_node.c
@@ -1101,6 +1101,8 @@ session_tx_fill_buffer (session_worker_t *wrk, session_tx_context_t *ctx,
          if (transport_connection_is_cless (ctx->tc))
            {
              ip_copy (&ctx->tc->rmt_ip, &hdr->rmt_ip, ctx->tc->is_ip4);
+             ip_copy (&ctx->tc->lcl_ip, &hdr->lcl_ip, ctx->tc->is_ip4);
+             /* Local port assumed to be bound, not overwriting it */
              ctx->tc->rmt_port = hdr->rmt_port;
            }
          hdr->data_offset += n_bytes_read;
@@ -1163,6 +1165,11 @@ session_tx_not_ready (session_t * s, u8 peek_data)
          return 2;
        }
     }
+  else
+    {
+      if (s->session_state == SESSION_STATE_TRANSPORT_DELETED)
+       return 2;
+    }
   return 0;
 }
 
@@ -1219,6 +1226,13 @@ session_tx_set_dequeue_params (vlib_main_t * vm, session_tx_context_t * ctx,
 
          svm_fifo_peek (ctx->s->tx_fifo, 0, sizeof (ctx->hdr),
                         (u8 *) & ctx->hdr);
+         /* Zero length dgrams not supported */
+         if (PREDICT_FALSE (ctx->hdr.data_length == 0))
+           {
+             svm_fifo_dequeue_drop (ctx->s->tx_fifo, sizeof (ctx->hdr));
+             ctx->max_len_to_snd = 0;
+             return;
+           }
          ASSERT (ctx->hdr.data_length > ctx->hdr.data_offset);
          len = ctx->hdr.data_length - ctx->hdr.data_offset;
 
@@ -1246,11 +1260,13 @@ session_tx_set_dequeue_params (vlib_main_t * vm, session_tx_context_t * ctx,
                {
                  svm_fifo_peek (ctx->s->tx_fifo, offset, sizeof (ctx->hdr),
                                 (u8 *) & hdr);
-                 ASSERT (hdr.data_length > hdr.data_offset);
                  dgram_len = hdr.data_length - hdr.data_offset;
-                 if (len + dgram_len > ctx->max_dequeue
-                     || first_dgram_len != dgram_len)
+                 if (offset + sizeof (hdr) + hdr.data_length >
+                       ctx->max_dequeue ||
+                     first_dgram_len != dgram_len)
                    break;
+                 /* Assert here to allow test above with zero length dgrams */
+                 ASSERT (hdr.data_length > hdr.data_offset);
                  len += dgram_len;
                  offset += sizeof (hdr) + hdr.data_length;
                }
@@ -1760,11 +1776,13 @@ session_event_dispatch_io (session_worker_t * wrk, vlib_node_runtime_t * node,
       app_wrk = app_worker_get (s->app_wrk_index);
       app_worker_builtin_rx (app_wrk, s);
       break;
-    case SESSION_IO_EVT_BUILTIN_TX:
-      s = session_get_from_handle_if_valid (e->session_handle);
+    case SESSION_IO_EVT_TX_MAIN:
+      s = session_get_if_valid (e->session_index, 0 /* main thread */);
+      if (PREDICT_FALSE (!s))
+       break;
       wrk->ctx.s = s;
       if (PREDICT_TRUE (s != 0))
-       session_tx_fifo_dequeue_internal (wrk, node, elt, n_tx_packets);
+       (smm->session_tx_fns[s->session_type]) (wrk, node, elt, n_tx_packets);
       break;
     default:
       clib_warning ("unhandled event type %d", e->event_type);
@@ -1920,6 +1938,8 @@ session_queue_node_fn (vlib_main_t * vm, vlib_node_runtime_t * node,
       if (wrk->trans_head == ((wrk->trans_tail + 1) & (wrk->trans_size - 1)))
        return 0;
       wrk->batch = vlib_dma_batch_new (vm, wrk->config_index);
+      if (!wrk->batch)
+       return 0;
     }
 
   /*