X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Ftcp%2Fbuiltin_http_server.c;h=763a46e95906ba028c1e295972fa89bb6a6b6b61;hb=e5f1d27695e2e6b9be17198e9b49e95639a15c58;hp=4e61fbd1aa8fcb3dba2978144ca222fbff66b08a;hpb=3335693cc1afe6742e9a5e726a682dd28b0ce4d4;p=vpp.git

diff --git a/src/vnet/tcp/builtin_http_server.c b/src/vnet/tcp/builtin_http_server.c
index 4e61fbd1aa8..763a46e9590 100644
--- a/src/vnet/tcp/builtin_http_server.c
+++ b/src/vnet/tcp/builtin_http_server.c
@@ -385,6 +385,13 @@ builtin_redirect_connect_callback (u32 client_index, void *mp)
   return -1;
 }
 
+static void
+alloc_http_process_callback (void *s_arg)
+{
+  stream_session_t *s = (stream_session_t *) s_arg;
+  alloc_http_process (s);
+}
+
 static int
 http_server_rx_callback (stream_session_t * s)
 {
@@ -414,7 +421,19 @@ http_server_rx_callback (stream_session_t * s)
   /* send the command to a new/recycled vlib process */
   s->opaque[1] = (u64) vec_dup (hsm->rx_buf);
 
-  alloc_http_process (s);
+  /* Send an RPC request via the thread-0 input node */
+  if (vlib_get_thread_index () != 0)
+    {
+      session_fifo_event_t evt;
+      evt.rpc_args.fp = alloc_http_process_callback;
+      evt.rpc_args.arg = s;
+      evt.event_type = FIFO_EVENT_RPC;
+      unix_shared_memory_queue_add
+	(session_manager_get_vpp_event_queue (0 /* main thread */ ),
+	 (u8 *) & evt, 0 /* do wait for mutex */ );
+    }
+  else
+    alloc_http_process (s);
   return 0;
 }