From 6442401c21f880dbfd25d36859f79ddf54b49178 Mon Sep 17 00:00:00 2001 From: Florin Coras Date: Sat, 2 Mar 2019 10:47:47 -0800 Subject: session: remove deprecated binary apis Change-Id: Ia1a628498fa3b639b6b1508f65c6aea1806f73ec Signed-off-by: Florin Coras --- src/tests/vnet/session/tcp_echo.c | 1 - src/tests/vnet/session/udp_echo.c | 37 ------------------------------------- 2 files changed, 38 deletions(-) (limited to 'src/tests/vnet') diff --git a/src/tests/vnet/session/tcp_echo.c b/src/tests/vnet/session/tcp_echo.c index 5249b8d6076..435a414d097 100644 --- a/src/tests/vnet/session/tcp_echo.c +++ b/src/tests/vnet/session/tcp_echo.c @@ -233,7 +233,6 @@ application_send_attach (echo_main_t * em) bmp->context = ntohl (0xfeedface); bmp->options[APP_OPTIONS_FLAGS] = APP_OPTIONS_FLAGS_ACCEPT_REDIRECT; bmp->options[APP_OPTIONS_FLAGS] |= APP_OPTIONS_FLAGS_ADD_SEGMENT; - bmp->options[APP_OPTIONS_FLAGS] |= APP_OPTIONS_FLAGS_USE_MQ_FOR_CTRL_MSGS; bmp->options[APP_OPTIONS_PREALLOC_FIFO_PAIRS] = 16; bmp->options[APP_OPTIONS_RX_FIFO_SIZE] = em->fifo_size; bmp->options[APP_OPTIONS_TX_FIFO_SIZE] = em->fifo_size; diff --git a/src/tests/vnet/session/udp_echo.c b/src/tests/vnet/session/udp_echo.c index 813aee22264..462e113dbbd 100644 --- a/src/tests/vnet/session/udp_echo.c +++ b/src/tests/vnet/session/udp_echo.c @@ -308,7 +308,6 @@ application_send_attach (udp_echo_main_t * utm) bmp->options[APP_OPTIONS_FLAGS] = APP_OPTIONS_FLAGS_ADD_SEGMENT; bmp->options[APP_OPTIONS_FLAGS] |= APP_OPTIONS_FLAGS_USE_GLOBAL_SCOPE; bmp->options[APP_OPTIONS_FLAGS] |= APP_OPTIONS_FLAGS_USE_LOCAL_SCOPE; - bmp->options[APP_OPTIONS_FLAGS] |= APP_OPTIONS_FLAGS_USE_MQ_FOR_CTRL_MSGS; bmp->options[APP_OPTIONS_PREALLOC_FIFO_PAIRS] = 2; bmp->options[APP_OPTIONS_RX_FIFO_SIZE] = utm->fifo_size; bmp->options[APP_OPTIONS_TX_FIFO_SIZE] = utm->fifo_size; @@ -874,41 +873,6 @@ client_test (udp_echo_main_t * utm) wait_for_state_change (utm, STATE_DETACHED); } -static void -vl_api_bind_uri_reply_t_handler (vl_api_bind_uri_reply_t * mp) -{ - udp_echo_main_t *utm = &udp_echo_main; - svm_fifo_t *rx_fifo, *tx_fifo; - app_session_t *session; - u32 session_index; - - if (mp->retval) - { - clib_warning ("bind failed: %d", mp->retval); - utm->state = STATE_FAILED; - return; - } - - rx_fifo = uword_to_pointer (mp->rx_fifo, svm_fifo_t *); - tx_fifo = uword_to_pointer (mp->tx_fifo, svm_fifo_t *); - - pool_get (utm->sessions, session); - clib_memset (session, 0, sizeof (*session)); - session_index = session - utm->sessions; - - rx_fifo->client_session_index = session_index; - tx_fifo->client_session_index = session_index; - session->rx_fifo = rx_fifo; - session->tx_fifo = tx_fifo; - clib_memcpy_fast (&session->transport.lcl_ip, mp->lcl_ip, - sizeof (ip46_address_t)); - session->transport.is_ip4 = mp->lcl_is_ip4; - session->transport.lcl_port = mp->lcl_port; - session->vpp_evt_q = uword_to_pointer (mp->vpp_evt_q, svm_msg_q_t *); - - utm->state = utm->is_connected ? STATE_BOUND : STATE_READY; -} - static void vl_api_map_another_segment_t_handler (vl_api_map_another_segment_t * mp) { @@ -977,7 +941,6 @@ static void } #define foreach_tcp_echo_msg \ -_(BIND_URI_REPLY, bind_uri_reply) \ _(UNBIND_URI_REPLY, unbind_uri_reply) \ _(MAP_ANOTHER_SEGMENT, map_another_segment) \ _(UNMAP_SEGMENT, unmap_segment) \ -- cgit 1.2.3-korg