diff options
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/hs_apps/proxy.c | 4 | ||||
| -rw-r--r-- | src/plugins/hs_apps/sapi/vpp_echo.c | 6 | ||||
| -rw-r--r-- | src/plugins/hs_apps/sapi/vpp_echo_bapi.c | 4 | ||||
| -rw-r--r-- | src/plugins/unittest/session_test.c | 2 |
4 files changed, 10 insertions, 6 deletions
diff --git a/src/plugins/hs_apps/proxy.c b/src/plugins/hs_apps/proxy.c index 7407bcb9f0d..f6b7f52d80c 100644 --- a/src/plugins/hs_apps/proxy.c +++ b/src/plugins/hs_apps/proxy.c @@ -830,7 +830,7 @@ active_open_alloc_session_fifos (session_t *s) * will receive data, etc. */ txf->shr->master_session_index = s->session_index; - txf->master_thread_index = s->thread_index; + txf->vpp_sh = s->handle; /* * Account for the active-open session's use of the fifos @@ -1101,7 +1101,7 @@ active_open_rx_callback (session_t * s) if (svm_fifo_set_event (proxy_tx_fifo)) { u8 thread_index = proxy_tx_fifo->master_thread_index; - u32 session_index = proxy_tx_fifo->shr->master_session_index; + u32 session_index = proxy_tx_fifo->vpp_session_index; return session_send_io_evt_to_thread_custom (&session_index, thread_index, SESSION_IO_EVT_TX); diff --git a/src/plugins/hs_apps/sapi/vpp_echo.c b/src/plugins/hs_apps/sapi/vpp_echo.c index 08fd4e175e9..9ae95e6e8e9 100644 --- a/src/plugins/hs_apps/sapi/vpp_echo.c +++ b/src/plugins/hs_apps/sapi/vpp_echo.c @@ -69,9 +69,9 @@ echo_session_dequeue_notify (echo_session_t * s) int rv; if (!svm_fifo_set_event (s->rx_fifo)) return; - if ((rv = app_send_io_evt_to_vpp (s->vpp_evt_q, - s->rx_fifo->shr->master_session_index, - SESSION_IO_EVT_RX, SVM_Q_WAIT))) + if ((rv = + app_send_io_evt_to_vpp (s->vpp_evt_q, s->rx_fifo->vpp_session_index, + SESSION_IO_EVT_RX, SVM_Q_WAIT))) ECHO_FAIL (ECHO_FAIL_SEND_IO_EVT, "app_send_io_evt_to_vpp errored %d", rv); svm_fifo_clear_deq_ntf (s->rx_fifo); diff --git a/src/plugins/hs_apps/sapi/vpp_echo_bapi.c b/src/plugins/hs_apps/sapi/vpp_echo_bapi.c index 868cc3a0591..12be20503a3 100644 --- a/src/plugins/hs_apps/sapi/vpp_echo_bapi.c +++ b/src/plugins/hs_apps/sapi/vpp_echo_bapi.c @@ -332,6 +332,10 @@ echo_attach_session (uword segment_handle, uword rxf_offset, uword txf_offset, s->tx_fifo = fifo_segment_alloc_fifo_w_offset (fs, txf_offset); s->rx_fifo->segment_index = fs_index; s->tx_fifo->segment_index = fs_index; + s->rx_fifo->vpp_session_index = s->rx_fifo->shr->master_session_index; + s->tx_fifo->vpp_session_index = s->tx_fifo->shr->master_session_index; + s->rx_fifo->app_session_index = s->session_index; + s->tx_fifo->app_session_index = s->session_index; s->rx_fifo->shr->client_session_index = s->session_index; s->tx_fifo->shr->client_session_index = s->session_index; diff --git a/src/plugins/unittest/session_test.c b/src/plugins/unittest/session_test.c index fe4664bda4a..993f1be41a9 100644 --- a/src/plugins/unittest/session_test.c +++ b/src/plugins/unittest/session_test.c @@ -1864,7 +1864,7 @@ test_app_send_io_evt_rx (app_worker_t *app_wrk, session_t *s) if (svm_fifo_has_event (s->rx_fifo)) return 0; - app_session = s->rx_fifo->shr->client_session_index; + app_session = s->rx_fifo->app_session_index; mq = app_wrk->event_queue; rv = test_mq_try_lock_and_alloc_msg (mq, SESSION_MQ_IO_EVT_RING, mq_msg); |