X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fsession%2Fsession_node.c;h=119cdd812ad8d907f8750faf8df17253de6fbab7;hb=ab2f6dbf;hp=1656e2eed0e3d8c9a0bb84492e325b45fa7d8d77;hpb=1553197f9a1a3258b6954adeb9536bbe0191683d;p=vpp.git

diff --git a/src/vnet/session/session_node.c b/src/vnet/session/session_node.c
index 1656e2eed0e..119cdd812ad 100644
--- a/src/vnet/session/session_node.c
+++ b/src/vnet/session/session_node.c
@@ -43,10 +43,19 @@ session_mq_accepted_reply_handler (void *data)
 
   if (session_handle_is_local (mp->handle))
     {
+      app_worker_t *app_wrk;
+      application_t *app;
       ls = application_get_local_session_from_handle (mp->handle);
-      if (!ls || ls->app_wrk_index != mp->context)
+      if (!ls)
 	{
-	  clib_warning ("server %u doesn't own local handle %llu",
+	  clib_warning ("unknown local handle 0x%lx", mp->handle);
+	  return;
+	}
+      app_wrk = app_worker_get (ls->app_wrk_index);
+      app = application_get (app_wrk->app_index);
+      if (app->app_index != mp->context)
+	{
+	  clib_warning ("server %u doesn't own local handle 0x%lx",
 			mp->context, mp->handle);
 	  return;
 	}
@@ -72,7 +81,7 @@ session_mq_accepted_reply_handler (void *data)
 	{
 	  app_worker_t *app;
 	  app = app_worker_get (s->app_wrk_index);
-	  application_send_event (app, s, FIFO_EVENT_APP_RX);
+	  app_worker_send_event (app, s, FIFO_EVENT_APP_RX);
 	}
     }
 }
@@ -132,12 +141,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 +316,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,
@@ -719,7 +735,7 @@ session_tx_fifo_dequeue_internal (vlib_main_t * vm,
 				  stream_session_t * s, int *n_tx_pkts)
 {
   application_t *app;
-  app = application_get (s->opaque);
+  app = application_get (s->t_app_index);
   svm_fifo_unset_event (s->server_tx_fifo);
   return app->cb_fns.builtin_app_tx_callback (s);
 }