session: add support for proxying apps

[vpp.git] / src / vnet / tcp / builtin_http_server.c

diff --git a/src/vnet/tcp/builtin_http_server.c b/src/vnet/tcp/builtin_http_server.c
index 9ba19ce..07c8a4d 100644 (file)
--- a/src/vnet/tcp/builtin_http_server.c
+++ b/src/vnet/tcp/builtin_http_server.c
@@ -129,7 +129,7 @@ send_data (builtin_http_server_args * args, u8 * data)
   f64 last_sent_timer = vlib_time_now (vm);
   stream_session_t *s;
 
-  s = stream_session_get_from_handle (args->session_handle);
+  s = session_get_from_handle (args->session_handle);
   ASSERT (s);
   bytes_to_send = vec_len (data);
   offset = 0;
@@ -166,7 +166,6 @@ send_data (builtin_http_server_args * args, u8 * data)
              /* Fabricate TX event, send to vpp */
              evt.fifo = s->server_tx_fifo;
              evt.event_type = FIFO_EVENT_APP_TX;
-             evt.event_id = 0;
 
              unix_shared_memory_queue_add (hsm->vpp_queue[s->thread_index],
                                            (u8 *) & evt,
@@ -346,7 +345,7 @@ http_server_rx_callback (stream_session_t * s)
   /* send the command to a new/recycled vlib process */
   args = clib_mem_alloc (sizeof (*args));
   args->data = vec_dup (hsm->rx_buf);
-  args->session_handle = stream_session_handle (s);
+  args->session_handle = session_handle (s);
 
   /* Send an RPC request via the thread-0 input node */
   if (vlib_get_thread_index () != 0)
@@ -382,7 +381,7 @@ builtin_session_disconnect_callback (stream_session_t * s)
   http_server_main_t *bsm = &http_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);
 }
@@ -460,7 +459,7 @@ server_attach ()
   a->options[SESSION_OPTIONS_SEGMENT_SIZE] = 128 << 20;
   a->options[SESSION_OPTIONS_RX_FIFO_SIZE] = 8 << 10;
   a->options[SESSION_OPTIONS_TX_FIFO_SIZE] = 32 << 10;
-  a->options[APP_OPTIONS_FLAGS] = APP_OPTIONS_FLAGS_BUILTIN_APP;
+  a->options[APP_OPTIONS_FLAGS] = APP_OPTIONS_FLAGS_IS_BUILTIN;
   a->options[APP_OPTIONS_PREALLOC_FIFO_PAIRS] = 16;
   a->segment_name = segment_name;
   a->segment_name_length = ARRAY_LEN (segment_name);