session: add support for application namespacing

[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 0968768..d2291fa 100644 (file)
--- a/src/vnet/session/session_node.c
+++ b/src/vnet/session/session_node.c
@@ -168,15 +168,19 @@ session_tx_fifo_read_and_snd_i (vlib_main_t * vm, vlib_node_runtime_t * node,
       return 0;
     }
 
+  /* Check how much we can pull. */
+  max_dequeue0 = svm_fifo_max_dequeue (s0->server_tx_fifo);
+
   if (peek_data)
     {
-      /* Offset in rx fifo from where to peek data  */
+      /* Offset in rx fifo from where to peek data */
       tx_offset = transport_vft->tx_fifo_offset (tc0);
+      if (PREDICT_FALSE (tx_offset >= max_dequeue0))
+       max_dequeue0 = 0;
+      else
+       max_dequeue0 -= tx_offset;
     }
 
-  /* Check how much we can pull. If buffering, subtract the offset */
-  max_dequeue0 = svm_fifo_max_dequeue (s0->server_tx_fifo) - tx_offset;
-
   /* Nothing to read return */
   if (max_dequeue0 == 0)
     {
@@ -277,6 +281,8 @@ session_tx_fifo_read_and_snd_i (vlib_main_t * vm, vlib_node_runtime_t * node,
            {
              n_bytes_read = svm_fifo_peek (s0->server_tx_fifo, tx_offset,
                                            len_to_deq0, data0);
+             if (n_bytes_read <= 0)
+               goto dequeue_fail;
              /* Keep track of progress locally, transport is also supposed to
               * increment it independently when pushing the header */
              tx_offset += n_bytes_read;
@@ -285,11 +291,10 @@ session_tx_fifo_read_and_snd_i (vlib_main_t * vm, vlib_node_runtime_t * node,
            {
              n_bytes_read = svm_fifo_dequeue_nowait (s0->server_tx_fifo,
                                                      len_to_deq0, data0);
+             if (n_bytes_read <= 0)
+               goto dequeue_fail;
            }
 
-         if (n_bytes_read <= 0)
-           goto dequeue_fail;
-
          b0->current_length = n_bytes_read;
 
          left_to_snd0 -= n_bytes_read;
@@ -429,7 +434,7 @@ dump_thread_0_event_queue (void)
          break;
 
        case FIFO_EVENT_DISCONNECT:
-         s0 = stream_session_get_from_handle (e->session_handle);
+         s0 = session_get_from_handle (e->session_handle);
          fformat (stdout, "[%04d] disconnect session %d\n", i,
                   s0->session_index);
          break;
@@ -472,7 +477,7 @@ session_node_cmp_event (session_fifo_event_t * e, svm_fifo_t * f)
     case FIFO_EVENT_DISCONNECT:
       break;
     case FIFO_EVENT_RPC:
-      s = stream_session_get_from_handle (e->session_handle);
+      s = session_get_from_handle (e->session_handle);
       if (!s)
        {
          clib_warning ("session has event but doesn't exist!");
@@ -616,7 +621,7 @@ skip_dequeue:
        case FIFO_EVENT_APP_TX:
          s0 = session_event_get_session (e0, my_thread_index);
 
-         if (CLIB_DEBUG && !s0)
+         if (PREDICT_FALSE (!s0))
            {
              clib_warning ("It's dead, Jim!");
              continue;
@@ -639,7 +644,7 @@ skip_dequeue:
            }
          break;
        case FIFO_EVENT_DISCONNECT:
-         s0 = stream_session_get_from_handle (e0->session_handle);
+         s0 = session_get_from_handle (e0->session_handle);
          stream_session_disconnect (s0);
          break;
        case FIFO_EVENT_BUILTIN_RX: