summaryrefslogtreecommitdiffstats
path: root/src/vnet/session-apps/echo_server.c
diff options
context:
space:
mode:
authorFlorin Coras <fcoras@cisco.com>2019-03-01 13:00:58 -0800
committerDave Barach <openvpp@barachs.net>2019-03-02 23:40:04 +0000
commit31c9955a4e83578422b3328ef0d7b2b248536644 (patch)
tree51dbc9de2cac22ca190ec394d6bf29e4ebb72d54 /src/vnet/session-apps/echo_server.c
parentf6c4313b6aa7746fe97afd398ce68c2efbef0600 (diff)
session: cleanup/rename functions
- remove unused functions - rename old "stream" functions Change-Id: Icbb03daa9f9f1c58b5be5c38aa8a9cbcf9159b47 Signed-off-by: Florin Coras <fcoras@cisco.com>
Diffstat (limited to 'src/vnet/session-apps/echo_server.c')
-rw-r--r--src/vnet/session-apps/echo_server.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/vnet/session-apps/echo_server.c b/src/vnet/session-apps/echo_server.c
index 1d99ff17a0f..2762347d441 100644
--- a/src/vnet/session-apps/echo_server.c
+++ b/src/vnet/session-apps/echo_server.c
@@ -61,7 +61,7 @@ echo_server_session_accept_callback (session_t * s)
echo_server_main_t *esm = &echo_server_main;
esm->vpp_queue[s->thread_index] =
- session_manager_get_vpp_event_queue (s->thread_index);
+ session_main_get_vpp_event_queue (s->thread_index);
s->session_state = SESSION_STATE_READY;
esm->byte_index = 0;
ASSERT (vec_len (esm->rx_retries) > s->thread_index);
@@ -86,7 +86,7 @@ echo_server_session_reset_callback (session_t * s)
{
echo_server_main_t *esm = &echo_server_main;
vnet_disconnect_args_t _a = { 0 }, *a = &_a;
- clib_warning ("Reset session %U", format_stream_session, s, 2);
+ clib_warning ("Reset session %U", format_session, s, 2);
a->handle = session_handle (s);
a->app_index = esm->app_index;
vnet_disconnect_session (a);
@@ -174,7 +174,7 @@ echo_server_rx_callback (session_t * s)
if (!esm->vpp_queue[s->thread_index])
{
svm_msg_q_t *mq;
- mq = session_manager_get_vpp_event_queue (s->thread_index);
+ mq = session_main_get_vpp_event_queue (s->thread_index);
esm->vpp_queue[s->thread_index] = mq;
}
max_enqueue -= sizeof (session_dgram_hdr_t);
@@ -202,7 +202,7 @@ echo_server_rx_callback (session_t * s)
vec_validate (esm->rx_retries[s->thread_index], s->session_index);
if (esm->rx_retries[thread_index][s->session_index] == 500000)
{
- clib_warning ("session stuck: %U", format_stream_session, s, 2);
+ clib_warning ("session stuck: %U", format_session, s, 2);
}
if (esm->rx_retries[thread_index][s->session_index] < 500001)
esm->rx_retries[thread_index][s->session_index]++;
@@ -395,7 +395,7 @@ echo_server_create (vlib_main_t * vm, u8 * appns_id, u64 appns_flags,
vec_validate (esm->rx_retries, num_threads - 1);
for (i = 0; i < vec_len (esm->rx_retries); i++)
vec_validate (esm->rx_retries[i],
- pool_elts (session_manager_main.wrk[i].sessions));
+ pool_elts (session_main.wrk[i].sessions));
esm->rcv_buffer_size = clib_max (esm->rcv_buffer_size, esm->fifo_size);
for (i = 0; i < num_threads; i++)
vec_validate (esm->rx_buf[i], esm->rcv_buffer_size);