summaryrefslogtreecommitdiffstats
path: root/src/plugins
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins')
-rw-r--r--src/plugins/tlsmbedtls/tls_mbedtls.c10
-rw-r--r--src/plugins/tlsopenssl/tls_openssl.c14
-rw-r--r--src/plugins/unittest/tcp_test.c3
3 files changed, 13 insertions, 14 deletions
diff --git a/src/plugins/tlsmbedtls/tls_mbedtls.c b/src/plugins/tlsmbedtls/tls_mbedtls.c
index e1262981cc2..6b56f5f0604 100644
--- a/src/plugins/tlsmbedtls/tls_mbedtls.c
+++ b/src/plugins/tlsmbedtls/tls_mbedtls.c
@@ -443,12 +443,12 @@ mbedtls_ctx_write (tls_ctx_t * ctx, session_t * app_session)
ASSERT (mc->ssl.state == MBEDTLS_SSL_HANDSHAKE_OVER);
- deq_max = svm_fifo_max_dequeue (app_session->tx_fifo);
+ deq_max = svm_fifo_max_dequeue_cons (app_session->tx_fifo);
if (!deq_max)
return 0;
tls_session = session_get_from_handle (ctx->tls_session_handle);
- enq_max = svm_fifo_max_enqueue (tls_session->tx_fifo);
+ enq_max = svm_fifo_max_enqueue_prod (tls_session->tx_fifo);
deq_now = clib_min (deq_max, TLS_CHUNK_SIZE);
if (PREDICT_FALSE (enq_max == 0))
@@ -493,12 +493,12 @@ mbedtls_ctx_read (tls_ctx_t * ctx, session_t * tls_session)
return 0;
}
- deq_max = svm_fifo_max_dequeue (tls_session->rx_fifo);
+ deq_max = svm_fifo_max_dequeue_cons (tls_session->rx_fifo);
if (!deq_max)
return 0;
app_session = session_get_from_handle (ctx->app_session_handle);
- enq_max = svm_fifo_max_enqueue (app_session->rx_fifo);
+ enq_max = svm_fifo_max_enqueue_prod (app_session->rx_fifo);
enq_now = clib_min (enq_max, TLS_CHUNK_SIZE);
if (PREDICT_FALSE (enq_now == 0))
@@ -520,7 +520,7 @@ mbedtls_ctx_read (tls_ctx_t * ctx, session_t * tls_session)
ASSERT (enq == read);
vec_reset_length (mm->rx_bufs[thread_index]);
- if (svm_fifo_max_dequeue (tls_session->rx_fifo))
+ if (svm_fifo_max_dequeue_cons (tls_session->rx_fifo))
tls_add_vpp_q_builtin_rx_evt (tls_session);
if (enq > 0)
diff --git a/src/plugins/tlsopenssl/tls_openssl.c b/src/plugins/tlsopenssl/tls_openssl.c
index e41d50a2b8b..d99a89c3d9c 100644
--- a/src/plugins/tlsopenssl/tls_openssl.c
+++ b/src/plugins/tlsopenssl/tls_openssl.c
@@ -112,7 +112,7 @@ openssl_try_handshake_read (openssl_ctx_t * oc, session_t * tls_session)
int wrote, rv;
f = tls_session->rx_fifo;
- deq_max = svm_fifo_max_dequeue (f);
+ deq_max = svm_fifo_max_dequeue_cons (f);
if (!deq_max)
return 0;
@@ -146,7 +146,7 @@ openssl_try_handshake_write (openssl_ctx_t * oc, session_t * tls_session)
return 0;
f = tls_session->tx_fifo;
- enq_max = svm_fifo_max_enqueue (f);
+ enq_max = svm_fifo_max_enqueue_prod (f);
if (!enq_max)
return 0;
@@ -306,7 +306,7 @@ openssl_ctx_write (tls_ctx_t * ctx, session_t * app_session)
svm_fifo_t *f;
f = app_session->tx_fifo;
- deq_max = svm_fifo_max_dequeue (f);
+ deq_max = svm_fifo_max_dequeue_cons (f);
if (!deq_max)
goto check_tls_fifo;
@@ -342,7 +342,7 @@ check_tls_fifo:
tls_session = session_get_from_handle (ctx->tls_session_handle);
f = tls_session->tx_fifo;
- enq_max = svm_fifo_max_enqueue (f);
+ enq_max = svm_fifo_max_enqueue_prod (f);
if (!enq_max)
{
tls_add_vpp_q_builtin_tx_evt (app_session);
@@ -390,7 +390,7 @@ openssl_ctx_read (tls_ctx_t * ctx, session_t * tls_session)
}
f = tls_session->rx_fifo;
- deq_max = svm_fifo_max_dequeue (f);
+ deq_max = svm_fifo_max_dequeue_cons (f);
max_space = max_buf - BIO_ctrl_pending (oc->wbio);
max_space = max_space < 0 ? 0 : max_space;
deq_now = clib_min (deq_max, max_space);
@@ -415,7 +415,7 @@ openssl_ctx_read (tls_ctx_t * ctx, session_t * tls_session)
wrote += rv;
}
}
- if (svm_fifo_max_dequeue (f))
+ if (svm_fifo_max_dequeue_cons (f))
tls_add_vpp_q_builtin_rx_evt (tls_session);
check_app_fifo:
@@ -425,7 +425,7 @@ check_app_fifo:
app_session = session_get_from_handle (ctx->app_session_handle);
f = app_session->rx_fifo;
- enq_max = svm_fifo_max_enqueue (f);
+ enq_max = svm_fifo_max_enqueue_prod (f);
if (!enq_max)
{
tls_add_vpp_q_builtin_rx_evt (tls_session);
diff --git a/src/plugins/unittest/tcp_test.c b/src/plugins/unittest/tcp_test.c
index fb01adb6c1f..c8d9d5fe247 100644
--- a/src/plugins/unittest/tcp_test.c
+++ b/src/plugins/unittest/tcp_test.c
@@ -1221,8 +1221,7 @@ tcp_test_fifo3 (vlib_main_t * vm, unformat_input_t * input)
/* manually set head and tail pointers to validate modular arithmetic */
fifo_initial_offset = fifo_initial_offset % fifo_size;
- f->head = fifo_initial_offset;
- f->tail = fifo_initial_offset;
+ svm_fifo_init_pointers (f, fifo_initial_offset);
for (i = !randomize; i < vec_len (generate); i++)
{