X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Ftcp%2Fbuiltin_server.c;h=b613b3ae5d53faeb6311d4dcf1d5d6d4671b2c92;hb=7999e83a41ebad8a3f02cfcb2809cdb3aae919ba;hp=b4a52c67fcd80b0a5befcb6ded21cd4a6362089d;hpb=cea194d8f973a2f2b5ef72d212533057174cc70a;p=vpp.git

diff --git a/src/vnet/tcp/builtin_server.c b/src/vnet/tcp/builtin_server.c
index b4a52c67fcd..b613b3ae5d5 100644
--- a/src/vnet/tcp/builtin_server.c
+++ b/src/vnet/tcp/builtin_server.c
@@ -73,7 +73,7 @@ builtin_session_disconnect_callback (stream_session_t * s)
   builtin_server_main_t *bsm = &builtin_server_main;
   vnet_disconnect_args_t _a, *a = &_a;
 
-  a->handle = stream_session_handle (s);
+  a->handle = session_handle (s);
   a->app_index = bsm->app_index;
   vnet_disconnect_session (a);
 }
@@ -158,7 +158,6 @@ builtin_server_rx_callback (stream_session_t * s)
   svm_fifo_t *tx_fifo, *rx_fifo;
   builtin_server_main_t *bsm = &builtin_server_main;
   session_fifo_event_t evt;
-  static int serial_number = 0;
   u32 thread_index = vlib_get_thread_index ();
 
   ASSERT (s->thread_index == thread_index);
@@ -190,7 +189,6 @@ builtin_server_rx_callback (stream_session_t * s)
 	  unix_shared_memory_queue_t *q;
 	  evt.fifo = rx_fifo;
 	  evt.event_type = FIFO_EVENT_BUILTIN_RX;
-	  evt.event_id = 0;
 
 	  q = bsm->vpp_queue[thread_index];
 	  if (PREDICT_FALSE (q->cursize == q->maxsize))
@@ -232,7 +230,6 @@ builtin_server_rx_callback (stream_session_t * s)
       /* Fabricate TX event, send to vpp */
       evt.fifo = tx_fifo;
       evt.event_type = FIFO_EVENT_APP_TX;
-      evt.event_id = serial_number++;
 
       if (unix_shared_memory_queue_add (bsm->vpp_queue[s->thread_index],
 					(u8 *) & evt,
@@ -299,7 +296,7 @@ server_attach (u8 * appns_id, u64 appns_flags, u64 appns_secret)
   a->options[APP_OPTIONS_PREALLOC_FIFO_PAIRS] =
     bsm->prealloc_fifos ? bsm->prealloc_fifos : 1;
 
-  a->options[APP_OPTIONS_FLAGS] = APP_OPTIONS_FLAGS_BUILTIN_APP;
+  a->options[APP_OPTIONS_FLAGS] = APP_OPTIONS_FLAGS_IS_BUILTIN;
   if (appns_id)
     {
       a->namespace_id = appns_id;