session: cleanup/rename functions

[vpp.git] / src / vnet / session-apps / echo_server.c

diff --git a/src/vnet/session-apps/echo_server.c b/src/vnet/session-apps/echo_server.c
index 1d99ff1..2762347 100644 (file)
--- 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);