From 288eaab5964b9211350acad8d742fae4789577fe Mon Sep 17 00:00:00 2001 From: Florin Coras Date: Sun, 3 Feb 2019 15:26:14 -0800 Subject: session: cleanup part 1 Rename core data structures. This will break compatibility for out of tree builtin apps. - stream_session_t to session_t - server_rx/tx_fifo to rx/tx_fifo - stream_session.h to session_types.h - update copyright Change-Id: I414097c6e28bcbea866fbf13b8773c7db3f49325 Signed-off-by: Florin Coras --- src/vnet/session-apps/http_server.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'src/vnet/session-apps/http_server.c') diff --git a/src/vnet/session-apps/http_server.c b/src/vnet/session-apps/http_server.c index 719608a79d1..25d83214112 100644 --- a/src/vnet/session-apps/http_server.c +++ b/src/vnet/session-apps/http_server.c @@ -475,7 +475,7 @@ session_rx_request (http_session_t * hs) } static int -http_server_rx_callback (stream_session_t * s) +http_server_rx_callback (session_t * s) { http_server_args *args; http_session_t *hs; @@ -507,7 +507,7 @@ http_server_rx_callback (stream_session_t * s) } static int -http_server_rx_callback_static (stream_session_t * s) +http_server_rx_callback_static (session_t * s) { http_server_main_t *hsm = &http_server_main; vnet_disconnect_args_t _a = { 0 }, *a = &_a; @@ -578,7 +578,7 @@ wait_for_data: } static int -http_server_session_accept_callback (stream_session_t * s) +http_server_session_accept_callback (session_t * s) { http_server_main_t *hsm = &http_server_main; http_session_t *hs; @@ -592,8 +592,8 @@ http_server_session_accept_callback (stream_session_t * s) hs = http_server_session_alloc (s->thread_index); http_server_session_lookup_add (s->thread_index, s->session_index, hs->session_index); - hs->rx_fifo = s->server_rx_fifo; - hs->tx_fifo = s->server_tx_fifo; + hs->rx_fifo = s->rx_fifo; + hs->tx_fifo = s->tx_fifo; hs->vpp_session_index = s->session_index; hs->vpp_session_handle = session_handle (s); hs->session_state = HTTP_STATE_ESTABLISHED; @@ -606,7 +606,7 @@ http_server_session_accept_callback (stream_session_t * s) } static void -http_server_session_disconnect_callback (stream_session_t * s) +http_server_session_disconnect_callback (session_t * s) { http_server_main_t *hsm = &http_server_main; vnet_disconnect_args_t _a = { 0 }, *a = &_a; @@ -627,7 +627,7 @@ http_server_session_disconnect_callback (stream_session_t * s) } static void -http_server_session_reset_callback (stream_session_t * s) +http_server_session_reset_callback (session_t * s) { http_server_main_t *hsm = &http_server_main; vnet_disconnect_args_t _a = { 0 }, *a = &_a; @@ -649,7 +649,7 @@ http_server_session_reset_callback (stream_session_t * s) static int http_server_session_connected_callback (u32 app_index, u32 api_context, - stream_session_t * s, u8 is_fail) + session_t * s, u8 is_fail) { clib_warning ("called..."); return -1; -- cgit 1.2.3-korg