VPP-1408: Fix bug that wrong tx fifo drop in buffer chains flow of dgram mode

[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 1656e2e..2c425ab 100644 (file)
--- a/src/vnet/session/session_node.c
+++ b/src/vnet/session/session_node.c
@@ -132,12 +132,16 @@ session_mq_disconnected_handler (void *data)
   int rv = 0;
 
   mp = (session_disconnected_msg_t *) data;
-  s = session_get_from_handle_if_valid (mp->handle);
+  if (!(s = session_get_from_handle_if_valid (mp->handle)))
+    {
+      clib_warning ("could not disconnect handle %llu", mp->handle);
+      return;
+    }
   app_wrk = app_worker_get (s->app_wrk_index);
   app = application_lookup (mp->client_index);
-  if (!(app_wrk && s && app->app_index == app_wrk->app_index))
+  if (!(app_wrk && app && app->app_index == app_wrk->app_index))
     {
-      clib_warning ("could not disconnect session: %llu app_wrk: %u",
+      clib_warning ("could not disconnect session: %llu app: %u",
                    mp->handle, mp->client_index);
       return;
     }
@@ -303,7 +307,10 @@ session_tx_fifo_chain_tail (vlib_main_t * vm, session_tx_context_t * ctx,
 
              hdr->data_offset += n_bytes_read;
              if (hdr->data_offset == hdr->data_length)
-               svm_fifo_dequeue_drop (f, hdr->data_length);
+               {
+                 u32 offset = hdr->data_length + SESSION_CONN_HDR_LEN;
+                 svm_fifo_dequeue_drop (f, offset);
+               }
            }
          else
            n_bytes_read = svm_fifo_dequeue_nowait (ctx->s->server_tx_fifo,