summaryrefslogtreecommitdiffstats
path: root/src/vnet
diff options
context:
space:
mode:
Diffstat (limited to 'src/vnet')
-rw-r--r--src/vnet/session/application.c29
-rw-r--r--src/vnet/session/session.h7
-rwxr-xr-xsrc/vnet/session/session_api.c5
-rw-r--r--src/vnet/session/session_node.c4
4 files changed, 40 insertions, 5 deletions
diff --git a/src/vnet/session/application.c b/src/vnet/session/application.c
index 85b5f939427..044ab293c7e 100644
--- a/src/vnet/session/application.c
+++ b/src/vnet/session/application.c
@@ -730,6 +730,35 @@ app_worker_own_session (app_worker_t * app_wrk, stream_session_t * s)
segment_manager_t *sm;
svm_fifo_t *rxf, *txf;
+ if (s->session_state == SESSION_STATE_LISTENING)
+ {
+ app_worker_t *old_wrk = app_worker_get (s->app_wrk_index);
+ u64 lsh = listen_session_get_handle (s);
+ app_listener_t *app_listener;
+ application_t *app;
+
+ if (!old_wrk)
+ return -1;
+
+ hash_unset (old_wrk->listeners_table, lsh);
+ if (!(sm = app_worker_alloc_segment_manager (app_wrk)))
+ return -1;
+
+ hash_set (app_wrk->listeners_table, lsh, segment_manager_index (sm));
+ s->app_wrk_index = app_wrk->wrk_index;
+
+ app = application_get (old_wrk->app_index);
+ if (!app)
+ return -1;
+
+ app_listener = app_listener_get (app, s->listener_db_index);
+ app_listener->workers = clib_bitmap_set (app_listener->workers,
+ app_wrk->wrk_map_index, 1);
+ app_listener->workers = clib_bitmap_set (app_listener->workers,
+ old_wrk->wrk_map_index, 0);
+ return 0;
+ }
+
s->app_wrk_index = app_wrk->wrk_index;
rxf = s->server_rx_fifo;
diff --git a/src/vnet/session/session.h b/src/vnet/session/session.h
index 2bbc380282c..babb002e07e 100644
--- a/src/vnet/session/session.h
+++ b/src/vnet/session/session.h
@@ -445,7 +445,12 @@ session_type_from_proto_and_ip (transport_proto_t proto, u8 is_ip4)
always_inline u64
session_segment_handle (stream_session_t * s)
{
- svm_fifo_t *f = s->server_rx_fifo;
+ svm_fifo_t *f;
+
+ if (s->session_state == SESSION_STATE_LISTENING)
+ return SESSION_INVALID_HANDLE;
+
+ f = s->server_rx_fifo;
return segment_manager_make_segment_handle (f->segment_manager,
f->segment_index);
}
diff --git a/src/vnet/session/session_api.c b/src/vnet/session/session_api.c
index 2decd9b8a2e..51b8ba91e42 100755
--- a/src/vnet/session/session_api.c
+++ b/src/vnet/session/session_api.c
@@ -719,12 +719,13 @@ mq_send_session_bound_cb (u32 app_wrk_index, u32 api_context,
mp->lcl_is_ip4 = session_type_is_ip4 (local->session_type);
}
+ vpp_evt_q = session_manager_get_vpp_event_queue (0);
+ mp->vpp_evt_q = pointer_to_uword (vpp_evt_q);
+
if (ls && session_transport_service_type (ls) == TRANSPORT_SERVICE_CL)
{
mp->rx_fifo = pointer_to_uword (ls->server_rx_fifo);
mp->tx_fifo = pointer_to_uword (ls->server_tx_fifo);
- vpp_evt_q = session_manager_get_vpp_event_queue (0);
- mp->vpp_evt_q = pointer_to_uword (vpp_evt_q);
}
done:
diff --git a/src/vnet/session/session_node.c b/src/vnet/session/session_node.c
index f5e5efeaf0f..882c591b35a 100644
--- a/src/vnet/session/session_node.c
+++ b/src/vnet/session/session_node.c
@@ -277,10 +277,10 @@ session_mq_worker_update_handler (void *data)
/*
* Retransmit messages that may have been lost
*/
- if (!svm_fifo_is_empty (s->server_tx_fifo))
+ if (s->server_tx_fifo && !svm_fifo_is_empty (s->server_tx_fifo))
session_send_io_evt_to_thread (s->server_tx_fifo, FIFO_EVENT_APP_TX);
- if (!svm_fifo_is_empty (s->server_rx_fifo))
+ if (s->server_rx_fifo && !svm_fifo_is_empty (s->server_rx_fifo))
app_worker_lock_and_send_event (app_wrk, s, FIFO_EVENT_APP_RX);
if (s->session_state >= SESSION_STATE_TRANSPORT_CLOSING)